From 106ecb2b9cdfadec3a3af0901eb7d1f9656e7f22 Mon Sep 17 00:00:00 2001 From: Joel Brown Date: Tue, 12 Aug 2014 11:54:46 -0600 Subject: [PATCH] formatting --- plugins/input/ogr/ogr_datasource.cpp | 23 +++++++++++++++++------ tests/python_tests/ogr_test.py | 2 +- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/plugins/input/ogr/ogr_datasource.cpp b/plugins/input/ogr/ogr_datasource.cpp index 6d516d203..69a0bc1a4 100644 --- a/plugins/input/ogr/ogr_datasource.cpp +++ b/plugins/input/ogr/ogr_datasource.cpp @@ -254,17 +254,28 @@ void ogr_datasource::init(mapnik::parameters const& params) OGRLayer* layer = layer_.layer(); // initialize envelope - boost::optional ext = params.get("extent"); - if (ext && !ext->empty()) - { + + boost::optional ext = params.get("extent"); + + + if (ext && !ext->empty()) + + + { extent_.from_string(*ext); - } + + + } else - { + + + { OGREnvelope envelope; layer->GetExtent(&envelope); extent_.init(envelope.MinX, envelope.MinY, envelope.MaxX, envelope.MaxY); - } + + + } // scan for index file // TODO - layer names don't match dataset name, so this will break for diff --git a/tests/python_tests/ogr_test.py b/tests/python_tests/ogr_test.py index 37a96504f..9720b9eec 100644 --- a/tests/python_tests/ogr_test.py +++ b/tests/python_tests/ogr_test.py @@ -54,7 +54,7 @@ if 'ogr' in mapnik.DatasourceCache.plugin_names(): query.add_property_name('bogus') fs = ds.features(query) - # OGR plugin extent parameter + # OGR plugin extent parameter def test_ogr_extent_parameter(): ds = mapnik.Ogr(file='../data/shp/world_merc.shp',layer_by_index=0,extent='-1,-1,1,1') e = ds.envelope()