mirror of
https://github.com/felt/tippecanoe.git
synced 2026-10-05 18:05:42 +02:00
Merge remote-tracking branch 'origin/main' into clean-polygons
This commit is contained in:
+308
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+599
-130
File diff suppressed because one or more lines are too long
@@ -9,7 +9,12 @@
|
||||
"maxzoom": "5",
|
||||
"minzoom": "0",
|
||||
"name": "tests/ne_110m_admin_0_countries/out/-ae_-zg_-M5000_--drop-smallest-as-needed.json.check.mbtiles",
|
||||
<<<<<<< HEAD
|
||||
"strategies": "[{\"tile_size_desired\":39166},{\"dropped_as_needed\":200,\"tile_size_desired\":25142},{\"dropped_as_needed\":187,\"tiny_polygons\":1,\"tile_size_desired\":21205},{\"dropped_as_needed\":154,\"tile_size_desired\":10768},{\"dropped_as_needed\":79,\"tile_size_desired\":6603},{\"tiny_polygons\":2}]",
|
||||
=======
|
||||
"strategies": "[{\"dropped_as_needed\":174,\"tile_size_desired\":39241},{\"dropped_as_needed\":200,\"tile_size_desired\":25163},{\"dropped_as_needed\":187,\"tiny_polygons\":1,\"tile_size_desired\":21214},{\"dropped_as_needed\":154,\"tile_size_desired\":10758},{\"dropped_as_needed\":79,\"tile_size_desired\":6601},{\"tiny_polygons\":2}]",
|
||||
"tippecanoe_decisions": "{\"basezoom\":0,\"droprate\":2.5,\"retain_points_multiplier\":1}",
|
||||
>>>>>>> origin/main
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -9,7 +9,11 @@
|
||||
"maxzoom": "5",
|
||||
"minzoom": "0",
|
||||
"name": "tests/ne_110m_admin_0_countries/out/-z5_-M5000_--coalesce-densest-as-needed.json.check.mbtiles",
|
||||
<<<<<<< HEAD
|
||||
"strategies": "[{\"coalesced_as_needed\":528,\"detail_reduced\":2,\"tiny_polygons\":2,\"tile_size_desired\":39186},{\"coalesced_as_needed\":212,\"tile_size_desired\":25143},{\"coalesced_as_needed\":190,\"tiny_polygons\":1,\"tile_size_desired\":21211},{\"coalesced_as_needed\":159,\"tile_size_desired\":10760},{\"coalesced_as_needed\":51,\"tile_size_desired\":6597},{\"tiny_polygons\":1}]",
|
||||
=======
|
||||
"strategies": "[{\"coalesced_as_needed\":528,\"detail_reduced\":2,\"tiny_polygons\":2,\"tile_size_desired\":39242},{\"coalesced_as_needed\":212,\"tile_size_desired\":25160},{\"coalesced_as_needed\":190,\"tiny_polygons\":1,\"tile_size_desired\":21223},{\"coalesced_as_needed\":159,\"tile_size_desired\":10749},{\"coalesced_as_needed\":51,\"tile_size_desired\":6591},{\"tiny_polygons\":1}]",
|
||||
>>>>>>> origin/main
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
|
||||
+753
-85
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -9,7 +9,11 @@
|
||||
"maxzoom": "5",
|
||||
"minzoom": "0",
|
||||
"name": "tests/ne_110m_admin_0_countries/out/-z5_-M5000_--drop-smallest-as-needed.json.check.mbtiles",
|
||||
<<<<<<< HEAD
|
||||
"strategies": "[{\"dropped_as_needed\":174,\"tile_size_desired\":39186},{\"dropped_as_needed\":202,\"tile_size_desired\":25143},{\"dropped_as_needed\":190,\"tile_size_desired\":21211},{\"dropped_as_needed\":155,\"tile_size_desired\":10760},{\"dropped_as_needed\":78,\"tile_size_desired\":6597},{\"tiny_polygons\":1}]",
|
||||
=======
|
||||
"strategies": "[{\"dropped_as_needed\":174,\"tile_size_desired\":39242},{\"dropped_as_needed\":202,\"tile_size_desired\":25160},{\"dropped_as_needed\":190,\"tile_size_desired\":21223},{\"dropped_as_needed\":155,\"tile_size_desired\":10749},{\"dropped_as_needed\":78,\"tile_size_desired\":6591},{\"tiny_polygons\":1}]",
|
||||
>>>>>>> origin/main
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
|
||||
Reference in New Issue
Block a user