qgis · May 11, 2020
diff --git a/‎external/mdal/frmts/mdal_3di.cpp
Lines changed: 15 additions & 1 deletion b/‎external/mdal/frmts/mdal_3di.cpp
Lines changed: 15 additions & 1 deletion
diff --git a/‎external/mdal/frmts/mdal_3di.hpp
Lines changed: 7 additions & 2 deletions b/‎external/mdal/frmts/mdal_3di.hpp
Lines changed: 7 additions & 2 deletions
@@ -194,10 +194,16 @@ std::set<std::string> MDAL::Driver3Di::ignoreNetCDFVariables()
   return ignore_variables;
 }
 
-void MDAL::Driver3Di::parseNetCDFVariableMetadata( int varid, const std::string &variableName, std::string &name, bool *is_vector, bool *is_x )
+void MDAL::Driver3Di::parseNetCDFVariableMetadata( int varid,
+    std::string &variableName,
+    std::string &name,
+    bool *is_vector,
+    bool *isPolar,
+    bool *is_x )
 {
   *is_vector = false;
   *is_x = true;
+  *isPolar = false;
 
   std::string long_name = mNcFile->getAttrStr( "long_name", varid );
   if ( long_name.empty() )
@@ -209,6 +215,7 @@ void MDAL::Driver3Di::parseNetCDFVariableMetadata( int varid, const std::string
     }
     else
     {
+      variableName = standard_name;
       if ( MDAL::contains( standard_name, "_x_" ) )
       {
         *is_vector = true;
@@ -228,6 +235,7 @@ void MDAL::Driver3Di::parseNetCDFVariableMetadata( int varid, const std::string
   }
   else
   {
+    variableName = long_name;
     if ( MDAL::contains( long_name, " in x direction" ) )
     {
       *is_vector = true;
@@ -245,3 +253,9 @@ void MDAL::Driver3Di::parseNetCDFVariableMetadata( int varid, const std::string
     }
   }
 }
+
+std::vector<std::pair<double, double>> MDAL::Driver3Di::parseClassification( int varid ) const
+{
+  MDAL_UNUSED( varid );
+  return std::vector<std::pair<double, double>>();
+}
@@ -50,8 +50,13 @@ namespace MDAL
       std::string getCoordinateSystemVariableName() override;
       std::string getTimeVariableName() const override;
       std::set<std::string> ignoreNetCDFVariables() override;
-      void parseNetCDFVariableMetadata( int varid, const std::string &variableName,
-                                        std::string &name, bool *is_vector, bool *is_x ) override;
+      void parseNetCDFVariableMetadata( int varid,
+                                        std::string &variableName,
+                                        std::string &name,
+                                        bool *is_vector,
+                                        bool *isPolar,
+                                        bool *is_x ) override;
+      std::vector<std::pair<double, double>> parseClassification( int varid ) const override;
 
       //! Returns number of vertices
       size_t parse2DMesh();
Original file line number	Diff line number	Diff line change
`@@ -194,10 +194,16 @@ std::set<std::string> MDAL::Driver3Di::ignoreNetCDFVariables()`
`194`	`194`	`return ignore_variables;`
`195`	`195`	`}`
`196`	`196`
`197`		`-void MDAL::Driver3Di::parseNetCDFVariableMetadata( int varid, const std::string &variableName, std::string &name, bool is_vector, bool is_x )`
	`197`	`+void MDAL::Driver3Di::parseNetCDFVariableMetadata( int varid,`
	`198`	`+ std::string &variableName,`
	`199`	`+ std::string &name,`
	`200`	`+ bool *is_vector,`
	`201`	`+ bool *isPolar,`
	`202`	`+ bool *is_x )`
`198`	`203`	`{`
`199`	`204`	`*is_vector = false;`
`200`	`205`	`*is_x = true;`
	`206`	`+ *isPolar = false;`
`201`	`207`
`202`	`208`	`std::string long_name = mNcFile->getAttrStr( "long_name", varid );`
`203`	`209`	`if ( long_name.empty() )`
`@@ -209,6 +215,7 @@ void MDAL::Driver3Di::parseNetCDFVariableMetadata( int varid, const std::string`
`209`	`215`	`}`
`210`	`216`	`else`
`211`	`217`	`{`
	`218`	`+ variableName = standard_name;`
`212`	`219`	`if ( MDAL::contains( standard_name, "_x_" ) )`
`213`	`220`	`{`
`214`	`221`	`*is_vector = true;`
`@@ -228,6 +235,7 @@ void MDAL::Driver3Di::parseNetCDFVariableMetadata( int varid, const std::string`
`228`	`235`	`}`
`229`	`236`	`else`
`230`	`237`	`{`
	`238`	`+ variableName = long_name;`
`231`	`239`	`if ( MDAL::contains( long_name, " in x direction" ) )`
`232`	`240`	`{`
`233`	`241`	`*is_vector = true;`
`@@ -245,3 +253,9 @@ void MDAL::Driver3Di::parseNetCDFVariableMetadata( int varid, const std::string`
`245`	`253`	`}`
`246`	`254`	`}`
`247`	`255`	`}`
	`256`	`+`
	`257`	`+std::vector<std::pair<double, double>> MDAL::Driver3Di::parseClassification( int varid ) const`
	`258`	`+{`
	`259`	`+ MDAL_UNUSED( varid );`
	`260`	`+ return std::vector<std::pair<double, double>>();`
	`261`	`+}`