aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Stabiszewski <github@grundid.de>2020-03-29 21:06:46 +0200
committerGitHub <noreply@github.com>2020-03-29 21:06:46 +0200
commitf3d62d71a71b1162c4ce8dd91d6d98413765d037 (patch)
treeca980ca1dac695d5205b18d36184271e66108b96
parentc82cc35537b59965827d1a21142d4e9afa69d885 (diff)
parentf640223f108eddfb801b34a82652b825418c779f (diff)
downloadgeojson-jackson-f3d62d71a71b1162c4ce8dd91d6d98413765d037.tar.gz
Merge pull request #54 from zepinto/master
GeoJsonObject: Ignore unknown properties (such as "name" used by QGIS).
-rw-r--r--src/main/java/org/geojson/GeoJsonObject.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/org/geojson/GeoJsonObject.java b/src/main/java/org/geojson/GeoJsonObject.java
index 3aafc4a..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 double[] bbox;
public Crs getCrs() {
return crs;
}
@@ -36,7 +37,6 @@ public abstract class GeoJsonObject implements Serializable {
this.bbox = bbox;
}
-
public abstract <T> T accept(GeoJsonObjectVisitor<T> geoJsonObjectVisitor);
@Override public boolean equals(Object o) {