Merge branch 'master' into update_november

orbisgis · Dec 8, 2023 · fc4ef28 · fc4ef28
2 parents 5ce4251 + a62146e
commit fc4ef28
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/geoindicators/src/main/resources/styles/en/sld/rsu_lcz_primary.sld b/geoindicators/src/main/resources/styles/en/sld/rsu_lcz_primary.sld
@@ -2,7 +2,7 @@
 <sld:StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:sld="http://www.opengis.net/sld"
                            xmlns:ogc="http://www.opengis.net/ogc"
                            version="1.0.0">
-    <sld:UserLayer>
+    <sld:NamedLayer>
         <sld:UserStyle>
             <sld:FeatureTypeStyle>
                 <sld:Rule>
@@ -330,5 +330,5 @@
                 </sld:Rule>
             </sld:FeatureTypeStyle>
         </sld:UserStyle>
-    </sld:UserLayer>
+    </sld:NamedLayer>
 </sld:StyledLayerDescriptor>
diff --git a/osm/src/test/groovy/org/orbisgis/geoclimate/osm/InputDataFormattingTest.groovy b/osm/src/test/groovy/org/orbisgis/geoclimate/osm/InputDataFormattingTest.groovy
@@ -316,6 +316,8 @@ class InputDataFormattingTest {
 
        //zoneToExtract="Sassenage"
 
+        zoneToExtract=[50, 8.6, 50.2, 8.8]
+
         Map extractData = OSM.InputDataLoading.extractAndCreateGISLayers(h2GIS, zoneToExtract)
 
         String formatedPlaceName = zoneToExtract.join("-").trim().split("\\s*(,|\\s)\\s*").join("_");

diff --git a/osm/src/test/groovy/org/orbisgis/geoclimate/osm/WorflowOSMTest.groovy b/osm/src/test/groovy/org/orbisgis/geoclimate/osm/WorflowOSMTest.groovy
@@ -651,7 +651,7 @@ class WorflowOSMTest extends WorkflowAbstractTest {
         dirFile.mkdir()
         def location = "Nice"
        //def nominatim = OSMTools.Utilities.getNominatimData("Nantes")
-        location="Sassenage"
+        //location=[50, 8.6, 50.2, 8.8]
        //location = nominatim.bbox
 
         def osm_parmeters = [
@@ -674,7 +674,7 @@ class WorflowOSMTest extends WorkflowAbstractTest {
                         ["distance"                                             : 0,
                          "rsu_indicators"                                       : [
 
-                                 "indicatorUse": ["LCZ"] //, "UTRF", "TEB"]
+                                 "indicatorUse": ["LCZ", "UTRF"] //, "UTRF", "TEB"]
 
                          ]/*,"grid_indicators": [
                                 "x_size": 200,