From e7c562e6deaae534797a34e9d63cd898ffd87a99 Mon Sep 17 00:00:00 2001 From: zp Date: Sat, 28 Mar 2020 09:40:57 +0000 Subject: GeoJsonObject: Added optional property "name" used by QGIS. --- src/main/java/org/geojson/GeoJsonObject.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/geojson/GeoJsonObject.java b/src/main/java/org/geojson/GeoJsonObject.java index 3aafc4a..960f96f 100644 --- a/src/main/java/org/geojson/GeoJsonObject.java +++ b/src/main/java/org/geojson/GeoJsonObject.java @@ -19,7 +19,7 @@ public abstract class GeoJsonObject implements Serializable { private Crs crs; private double[] bbox; - + private String name = ""; public Crs getCrs() { return crs; } @@ -37,6 +37,20 @@ public abstract class GeoJsonObject implements Serializable { } + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + public abstract T accept(GeoJsonObjectVisitor geoJsonObjectVisitor); @Override public boolean equals(Object o) { -- cgit v1.2.3 From f640223f108eddfb801b34a82652b825418c779f Mon Sep 17 00:00:00 2001 From: zp Date: Sat, 28 Mar 2020 09:48:34 +0000 Subject: GeoJsonObject: Ignore unknown properties. --- src/main/java/org/geojson/GeoJsonObject.java | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/geojson/GeoJsonObject.java b/src/main/java/org/geojson/GeoJsonObject.java index 960f96f..ed045f2 100644 --- a/src/main/java/org/geojson/GeoJsonObject.java +++ b/src/main/java/org/geojson/GeoJsonObject.java @@ -1,5 +1,9 @@ package org.geojson; +import java.io.Serializable; +import java.util.Arrays; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -7,19 +11,16 @@ import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; -import java.io.Serializable; -import java.util.Arrays; - @JsonTypeInfo(property = "type", use = Id.NAME) @JsonSubTypes({ @Type(Feature.class), @Type(Polygon.class), @Type(MultiPolygon.class), @Type(FeatureCollection.class), @Type(Point.class), @Type(MultiPoint.class), @Type(MultiLineString.class), @Type(LineString.class), @Type(GeometryCollection.class) }) @JsonInclude(Include.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) public abstract class GeoJsonObject implements Serializable { private Crs crs; - private double[] bbox; - private String name = ""; + private double[] bbox; public Crs getCrs() { return crs; } @@ -36,21 +37,6 @@ public abstract class GeoJsonObject implements Serializable { this.bbox = bbox; } - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - public abstract T accept(GeoJsonObjectVisitor geoJsonObjectVisitor); @Override public boolean equals(Object o) { -- cgit v1.2.3