diff --git a/geojson/feature.go b/geojson/feature.go index dea91f4..33a439a 100644 --- a/geojson/feature.go +++ b/geojson/feature.go @@ -78,7 +78,7 @@ func (f *Feature) UnmarshalJSON(data []byte) error { return fmt.Errorf("geojson: not a feature: type=%s", jf.Type) } - if jf.Geometry == nil || jf.Geometry.Coordinates == nil { + if jf.Geometry == nil || (jf.Geometry.Coordinates == nil && jf.Geometry.Geometries == nil) { return ErrInvalidGeometry } @@ -87,7 +87,7 @@ func (f *Feature) UnmarshalJSON(data []byte) error { Type: jf.Type, Properties: jf.Properties, BBox: jf.BBox, - Geometry: jf.Geometry.Coordinates, + Geometry: jf.Geometry.Geometry(), } return nil diff --git a/geojson/feature_test.go b/geojson/feature_test.go index 549837e..726d39d 100644 --- a/geojson/feature_test.go +++ b/geojson/feature_test.go @@ -146,6 +146,23 @@ func TestUnmarshalFeature(t *testing.T) { } } +func TestUnmarshalFeature_GeometryCollection(t *testing.T) { + rawJSON := ` + { "type": "Feature", + "geometry": {"type":"GeometryCollection","geometries":[{"type": "Point", "coordinates": [102.0, 0.5]}]} + }` + + f, err := UnmarshalFeature([]byte(rawJSON)) + if err != nil { + t.Fatalf("unmarshal error: %v", err) + } + + wantType := orb.Collection{}.GeoJSONType() + if f.Geometry.GeoJSONType() != wantType { + t.Fatalf("invalid GeoJSONType: %v", f.Geometry.GeoJSONType()) + } +} + func TestUnmarshalFeature_missingGeometry(t *testing.T) { t.Run("empty geometry", func(t *testing.T) { rawJSON := `{ "type": "Feature", "geometry": {} }`