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

Do more of line simplification with integer coordinates (#113)

Browse Source 
* Turn off unit, which has bit-rotted

* Instrument line simplification

* Do more work in integer space

* Update tests with simplification done with more integers

* Clean up

* Update changelog

* Eradicate calls to deprecated sprintf()

* Revert "Turn off unit, which has bit-rotted"

This reverts commit 998779313f.

* Fix catch by switching to an unsigned type
This commit is contained in:
Erica Fischer
2023-07-10 15:54:21 -07:00
committed by GitHub
parent b09a880822
commit c1051232ad
59 changed files with 282 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/knox/out/-zg.json
+4 -4
View File
@@ -666,7 +666,7 @@
,
{ "type": "Feature", "properties": { "LINEARID": "1104257624535", "FULLNAME": "US Hwy 41", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.563782, 38.490682 ], [ -87.561035, 38.508415 ], [ -87.559662, 38.511639 ], [ -87.555542, 38.514863 ], [ -87.541122, 38.521847 ], [ -87.538376, 38.525607 ], [ -87.538376, 38.610969 ], [ -87.532883, 38.624381 ], [ -87.528076, 38.646908 ], [ -87.526016, 38.650126 ], [ -87.509537, 38.661922 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493744, 38.694621 ], [ -87.490311, 38.686582 ], [ -87.489624, 38.681222 ], [ -87.487564, 38.678542 ] ] } }
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493744, 38.694621 ], [ -87.490997, 38.687118 ], [ -87.489624, 38.681222 ], [ -87.487564, 38.678542 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "110170070276", "FULLNAME": "US Hwy 50", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.487564, 38.678542 ], [ -87.489624, 38.680686 ], [ -87.490311, 38.683902 ] ] } }
,
@@ -790,7 +790,7 @@
,
{ "type": "Feature", "properties": { "LINEARID": "1104257624535", "FULLNAME": "US Hwy 41", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.564125, 38.490951 ], [ -87.561378, 38.508415 ], [ -87.559662, 38.511370 ], [ -87.558289, 38.513251 ], [ -87.555542, 38.515131 ], [ -87.541466, 38.521847 ], [ -87.539406, 38.523727 ], [ -87.538033, 38.525876 ], [ -87.538376, 38.610969 ], [ -87.533226, 38.624381 ], [ -87.529449, 38.644495 ], [ -87.528419, 38.647176 ], [ -87.526016, 38.649858 ], [ -87.509537, 38.661654 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493744, 38.694889 ], [ -87.490654, 38.686850 ], [ -87.489967, 38.681222 ], [ -87.487907, 38.678542 ] ] } }
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493744, 38.694889 ], [ -87.490654, 38.687386 ], [ -87.489967, 38.681222 ], [ -87.487907, 38.678542 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "110170070276", "FULLNAME": "US Hwy 50", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.487907, 38.678542 ], [ -87.489624, 38.680954 ], [ -87.490311, 38.683634 ] ] } }
,
@@ -916,7 +916,7 @@
,
{ "type": "Feature", "properties": { "LINEARID": "1104257624535", "FULLNAME": "US Hwy 41", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.563953, 38.490816 ], [ -87.561207, 38.508415 ], [ -87.559834, 38.511505 ], [ -87.558117, 38.513385 ], [ -87.555542, 38.515131 ], [ -87.541466, 38.521713 ], [ -87.539406, 38.523593 ], [ -87.538204, 38.525876 ], [ -87.537861, 38.529367 ], [ -87.538719, 38.599969 ], [ -87.538719, 38.609091 ], [ -87.538548, 38.610969 ], [ -87.533913, 38.622101 ], [ -87.533054, 38.624381 ], [ -87.529449, 38.644495 ], [ -87.528419, 38.647042 ], [ -87.527218, 38.648651 ], [ -87.526016, 38.649858 ], [ -87.516747, 38.656695 ], [ -87.509365, 38.661654 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493572, 38.694755 ], [ -87.490482, 38.686850 ], [ -87.489796, 38.681356 ], [ -87.489109, 38.679882 ], [ -87.487736, 38.678542 ] ] } }
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493572, 38.694755 ], [ -87.490654, 38.687252 ], [ -87.489796, 38.681356 ], [ -87.489109, 38.679882 ], [ -87.487736, 38.678542 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "110170070276", "FULLNAME": "US Hwy 50", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.487736, 38.678542 ], [ -87.489109, 38.679882 ], [ -87.489624, 38.680954 ], [ -87.490139, 38.683634 ] ] } }
,
@@ -1078,7 +1078,7 @@
,
{ "type": "Feature", "properties": { "LINEARID": "1104257624535", "FULLNAME": "US Hwy 41", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.538033, 38.542795 ], [ -87.538033, 38.548165 ], [ -87.538290, 38.555079 ], [ -87.538290, 38.574005 ], [ -87.538548, 38.591919 ], [ -87.538805, 38.600036 ], [ -87.538805, 38.609091 ], [ -87.538548, 38.610902 ], [ -87.538204, 38.611975 ], [ -87.533827, 38.622034 ], [ -87.533054, 38.624381 ], [ -87.532539, 38.626661 ], [ -87.529449, 38.644495 ], [ -87.529192, 38.645366 ], [ -87.528419, 38.647042 ], [ -87.527218, 38.648718 ], [ -87.526016, 38.649858 ], [ -87.516747, 38.656695 ], [ -87.509365, 38.661654 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493658, 38.694755 ], [ -87.490568, 38.686850 ], [ -87.490311, 38.685443 ], [ -87.490139, 38.682361 ], [ -87.489882, 38.681356 ], [ -87.489023, 38.679882 ], [ -87.487736, 38.678542 ] ] } }
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493658, 38.694755 ], [ -87.490654, 38.687252 ], [ -87.490311, 38.685443 ], [ -87.490139, 38.682361 ], [ -87.489882, 38.681356 ], [ -87.489023, 38.679882 ], [ -87.487736, 38.678542 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "110170070276", "FULLNAME": "US Hwy 50", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.487736, 38.678542 ], [ -87.489023, 38.679882 ], [ -87.489710, 38.680954 ], [ -87.490139, 38.682361 ], [ -87.490225, 38.683634 ] ] } }
,
tests/knox/out/-zg_-P.json
+4 -4
View File
@@ -666,7 +666,7 @@
,
{ "type": "Feature", "properties": { "LINEARID": "1104257624535", "FULLNAME": "US Hwy 41", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.563782, 38.490682 ], [ -87.561035, 38.508415 ], [ -87.559662, 38.511639 ], [ -87.555542, 38.514863 ], [ -87.541122, 38.521847 ], [ -87.538376, 38.525607 ], [ -87.538376, 38.610969 ], [ -87.532883, 38.624381 ], [ -87.528076, 38.646908 ], [ -87.526016, 38.650126 ], [ -87.509537, 38.661922 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493744, 38.694621 ], [ -87.490311, 38.686582 ], [ -87.489624, 38.681222 ], [ -87.487564, 38.678542 ] ] } }
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493744, 38.694621 ], [ -87.490997, 38.687118 ], [ -87.489624, 38.681222 ], [ -87.487564, 38.678542 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "110170070276", "FULLNAME": "US Hwy 50", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.487564, 38.678542 ], [ -87.489624, 38.680686 ], [ -87.490311, 38.683902 ] ] } }
,
@@ -790,7 +790,7 @@
,
{ "type": "Feature", "properties": { "LINEARID": "1104257624535", "FULLNAME": "US Hwy 41", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.564125, 38.490951 ], [ -87.561378, 38.508415 ], [ -87.559662, 38.511370 ], [ -87.558289, 38.513251 ], [ -87.555542, 38.515131 ], [ -87.541466, 38.521847 ], [ -87.539406, 38.523727 ], [ -87.538033, 38.525876 ], [ -87.538376, 38.610969 ], [ -87.533226, 38.624381 ], [ -87.529449, 38.644495 ], [ -87.528419, 38.647176 ], [ -87.526016, 38.649858 ], [ -87.509537, 38.661654 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493744, 38.694889 ], [ -87.490654, 38.686850 ], [ -87.489967, 38.681222 ], [ -87.487907, 38.678542 ] ] } }
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493744, 38.694889 ], [ -87.490654, 38.687386 ], [ -87.489967, 38.681222 ], [ -87.487907, 38.678542 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "110170070276", "FULLNAME": "US Hwy 50", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.487907, 38.678542 ], [ -87.489624, 38.680954 ], [ -87.490311, 38.683634 ] ] } }
,
@@ -916,7 +916,7 @@
,
{ "type": "Feature", "properties": { "LINEARID": "1104257624535", "FULLNAME": "US Hwy 41", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.563953, 38.490816 ], [ -87.561207, 38.508415 ], [ -87.559834, 38.511505 ], [ -87.558117, 38.513385 ], [ -87.555542, 38.515131 ], [ -87.541466, 38.521713 ], [ -87.539406, 38.523593 ], [ -87.538204, 38.525876 ], [ -87.537861, 38.529367 ], [ -87.538719, 38.599969 ], [ -87.538719, 38.609091 ], [ -87.538548, 38.610969 ], [ -87.533913, 38.622101 ], [ -87.533054, 38.624381 ], [ -87.529449, 38.644495 ], [ -87.528419, 38.647042 ], [ -87.527218, 38.648651 ], [ -87.526016, 38.649858 ], [ -87.516747, 38.656695 ], [ -87.509365, 38.661654 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493572, 38.694755 ], [ -87.490482, 38.686850 ], [ -87.489796, 38.681356 ], [ -87.489109, 38.679882 ], [ -87.487736, 38.678542 ] ] } }
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493572, 38.694755 ], [ -87.490654, 38.687252 ], [ -87.489796, 38.681356 ], [ -87.489109, 38.679882 ], [ -87.487736, 38.678542 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "110170070276", "FULLNAME": "US Hwy 50", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.487736, 38.678542 ], [ -87.489109, 38.679882 ], [ -87.489624, 38.680954 ], [ -87.490139, 38.683634 ] ] } }
,
@@ -1078,7 +1078,7 @@
,
{ "type": "Feature", "properties": { "LINEARID": "1104257624535", "FULLNAME": "US Hwy 41", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.538033, 38.542795 ], [ -87.538033, 38.548165 ], [ -87.538290, 38.555079 ], [ -87.538290, 38.574005 ], [ -87.538548, 38.591919 ], [ -87.538805, 38.600036 ], [ -87.538805, 38.609091 ], [ -87.538548, 38.610902 ], [ -87.538204, 38.611975 ], [ -87.533827, 38.622034 ], [ -87.533054, 38.624381 ], [ -87.532539, 38.626661 ], [ -87.529449, 38.644495 ], [ -87.529192, 38.645366 ], [ -87.528419, 38.647042 ], [ -87.527218, 38.648718 ], [ -87.526016, 38.649858 ], [ -87.516747, 38.656695 ], [ -87.509365, 38.661654 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493658, 38.694755 ], [ -87.490568, 38.686850 ], [ -87.490311, 38.685443 ], [ -87.490139, 38.682361 ], [ -87.489882, 38.681356 ], [ -87.489023, 38.679882 ], [ -87.487736, 38.678542 ] ] } }
{ "type": "Feature", "properties": { "LINEARID": "1104485841553", "FULLNAME": "US Hwy 150", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.493658, 38.694755 ], [ -87.490654, 38.687252 ], [ -87.490311, 38.685443 ], [ -87.490139, 38.682361 ], [ -87.489882, 38.681356 ], [ -87.489023, 38.679882 ], [ -87.487736, 38.678542 ] ] } }
,
{ "type": "Feature", "properties": { "LINEARID": "110170070276", "FULLNAME": "US Hwy 50", "RTTYP": "U", "MTFCC": "S1200" }, "geometry": { "type": "LineString", "coordinates": [ [ -87.487736, 38.678542 ], [ -87.489023, 38.679882 ], [ -87.489710, 38.680954 ], [ -87.490139, 38.682361 ], [ -87.490225, 38.683634 ] ] } }
,