Cleanup of Xml files having old .map path in map keys. Updated filename check in NetCDF loadmap_base

Author: doc78

src/lisflood/global_modules/add1.py

@@ -404,7 +404,7 @@ def loadmap_base(name, pcr=False, lddflag=False, timestampflag='exact', averagey
     if not load:
         # read a netcdf  (single one not a stack)
         # here we already tried to load the map as PCRaster and failed, thus try as NetCDF (with or without .nc extension)
-        filename = value if value.lower().endswith('.nc') else value + '.nc'
+        filename = value if value.lower().endswith('.nc') or value.lower().endswith('.map') else value + '.nc'
         # get mapextend of netcdf map and calculate the cutting
         cut0, cut1, cut2, cut3 = mapattrNetCDF(filename)
         # load netcdf map but only the rectangle needed

tests/data/LF_ETRS89_UseCase/settings/cold.xml

@@ -4558,7 +4558,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
 
                 <textvar name="DirectRunoffFraction" value="$(PathMapsLanduse)/fracsealed">
                     <comment>
-                        $(PathMapsLanduse)/fracsealed.map
+                        $(PathMapsLanduse)/fracsealed
                         urban area (0-1)
                     </comment>
                 </textvar>
@@ -4571,7 +4571,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
 
                 <textvar name="ForestFraction" value="$(PathMapsLanduse)/fracforest">
                     <comment>
-                        $(PathMapsLanduse)/fracforest.map
+                        $(PathMapsLanduse)/fracforest
                         forest fraction of a pixel (0-1)
                     </comment>
                 </textvar>
@@ -4585,7 +4585,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
 
                 <textvar name="WaterFraction" value="$(PathMapsLanduse)/fracwater">
                     <comment>
-                        $(PathMapsLanduse)/fracwater.map
+                        $(PathMapsLanduse)/fracwater
                         forest fraction of a pixel (0-1)
                     </comment>
                 </textvar>
@@ -4599,7 +4599,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
 
                 <textvar name="OtherFraction" value="$(PathMapsLanduse)/fracother">
                     <comment>
-                        $(PathMapsLanduse)/fracother.map
+                        $(PathMapsLanduse)/fracother
                         forest fraction of a pixel (0-1)
                     </comment>
                 </textvar>
@@ -4613,7 +4613,7 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
 
                 <textvar name="IrrigationFraction" value="$(PathMapsLanduse)/fracirrigated">
                     <comment>
-                        $(PathMapsLanduse)/fracirrigated.map
+                        $(PathMapsLanduse)/fracirrigated
                         irrigated area fraction of a pixel (0-1)
                     </comment>
                 </textvar>