sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OGR : support reading OFTInteger64/OFTInteger64List

Browse source
This commit is contained in:
artemp 2015-06-16 11:36:17 +02:00
parent 0a24e8cfca
commit 8bf82b717e
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/input/ogr/ogr_datasource.cpp
View file

@ -330,7 +330,6 @@ void ogr_datasource::init(mapnik::parameters const& params)
const std::string fld_name = fld->GetNameRef(); const std::string fld_name = fld->GetNameRef();
const OGRFieldType type_oid = fld->GetType(); const OGRFieldType type_oid = fld->GetType();
switch (type_oid) switch (type_oid)
{ {
case OFTInteger: case OFTInteger:

6
plugins/input/ogr/ogr_featureset.cpp
View file

@ -125,6 +125,9 @@ feature_ptr ogr_featureset::next()
switch (type_oid) switch (type_oid)
{ {
case OFTInteger: case OFTInteger:
#if GDAL_VERSION_MAJOR >= 2
case OFTInteger64:
#endif
{ {
feature->put<mapnik::value_integer>( fld_name, poFeature->GetFieldAsInteger(i)); feature->put<mapnik::value_integer>( fld_name, poFeature->GetFieldAsInteger(i));
break; break;
@ -144,6 +147,9 @@ feature_ptr ogr_featureset::next()
} }
case OFTIntegerList: case OFTIntegerList:
#if GDAL_VERSION_MAJOR >= 2
case OFTInteger64List:
#endif
case OFTRealList: case OFTRealList:
case OFTStringList: case OFTStringList:
case OFTWideStringList: // deprecated ! case OFTWideStringList: // deprecated !