Merge pull request geo-data#1 from angelswing-team/fix-#DPP-26

Support GDAL 3.0 in cesium-terrain-builder
sotex · Jun 9, 2020 · 363131a · 363131a
2 parents 08d105f + d304da1
commit 363131a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 1 deletion.
diff --git a/src/GDALTiler.cpp b/src/GDALTiler.cpp
@@ -70,6 +70,11 @@ GDALTiler::GDALTiler(GDALDataset *poDataset, const Grid &grid, const TilerOption
     OGRSpatialReference srcSRS = OGRSpatialReference(srcWKT);
     OGRSpatialReference gridSRS = mGrid.getSRS();
 
+    #if ( GDAL_VERSION_MAJOR >= 3 )
+    srcSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+    gridSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+    #endif
+
     if (!srcSRS.IsSame(&gridSRS)) { // it doesn't match
       // Check the srs is valid
       switch(srcSRS.Validate()) {

diff --git a/src/GlobalGeodetic.cpp b/src/GlobalGeodetic.cpp
@@ -27,6 +27,11 @@ using namespace ctb;
 static OGRSpatialReference
 setSRS(void) {
   OGRSpatialReference srs;
+
+  #if ( GDAL_VERSION_MAJOR >= 3 )
+  srs.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+  #endif
+
   srs.importFromEPSG(4326);
   return srs;
 }

diff --git a/src/GlobalMercator.cpp b/src/GlobalMercator.cpp
@@ -34,6 +34,11 @@ const double GlobalMercator::cOriginShift = GlobalMercator::cEarthCircumference
 static OGRSpatialReference
 setSRS(void) {
   OGRSpatialReference srs;
+
+  #if ( GDAL_VERSION_MAJOR >= 3 )
+  srs.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+  #endif
+
   srs.importFromEPSG(3857);
   return srs;
 }

diff --git a/src/Grid.hpp b/src/Grid.hpp
@@ -67,7 +67,11 @@ class ctb::Grid {
     mXOriginShift(extent.getWidth() / 2),
     mYOriginShift(extent.getHeight() / 2),
     mZoomFactor(zoomFactor)
-  {}
+  {
+    #if ( GDAL_VERSION_MAJOR >= 3 )
+    mSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+    #endif
+  }
 
   /// Overload the assignment operator
   Grid &

diff --git a/src/TerrainTile.cpp b/src/TerrainTile.cpp
@@ -324,6 +324,11 @@ TerrainTile::heightsToRaster() const {
 
   // Create the spatial reference system for the raster
   OGRSpatialReference oSRS;
+
+  #if ( GDAL_VERSION_MAJOR >= 3 )
+  oSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+  #endif
+
   if (oSRS.importFromEPSG(4326) != OGRERR_NONE) {
     throw CTBException("Could not create EPSG:4326 spatial reference");
   }

diff --git a/tools/ctb-tile.cpp b/tools/ctb-tile.cpp
@@ -523,6 +523,11 @@ createEmptyRootElevationFile(std::string &fileName, const Grid &grid, const Tile
 
   // Create the spatial reference system for the file
   OGRSpatialReference oSRS;
+
+  #if ( GDAL_VERSION_MAJOR >= 3 )
+  oSRS.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+  #endif
+
   if (oSRS.importFromEPSG(4326) != OGRERR_NONE) {
     throw CTBException("Could not create EPSG:4326 spatial reference");
   }