fix #211 reading of sww files without xllcorner and yllcorner attribu…

…tes (#214) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
lutraconsulting · Feb 20, 2020 · 356de8e · 356de8e
1 parent 3ffbf15
commit 356de8e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/mdal/frmts/mdal_netcdf.cpp b/mdal/frmts/mdal_netcdf.cpp
@@ -144,6 +144,14 @@ double NetCDFFile::getFillValue( int varid ) const
   return getAttrDouble( varid, "_FillValue" );
 }
 
+bool NetCDFFile::hasAttrDouble( int varid, const std::string &attr_name ) const
+{
+  double res;
+  if ( nc_get_att_double( mNcid, varid, attr_name.c_str(), &res ) )
+    return false;
+  return true;
+}
+
 double NetCDFFile::getAttrDouble( int varid, const std::string &attr_name ) const
 {
   double res;

diff --git a/mdal/frmts/mdal_netcdf.hpp b/mdal/frmts/mdal_netcdf.hpp
@@ -28,6 +28,7 @@ class NetCDFFile
 
     bool hasAttrInt( const std::string &name, const std::string &attr_name ) const;
     int getAttrInt( const std::string &name, const std::string &attr_name ) const;
+    bool hasAttrDouble( int varid, const std::string &attr_name ) const;
     double getAttrDouble( int varid, const std::string &attr_name ) const;
     /**
      * Get string attribute

diff --git a/mdal/frmts/mdal_sww.cpp b/mdal/frmts/mdal_sww.cpp
@@ -122,8 +122,12 @@ MDAL::Vertices MDAL::DriverSWW::readVertices( const NetCDFFile &ncFile ) const
   std::vector<double> pz = readZCoords( ncFile );
 
   // we may need to apply a shift to the X,Y coordinates
-  double xLLcorner = ncFile.getAttrDouble( NC_GLOBAL, "xllcorner" );
-  double yLLcorner = ncFile.getAttrDouble( NC_GLOBAL, "yllcorner" );
+  double xLLcorner = 0.0;
+  if ( ncFile.hasAttrDouble( NC_GLOBAL, "xllcorner" ) )
+    xLLcorner = ncFile.getAttrDouble( NC_GLOBAL, "xllcorner" );
+  double yLLcorner = 0.0;
+  if ( ncFile.hasAttrDouble( NC_GLOBAL, "yllcorner" ) )
+    yLLcorner = ncFile.getAttrDouble( NC_GLOBAL, "yllcorner" );
 
   MDAL::Vertices vertices( nPoints );
   Vertex *vertexPtr = vertices.data();

diff --git a/tests/test_sww.cpp b/tests/test_sww.cpp
@@ -34,21 +34,15 @@ TEST( MeshSWWTest, Cairns )
 
   std::vector<double> expectedCoords =
   {
-    0.0, 0.0, 0.0,
-    12, 0, 0.0,
-    12, 12, 0.0,
-    0, 12, 0.0,
-    12, 24, 0.0,
-    0, 24, 0.0,
-    24, 0, 0.0,
-    24, 12, 0.0,
-    24, 24, 0.0
+    368725.71875, 8129547, 3.109999895095825,
+    368745.71875, 8129547, 3.010999917984009,
+    368765.71875, 8129547, 2.920000076293945
   };
-  EXPECT_EQ( expectedCoords.size(), 9 * 3 );
+  EXPECT_EQ( expectedCoords.size(), 3 * 3 );
 
-  std::vector<double> coordinates = getCoordinates( m, 9 );
+  std::vector<double> coordinates = getCoordinates( m, 3 );
 
-  compareVectors( expectedCoords, coordinates );
+  EXPECT_TRUE( compareVectors( expectedCoords, coordinates ) );
 
   // ///////////
   // Faces