fix ogr plugin compile

This commit is contained in:
Dane Springmeyer 2015-03-24 14:16:28 -07:00
parent dcc5632f82
commit 546e46756c

View file

@ -405,16 +405,16 @@ boost::optional<mapnik::datasource_geometry_t> ogr_datasource::get_geometry_type
{ {
case wkbPoint: case wkbPoint:
case wkbMultiPoint: case wkbMultiPoint:
result.reset(mapnik::datasource::Point); result.reset(mapnik::datasource_geometry_t::Point);
break; break;
case wkbLinearRing: case wkbLinearRing:
case wkbLineString: case wkbLineString:
case wkbMultiLineString: case wkbMultiLineString:
result.reset(mapnik::datasource::LineString); result.reset(mapnik::datasource_geometry_t::LineString);
break; break;
case wkbPolygon: case wkbPolygon:
case wkbMultiPolygon: case wkbMultiPolygon:
result.reset(mapnik::datasource::Polygon); result.reset(mapnik::datasource_geometry_t::Polygon);
break; break;
case wkbGeometryCollection: case wkbGeometryCollection:
result.reset(mapnik::datasource_geometry_t::Collection); result.reset(mapnik::datasource_geometry_t::Collection);
@ -440,16 +440,16 @@ boost::optional<mapnik::datasource_geometry_t> ogr_datasource::get_geometry_type
{ {
case wkbPoint: case wkbPoint:
case wkbMultiPoint: case wkbMultiPoint:
result.reset(mapnik::datasource::Point); result.reset(mapnik::datasource_geometry_t::Point);
break; break;
case wkbLinearRing: case wkbLinearRing:
case wkbLineString: case wkbLineString:
case wkbMultiLineString: case wkbMultiLineString:
result.reset(mapnik::datasource::LineString); result.reset(mapnik::datasource_geometry_t::LineString);
break; break;
case wkbPolygon: case wkbPolygon:
case wkbMultiPolygon: case wkbMultiPolygon:
result.reset(mapnik::datasource::Polygon); result.reset(mapnik::datasource_geometry_t::Polygon);
break; break;
case wkbGeometryCollection: case wkbGeometryCollection:
result.reset(mapnik::datasource_geometry_t::Collection); result.reset(mapnik::datasource_geometry_t::Collection);