Merge branch 'modify_types' of github.com:j3r3m1/geoclimate into modi…

…fy_types
orbisgis · Mar 26, 2024 · 5bb4342 · 5bb4342
2 parents 83b22e4 + 857aa37
commit 5bb4342
Show file tree

Hide file tree

Showing 3 changed files with 143 additions and 118 deletions.
diff --git a/bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/WorkflowDebugTest.groovy b/bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/WorkflowDebugTest.groovy
@@ -158,7 +158,7 @@ class WorkflowDebugTest {
                 "parameters"  :
                         ["distance"       : 0,
                          rsu_indicators   : [
-                                 "indicatorUse": ["LCZ",  "UTRF",  "URBAN_TYPOLOGY"]
+                                 "indicatorUse": ["LCZ",  "UTRF"]
                          ],
                          "grid_indicators": [
                                  "x_size"    : 1000,

diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/RsuIndicators.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/RsuIndicators.groovy
@@ -530,14 +530,14 @@ String projectedFacadeAreaDistribution(JdbcDataSource datasource, String buildin
         def sumNamesDir = []
         def queryColumns = []
         for (int d = 0; d < numberOfDirection / 2; d++) {
-            Integer dirDeg = d * 360 / numberOfDirection
+            int dirDeg = d * 360 / numberOfDirection
             def dirRad = toRadians(dirDeg)
-            Integer rangeDeg = 360 / numberOfDirection
+            int rangeDeg = 360 / numberOfDirection
             def dirRadMid = dirRad + dirMedRad
             def dirDegMid = dirDeg + dirMedDeg
             // Define the field name for each of the directions and vertical layers
             names.each {
-                namesAndTypeDir += " " + "${getDistribIndicName(it, 'D', dirDeg, dirDeg + rangeDeg)} double"
+                namesAndTypeDir += " " + "${getDistribIndicName(it, 'D', dirDeg, dirDeg + rangeDeg)} double precision"
                 queryColumns += """CASE
                             WHEN  a.azimuth-$dirRadMid>PI()/2
                             THEN  a.$it*a.length*COS(a.azimuth-$dirRadMid-PI()/2)/2