Merge pull request #2380 from telefonicaid/task/set_geometry_null_val…

…ue_when_invalid_format force null geometry when invalid geo:json format or type found
telefonicaid · Jun 7, 2024 · 22c6c24 · 22c6c24
2 parents 9c9657c + 11ed530
commit 22c6c24
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1 +1,2 @@
 - [cygnus-arcgis] Insert null attribute as is in feature table (#2376)
+- [cygnus-arcgis] force null geometry when invalid geo:json format or type is found instead of Point(0,0) (#2379)
diff --git a/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/Feature.java b/cygnus-common/src/main/java/com/telefonica/iot/cygnus/backends/arcgis/model/Feature.java
@@ -312,7 +312,7 @@ public static Feature createInstanceFromJson(JsonObject json) throws ArcgisExcep
                 geometry = Point.createInstanceFromJson(jsonGeometry); // TODO another 
                                                                        //geometry types?
             } else {
-                geometry = new Point(0, 0);
+                geometry = null;
             }
             Map<String, Object> attributes = attToMap(json.get(ATTRIBUTES_TAG).getAsJsonObject());
             return new Feature(geometry, attributes);

diff --git a/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIArcgisFeatureTableSink.java b/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIArcgisFeatureTableSink.java
@@ -596,10 +596,12 @@ protected void jsonElementToFeatureAttr(String attrName, String attrType, JsonEl
 
                     } else {
                         LOGGER.warn("Invalid geo:json type, only points allowed: " + location.toString());
+                        feature.setGeometry(null);
                     }
                 } catch (Exception e) {
                     LOGGER.error("Invalid geo:json format, (sikipped): " + attrValue.toString() + " - Error: "
                             + e.getMessage());
+                    feature.setGeometry(null);
                 }
                 break;
             case NGSI_BOOLEAN_DATATYPE:
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		- [cygnus-arcgis] Insert null attribute as is in feature table (#2376)
		- [cygnus-arcgis] force null geometry when invalid geo:json format or type is found instead of Point(0,0) (#2379)