Merge branch 'master' of github.com:orbisgis/geoclimate into ownRsu

orbisgis · May 7, 2024 · 87de9d9 · 87de9d9
2 parents ac76406 + 4714408
commit 87de9d9
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...cators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowGeoIndicators.groovy b/...cators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowGeoIndicators.groovy
@@ -383,7 +383,7 @@ String computeRSUIndicators(JdbcDataSource datasource, String buildingTable,
                                                                             "heavy_industry_lcz": ["refinery"],
                                                                             "residential_lcz"   : ["house", "detached", "bungalow", "farm", "apartments", "barracks",
                                                                                                 "abbey", "condominium", "villa", "dormitory", "sheltered_housing",
-                                                                                               "workers_dormitory", "terrace", "residential"]],
+                                                                                               "workers_dormitory", "terrace", "residential", "cabin"]],
                                      floorAreaTypeAndCompositionLcz     : [:],
                                      buildingAreaTypeAndCompositionTeb  : ["individual_housing": ["house", "detached", "bungalow", "farm", "villa", "terrace", "cabin"],
                                                                            "collective_housing": [ "apartments","barracks","abbey", "dormitory",
@@ -1230,10 +1230,10 @@ Map getParameters() {
                                                   "heavy_industry_lcz": ["refinery"],
                                                   "residential_lcz"   : ["house", "detached", "bungalow", "farm", "apartments", "barracks",
                                                                          "abbey", "condominium", "villa", "dormitory", "sheltered_housing",
-                                                                         "workers_dormitory", "terrace", "residential"]],
+                                                                         "workers_dormitory", "terrace", "residential", "cabin"]],
             "floorAreaTypeAndCompositionLcz"     : [:],
             "buildingAreaTypeAndCompositionTeb"  : ["undefined": ["building"],
-                                                  "individual_housing": ["house", "detached", "bungalow", "farm", "villa", "terrace"],
+                                                  "individual_housing": ["house", "detached", "bungalow", "farm", "villa", "terrace", "cabin"],
                                                   "collective_housing": [ "apartments","barracks","abbey", "dormitory",
                                                                           "sheltered_housing", "workers_dormitory",
                                                                           "condominium", "residential"],
@@ -1260,9 +1260,9 @@ Map getParameters() {
                                                                      "ammunition","bunker","casemate","shelter","religious","place_of_worship",
                                                                      "wayside_shrine","station","stable","sty","greenhouse","kiosk","marketplace",
                                                                      "marker","warehouse","planetarium","fire_station","water_tower","grandstand",
-                                                                     "transportation","toll_booth"]],
+                                                                     "transportation","toll_booth", "hut", "shed"]],
             "floorAreaTypeAndCompositionTeb"     : ["undefined": ["building"],
-                                                    "individual_housing": ["house", "detached", "bungalow", "farm", "villa", "terrace"],
+                                                    "individual_housing": ["house", "detached", "bungalow", "farm", "villa", "terrace", "cabin"],
                                                   "collective_housing": [ "apartments","barracks","abbey", "dormitory",
                                                                           "sheltered_housing", "workers_dormitory",
                                                                           "condominium", "residential"],
@@ -1289,7 +1289,7 @@ Map getParameters() {
                                                                      "ammunition","bunker","casemate","shelter","religious","place_of_worship",
                                                                      "wayside_shrine","station","stable","sty","greenhouse","kiosk","marketplace",
                                                                      "marker","warehouse","planetarium","fire_station","water_tower","grandstand",
-                                                                     "transportation","toll_booth"]],
+                                                                     "transportation","toll_booth","hut", "shed"]],
             "utrfSurfFraction"              : ["vegetation_fraction_utrf"                : ["high_vegetation_fraction",
                                                                                             "low_vegetation_fraction",
                                                                                             "high_vegetation_low_vegetation_fraction",