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

Merge pull request #4419 from geofabrik/drop-old-gdal-pr

Browse source 
Drop support for old versions of GDAL/OGR (older than 2.0)
This commit is contained in:
Artem Pavlenko 2023-11-17 09:10:49 +00:00 • committed by GitHub
commit 279acf4c36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,8 +24,6 @@
#include "ogr_featureset.hpp" #include "ogr_featureset.hpp"
#include "ogr_index_featureset.hpp" #include "ogr_index_featureset.hpp"
#include <gdal_version.h>
// mapnik // mapnik
#include <mapnik/debug.hpp> #include <mapnik/debug.hpp>
#include <mapnik/boolean.hpp> #include <mapnik/boolean.hpp>
@ -93,11 +91,7 @@ ogr_datasource::~ogr_datasource()
{ {
// free layer before destroying the datasource // free layer before destroying the datasource
layer_.free_layer(); layer_.free_layer();
#if GDAL_VERSION_MAJOR >= 2
GDALClose((GDALDatasetH)dataset_); GDALClose((GDALDatasetH)dataset_);
#else
OGRDataSource::DestroyDataSource(dataset_);
#endif
} }
void ogr_datasource::init(mapnik::parameters const& params) void ogr_datasource::init(mapnik::parameters const& params)
@ -136,27 +130,15 @@ void ogr_datasource::init(mapnik::parameters const& params)
if (!driver.empty()) if (!driver.empty())
{ {
#if GDAL_VERSION_MAJOR >= 2
unsigned int nOpenFlags = GDAL_OF_READONLY | GDAL_OF_VECTOR; unsigned int nOpenFlags = GDAL_OF_READONLY | GDAL_OF_VECTOR;
const char* papszAllowedDrivers[] = {driver.c_str(), nullptr}; const char* papszAllowedDrivers[] = {driver.c_str(), nullptr};
dataset_ = reinterpret_cast<gdal_dataset_type>( dataset_ = reinterpret_cast<gdal_dataset_type>(
GDALOpenEx(dataset_name_.c_str(), nOpenFlags, papszAllowedDrivers, nullptr, nullptr)); GDALOpenEx(dataset_name_.c_str(), nOpenFlags, papszAllowedDrivers, nullptr, nullptr));
#else
OGRSFDriver* ogr_driver = OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName(driver.c_str());
if (ogr_driver && ogr_driver != nullptr)
{
dataset_ = ogr_driver->Open((dataset_name_).c_str(), false);
}
#endif
} }
else else
{ {
// open ogr driver // open ogr driver
#if GDAL_VERSION_MAJOR >= 2
dataset_ = reinterpret_cast<gdal_dataset_type>(OGROpen(dataset_name_.c_str(), false, nullptr)); dataset_ = reinterpret_cast<gdal_dataset_type>(OGROpen(dataset_name_.c_str(), false, nullptr));
#else
dataset_ = OGRSFDriverRegistrar::Open(dataset_name_.c_str(), false);
#endif
} }
if (!dataset_) if (!dataset_)
@ -353,9 +335,7 @@ void ogr_datasource::init(mapnik::parameters const& params)
switch (type_oid) switch (type_oid)
{ {
case OFTInteger: case OFTInteger:
#if GDAL_VERSION_MAJOR >= 2
case OFTInteger64: case OFTInteger64:
#endif
desc_.add_descriptor(attribute_descriptor(fld_name, mapnik::Integer)); desc_.add_descriptor(attribute_descriptor(fld_name, mapnik::Integer));
break; break;
@ -373,9 +353,7 @@ void ogr_datasource::init(mapnik::parameters const& params)
break; break;
case OFTIntegerList: case OFTIntegerList:
#if GDAL_VERSION_MAJOR >= 2
case OFTInteger64List: case OFTInteger64List:
#endif
case OFTRealList: case OFTRealList:
case OFTStringList: case OFTStringList:
case OFTWideStringList: // deprecated ! case OFTWideStringList: // deprecated !

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

@ -122,12 +122,10 @@ feature_ptr ogr_featureset::next()
feature->put<mapnik::value_integer>(fld_name, poFeature->GetFieldAsInteger(i)); feature->put<mapnik::value_integer>(fld_name, poFeature->GetFieldAsInteger(i));
break; break;
} }
#if GDAL_VERSION_MAJOR >= 2
case OFTInteger64: { case OFTInteger64: {
feature->put<mapnik::value_integer>(fld_name, poFeature->GetFieldAsInteger64(i)); feature->put<mapnik::value_integer>(fld_name, poFeature->GetFieldAsInteger64(i));
break; break;
} }
#endif
case OFTReal: { case OFTReal: {
feature->put(fld_name, poFeature->GetFieldAsDouble(i)); feature->put(fld_name, poFeature->GetFieldAsDouble(i));
@ -142,9 +140,7 @@ feature_ptr ogr_featureset::next()
} }
case OFTIntegerList: case OFTIntegerList:
#if GDAL_VERSION_MAJOR >= 2
case OFTInteger64List: case OFTInteger64List:
#endif
case OFTRealList: case OFTRealList:
case OFTStringList: case OFTStringList:
case OFTWideStringList: // deprecated ! case OFTWideStringList: // deprecated !

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

@ -48,8 +48,6 @@ MAPNIK_DISABLE_WARNING_POP
#include "ogr_converter.hpp" #include "ogr_converter.hpp"
#include "ogr_index.hpp" #include "ogr_index.hpp"
#include <gdal_version.h>
using mapnik::box2d; using mapnik::box2d;
using mapnik::feature_factory; using mapnik::feature_factory;
using mapnik::feature_ptr; using mapnik::feature_ptr;
@ -153,12 +151,10 @@ feature_ptr ogr_index_featureset<filterT>::next()
feature->put<mapnik::value_integer>(fld_name, poFeature->GetFieldAsInteger(i)); feature->put<mapnik::value_integer>(fld_name, poFeature->GetFieldAsInteger(i));
break; break;
} }
#if GDAL_VERSION_MAJOR >= 2
case OFTInteger64: { case OFTInteger64: {
feature->put<mapnik::value_integer>(fld_name, poFeature->GetFieldAsInteger64(i)); feature->put<mapnik::value_integer>(fld_name, poFeature->GetFieldAsInteger64(i));
break; break;
} }
#endif
case OFTReal: { case OFTReal: {
feature->put(fld_name, poFeature->GetFieldAsDouble(i)); feature->put(fld_name, poFeature->GetFieldAsDouble(i));
@ -173,9 +169,7 @@ feature_ptr ogr_index_featureset<filterT>::next()
} }
case OFTIntegerList: case OFTIntegerList:
#if GDAL_VERSION_MAJOR >= 2
case OFTInteger64List: case OFTInteger64List:
#endif
case OFTRealList: case OFTRealList:
case OFTStringList: case OFTStringList:
case OFTWideStringList: // deprecated ! case OFTWideStringList: // deprecated !

5
plugins/input/ogr/ogr_layer_ptr.hpp
View file

@ -30,14 +30,9 @@
#include <stdexcept> #include <stdexcept>
// gdal // gdal
#include <gdal_version.h>
#include <ogrsf_frmts.h> #include <ogrsf_frmts.h>
#if GDAL_VERSION_MAJOR >= 2
using gdal_dataset_type = GDALDataset*; using gdal_dataset_type = GDALDataset*;
#else
using gdal_dataset_type = OGRDataSource*;
#endif
class ogr_layer_ptr class ogr_layer_ptr
{ {