diff options
| author | Adrian Stabiszewski <github@grundid.de> | 2015-06-26 12:02:09 +0200 |
|---|---|---|
| committer | Adrian Stabiszewski <github@grundid.de> | 2015-06-26 12:02:09 +0200 |
| commit | 0e44f43c5d8c027d473af61517391de09adff44f (patch) | |
| tree | 65a129816bff351210bdde43adc15b5983c0798c | |
| parent | 5b2667a884ae8aa664ad22a0a332487f18f519a7 (diff) | |
| parent | dfcffebe2c9f65dd894e40ef94258a53b63b0a69 (diff) | |
| download | geojson-jackson-0e44f43c5d8c027d473af61517391de09adff44f.tar.gz | |
Merge pull request #22 from robpc/master
Fix for GeometryCollection not being a valid geometry
| -rw-r--r-- | src/main/java/org/geojson/GeoJsonObject.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/org/geojson/GeoJsonObject.java b/src/main/java/org/geojson/GeoJsonObject.java index 32ac04c..3aafc4a 100644 --- a/src/main/java/org/geojson/GeoJsonObject.java +++ b/src/main/java/org/geojson/GeoJsonObject.java @@ -12,7 +12,8 @@ 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(Point.class), @Type(MultiPoint.class), @Type(MultiLineString.class), @Type(LineString.class), + @Type(GeometryCollection.class) }) @JsonInclude(Include.NON_NULL) public abstract class GeoJsonObject implements Serializable { |