Merge pull request #670 from ELSW56/fix_Pb_windows

Ok it compiles. I merge it. @ELSW56 +1
orbisgis · Feb 1, 2022 · 37af576 · 37af576
2 parents bed6715 + b709429
commit 37af576
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/GenericIndicators.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/GenericIndicators.groovy
@@ -480,7 +480,7 @@ IProcess distributionCharacterization() {
                 }
                 // Get the distribution columns and the number of columns
                 def distribColumns = allColumns.minus(inputId.toUpperCase())
-                def nbDistCol = distribColumns.size
+                def nbDistCol = distribColumns.size()
 
                 def idxExtrem = nbDistCol - 1
                 def idxExtrem_1 = nbDistCol - 2

diff --git a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/WorkflowOSM.groovy b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/WorkflowOSM.groovy
@@ -383,7 +383,7 @@ IProcess workflow() {
                                 return
                             }
                             def allowedOutputTableNames = geoclimateTableNames.intersect(outputTableNames.keySet())
-                            def notSameTableNames = allowedOutputTableNames.groupBy { it.value }.size() != allowedOutputTableNames.size()
+                            def notSameTableNames = allowedOutputTableNames.groupBy { it}.size() != allowedOutputTableNames.size()
                             if (allowedOutputTableNames && !notSameTableNames) {
                                 def finalOutputTables = outputTableNames.subMap(allowedOutputTableNames)
                                 def output_datasource = createDatasource(outputDataBase.subMap(["user", "password", "url"]))

diff --git a/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/utils/Utilities.groovy b/osmtools/src/main/groovy/org/orbisgis/geoclimate/osmtools/utils/Utilities.groovy
@@ -154,10 +154,10 @@ class Utilities {
             error e.getMessage()
             return null
         }
-        if (coordinates.size == 1) {
+        if (coordinates.size() == 1) {
             return geometryFactory.createPolygon(ring)
         } else {
-            def holes = coordinates[1..coordinates.size - 1].collect { it ->
+            def holes = coordinates[1..coordinates.size() - 1].collect { it ->
                 geometryFactory.createLinearRing(arrayToCoordinate(it))
             }.toArray(new LinearRing[0])
             return geometryFactory.createPolygon(ring, holes)
@@ -173,10 +173,10 @@ class Utilities {
      */
     static Coordinate[] arrayToCoordinate(def coordinates) {
         coordinates.collect { it ->
-            if (it.size == 2) {
+            if (it.size() == 2) {
                 def (x, y) = it
                 new Coordinate(x, y)
-            } else if (it.size == 3) {
+            } else if (it.size() == 3) {
                 def (x, y, z) = it
                 new Coordinate(x, y, z)
             }