Merge branch 'master' into w_target_filter

orbisgis · Dec 10, 2024 · 0f60dc6 · 0f60dc6
2 parents 5a67f39 + 76ba3df
commit 0f60dc6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -8,4 +8,5 @@
 - Add a test to check if the worldpop service is available
 - Fix github actions
 - Add TARGET landcover production
+- Force TARGET ROOF fraction to 0.75 when BUILDING fraction is greater than 0.75
 - Force TARGET W indicator to the grid resolution
diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/GridIndicators.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/GridIndicators.groovy
@@ -387,7 +387,7 @@ String formatGrid4Target(JdbcDataSource datasource, String gridTable, float reso
                             THE_GEOM,
                             ID_COL, ID_ROW,
                             CAST(row_number() over(ORDER BY ID_ROW DESC) as integer) as "FID",
-                            BUILDING_FRACTION AS "roof",
+                            CASE WHEN BUILDING_FRACTION>0.75 THEN 0.75 ELSE BUILDING_FRACTION END AS "roof",
                             ROAD_FRACTION AS "road",
                             WATER_FRACTION AS "watr",
                             IMPERVIOUS_FRACTION AS "conc",