add recognision of ECMWF_ERA to MDAL

qgis · Oct 5, 2018 · 618ed2e · 618ed2e
1 parent 9acc5c1
commit 618ed2e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/external/mdal/frmts/mdal_gdal.cpp b/external/mdal/frmts/mdal_gdal.cpp
@@ -545,6 +545,7 @@ void MDAL::LoaderGdal::parseBandIsVector( std::string &band_name, bool *is_vecto
        MDAL::startsWith( band_name, "x-", MDAL::CaseInsensitive ) ||
        MDAL::contains( band_name, "u-component", MDAL::CaseInsensitive ) ||
        MDAL::contains( band_name, "u component", MDAL::CaseInsensitive ) ||
+       MDAL::contains( band_name, "U wind component", MDAL::CaseInsensitive ) ||
        MDAL::contains( band_name, "x-component", MDAL::CaseInsensitive ) ||
        MDAL::contains( band_name, "x component", MDAL::CaseInsensitive ) )
   {
@@ -555,6 +556,7 @@ void MDAL::LoaderGdal::parseBandIsVector( std::string &band_name, bool *is_vecto
             MDAL::startsWith( band_name, "y-", MDAL::CaseInsensitive ) ||
             MDAL::contains( band_name, "v-component", MDAL::CaseInsensitive ) ||
             MDAL::contains( band_name, "v component", MDAL::CaseInsensitive ) ||
+            MDAL::contains( band_name, "V wind component", MDAL::CaseInsensitive ) ||
             MDAL::contains( band_name, "y-component", MDAL::CaseInsensitive ) ||
             MDAL::contains( band_name, "y component", MDAL::CaseInsensitive ) )
   {
@@ -571,6 +573,8 @@ void MDAL::LoaderGdal::parseBandIsVector( std::string &band_name, bool *is_vecto
   {
     band_name = MDAL::replace( band_name, "u-component of", "", MDAL::CaseInsensitive );
     band_name = MDAL::replace( band_name, "v-component of", "", MDAL::CaseInsensitive );
+    band_name = MDAL::replace( band_name, "U wind component", "wind", MDAL::CaseInsensitive );
+    band_name = MDAL::replace( band_name, "V wind component", "wind", MDAL::CaseInsensitive );
     band_name = MDAL::replace( band_name, "x-component of", "", MDAL::CaseInsensitive );
     band_name = MDAL::replace( band_name, "y-component of", "", MDAL::CaseInsensitive );
     band_name = MDAL::replace( band_name, "u-component", "", MDAL::CaseInsensitive );

diff --git a/external/mdal/mdal.cpp b/external/mdal/mdal.cpp
@@ -18,7 +18,7 @@ static MDAL_Status sLastStatus;
 
 const char *MDAL_Version()
 {
-  return "0.0.8";
+  return "0.0.10";
 }
 
 MDAL_Status MDAL_LastStatus()