From cfc06057972d5dcec1ebba192698966e2aa392c8 Mon Sep 17 00:00:00 2001 From: jeremy Date: Mon, 6 May 2024 12:25:15 +0200 Subject: [PATCH] Add the recently added building types into default parameters and in LCZ calc --- .../geoindicators/WorkflowGeoIndicators.groovy | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowGeoIndicators.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowGeoIndicators.groovy index aedeba729c..05d1dacb4f 100644 --- a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowGeoIndicators.groovy +++ b/geoindicators/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",