diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-05 18:05:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Round coordinates instead of truncating them (#60)

Browse Source 
* Round coordinates instead of truncating them

* Update all the tests for coordinate rounding changes

* Curses, integer division still truncates

* Fix tests

* Also round instead of shifting when looking for no-op linetos

* Should I worry that the same change for moveto doesn't change any tests?

* Also round instead of shifting when scaling down to maxzoom resolution

* Replace another explicit shift, for origin point

* Round instead of shift when writing clipped geometries to the next zoom

* Fix low-zoom gridding and smaller-than-a-pixel checks

* Don't guess an excessively large maxzoom when there is only one feature

* Add a test for guessing the maxzoom of a single point

* Explicitly sort by index if no other order distinguishes features

* Another affected test
This commit is contained in:
Erica Fischer
2023-01-27 10:57:22 -08:00
committed by GitHub
parent 1c576c2dc1
commit c58a8e3b97
181 changed files with 166358 additions and 165951 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/stable/out/-z3_-B0.json
+54 -54
View File
@@ -13,111 +13,111 @@
}, "features": [
{ "type": "FeatureCollection", "properties": { "zoom": 0, "x": 0, "y": 0 }, "features": [
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
{ "type": "Feature", "properties": { "order": "one" }, "geometry": { "type": "Point", "coordinates": [ -122.080078, 37.020098 ] } }
{ "type": "Feature", "properties": { "order": "one" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 37.020098 ] } }
,
{ "type": "Feature", "properties": { "order": "two" }, "geometry": { "type": "Point", "coordinates": [ -122.080078, 37.020098 ] } }
{ "type": "Feature", "properties": { "order": "two" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 37.020098 ] } }
,
{ "type": "Feature", "properties": { "order": "three" }, "geometry": { "type": "Point", "coordinates": [ -122.080078, 37.020098 ] } }
{ "type": "Feature", "properties": { "order": "three" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 37.020098 ] } }
,
{ "type": "Feature", "properties": { "order": "four" }, "geometry": { "type": "Point", "coordinates": [ -122.080078, 37.020098 ] } }
{ "type": "Feature", "properties": { "order": "four" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 37.020098 ] } }
,
{ "type": "Feature", "properties": { "order": "five" }, "geometry": { "type": "Point", "coordinates": [ -122.080078, 37.020098 ] } }
{ "type": "Feature", "properties": { "order": "five" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 37.020098 ] } }
,
{ "type": "Feature", "properties": { "order": "six" }, "geometry": { "type": "Point", "coordinates": [ -122.080078, 37.020098 ] } }
{ "type": "Feature", "properties": { "order": "six" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 37.020098 ] } }
,
{ "type": "Feature", "properties": { "order": "one" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.187405 ] } }
{ "type": "Feature", "properties": { "order": "one" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "two" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.187405 ] } }
{ "type": "Feature", "properties": { "order": "two" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "three" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.187405 ] } }
{ "type": "Feature", "properties": { "order": "three" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "four" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.187405 ] } }
{ "type": "Feature", "properties": { "order": "four" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "five" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.187405 ] } }
{ "type": "Feature", "properties": { "order": "five" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "six" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.187405 ] } }
{ "type": "Feature", "properties": { "order": "six" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "seven" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.187405 ] } }
{ "type": "Feature", "properties": { "order": "seven" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "eight" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.187405 ] } }
{ "type": "Feature", "properties": { "order": "eight" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "nine" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.187405 ] } }
{ "type": "Feature", "properties": { "order": "nine" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
] }
] }
,
{ "type": "FeatureCollection", "properties": { "zoom": 1, "x": 0, "y": 0 }, "features": [
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
{ "type": "Feature", "properties": { "order": "one" }, "geometry": { "type": "Point", "coordinates": [ -122.036133, 37.020098 ] } }
{ "type": "Feature", "properties": { "order": "one" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 36.985003 ] } }
,
{ "type": "Feature", "properties": { "order": "two" }, "geometry": { "type": "Point", "coordinates": [ -122.036133, 37.020098 ] } }
{ "type": "Feature", "properties": { "order": "two" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 36.985003 ] } }
,
{ "type": "Feature", "properties": { "order": "three" }, "geometry": { "type": "Point", "coordinates": [ -122.036133, 37.020098 ] } }
{ "type": "Feature", "properties": { "order": "three" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 36.985003 ] } }
,
{ "type": "Feature", "properties": { "order": "four" }, "geometry": { "type": "Point", "coordinates": [ -122.036133, 37.020098 ] } }
{ "type": "Feature", "properties": { "order": "four" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 36.985003 ] } }
,
{ "type": "Feature", "properties": { "order": "five" }, "geometry": { "type": "Point", "coordinates": [ -122.036133, 37.020098 ] } }
{ "type": "Feature", "properties": { "order": "five" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 36.985003 ] } }
,
{ "type": "Feature", "properties": { "order": "six" }, "geometry": { "type": "Point", "coordinates": [ -122.036133, 37.020098 ] } }
{ "type": "Feature", "properties": { "order": "six" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 36.985003 ] } }
] }
] }
,
{ "type": "FeatureCollection", "properties": { "zoom": 1, "x": 1, "y": 1 }, "features": [
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
{ "type": "Feature", "properties": { "order": "one" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.228090 ] } }
{ "type": "Feature", "properties": { "order": "one" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "two" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.228090 ] } }
{ "type": "Feature", "properties": { "order": "two" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "three" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.228090 ] } }
{ "type": "Feature", "properties": { "order": "three" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "four" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.228090 ] } }
{ "type": "Feature", "properties": { "order": "four" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "five" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.228090 ] } }
{ "type": "Feature", "properties": { "order": "five" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "six" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.228090 ] } }
{ "type": "Feature", "properties": { "order": "six" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "seven" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.228090 ] } }
{ "type": "Feature", "properties": { "order": "seven" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "eight" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.228090 ] } }
{ "type": "Feature", "properties": { "order": "eight" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "nine" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.228090 ] } }
{ "type": "Feature", "properties": { "order": "nine" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
] }
] }
,
{ "type": "FeatureCollection", "properties": { "zoom": 2, "x": 0, "y": 1 }, "features": [
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
{ "type": "Feature", "properties": { "order": "one" }, "geometry": { "type": "Point", "coordinates": [ -122.014160, 37.002553 ] } }
{ "type": "Feature", "properties": { "order": "one" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 37.002553 ] } }
,
{ "type": "Feature", "properties": { "order": "two" }, "geometry": { "type": "Point", "coordinates": [ -122.014160, 37.002553 ] } }
{ "type": "Feature", "properties": { "order": "two" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 37.002553 ] } }
,
{ "type": "Feature", "properties": { "order": "three" }, "geometry": { "type": "Point", "coordinates": [ -122.014160, 37.002553 ] } }
{ "type": "Feature", "properties": { "order": "three" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 37.002553 ] } }
,
{ "type": "Feature", "properties": { "order": "four" }, "geometry": { "type": "Point", "coordinates": [ -122.014160, 37.002553 ] } }
{ "type": "Feature", "properties": { "order": "four" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 37.002553 ] } }
,
{ "type": "Feature", "properties": { "order": "five" }, "geometry": { "type": "Point", "coordinates": [ -122.014160, 37.002553 ] } }
{ "type": "Feature", "properties": { "order": "five" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 37.002553 ] } }
,
{ "type": "Feature", "properties": { "order": "six" }, "geometry": { "type": "Point", "coordinates": [ -122.014160, 37.002553 ] } }
{ "type": "Feature", "properties": { "order": "six" }, "geometry": { "type": "Point", "coordinates": [ -121.992188, 37.002553 ] } }
] }
] }
,
{ "type": "FeatureCollection", "properties": { "zoom": 2, "x": 3, "y": 2 }, "features": [
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
{ "type": "Feature", "properties": { "order": "one" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.248429 ] } }
{ "type": "Feature", "properties": { "order": "one" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "two" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.248429 ] } }
{ "type": "Feature", "properties": { "order": "two" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "three" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.248429 ] } }
{ "type": "Feature", "properties": { "order": "three" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "four" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.248429 ] } }
{ "type": "Feature", "properties": { "order": "four" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "five" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.248429 ] } }
{ "type": "Feature", "properties": { "order": "five" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "six" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.248429 ] } }
{ "type": "Feature", "properties": { "order": "six" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "seven" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.248429 ] } }
{ "type": "Feature", "properties": { "order": "seven" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "eight" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.248429 ] } }
{ "type": "Feature", "properties": { "order": "eight" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "nine" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.248429 ] } }
{ "type": "Feature", "properties": { "order": "nine" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
] }
] }
,
@@ -139,23 +139,23 @@
,
{ "type": "FeatureCollection", "properties": { "zoom": 3, "x": 6, "y": 4 }, "features": [
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
{ "type": "Feature", "properties": { "order": "one" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.258597 ] } }
{ "type": "Feature", "properties": { "order": "one" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "two" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.258597 ] } }
{ "type": "Feature", "properties": { "order": "two" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "three" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.258597 ] } }
{ "type": "Feature", "properties": { "order": "three" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "four" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.258597 ] } }
{ "type": "Feature", "properties": { "order": "four" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "five" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.258597 ] } }
{ "type": "Feature", "properties": { "order": "five" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "six" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.258597 ] } }
{ "type": "Feature", "properties": { "order": "six" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "seven" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.258597 ] } }
{ "type": "Feature", "properties": { "order": "seven" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "eight" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.258597 ] } }
{ "type": "Feature", "properties": { "order": "eight" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
,
{ "type": "Feature", "properties": { "order": "nine" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.258597 ] } }
{ "type": "Feature", "properties": { "order": "nine" }, "geometry": { "type": "Point", "coordinates": [ 132.187500, -22.268764 ] } }
] }
] }
] }