Merge branch 'master' into feature_impl

plugins/input/gdal/gdal_datasource.cpp

@@ -28,6 +28,8 @@
 #include <mapnik/ptree_helpers.hpp>
 #include <mapnik/geom_util.hpp>
 
+#include <gdal_version.h>
+
 using mapnik::datasource;
 using mapnik::parameters;
 

plugins/input/ogr/ogr_datasource.cpp

@@ -30,6 +30,8 @@
 #include "ogr_index_featureset.hpp"
 #include "ogr_feature_ptr.hpp"
 
+#include <gdal_version.h>
+
 // mapnik
 #include <mapnik/ptree_helpers.hpp>
 #include <mapnik/geom_util.hpp>
@@ -350,7 +352,11 @@ boost::optional<mapnik::datasource::geometry_t> ogr_datasource::get_geometry_typ
     {
         OGRLayer* layer = layer_.layer();
         // NOTE: wkbFlatten macro in ogr flattens 2.5d types into base 2d type
+#if GDAL_VERSION_NUM < 1800
+        switch (wkbFlatten(layer->GetLayerDefn()->GetGeomType()))
+#else
         switch (wkbFlatten(layer->GetGeomType()))
+#endif
         {
         case wkbPoint:
         case wkbMultiPoint:

tests/python_tests/ogr_test.py

@@ -26,8 +26,9 @@ if 'ogr' in mapnik.DatasourceCache.instance().plugin_names():
     
     # Shapefile properties
     def test_shapefile_properties():
-        s = mapnik.Ogr(file='../../demo/data/boundaries.shp',layer_by_index=0,encoding='latin1')
-        f = s.features_at_point(s.envelope().center()).features[0]
+        ds = mapnik.Ogr(file='../../demo/data/boundaries.shp',layer_by_index=0,encoding='latin1')
+        f = ds.features_at_point(ds.envelope().center()).features[0]
+        eq_(ds.geometry_type(),mapnik.DataGeometryType.Polygon)
     
         eq_(f['CGNS_FID'], u'6f733341ba2011d892e2080020a0f4c9')
         eq_(f['COUNTRY'], u'CAN')