Require properties member for geojson features

tidwall · Feb 12, 2019 · 30f903b · 30f903b
1 parent fb7259b
commit 30f903b
Show file tree

Hide file tree

Showing 21 changed files with 151 additions and 35 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -23,7 +23,6 @@
 required = [
   "github.com/tidwall/lotsa", 
   "github.com/mmcloughlin/geohash", 
-  "github.com/tidwall/geojson",
   "github.com/tidwall/evio"
 ]
 
@@ -35,6 +34,10 @@ required = [
   branch = "master"
   name = "github.com/tidwall/boxtree"
 
+[[constraint]]
+  name = "github.com/tidwall/geojson"
+  version = "1.1.0"
+
 [[constraint]]
   name = "github.com/Shopify/sarama"
   version = "1.13.0"

diff --git a/internal/collection/string.go b/internal/collection/string.go
@@ -58,6 +58,11 @@ func (s String) JSON() string {
 	return string(s.AppendJSON(nil))
 }
 
+// MarshalJSON ...
+func (s String) MarshalJSON() ([]byte, error) {
+	return s.AppendJSON(nil), nil
+}
+
 // Within ...
 func (s String) Within(obj geojson.Object) bool {
 	return false

diff --git a/tests/json_test.go b/tests/json_test.go
@@ -30,7 +30,7 @@ func json_JSET_geojson_test(mc *mockServer) error {
 		{"JSET", "mykey", "myid1", "coordinates.1", 44}, {"OK"},
 		{"JGET", "mykey", "myid1"}, {`{"type":"Point","coordinates":[-115,44]}`},
 		{"SET", "mykey", "myid1", "OBJECT", `{"type":"Feature","geometry":{"type":"Point","coordinates":[-115,44]}}`}, {"OK"},
-		{"JGET", "mykey", "myid1"}, {`{"type":"Feature","geometry":{"type":"Point","coordinates":[-115,44]}}`},
+		{"JGET", "mykey", "myid1"}, {`{"type":"Feature","geometry":{"type":"Point","coordinates":[-115,44]},"properties":{}}`},
 		{"JGET", "mykey", "myid1", "geometry.type"}, {"Point"},
 		{"JSET", "mykey", "myid1", "properties.tags.-1", "southwest"}, {"OK"},
 		{"JSET", "mykey", "myid1", "properties.tags.-1", "united states"}, {"OK"},

diff --git a/tests/testcmd_test.go b/tests/testcmd_test.go
@@ -111,7 +111,7 @@ func testcmd_INTERSECTS_CLIP_test(mc *mockServer) error {
 
 		{"TEST", "OBJECT", poly9, "INTERSECTS", "CLIP", "BOUNDS", 37.732906137107, -122.44126439094543, 37.73421283683962, -122.43980526924135}, {"[1 " + poly9 + "]"},
 		{"TEST", "OBJECT", poly8, "INTERSECTS", "CLIP", "BOUNDS", 37.733, -122.4408378, 37.7341129, -122.44}, {"[1 " + poly8 + "]"},
-		{"TEST", "OBJECT", multipoly5, "INTERSECTS", "CLIP", "BOUNDS", 37.73227823422744, -122.44120001792908, 37.73319038868677, -122.43955314159392}, {"[1 " + `{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Polygon","coordinates":[[[-122.4408378,37.73319038868677],[-122.4408378,37.733],[-122.44,37.733],[-122.44,37.73319038868677],[-122.4408378,37.73319038868677]]]}},{"type":"Feature","geometry":{"type":"Polygon","coordinates":[[[-122.44091033935547,37.73227823422744],[-122.43994474411011,37.73227823422744],[-122.43994474411011,37.73254976045042],[-122.44091033935547,37.73254976045042],[-122.44091033935547,37.73227823422744]]]}}]}` + "]"},
+		{"TEST", "OBJECT", multipoly5, "INTERSECTS", "CLIP", "BOUNDS", 37.73227823422744, -122.44120001792908, 37.73319038868677, -122.43955314159392}, {"[1 " + `{"type":"FeatureCollection","features":[{"type":"Feature","geometry":{"type":"Polygon","coordinates":[[[-122.4408378,37.73319038868677],[-122.4408378,37.733],[-122.44,37.733],[-122.44,37.73319038868677],[-122.4408378,37.73319038868677]]]},"properties":{}},{"type":"Feature","geometry":{"type":"Polygon","coordinates":[[[-122.44091033935547,37.73227823422744],[-122.43994474411011,37.73227823422744],[-122.43994474411011,37.73254976045042],[-122.44091033935547,37.73254976045042],[-122.44091033935547,37.73227823422744]]]},"properties":{}}]}` + "]"},
 		{"TEST", "OBJECT", poly101, "INTERSECTS", "CLIP", "BOUNDS", 37.73315644825698, -122.44054287672043, 37.73349585185455, -122.44008690118788}, {"0"},
 	})
 }
diff --git a/tests/tests_test.go b/tests/tests_test.go
@@ -57,7 +57,9 @@ func runSubTest(t *testing.T, name string, mc *mockServer, test func(t *testing.
 }
 
 func runStep(t *testing.T, mc *mockServer, name string, step func(mc *mockServer) error) {
+	t.Helper()
 	t.Run(name, func(t *testing.T) {
+		t.Helper()
 		if err := func() error {
 			// reset the current server
 			mc.ResetConn()

diff --git a/vendor/github.com/tidwall/geojson/circle.go b/vendor/github.com/tidwall/geojson/circle.go
diff --git a/vendor/github.com/tidwall/geojson/collection.go b/vendor/github.com/tidwall/geojson/collection.go
diff --git a/vendor/github.com/tidwall/geojson/feature.go b/vendor/github.com/tidwall/geojson/feature.go
diff --git a/vendor/github.com/tidwall/geojson/feature_test.go b/vendor/github.com/tidwall/geojson/feature_test.go
diff --git a/vendor/github.com/tidwall/geojson/featurecollection.go b/vendor/github.com/tidwall/geojson/featurecollection.go
diff --git a/vendor/github.com/tidwall/geojson/geometrycollection.go b/vendor/github.com/tidwall/geojson/geometrycollection.go
diff --git a/vendor/github.com/tidwall/geojson/linestring.go b/vendor/github.com/tidwall/geojson/linestring.go
diff --git a/vendor/github.com/tidwall/geojson/multilinestring.go b/vendor/github.com/tidwall/geojson/multilinestring.go
diff --git a/vendor/github.com/tidwall/geojson/multipoint.go b/vendor/github.com/tidwall/geojson/multipoint.go
diff --git a/vendor/github.com/tidwall/geojson/multipolygon.go b/vendor/github.com/tidwall/geojson/multipolygon.go
diff --git a/vendor/github.com/tidwall/geojson/object.go b/vendor/github.com/tidwall/geojson/object.go
diff --git a/vendor/github.com/tidwall/geojson/object_test.go b/vendor/github.com/tidwall/geojson/object_test.go