fix bug, should be recursive (#19)

district10 · web-flow · commit 3e48d2a130dd · 2023-04-10T22:47:36.000+08:00
* diff output

* fix recursive

* fix
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
@@ -54,8 +54,13 @@ benchmark_all:
 normalize:
 	python3 -m pybind11_geobuf normalize_json $(JSON_PATH) --output_path linted_input.json
 	python3 -m pybind11_geobuf normalize_json $(JSON_PATH)__js.pbf.json --output_path linted_js.json
-	# python3 -m pybind11_geobuf normalize_json $(JSON_PATH)__py.pbf.json --output_path linted_py.json
-	python3 -m pybind11_geobuf normalize_json $(JSON_PATH)__cpp.pbf.json --output_path linted_cpp.json && python3 fix.py linted_cpp.json
+	python3 -m pybind11_geobuf normalize_json $(JSON_PATH)__py.pbf.json --output_path linted_py.json
+	python3 -m pybind11_geobuf normalize_json $(JSON_PATH)__cpp.pbf.json --output_path linted_cpp.json
+
+diff:
+	diff linted_input.json linted_js.json
+	diff linted_input.json linted_py.json
+	diff linted_input.json linted_cpp.json
 
 check:
 	vim -p linted_input.json linted_js.json linted_py.json linted_cpp.json
diff --git a/benchmarks/README b/benchmarks/README
@@ -1 +1,3 @@
 make benchmark_all --no-print-directory
+make normalize
+make diff
diff --git a/benchmarks/diffjson.sh b/benchmarks/diffjson.sh
diff --git a/benchmarks/fix.py b/benchmarks/fix.py
diff --git a/docs/about/release-notes.md b/docs/about/release-notes.md
@@ -10,6 +10,10 @@ To upgrade `pybind11-geobuf` to the latest version, use pip:
 pip install -U pybind11-geobuf
 ```
 
+## Version 0.1.2 (2023-04-10)
+
+*   Fix round geojson-non-geometry, should be recursive
+
 ## Version 0.1.1 (2023-04-09)
 
 *   benchmark (speed: cpp > js > python)
diff --git a/setup.py b/setup.py
@@ -127,7 +127,7 @@ def build_extension(self, ext):
 # logic and declaration, and simpler if you include description/version in a file.
 setup(
     name="pybind11_geobuf",
-    version="0.1.1",
+    version="0.1.2",
     author="tzx",
     author_email="dvorak4tzx@gmail.com",
     url="https://geobuf-cpp.readthedocs.io",
diff --git a/src/geobuf/rapidjson_helpers.hpp b/src/geobuf/rapidjson_helpers.hpp
@@ -112,7 +112,7 @@ inline void round_geojson_non_geometry(RapidjsonValue &json, double scale)
     } else if (type == "FeatureCollection") {
         round_rapidjson(json, scale, INT_MAX, {"features"});
         for (auto &f : json["features"].GetArray()) {
-            round_rapidjson(f, scale);
+            round_rapidjson(f, scale, INT_MAX);
         }
     } else if (type == "Point" || type == "MultiPoint" ||
                type == "LineString" || type == "MultiLineString" ||
@@ -121,7 +121,7 @@ inline void round_geojson_non_geometry(RapidjsonValue &json, double scale)
     } else if (type == "GeometryCollection") {
         round_rapidjson(json, scale, INT_MAX, {"geometries"});
         for (auto &g : json["geometries"].GetArray()) {
-            round_rapidjson(g, scale);
+            round_rapidjson(g, scale, INT_MAX);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`make benchmark_all --no-print-directory`
	`2`	`+make normalize`
	`3`	`+make diff`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ inline void round_geojson_non_geometry(RapidjsonValue &json, double scale)`
`112`	`112`	`} else if (type == "FeatureCollection") {`
`113`	`113`	`round_rapidjson(json, scale, INT_MAX, {"features"});`
`114`	`114`	`for (auto &f : json["features"].GetArray()) {`
`115`		`- round_rapidjson(f, scale);`
	`115`	`+ round_rapidjson(f, scale, INT_MAX);`
`116`	`116`	`}`
`117`	`117`	`} else if (type == "Point" \|\| type == "MultiPoint" \|\|`
`118`	`118`	`type == "LineString" \|\| type == "MultiLineString" \|\|`
`@@ -121,7 +121,7 @@ inline void round_geojson_non_geometry(RapidjsonValue &json, double scale)`
`121`	`121`	`} else if (type == "GeometryCollection") {`
`122`	`122`	`round_rapidjson(json, scale, INT_MAX, {"geometries"});`
`123`	`123`	`for (auto &g : json["geometries"].GetArray()) {`
`124`		`- round_rapidjson(g, scale);`
	`124`	`+ round_rapidjson(g, scale, INT_MAX);`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`	`}`