Warn instead of fail for non-Earth Dem's on 20.04 (#2828) (#2882)

* Dem: check for nullptr and fix memory leak * Fix deprecation warning * Catch exceptions from Dem::GetGeoReference* APIs Wrap calls to Dem::GetGeoReference and Dem::GetGeoReferenceOrigin in a try/catch block and print warning messages if exceptions are caught. The Dem_TEST is still broken on 20.04, but this prevents crashes. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
gazebosim · Nov 24, 2020 · d133984 · d133984
1 parent 25d3381
commit d133984
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 22 deletions.
diff --git a/gazebo/common/Dem.cc b/gazebo/common/Dem.cc
@@ -106,25 +106,34 @@ int Dem::Load(const std::string &_filename)
   ySize = this->dataPtr->dataSet->GetRasterYSize();
 
   // Corner coordinates
-  upLeftX = 0.0;
-  upLeftY = 0.0;
-  upRightX = xSize;
-  upRightY = 0.0;
-  lowLeftX = 0.0;
-  lowLeftY = ySize;
-
-  // Calculate the georeferenced coordinates of the terrain corners
-  this->GetGeoReference(upLeftX, upLeftY, upLeftLat, upLeftLong);
-  this->GetGeoReference(upRightX, upRightY, upRightLat, upRightLong);
-  this->GetGeoReference(lowLeftX, lowLeftY, lowLeftLat, lowLeftLong);
-
-  // Set the world width and height
-  this->dataPtr->worldWidth =
-     common::SphericalCoordinates::Distance(upLeftLat, upLeftLong,
-                                            upRightLat, upRightLong);
-  this->dataPtr->worldHeight =
-     common::SphericalCoordinates::Distance(upLeftLat, upLeftLong,
-                                            lowLeftLat, lowLeftLong);
+  try
+  {
+    upLeftX = 0.0;
+    upLeftY = 0.0;
+    upRightX = xSize;
+    upRightY = 0.0;
+    lowLeftX = 0.0;
+    lowLeftY = ySize;
+
+    // Calculate the georeferenced coordinates of the terrain corners
+    this->GetGeoReference(upLeftX, upLeftY, upLeftLat, upLeftLong);
+    this->GetGeoReference(upRightX, upRightY, upRightLat, upRightLong);
+    this->GetGeoReference(lowLeftX, lowLeftY, lowLeftLat, lowLeftLong);
+
+    // Set the world width and height
+    this->dataPtr->worldWidth =
+       common::SphericalCoordinates::Distance(upLeftLat, upLeftLong,
+                                              upRightLat, upRightLong);
+    this->dataPtr->worldHeight =
+       common::SphericalCoordinates::Distance(upLeftLat, upLeftLong,
+                                              lowLeftLat, lowLeftLong);
+  }
+  catch(const common::Exception &)
+  {
+    gzwarn << "Failed to automatically compute DEM size. "
+           << "Please use the <size> element to manually set DEM size."
+           << std::endl;
+  }
 
   // Set the terrain's side (the terrain will be squared after the padding)
   if (ignition::math::isPowerOfTwo(ySize - 1))
@@ -165,7 +174,9 @@ int Dem::Load(const std::string &_filename)
   }
   if (ignition::math::equal(min, ignition::math::MAX_D) ||
       ignition::math::equal(max, -ignition::math::MAX_D))
+  {
     gzwarn << "Dem is composed of 'nodata' values!" << std::endl;
+  }
 
   this->dataPtr->minElevation = min;
   this->dataPtr->maxElevation = max;
@@ -211,10 +222,20 @@ void Dem::GetGeoReference(double _x, double _y,
     double xGeoDeg, yGeoDeg;
 
     // Transform the terrain's coordinate system to WGS84
-    char *importString = strdup(this->dataPtr->dataSet->GetProjectionRef());
+    #if GDAL_VERSION_NUM >= 2030000
+    const char *importString;
+    #else
+    char *importString;
+    #endif
+    importString = strdup(this->dataPtr->dataSet->GetProjectionRef());
     sourceCs.importFromWkt(&importString);
     targetCs.SetWellKnownGeogCS("WGS84");
     cT = OGRCreateCoordinateTransformation(&sourceCs, &targetCs);
+    if (nullptr == cT)
+    {
+      gzthrow("Unable to transform terrain coordinate system to WGS84 for "
+          << "coordinates (" << _x << "," << _y << ")");
+    }
 
     xGeoDeg = geoTransf[0] + _x * geoTransf[1] + _y * geoTransf[2];
     yGeoDeg = geoTransf[3] + _x * geoTransf[4] + _y * geoTransf[5];
@@ -223,10 +244,14 @@ void Dem::GetGeoReference(double _x, double _y,
 
     _latitude.Degree(yGeoDeg);
     _longitude.Degree(xGeoDeg);
+
+    OCTDestroyCoordinateTransformation(cT);
   }
   else
+  {
     gzthrow("Unable to obtain the georeferenced values for coordinates ("
-            << _x << "," << _y << ")\n");
+            << _x << "," << _y << ")");
+  }
 }
 
 //////////////////////////////////////////////////

diff --git a/gazebo/physics/HeightmapShape.cc b/gazebo/physics/HeightmapShape.cc
@@ -116,7 +116,16 @@ int HeightmapShape::LoadTerrainFile(const std::string &_filename)
       ignition::math::Angle latitude, longitude;
       double elevation;
 
-      this->dem.GetGeoReferenceOrigin(latitude, longitude);
+      try
+      {
+        this->dem.GetGeoReferenceOrigin(latitude, longitude);
+      }
+      catch(const common::Exception &)
+      {
+        gzwarn << "DEM coordinate transformation error. "
+               << "SphericalCoordiantes and GpsSensor may not function properly."
+               << std::endl;
+      }
       elevation = this->dem.GetElevation(0.0, 0.0);
 
       sphericalCoordinates->SetLatitudeReference(latitude);
@@ -125,7 +134,9 @@ int HeightmapShape::LoadTerrainFile(const std::string &_filename)
       sphericalCoordinates.reset();
     }
     else
+    {
       gzerr << "Unable to get a valid SphericalCoordinates pointer\n";
+    }
 
     return 0;
   }