Skip to content

geojson: don't error on nil geometry #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulmach merged 1 commit into from
Jan 16, 2021
+14 −6
Merged

geojson: don't error on nil geometry #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions geojson/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,20 @@ 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 && jf.Geometry.Geometries == nil) {
return ErrInvalidGeometry
var g orb.Geometry
if jf.Geometry != nil {
if jf.Geometry.Coordinates == nil && jf.Geometry.Geometries == nil {
return ErrInvalidGeometry
}
g = jf.Geometry.Geometry()
}

*f = Feature{
ID: jf.ID,
Type: jf.Type,
Properties: jf.Properties,
BBox: jf.BBox,
Geometry: jf.Geometry.Geometry(),
Geometry: g,
}

return nil
Expand Down
10 changes: 7 additions & 3 deletions geojson/feature_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,13 @@ func TestUnmarshalFeature_missingGeometry(t *testing.T) {
t.Run("missing geometry", func(t *testing.T) {
rawJSON := `{ "type": "Feature" }`

_, err := UnmarshalFeature([]byte(rawJSON))
if err != ErrInvalidGeometry {
t.Fatalf("incorrect unmarshal error: %v", err)
f, err := UnmarshalFeature([]byte(rawJSON))
if err != nil {
t.Fatalf("should not error: %v", err)
}

if f == nil {
t.Fatalf("feature should not be nil")
}
})
}
Expand Down
⚡