mirror of
https://github.com/felt/tippecanoe.git
synced 2026-10-05 01:45:41 +02:00
Resolve the test conflicts
This commit is contained in:
Erica Fischer
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -9,23 +9,7 @@
|
||||
"maxzoom": "5",
|
||||
"minzoom": "0",
|
||||
"name": "tests/ne_110m_admin_0_countries/out/-ae_-zg_-M5000_--drop-fraction-as-needed.json.check.mbtiles",
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"strategies": "[{\"dropped_as_needed\":160,\"tile_size_desired\":39209},{\"dropped_as_needed\":188,\"tile_size_desired\":25164},{\"dropped_as_needed\":190,\"tile_size_desired\":21198},{\"dropped_as_needed\":180,\"tile_size_desired\":10761},{\"dropped_as_needed\":145,\"tile_size_desired\":6604},{\"tiny_polygons\":2}]",
|
||||
=======
|
||||
"strategies": "[{\"dropped_as_needed\":160,\"tile_size_desired\":39206},{\"dropped_as_needed\":188,\"tile_size_desired\":25164},{\"dropped_as_needed\":190,\"tiny_polygons\":2,\"tile_size_desired\":21198},{\"dropped_as_needed\":180,\"tiny_polygons\":9,\"tile_size_desired\":10761},{\"dropped_as_needed\":145,\"tiny_polygons\":17,\"tile_size_desired\":6604},{\"tiny_polygons\":47}]",
|
||||
>>>>>>> 16f61fc (Scale geometry up before wagyu to prevent changes from precision loss)
|
||||
=======
|
||||
"strategies": "[{\"dropped_as_needed\":163,\"tile_size_desired\":39196},{\"dropped_as_needed\":187,\"tile_size_desired\":25157},{\"dropped_as_needed\":189,\"tiny_polygons\":2,\"tile_size_desired\":21202},{\"dropped_as_needed\":182,\"tiny_polygons\":6,\"tile_size_desired\":10760},{\"dropped_as_needed\":147,\"tiny_polygons\":15,\"tile_size_desired\":6601},{\"tiny_polygons\":47}]",
|
||||
>>>>>>> 644a9ce (Was still truncating instead of rounding in projection)
|
||||
=======
|
||||
"strategies": "[{\"dropped_as_needed\":164,\"tile_size_desired\":39660},{\"dropped_as_needed\":192,\"tile_size_desired\":25221},{\"dropped_as_needed\":190,\"tiny_polygons\":2,\"tile_size_desired\":21217},{\"dropped_as_needed\":182,\"tiny_polygons\":6,\"tile_size_desired\":10764},{\"dropped_as_needed\":147,\"tiny_polygons\":15,\"tile_size_desired\":6601},{\"tiny_polygons\":47}]",
|
||||
>>>>>>> d6e33c4 (Stay in integers in line simplification)
|
||||
=======
|
||||
"strategies": "[{\"dropped_as_needed\":151,\"tile_size_desired\":26114},{\"dropped_as_needed\":168,\"tiny_polygons\":1,\"tile_size_desired\":17128},{\"dropped_as_needed\":171,\"tiny_polygons\":2,\"tile_size_desired\":14764},{\"dropped_as_needed\":145,\"tiny_polygons\":8,\"tile_size_desired\":8081},{\"dropped_as_needed\":86,\"tiny_polygons\":17,\"tile_size_desired\":5316},{\"tiny_polygons\":47}]",
|
||||
>>>>>>> c5b6eb5 (All the tests change again)
|
||||
"strategies": "[{\"dropped_as_needed\":151,\"tile_size_desired\":26114},{\"dropped_as_needed\":168,\"tile_size_desired\":17128},{\"dropped_as_needed\":171,\"tiny_polygons\":1,\"tile_size_desired\":14764},{\"dropped_as_needed\":145,\"tile_size_desired\":8081},{\"dropped_as_needed\":86,\"tile_size_desired\":5316},{\"tiny_polygons\":2}]",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
@@ -51,19 +35,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "Kosovo", "sov_a3": "KOS", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Kosovo", "adm0_a3": "KOS", "geou_dif": 0, "geounit": "Kosovo", "gu_a3": "KOS", "su_dif": 0, "subunit": "Kosovo", "su_a3": "KOS", "brk_diff": 1, "name": "Kosovo", "name_long": "Kosovo", "brk_a3": "B57", "brk_name": "Kosovo", "abbrev": "Kos.", "postal": "KO", "formal_en": "Republic of Kosovo", "note_brk": "Self admin.; Claimed by Serbia", "name_sort": "Kosovo", "mapcolor7": 2, "mapcolor8": 2, "mapcolor9": 3, "mapcolor13": 11, "pop_est": 1804838, "gdp_md_est": 5352, "pop_year": -99, "lastcensus": 1981, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "-99", "iso_a3": "-99", "iso_n3": "-99", "un_a3": "-099", "wb_a2": "KV", "wb_a3": "KSV", "woe_id": -99, "adm0_a3_is": "SRB", "adm0_a3_us": "KOS", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Southern Europe", "region_wb": "Europe & Central Asia", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 20.830078, 43.261206 ], [ 20.742188, 41.836828 ], [ 20.039062, 42.617791 ], [ 20.830078, 43.261206 ] ] ] } }
|
||||
,
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Ethiopia", "sov_a3": "ETH", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Ethiopia", "adm0_a3": "ETH", "geou_dif": 0, "geounit": "Ethiopia", "gu_a3": "ETH", "su_dif": 0, "subunit": "Ethiopia", "su_a3": "ETH", "brk_diff": 0, "name": "Ethiopia", "name_long": "Ethiopia", "brk_a3": "ETH", "brk_name": "Ethiopia", "abbrev": "Eth.", "postal": "ET", "formal_en": "Federal Democratic Republic of Ethiopia", "name_sort": "Ethiopia", "mapcolor7": 4, "mapcolor8": 4, "mapcolor9": 1, "mapcolor13": 13, "pop_est": 85237338, "gdp_md_est": 68770, "pop_year": -99, "lastcensus": 2007, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "ET", "iso_a3": "ETH", "iso_n3": "231", "un_a3": "231", "wb_a2": "ET", "wb_a3": "ETH", "woe_id": -99, "adm0_a3_is": "ETH", "adm0_a3_us": "ETH", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 8, "long_len": 8, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 37.880859, 14.944785 ], [ 38.496094, 14.519780 ], [ 39.111328, 14.774883 ], [ 39.375000, 14.519780 ], [ 39.990234, 14.519780 ], [ 40.869141, 14.093957 ], [ 41.572266, 13.410994 ], [ 42.363281, 12.554564 ], [ 41.660156, 11.609193 ], [ 41.748047, 11.092166 ], [ 42.539062, 11.092166 ], [ 42.802734, 10.919618 ], [ 42.539062, 10.574222 ], [ 43.681641, 9.188870 ], [ 46.933594, 7.972198 ], [ 47.812500, 7.972198 ], [ 45.000000, 5.003394 ], [ 43.681641, 4.915833 ], [ 42.802734, 4.214943 ], [ 42.099609, 4.214943 ], [ 41.835938, 3.951941 ], [ 41.132812, 3.951941 ], [ 40.781250, 4.214943 ], [ 39.814453, 3.864255 ], [ 39.550781, 3.425692 ], [ 38.144531, 3.601142 ], [ 36.826172, 4.477856 ], [ 36.123047, 4.477856 ], [ 35.859375, 4.740675 ], [ 35.859375, 5.353521 ], [ 35.332031, 5.528511 ], [ 34.716797, 6.577303 ], [ 34.277344, 6.839170 ], [ 34.101562, 7.188101 ], [ 33.574219, 7.710992 ], [ 32.958984, 7.798079 ], [ 33.310547, 8.320212 ], [ 33.837891, 8.407168 ], [ 34.013672, 8.667918 ], [ 33.925781, 9.622414 ], [ 34.277344, 10.660608 ], [ 34.716797, 10.919618 ], [ 35.244141, 12.125264 ], [ 35.859375, 12.554564 ], [ 36.298828, 13.581921 ], [ 36.386719, 14.434680 ], [ 37.617188, 14.179186 ], [ 37.880859, 14.944785 ] ] ] } }
|
||||
=======
|
||||
{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 5, "sovereignt": "Bhutan", "sov_a3": "BTN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Bhutan", "adm0_a3": "BTN", "geou_dif": 0, "geounit": "Bhutan", "gu_a3": "BTN", "su_dif": 0, "subunit": "Bhutan", "su_a3": "BTN", "brk_diff": 0, "name": "Bhutan", "name_long": "Bhutan", "brk_a3": "BTN", "brk_name": "Bhutan", "abbrev": "Bhutan", "postal": "BT", "formal_en": "Kingdom of Bhutan", "name_sort": "Bhutan", "mapcolor7": 5, "mapcolor8": 6, "mapcolor9": 1, "mapcolor13": 8, "pop_est": 691141, "gdp_md_est": 3524, "pop_year": -99, "lastcensus": 2005, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "BT", "iso_a3": "BTN", "iso_n3": "064", "un_a3": "064", "wb_a2": "BT", "wb_a3": "BTN", "woe_id": -99, "adm0_a3_is": "BTN", "adm0_a3_us": "BTN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "Southern Asia", "region_wb": "South Asia", "name_len": 6, "long_len": 6, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 90.000000, 28.304381 ], [ 90.703125, 28.071980 ], [ 91.230469, 28.071980 ], [ 92.109375, 27.449790 ], [ 92.021484, 26.824071 ], [ 90.351562, 26.902477 ], [ 89.736328, 26.745610 ], [ 88.857422, 27.137368 ], [ 88.857422, 27.293689 ], [ 89.472656, 28.071980 ], [ 90.000000, 28.304381 ] ] ] } }
|
||||
>>>>>>> 644a9ce (Was still truncating instead of rounding in projection)
|
||||
=======
|
||||
{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "Brunei", "sov_a3": "BRN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Brunei", "adm0_a3": "BRN", "geou_dif": 0, "geounit": "Brunei", "gu_a3": "BRN", "su_dif": 0, "subunit": "Brunei", "su_a3": "BRN", "brk_diff": 0, "name": "Brunei", "name_long": "Brunei Darussalam", "brk_a3": "BRN", "brk_name": "Brunei", "abbrev": "Brunei", "postal": "BN", "formal_en": "Negara Brunei Darussalam", "name_sort": "Brunei", "mapcolor7": 4, "mapcolor8": 6, "mapcolor9": 6, "mapcolor13": 12, "pop_est": 388190, "gdp_md_est": 20250, "pop_year": -99, "lastcensus": 2001, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "BN", "iso_a3": "BRN", "iso_n3": "096", "un_a3": "096", "wb_a2": "BN", "wb_a3": "BRN", "woe_id": -99, "adm0_a3_is": "BRN", "adm0_a3_us": "BRN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "South-Eastern Asia", "region_wb": "East Asia & Pacific", "name_len": 6, "long_len": 17, "abbrev_len": 6, "tiny": 2, "homepart": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 115.488281, 5.441022 ], [ 115.312500, 4.302591 ], [ 114.873047, 4.390229 ], [ 114.697266, 4.039618 ], [ 114.169922, 4.565474 ], [ 115.488281, 5.441022 ] ] ] } }
|
||||
>>>>>>> d6e33c4 (Stay in integers in line simplification)
|
||||
=======
|
||||
{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Ukraine", "sov_a3": "UKR", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Ukraine", "adm0_a3": "UKR", "geou_dif": 0, "geounit": "Ukraine", "gu_a3": "UKR", "su_dif": 0, "subunit": "Ukraine", "su_a3": "UKR", "brk_diff": 0, "name": "Ukraine", "name_long": "Ukraine", "brk_a3": "UKR", "brk_name": "Ukraine", "abbrev": "Ukr.", "postal": "UA", "formal_en": "Ukraine", "name_sort": "Ukraine", "mapcolor7": 5, "mapcolor8": 1, "mapcolor9": 6, "mapcolor13": 3, "pop_est": 45700395, "gdp_md_est": 339800, "pop_year": -99, "lastcensus": 2001, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "UA", "iso_a3": "UKR", "iso_n3": "804", "un_a3": "804", "wb_a2": "UA", "wb_a3": "UKR", "woe_id": -99, "adm0_a3_is": "UKR", "adm0_a3_us": "UKR", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Eastern Europe", "region_wb": "Europe & Central Asia", "name_len": 7, "long_len": 7, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 40.078125, 49.610710 ], [ 33.925781, 44.339565 ], [ 22.060547, 48.400032 ], [ 40.078125, 49.610710 ] ] ] } }
|
||||
>>>>>>> c5b6eb5 (All the tests change again)
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 5, "sovereignt": "Georgia", "sov_a3": "GEO", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Georgia", "adm0_a3": "GEO", "geou_dif": 0, "geounit": "Georgia", "gu_a3": "GEO", "su_dif": 0, "subunit": "Georgia", "su_a3": "GEO", "brk_diff": 0, "name": "Georgia", "name_long": "Georgia", "brk_a3": "GEO", "brk_name": "Georgia", "abbrev": "Geo.", "postal": "GE", "formal_en": "Georgia", "name_sort": "Georgia", "mapcolor7": 5, "mapcolor8": 1, "mapcolor9": 3, "mapcolor13": 2, "pop_est": 4615807, "gdp_md_est": 21510, "pop_year": -99, "lastcensus": 2002, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "GE", "iso_a3": "GEO", "iso_n3": "268", "un_a3": "268", "wb_a2": "GE", "wb_a3": "GEO", "woe_id": -99, "adm0_a3_is": "GEO", "adm0_a3_us": "GEO", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "Western Asia", "region_wb": "Europe & Central Asia", "name_len": 7, "long_len": 7, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 39.990234, 43.452919 ], [ 45.439453, 42.488302 ], [ 46.669922, 41.178654 ], [ 39.990234, 43.452919 ] ] ] } }
|
||||
,
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -9,23 +9,7 @@
|
||||
"maxzoom": "5",
|
||||
"minzoom": "0",
|
||||
"name": "tests/ne_110m_admin_0_countries/out/-ae_-zg_-M5000_--force-feature-limit.json.check.mbtiles",
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"strategies": "[{\"dropped_as_needed\":316,\"tile_size_desired\":39209},{\"dropped_as_needed\":287,\"tiny_polygons\":3,\"tile_size_desired\":25164},{\"dropped_as_needed\":223,\"tiny_polygons\":2,\"tile_size_desired\":21198},{\"dropped_as_needed\":93,\"tile_size_desired\":10761},{\"dropped_as_needed\":9,\"tile_size_desired\":6604},{\"tiny_polygons\":2}]",
|
||||
=======
|
||||
"strategies": "[{\"dropped_as_needed\":316,\"tile_size_desired\":39206},{\"dropped_as_needed\":287,\"tiny_polygons\":4,\"tile_size_desired\":25164},{\"dropped_as_needed\":223,\"tiny_polygons\":4,\"tile_size_desired\":21198},{\"dropped_as_needed\":93,\"tiny_polygons\":14,\"tile_size_desired\":10761},{\"dropped_as_needed\":9,\"tiny_polygons\":21,\"tile_size_desired\":6604},{\"tiny_polygons\":47}]",
|
||||
>>>>>>> 16f61fc (Scale geometry up before wagyu to prevent changes from precision loss)
|
||||
=======
|
||||
"strategies": "[{\"dropped_as_needed\":479,\"tile_size_desired\":39196},{\"dropped_as_needed\":265,\"tiny_polygons\":3,\"tile_size_desired\":25157},{\"dropped_as_needed\":221,\"tiny_polygons\":3,\"tile_size_desired\":21202},{\"dropped_as_needed\":93,\"tiny_polygons\":13,\"tile_size_desired\":10760},{\"dropped_as_needed\":9,\"tiny_polygons\":20,\"tile_size_desired\":6601},{\"tiny_polygons\":47}]",
|
||||
>>>>>>> 644a9ce (Was still truncating instead of rounding in projection)
|
||||
=======
|
||||
"strategies": "[{\"dropped_as_needed\":803,\"tile_size_desired\":39660},{\"dropped_as_needed\":363,\"tiny_polygons\":3,\"tile_size_desired\":25221},{\"dropped_as_needed\":301,\"tiny_polygons\":3,\"tile_size_desired\":21217},{\"dropped_as_needed\":93,\"tiny_polygons\":13,\"tile_size_desired\":10764},{\"dropped_as_needed\":9,\"tiny_polygons\":20,\"tile_size_desired\":6601},{\"tiny_polygons\":47}]",
|
||||
>>>>>>> d6e33c4 (Stay in integers in line simplification)
|
||||
=======
|
||||
"strategies": "[{\"dropped_as_needed\":296,\"tile_size_desired\":26114},{\"dropped_as_needed\":205,\"tiny_polygons\":4,\"tile_size_desired\":17128},{\"dropped_as_needed\":159,\"tiny_polygons\":3,\"tile_size_desired\":14764},{\"dropped_as_needed\":58,\"tiny_polygons\":14,\"tile_size_desired\":8081},{\"dropped_as_needed\":4,\"tiny_polygons\":21,\"tile_size_desired\":5316},{\"tiny_polygons\":47}]",
|
||||
>>>>>>> c5b6eb5 (All the tests change again)
|
||||
"strategies": "[{\"dropped_as_needed\":296,\"tile_size_desired\":26114},{\"dropped_as_needed\":205,\"tiny_polygons\":2,\"tile_size_desired\":17128},{\"dropped_as_needed\":159,\"tiny_polygons\":1,\"tile_size_desired\":14764},{\"dropped_as_needed\":58,\"tile_size_desired\":8081},{\"dropped_as_needed\":4,\"tile_size_desired\":5316},{\"tiny_polygons\":2}]",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
@@ -51,19 +35,7 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "Kosovo", "sov_a3": "KOS", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Kosovo", "adm0_a3": "KOS", "geou_dif": 0, "geounit": "Kosovo", "gu_a3": "KOS", "su_dif": 0, "subunit": "Kosovo", "su_a3": "KOS", "brk_diff": 1, "name": "Kosovo", "name_long": "Kosovo", "brk_a3": "B57", "brk_name": "Kosovo", "abbrev": "Kos.", "postal": "KO", "formal_en": "Republic of Kosovo", "note_brk": "Self admin.; Claimed by Serbia", "name_sort": "Kosovo", "mapcolor7": 2, "mapcolor8": 2, "mapcolor9": 3, "mapcolor13": 11, "pop_est": 1804838, "gdp_md_est": 5352, "pop_year": -99, "lastcensus": 1981, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "-99", "iso_a3": "-99", "iso_n3": "-99", "un_a3": "-099", "wb_a2": "KV", "wb_a3": "KSV", "woe_id": -99, "adm0_a3_is": "SRB", "adm0_a3_us": "KOS", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Southern Europe", "region_wb": "Europe & Central Asia", "name_len": 6, "long_len": 6, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 20.830078, 43.261206 ], [ 20.742188, 41.836828 ], [ 20.039062, 42.617791 ], [ 20.830078, 43.261206 ] ] ] } }
|
||||
,
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 2, "sovereignt": "Ethiopia", "sov_a3": "ETH", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Ethiopia", "adm0_a3": "ETH", "geou_dif": 0, "geounit": "Ethiopia", "gu_a3": "ETH", "su_dif": 0, "subunit": "Ethiopia", "su_a3": "ETH", "brk_diff": 0, "name": "Ethiopia", "name_long": "Ethiopia", "brk_a3": "ETH", "brk_name": "Ethiopia", "abbrev": "Eth.", "postal": "ET", "formal_en": "Federal Democratic Republic of Ethiopia", "name_sort": "Ethiopia", "mapcolor7": 4, "mapcolor8": 4, "mapcolor9": 1, "mapcolor13": 13, "pop_est": 85237338, "gdp_md_est": 68770, "pop_year": -99, "lastcensus": 2007, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "5. Low income", "wikipedia": -99, "iso_a2": "ET", "iso_a3": "ETH", "iso_n3": "231", "un_a3": "231", "wb_a2": "ET", "wb_a3": "ETH", "woe_id": -99, "adm0_a3_is": "ETH", "adm0_a3_us": "ETH", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Africa", "region_un": "Africa", "subregion": "Eastern Africa", "region_wb": "Sub-Saharan Africa", "name_len": 8, "long_len": 8, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 37.880859, 14.944785 ], [ 38.496094, 14.519780 ], [ 39.111328, 14.774883 ], [ 39.375000, 14.519780 ], [ 39.990234, 14.519780 ], [ 40.869141, 14.093957 ], [ 41.572266, 13.410994 ], [ 42.363281, 12.554564 ], [ 41.660156, 11.609193 ], [ 41.748047, 11.092166 ], [ 42.539062, 11.092166 ], [ 42.802734, 10.919618 ], [ 42.539062, 10.574222 ], [ 43.681641, 9.188870 ], [ 46.933594, 7.972198 ], [ 47.812500, 7.972198 ], [ 45.000000, 5.003394 ], [ 43.681641, 4.915833 ], [ 42.802734, 4.214943 ], [ 42.099609, 4.214943 ], [ 41.835938, 3.951941 ], [ 41.132812, 3.951941 ], [ 40.781250, 4.214943 ], [ 39.814453, 3.864255 ], [ 39.550781, 3.425692 ], [ 38.144531, 3.601142 ], [ 36.826172, 4.477856 ], [ 36.123047, 4.477856 ], [ 35.859375, 4.740675 ], [ 35.859375, 5.353521 ], [ 35.332031, 5.528511 ], [ 34.716797, 6.577303 ], [ 34.277344, 6.839170 ], [ 34.101562, 7.188101 ], [ 33.574219, 7.710992 ], [ 32.958984, 7.798079 ], [ 33.310547, 8.320212 ], [ 33.837891, 8.407168 ], [ 34.013672, 8.667918 ], [ 33.925781, 9.622414 ], [ 34.277344, 10.660608 ], [ 34.716797, 10.919618 ], [ 35.244141, 12.125264 ], [ 35.859375, 12.554564 ], [ 36.298828, 13.581921 ], [ 36.386719, 14.434680 ], [ 37.617188, 14.179186 ], [ 37.880859, 14.944785 ] ] ] } }
|
||||
=======
|
||||
{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 5, "sovereignt": "Bhutan", "sov_a3": "BTN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Bhutan", "adm0_a3": "BTN", "geou_dif": 0, "geounit": "Bhutan", "gu_a3": "BTN", "su_dif": 0, "subunit": "Bhutan", "su_a3": "BTN", "brk_diff": 0, "name": "Bhutan", "name_long": "Bhutan", "brk_a3": "BTN", "brk_name": "Bhutan", "abbrev": "Bhutan", "postal": "BT", "formal_en": "Kingdom of Bhutan", "name_sort": "Bhutan", "mapcolor7": 5, "mapcolor8": 6, "mapcolor9": 1, "mapcolor13": 8, "pop_est": 691141, "gdp_md_est": 3524, "pop_year": -99, "lastcensus": 2005, "gdp_year": -99, "economy": "7. Least developed region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "BT", "iso_a3": "BTN", "iso_n3": "064", "un_a3": "064", "wb_a2": "BT", "wb_a3": "BTN", "woe_id": -99, "adm0_a3_is": "BTN", "adm0_a3_us": "BTN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "Southern Asia", "region_wb": "South Asia", "name_len": 6, "long_len": 6, "abbrev_len": 6, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 90.000000, 28.304381 ], [ 90.703125, 28.071980 ], [ 91.230469, 28.071980 ], [ 92.109375, 27.449790 ], [ 92.021484, 26.824071 ], [ 90.351562, 26.902477 ], [ 89.736328, 26.745610 ], [ 88.857422, 27.137368 ], [ 88.857422, 27.293689 ], [ 89.472656, 28.071980 ], [ 90.000000, 28.304381 ] ] ] } }
|
||||
>>>>>>> 644a9ce (Was still truncating instead of rounding in projection)
|
||||
=======
|
||||
{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 6, "sovereignt": "Brunei", "sov_a3": "BRN", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Brunei", "adm0_a3": "BRN", "geou_dif": 0, "geounit": "Brunei", "gu_a3": "BRN", "su_dif": 0, "subunit": "Brunei", "su_a3": "BRN", "brk_diff": 0, "name": "Brunei", "name_long": "Brunei Darussalam", "brk_a3": "BRN", "brk_name": "Brunei", "abbrev": "Brunei", "postal": "BN", "formal_en": "Negara Brunei Darussalam", "name_sort": "Brunei", "mapcolor7": 4, "mapcolor8": 6, "mapcolor9": 6, "mapcolor13": 12, "pop_est": 388190, "gdp_md_est": 20250, "pop_year": -99, "lastcensus": 2001, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "2. High income: nonOECD", "wikipedia": -99, "iso_a2": "BN", "iso_a3": "BRN", "iso_n3": "096", "un_a3": "096", "wb_a2": "BN", "wb_a3": "BRN", "woe_id": -99, "adm0_a3_is": "BRN", "adm0_a3_us": "BRN", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "South-Eastern Asia", "region_wb": "East Asia & Pacific", "name_len": 6, "long_len": 17, "abbrev_len": 6, "tiny": 2, "homepart": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 115.488281, 5.441022 ], [ 115.312500, 4.302591 ], [ 114.873047, 4.390229 ], [ 114.697266, 4.039618 ], [ 114.169922, 4.565474 ], [ 115.488281, 5.441022 ] ] ] } }
|
||||
>>>>>>> d6e33c4 (Stay in integers in line simplification)
|
||||
=======
|
||||
{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 3, "sovereignt": "Ukraine", "sov_a3": "UKR", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Ukraine", "adm0_a3": "UKR", "geou_dif": 0, "geounit": "Ukraine", "gu_a3": "UKR", "su_dif": 0, "subunit": "Ukraine", "su_a3": "UKR", "brk_diff": 0, "name": "Ukraine", "name_long": "Ukraine", "brk_a3": "UKR", "brk_name": "Ukraine", "abbrev": "Ukr.", "postal": "UA", "formal_en": "Ukraine", "name_sort": "Ukraine", "mapcolor7": 5, "mapcolor8": 1, "mapcolor9": 6, "mapcolor13": 3, "pop_est": 45700395, "gdp_md_est": 339800, "pop_year": -99, "lastcensus": 2001, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "UA", "iso_a3": "UKR", "iso_n3": "804", "un_a3": "804", "wb_a2": "UA", "wb_a3": "UKR", "woe_id": -99, "adm0_a3_is": "UKR", "adm0_a3_us": "UKR", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Europe", "region_un": "Europe", "subregion": "Eastern Europe", "region_wb": "Europe & Central Asia", "name_len": 7, "long_len": 7, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 40.078125, 49.610710 ], [ 33.925781, 44.339565 ], [ 22.060547, 48.400032 ], [ 40.078125, 49.610710 ] ] ] } }
|
||||
>>>>>>> c5b6eb5 (All the tests change again)
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 1, "featurecla": "Admin-0 country", "labelrank": 5, "sovereignt": "Georgia", "sov_a3": "GEO", "adm0_dif": 0, "level": 2, "type": "Sovereign country", "admin": "Georgia", "adm0_a3": "GEO", "geou_dif": 0, "geounit": "Georgia", "gu_a3": "GEO", "su_dif": 0, "subunit": "Georgia", "su_a3": "GEO", "brk_diff": 0, "name": "Georgia", "name_long": "Georgia", "brk_a3": "GEO", "brk_name": "Georgia", "abbrev": "Geo.", "postal": "GE", "formal_en": "Georgia", "name_sort": "Georgia", "mapcolor7": 5, "mapcolor8": 1, "mapcolor9": 3, "mapcolor13": 2, "pop_est": 4615807, "gdp_md_est": 21510, "pop_year": -99, "lastcensus": 2002, "gdp_year": -99, "economy": "6. Developing region", "income_grp": "4. Lower middle income", "wikipedia": -99, "iso_a2": "GE", "iso_a3": "GEO", "iso_n3": "268", "un_a3": "268", "wb_a2": "GE", "wb_a3": "GEO", "woe_id": -99, "adm0_a3_is": "GEO", "adm0_a3_us": "GEO", "adm0_a3_un": -99, "adm0_a3_wb": -99, "continent": "Asia", "region_un": "Asia", "subregion": "Western Asia", "region_wb": "Europe & Central Asia", "name_len": 7, "long_len": 7, "abbrev_len": 4, "tiny": -99, "homepart": 1 }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 39.990234, 43.452919 ], [ 45.439453, 42.488302 ], [ 46.669922, 41.178654 ], [ 39.990234, 43.452919 ] ] ] } }
|
||||
,
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
-20
File diff suppressed because one or more lines are too long
-8
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -9,11 +9,7 @@
|
||||
"maxzoom": "4",
|
||||
"minzoom": "0",
|
||||
"name": "tests/ne_110m_admin_0_countries/out/-z4_-yname_--drop-polygons.json.check.mbtiles",
|
||||
<<<<<<< HEAD
|
||||
"strategies": "[{\"dropped_by_rate\":172},{\"dropped_by_rate\":205},{\"dropped_by_rate\":189},{\"dropped_by_rate\":166},{}]",
|
||||
=======
|
||||
"strategies": "[{\"dropped_by_rate\":172},{\"dropped_by_rate\":203,\"tiny_polygons\":1},{\"dropped_by_rate\":187,\"tiny_polygons\":2},{\"dropped_by_rate\":168,\"tiny_polygons\":7},{\"tiny_polygons\":20}]",
|
||||
>>>>>>> c5b6eb5 (All the tests change again)
|
||||
"strategies": "[{\"dropped_by_rate\":172},{\"dropped_by_rate\":203},{\"dropped_by_rate\":187},{\"dropped_by_rate\":168},{}]",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
-8
File diff suppressed because one or more lines are too long
@@ -9,23 +9,7 @@
|
||||
"maxzoom": "5",
|
||||
"minzoom": "0",
|
||||
"name": "tests/ne_110m_admin_0_countries/out/-z5_-M5000_--coalesce-densest-as-needed.json.check.mbtiles",
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"strategies": "[{\"coalesced_as_needed\":528,\"detail_reduced\":2,\"tiny_polygons\":2,\"tile_size_desired\":39204},{\"coalesced_as_needed\":212,\"tile_size_desired\":25156},{\"coalesced_as_needed\":192,\"tiny_polygons\":1,\"tile_size_desired\":21207},{\"coalesced_as_needed\":156,\"tile_size_desired\":10753},{\"coalesced_as_needed\":65,\"tile_size_desired\":6588},{\"tiny_polygons\":1}]",
|
||||
=======
|
||||
"strategies": "[{\"coalesced_as_needed\":528,\"detail_reduced\":2,\"tile_size_desired\":39203},{\"coalesced_as_needed\":212,\"tile_size_desired\":25157},{\"coalesced_as_needed\":192,\"tiny_polygons\":3,\"tile_size_desired\":21207},{\"coalesced_as_needed\":156,\"tiny_polygons\":11,\"tile_size_desired\":10753},{\"coalesced_as_needed\":65,\"tiny_polygons\":20,\"tile_size_desired\":6588},{\"tiny_polygons\":46}]",
|
||||
>>>>>>> 16f61fc (Scale geometry up before wagyu to prevent changes from precision loss)
|
||||
=======
|
||||
"strategies": "[{\"coalesced_as_needed\":528,\"detail_reduced\":2,\"tile_size_desired\":39222},{\"coalesced_as_needed\":212,\"tile_size_desired\":25157},{\"coalesced_as_needed\":192,\"tiny_polygons\":3,\"tile_size_desired\":21207},{\"coalesced_as_needed\":156,\"tiny_polygons\":11,\"tile_size_desired\":10753},{\"coalesced_as_needed\":65,\"tiny_polygons\":20,\"tile_size_desired\":6588},{\"tiny_polygons\":46}]",
|
||||
>>>>>>> 644a9ce (Was still truncating instead of rounding in projection)
|
||||
=======
|
||||
"strategies": "[{\"coalesced_as_needed\":704,\"detail_reduced\":3,\"tile_size_desired\":39670},{\"coalesced_as_needed\":212,\"tile_size_desired\":25209},{\"coalesced_as_needed\":192,\"tiny_polygons\":3,\"tile_size_desired\":21224},{\"coalesced_as_needed\":156,\"tiny_polygons\":11,\"tile_size_desired\":10755},{\"coalesced_as_needed\":65,\"tiny_polygons\":20,\"tile_size_desired\":6588},{\"tiny_polygons\":46}]",
|
||||
>>>>>>> d6e33c4 (Stay in integers in line simplification)
|
||||
=======
|
||||
"strategies": "[{\"coalesced_as_needed\":160,\"tile_size_desired\":26154},{\"coalesced_as_needed\":159,\"tiny_polygons\":2,\"tile_size_desired\":17130},{\"coalesced_as_needed\":147,\"tiny_polygons\":3,\"tile_size_desired\":14761},{\"coalesced_as_needed\":84,\"tiny_polygons\":12,\"tile_size_desired\":8076},{\"coalesced_as_needed\":17,\"tiny_polygons\":20,\"tile_size_desired\":5304},{\"tiny_polygons\":46}]",
|
||||
>>>>>>> c5b6eb5 (All the tests change again)
|
||||
"strategies": "[{\"coalesced_as_needed\":160,\"tile_size_desired\":26154},{\"coalesced_as_needed\":159,\"tiny_polygons\":1,\"tile_size_desired\":17130},{\"coalesced_as_needed\":147,\"tiny_polygons\":1,\"tile_size_desired\":14761},{\"coalesced_as_needed\":84,\"tile_size_desired\":8076},{\"coalesced_as_needed\":17,\"tile_size_desired\":5304},{\"tiny_polygons\":1}]",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
|
||||
@@ -9,23 +9,7 @@
|
||||
"maxzoom": "5",
|
||||
"minzoom": "0",
|
||||
"name": "tests/ne_110m_admin_0_countries/out/-z5_-M5000_--coalesce-fraction-as-needed.json.check.mbtiles",
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"strategies": "[{\"coalesced_as_needed\":528,\"detail_reduced\":2,\"tiny_polygons\":2,\"tile_size_desired\":39204},{\"coalesced_as_needed\":217,\"tile_size_desired\":25156},{\"coalesced_as_needed\":218,\"tile_size_desired\":21207},{\"coalesced_as_needed\":227,\"tile_size_desired\":10753},{\"coalesced_as_needed\":192,\"tile_size_desired\":6588},{\"tiny_polygons\":1}]",
|
||||
=======
|
||||
"strategies": "[{\"coalesced_as_needed\":528,\"detail_reduced\":2,\"tile_size_desired\":39203},{\"coalesced_as_needed\":217,\"tile_size_desired\":25157},{\"coalesced_as_needed\":218,\"tiny_polygons\":2,\"tile_size_desired\":21207},{\"coalesced_as_needed\":227,\"tiny_polygons\":4,\"tile_size_desired\":10753},{\"coalesced_as_needed\":192,\"tiny_polygons\":13,\"tile_size_desired\":6588},{\"tiny_polygons\":46}]",
|
||||
>>>>>>> 16f61fc (Scale geometry up before wagyu to prevent changes from precision loss)
|
||||
=======
|
||||
"strategies": "[{\"coalesced_as_needed\":528,\"detail_reduced\":2,\"tile_size_desired\":39222},{\"coalesced_as_needed\":217,\"tile_size_desired\":25157},{\"coalesced_as_needed\":218,\"tiny_polygons\":2,\"tile_size_desired\":21207},{\"coalesced_as_needed\":227,\"tiny_polygons\":4,\"tile_size_desired\":10753},{\"coalesced_as_needed\":192,\"tiny_polygons\":13,\"tile_size_desired\":6588},{\"tiny_polygons\":46}]",
|
||||
>>>>>>> 644a9ce (Was still truncating instead of rounding in projection)
|
||||
=======
|
||||
"strategies": "[{\"coalesced_as_needed\":704,\"detail_reduced\":3,\"tile_size_desired\":39670},{\"coalesced_as_needed\":217,\"tile_size_desired\":25209},{\"coalesced_as_needed\":219,\"tiny_polygons\":2,\"tile_size_desired\":21224},{\"coalesced_as_needed\":226,\"tiny_polygons\":4,\"tile_size_desired\":10755},{\"coalesced_as_needed\":192,\"tiny_polygons\":13,\"tile_size_desired\":6588},{\"tiny_polygons\":46}]",
|
||||
>>>>>>> d6e33c4 (Stay in integers in line simplification)
|
||||
=======
|
||||
"strategies": "[{\"coalesced_as_needed\":159,\"tile_size_desired\":26154},{\"coalesced_as_needed\":180,\"tile_size_desired\":17130},{\"coalesced_as_needed\":180,\"tiny_polygons\":2,\"tile_size_desired\":14761},{\"coalesced_as_needed\":168,\"tiny_polygons\":7,\"tile_size_desired\":8076},{\"coalesced_as_needed\":84,\"tiny_polygons\":18,\"tile_size_desired\":5304},{\"tiny_polygons\":46}]",
|
||||
>>>>>>> c5b6eb5 (All the tests change again)
|
||||
"strategies": "[{\"coalesced_as_needed\":159,\"tile_size_desired\":26154},{\"coalesced_as_needed\":180,\"tile_size_desired\":17130},{\"coalesced_as_needed\":180,\"tile_size_desired\":14761},{\"coalesced_as_needed\":168,\"tile_size_desired\":8076},{\"coalesced_as_needed\":84,\"tile_size_desired\":5304},{\"tiny_polygons\":1}]",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user