Merge branch 'master' into urban_areas_rsu

orbisgis · Oct 5, 2023 · 695ea04 · 695ea04
2 parents 43f0307 + 008e4c8
commit 695ea04
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 17 deletions.
diff --git a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/InputDataFormatting.groovy b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/InputDataFormatting.groovy
@@ -455,21 +455,29 @@ String formatVegetationLayer(JdbcDataSource datasource, String vegetation, Strin
                 datasource.eachRow(queryMapper) { row ->
                     def type = getTypeValue(row, columnNames, mappingType)
                     if (type) {
-                        def height_class = typeAndVegClass[type]
-                        def zindex = getZIndex(row."layer")
-                        Geometry geom = row.the_geom
-                        int epsg = geom.getSRID()
-                        for (int i = 0; i < geom.getNumGeometries(); i++) {
-                            Geometry subGeom = geom.getGeometryN(i)
-                            if (subGeom instanceof Polygon && subGeom.getArea()>1) {
-                                stmt.addBatch """
+                        //Check surface
+                        boolean addGeom = true
+                        if (row."surface" && row."surface" != "grass") {
+                            addGeom=false
+                        }
+                        if (addGeom) {
+                            def height_class = typeAndVegClass[type]
+                            def zindex = getZIndex(row."layer")
+
+                            Geometry geom = row.the_geom
+                            int epsg = geom.getSRID()
+                            for (int i = 0; i < geom.getNumGeometries(); i++) {
+                                Geometry subGeom = geom.getGeometryN(i)
+                                if (subGeom instanceof Polygon && subGeom.getArea() > 1) {
+                                    stmt.addBatch """
                                             INSERT INTO $outputTableName VALUES(
                                                 ST_GEOMFROMTEXT('${subGeom}',$epsg), 
                                                 ${rowcount++}, 
                                                 '${row.id}',
                                                 ${singleQuote(type)}, 
                                                 ${singleQuote(height_class)}, ${zindex})
                                     """.toString()
+                                }
                             }
                         }
                     }

diff --git a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/InputDataLoading.groovy b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/InputDataLoading.groovy
@@ -99,7 +99,7 @@ Map extractAndCreateGISLayers(JdbcDataSource datasource, Object zoneToExtract, f
             def keysValues = ["building", "railway", "amenity",
                               "leisure", "highway", "natural",
                               "landuse", "landcover",
-                              "vegetation", "waterway", "area", "aeroway", "area:aeroway"]
+                              "vegetation", "waterway", "area", "aeroway", "area:aeroway", "tourism", "sport"]
             query = "[maxsize:1073741824]" + OSMTools.Utilities.buildOSMQueryWithAllData(envelope, keysValues, OSMElement.NODE, OSMElement.WAY, OSMElement.RELATION)
         }
 

diff --git a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/WorkflowOSM.groovy b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/WorkflowOSM.groovy
@@ -439,7 +439,7 @@ Map osm_processing(JdbcDataSource h2gis_datasource, def processing_parameters, d
                 def keysValues = ["building", "railway", "amenity",
                                   "leisure", "highway", "natural",
                                   "landuse", "landcover",
-                                  "vegetation", "waterway", "area", "aeroway", "area:aeroway"]
+                                  "vegetation", "waterway", "area", "aeroway", "area:aeroway", "tourism", "sport"]
                 query = "[timeout:$overpass_timeout][maxsize:$overpass_maxsize]" + OSMTools.Utilities.buildOSMQueryWithAllData(zones.envelope, keysValues, OSMElement.NODE, OSMElement.WAY, OSMElement.RELATION)
             }
 

diff --git a/osm/src/main/resources/org/orbisgis/geoclimate/osm/vegetParams.json b/osm/src/main/resources/org/orbisgis/geoclimate/osm/vegetParams.json
@@ -46,7 +46,9 @@
     "produce": [],
     "surface": [
       "grass"
-    ]
+    ],
+    "tourism": ["camp_site"],
+    "sport": []
   },
   "columns": [
     "natural",
@@ -63,7 +65,9 @@
     "produce",
     "layer",
     "surface",
-    "leisure"
+    "leisure",
+    "tourism",
+    "sport"
   ],
   "type": {
     "farmland": {
@@ -121,7 +125,9 @@
       ],
       "surface": [
         "grass"
-      ]
+      ],
+      "tourism": ["camp_site"],
+      "sport": ["soccer", "rugby"]
     },
     "grassland": {
       "landcover": [

diff --git a/osm/src/test/groovy/org/orbisgis/geoclimate/osm/InputDataFormattingTest.groovy b/osm/src/test/groovy/org/orbisgis/geoclimate/osm/InputDataFormattingTest.groovy
@@ -64,7 +64,7 @@ class InputDataFormattingTest {
         assertEquals 1038, h2GIS.getTable(extractData.building).rowCount
         assertEquals 211, h2GIS.getTable(extractData.road).rowCount
         assertEquals 44, h2GIS.getTable(extractData.rail).rowCount
-        assertEquals 135, h2GIS.getTable(extractData.vegetation).rowCount
+        assertEquals 136, h2GIS.getTable(extractData.vegetation).rowCount
         assertEquals 10, h2GIS.getTable(extractData.water).rowCount
         assertEquals 47, h2GIS.getTable(extractData.impervious).rowCount
         assertEquals 6, h2GIS.getTable(extractData.urban_areas).rowCount
@@ -248,7 +248,7 @@ class InputDataFormattingTest {
         assertEquals 1038, h2GIS.getTable(extractData.building).rowCount
         assertEquals 211, h2GIS.getTable(extractData.road).rowCount
         assertEquals 44, h2GIS.getTable(extractData.rail).rowCount
-        assertEquals 135, h2GIS.getTable(extractData.vegetation).rowCount
+        assertEquals 136, h2GIS.getTable(extractData.vegetation).rowCount
         assertEquals 10, h2GIS.getTable(extractData.water).rowCount
         assertEquals 47, h2GIS.getTable(extractData.impervious).rowCount
 
@@ -311,7 +311,7 @@ class InputDataFormattingTest {
 
             zoneToExtract = "Göteborgs Stad"
 
-        zoneToExtract = "Dijon"
+        zoneToExtract = "Ploemeur"
 
         //zoneToExtract =  [69.24666, 28.3359, 69.32999, 28.41923]
 

diff --git a/osm/src/test/groovy/org/orbisgis/geoclimate/osm/InputDataLoadingTest.groovy b/osm/src/test/groovy/org/orbisgis/geoclimate/osm/InputDataLoadingTest.groovy
@@ -57,7 +57,7 @@ class InputDataLoadingTest {
         Map extract = OSM.InputDataLoading.createGISLayers(h2GIS, osmfile, 2154)
         assertEquals 1038, h2GIS.getTable(extract.building).rowCount
 
-        assertEquals 135, h2GIS.getTable(extract.vegetation).rowCount
+        assertEquals 136, h2GIS.getTable(extract.vegetation).rowCount
         assertEquals 211, h2GIS.getTable(extract.road).rowCount
 
         assertEquals 44, h2GIS.getTable(extract.rail).rowCount