Fix lat/lon order for coodinate transformations for GDAL 3.x

Author: gbburkhardt

src/gov/nasa/worldwind/data/GDAL.java

@@ -32,6 +32,8 @@
 import gov.nasa.worldwind.geom.*;
 import gov.nasa.worldwind.util.Logging;
 import gov.nasa.worldwind.util.gdal.GDALUtils;
+import gov.nasa.worldwind.util.gdal.GDALUtils.LatLonOrder;
+
 import org.gdal.gdal.Dataset;
 import org.gdal.osr.*;
 
@@ -111,8 +113,10 @@ public Area(SpatialReference srs, Dataset ds) throws IllegalArgumentException
  if (null == srs)
  {
  String wkt = ds.GetProjectionRef();
- if (null != wkt && wkt.length() > 0)
+ if (null != wkt && wkt.length() > 0) {
  srs = new SpatialReference(wkt);
+ GDALUtils.setGDAL3axis(srs);
+ }
 
  if (null == srs)
  {

src/gov/nasa/worldwind/data/GDALDataRaster.java

@@ -38,6 +38,7 @@
 import org.gdal.gdal.*;
 import org.gdal.gdalconst.gdalconst;
 import org.gdal.osr.SpatialReference;
+import org.gdal.osr.osrConstants;
 
 import java.awt.geom.*;
 import java.io.*;
@@ -269,12 +270,14 @@ protected SpatialReference readSpatialReference(Dataset ds)
  if (!WWUtil.isEmpty(proj))
  {
  srs = new SpatialReference(proj);
+ GDALUtils.setGDAL3axis(srs);
  }
 
  if ((null == srs || srs.IsLocal() == 1) && this.hasKey(AVKey.SPATIAL_REFERENCE_WKT))
  {
  proj = this.getStringValue(AVKey.SPATIAL_REFERENCE_WKT);
  srs = new SpatialReference(proj);
+ srs.SetAxisMappingStrategy(osrConstants.OAMS_AUTHORITY_COMPLIANT);
  }
 
  return srs;

src/gov/nasa/worldwind/data/GDALMetadata.java

@@ -31,6 +31,8 @@
 import gov.nasa.worldwind.avlist.*;
 import gov.nasa.worldwind.exception.WWRuntimeException;
 import gov.nasa.worldwind.util.*;
+import gov.nasa.worldwind.util.gdal.GDALUtils;
+
 import org.gdal.gdal.Dataset;
 import org.gdal.osr.SpatialReference;
 
@@ -348,6 +350,7 @@ else if (zone.endsWith("S"))
  try
  {
  SpatialReference srs = new SpatialReference();
+ GDALUtils.setGDAL3axis(srs);
  srs.ImportFromProj4(proj4.toString());
  destParams.setValue(AVKey.SPATIAL_REFERENCE_WKT, srs.ExportToWkt());
  }

src/gov/nasa/worldwind/data/TiledRasterProducer.java

@@ -281,8 +281,16 @@ protected void initLevelSetParameters(AVList params)
  // Compute a sector that bounds the data rasters. Make sure the sector does not exceed the limits of
  // latitude and longitude.
  sector = this.computeBoundingSector(this.dataRasterList);
- if (sector != null)
+ if (sector != null) 
+ {
  sector = sector.intersection(Sector.FULL_SPHERE);
+ if (sector == null) 
+ {
+ String msg = Logging.getMessage("generic.CannotCreateRaster", dataRasterList.get(0).toString());
+ Logging.logger().severe(msg);
+ return;
+ }
+ }
  params.setValue(AVKey.SECTOR, sector);
  }
 

src/gov/nasa/worldwind/util/gdal/GDALUtils.java

@@ -44,6 +44,7 @@
 import java.awt.color.*;
 import java.awt.image.*;
 import java.io.*;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.nio.*;
 import java.util.*;
@@ -84,6 +85,9 @@ public class GDALUtils
  protected static final String GDAL_DATA_PATH = "GDAL_DATA";
 
  protected static final AtomicBoolean gdalIsAvailable = new AtomicBoolean(false);
+ 
+ public enum LatLonOrder { latLonCRSauthority, longitudeLatitude };
+ private static LatLonOrder latLonOrder = LatLonOrder.latLonCRSauthority;
 
  static
  {
@@ -199,6 +203,25 @@ public class GDALUtils
  }
  }
  }
+ 
+ // For GDAL 3.0, set the transformation axis order. Coordinate transformations
+ // for vesion 2.x and 3.x have lat/lon reversed
+ // See https://gdal.org/tutorials/osr_api_tut.html#crs-and-axis-order
+ public static void setGDAL3axis(SpatialReference srs)
+ {
+ // Force all transformations to return longitude, latitude
+ try {
+ Class<?>[] a = { int.class };
+ Method setAxis = srs.getClass().getMethod("SetAxisMappingStrategy", a);
+ Field v = org.gdal.osr.osrConstants.class.getField("OAMS_TRADITIONAL_GIS_ORDER");
+ setAxis.invoke(srs, v.getInt(v));
+ latLonOrder = LatLonOrder.longitudeLatitude;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ 
+ public static LatLonOrder getLatLonOrder() { return latLonOrder; }
 
  protected static String getCurrentDirectory()
  {
@@ -1164,6 +1187,7 @@ public static SpatialReference createGeographicSRS() throws WWRuntimeException
  }
 
  SpatialReference srs = new SpatialReference();
+ GDALUtils.setGDAL3axis(srs);
  srs.ImportFromProj4("+proj=latlong +datum=WGS84 +no_defs");
  return srs;
  }
@@ -1468,6 +1492,7 @@ else if (dataType == gdalconst.GDT_UInt32)
  {
  params.setValue(AVKey.SPATIAL_REFERENCE_WKT, proj_wkt);
  srs = new SpatialReference(proj_wkt);
+ GDALUtils.setGDAL3axis(srs);
  }
 
  double[] gt = new double[6];
@@ -1504,6 +1529,12 @@ else if (Angle.isValidLongitude(minX) && Angle.isValidLatitude(maxY)
  if (null == srs)
  {
  srs = createGeographicSRS();
+ // For GDAL 3.0, set the transformation axis order
+ try {
+ Method setAxis = srs.getClass().getMethod("SetAxisMappingStrategy", Integer.class);
+ Field v = org.gdal.osr.osrConstants.class.getField("OAMS_TRADITIONAL_GIS_ORDER");
+ setAxis.invoke(srs, v);
+ } catch (Exception e) {}
  }
  else if (srs.IsGeographic() == 0)
  {