Merge branch 'master' into task/log_json_geometry

telefonicaid · Sep 25, 2024 · a6d9cb3 · a6d9cb3
2 parents a957ce8 + d6e9e78
commit a6d9cb3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1,2 +1,3 @@
 - [cygnus-ngsi][arcgis] Log json geometry before create instance and in errors related
-- [cygnus-ngsi][arcgis] Fix CygnusRuntimeError due to Cannot invoke "java.util.List.size()" because "serverFeatures" is null (#2413)
+- [cygnus-common][arcgis] toString of complex geometry is not returning equivalent input (#2418)
+- [cygnus-ngsi][arcgis] Fix CygnusRuntimeError due to Cannot invoke "java.util.List.size()" because "serverFeatures" is null (#2413)
diff --git a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/MultiPoint.java b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/MultiPoint.java
@@ -144,18 +144,16 @@ public static Geometry createInstanceFromJson(JsonObject json) throws ArcgisExce
      */
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("{ \"points\": [");
+        sb.append("[");
         for (int i = 0; i < this.points.size(); i++) {
             sb.append("[");
-            double[] array = points.get(i);                
+            double[] array = points.get(i);
             for (double value : array) {
                 sb.append(" ").append(value).append(",");
             }
-            sb.setLength(sb.length() - 2);
             sb.append(" ],");
         }
-        sb.setLength(sb.length() - 2);
-        sb.append(" ]}");
+        sb.append(" ]");
         return sb.toString();
     }
 

diff --git a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/PolyLine.java b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/PolyLine.java
@@ -144,23 +144,21 @@ public static Geometry createInstanceFromJson(JsonObject json) throws ArcgisExce
      */
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("{ \"paths\": [");
+        sb.append("[");
         for (int i = 0; i < this.paths.size(); i++) {
             List<double[]> innerList = this.paths.get(i);
+            sb.append("[");
             for (int j = 0; j < innerList.size(); j++) {
                 sb.append(" [");
-                sb.append("[");
                 double[] array = innerList.get(j);
                 for (double value : array) {
                     sb.append(" ").append(value).append(",");
                 }
-                sb.append(" ]");
-                sb.setLength(sb.length() - 2);
                 sb.append(" ],");
             }
+            sb.append(" ]");
         }
-        sb.setLength(sb.length() - 2);
-        sb.append(" ]}");
+        sb.append(" ]");
         return sb.toString();
     }
 

diff --git a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/Polygon.java b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/Polygon.java
@@ -144,23 +144,21 @@ public static Geometry createInstanceFromJson(JsonObject json) throws ArcgisExce
      */
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("{ \"rings\": [");
+        sb.append("[");
         for (int i = 0; i < this.rings.size(); i++) {
             List<double[]> innerList = this.rings.get(i);
+            sb.append("[");
             for (int j = 0; j < innerList.size(); j++) {
                 sb.append(" [");
-                sb.append("[");
                 double[] array = innerList.get(j);
                 for (double value : array) {
                     sb.append(" ").append(value).append(",");
                 }
-                sb.append(" ]");
-                sb.setLength(sb.length() - 2);
                 sb.append(" ],");
             }
+            sb.append(" ]");
         }
-        sb.setLength(sb.length() - 2);
-        sb.append(" ]}");
+        sb.append(" ]");
         return sb.toString();
     }