mirror of
https://github.com/felt/tippecanoe.git
synced 2026-10-02 08:25:40 +02:00
It only needs to look for other small features when coalescing, not dropping (#64)
* Back out the slow search for other small features when dropping features * Actually, *do* look for small features still when coalescing * Update changelog
This commit is contained in:
Erica Fischer
@@ -1,3 +1,7 @@
|
||||
## 2.22.0
|
||||
|
||||
* Speed up feature dropping by removing unnecessary search for other small features
|
||||
|
||||
## 2.21.0
|
||||
|
||||
* Improve label placement to avoid placing labels in polygon holes
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+4
-20
@@ -1,6 +1,6 @@
|
||||
{ "type": "FeatureCollection", "properties": {
|
||||
"bounds": "-124.213807,29.689480,-70.645734,49.005639",
|
||||
"center": "-95.625000,44.951199,5",
|
||||
"center": "-118.125000,44.951199,5",
|
||||
"description": "tests/ne_110m_admin_1_states_provinces_lines/out/-z5_-M500_--drop-smallest-as-needed.json.check.mbtiles",
|
||||
"format": "pbf",
|
||||
"generator_options": "./tippecanoe -q -a@ -f -o tests/ne_110m_admin_1_states_provinces_lines/out/-z5_-M500_--drop-smallest-as-needed.json.check.mbtiles -z5 -M500 --drop-smallest-as-needed tests/ne_110m_admin_1_states_provinces_lines/in.json",
|
||||
@@ -8,7 +8,7 @@
|
||||
"maxzoom": "5",
|
||||
"minzoom": "0",
|
||||
"name": "tests/ne_110m_admin_1_states_provinces_lines/out/-z5_-M500_--drop-smallest-as-needed.json.check.mbtiles",
|
||||
"strategies": "[{\"dropped_as_needed\":92,\"tile_size_desired\":1377},{\"dropped_as_needed\":96,\"tile_size_desired\":1738},{\"dropped_as_needed\":115,\"tile_size_desired\":1303},{\"dropped_as_needed\":126,\"tile_size_desired\":1154},{\"dropped_as_needed\":103,\"tile_size_desired\":1228},{\"dropped_as_needed\":101,\"tile_size_desired\":1077}]",
|
||||
"strategies": "[{\"dropped_as_needed\":92,\"tile_size_desired\":1377},{\"dropped_as_needed\":96,\"tile_size_desired\":1738},{\"dropped_as_needed\":115,\"tile_size_desired\":1303},{\"dropped_as_needed\":127,\"tile_size_desired\":1154},{\"dropped_as_needed\":105,\"tile_size_desired\":1228},{\"dropped_as_needed\":106,\"tile_size_desired\":1077}]",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
@@ -124,8 +124,6 @@
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -120.003662, 41.640078 ], [ -120.003662, 40.979898 ], [ -120.003662, 38.993572 ], [ -118.114014, 37.640335 ], [ -114.642334, 35.047987 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -111.049805, 41.640078 ], [ -111.049805, 41.029643 ], [ -109.050293, 41.004775 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -114.027100, 36.993778 ], [ -114.038086, 40.979898 ], [ -114.038086, 41.640078 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -102.996826, 36.993778 ], [ -109.039307, 37.002553 ] ] } }
|
||||
@@ -187,8 +185,6 @@
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -119.998169, 41.310824 ], [ -119.998169, 40.979898 ], [ -119.998169, 38.993572 ], [ -118.114014, 37.644685 ], [ -114.642334, 35.052484 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -114.027100, 36.993778 ], [ -114.032593, 40.979898 ], [ -114.032593, 41.310824 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -114.027100, 36.993778 ], [ -114.021606, 36.186659 ], [ -114.065552, 36.155618 ], [ -114.131470, 36.004673 ], [ -114.268799, 36.044658 ], [ -114.461060, 36.115690 ], [ -114.669800, 36.115690 ], [ -114.735718, 35.991341 ], [ -114.647827, 35.853440 ], [ -114.647827, 35.639441 ], [ -114.631348, 35.442771 ], [ -114.581909, 35.250105 ], [ -114.642334, 35.052484 ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -236,8 +232,6 @@
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -111.082764, 44.504341 ], [ -111.192627, 44.559163 ], [ -111.291504, 44.699898 ], [ -111.401367, 44.727223 ], [ -111.538696, 44.527843 ], [ -111.769409, 44.496505 ], [ -112.335205, 44.559163 ], [ -112.362671, 44.461231 ], [ -112.500000, 44.476911 ], [ -112.692261, 44.496505 ], [ -112.873535, 44.359206 ], [ -112.939453, 44.457310 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -111.049805, 42.000325 ], [ -112.500000, 41.996243 ], [ -112.939453, 41.996243 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -111.082764, 44.504341 ], [ -111.066284, 44.539590 ], [ -111.071777, 45.050240 ], [ -109.099731, 45.054121 ], [ -107.545166, 45.046359 ], [ -105.743408, 45.050240 ], [ -104.078979, 45.038597 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -104.024048, 45.954969 ], [ -100.063477, 45.966425 ], [ -98.442993, 45.962606 ], [ -96.536865, 46.016039 ] ] } }
|
||||
@@ -254,14 +248,14 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -90.439453, 36.478724 ], [ -90.115356, 36.461054 ], [ -90.032959, 36.337253 ], [ -90.252686, 36.120128 ], [ -90.318604, 36.022447 ], [ -90.000000, 36.022447 ], [ -89.659424, 36.022447 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -89.659424, 36.022447 ], [ -89.670410, 35.937988 ], [ -89.774780, 35.799994 ], [ -89.950562, 35.701917 ], [ -89.989014, 35.536696 ], [ -90.000000, 35.527756 ], [ -90.148315, 35.402484 ], [ -90.137329, 35.110922 ], [ -90.252686, 35.021000 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -90.439453, 31.015279 ], [ -90.000000, 31.015279 ], [ -89.758301, 31.010571 ], [ -89.785767, 30.845647 ], [ -89.851685, 30.680440 ], [ -89.791260, 30.557531 ], [ -89.659424, 30.439202 ], [ -89.604492, 30.173625 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -83.671875, 36.597889 ], [ -84.347534, 36.567012 ], [ -85.231934, 36.606709 ], [ -85.517578, 36.597889 ], [ -86.088867, 36.624345 ], [ -87.214966, 36.637570 ], [ -87.841187, 36.611118 ], [ -87.874146, 36.655200 ], [ -88.071899, 36.655200 ], [ -88.066406, 36.496390 ], [ -89.494629, 36.505221 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -77.722778, 39.321550 ], [ -77.832642, 39.134321 ], [ -78.343506, 39.406489 ], [ -78.420410, 39.138582 ], [ -78.546753, 39.040520 ], [ -78.744507, 38.908133 ], [ -78.892822, 38.779781 ], [ -78.964233, 38.822591 ], [ -79.172974, 38.552461 ], [ -79.222412, 38.462192 ], [ -79.365234, 38.423470 ], [ -79.513550, 38.496594 ], [ -79.645386, 38.573938 ], [ -79.744263, 38.354580 ], [ -79.914551, 38.177751 ], [ -79.963989, 38.030786 ], [ -80.156250, 37.900865 ], [ -80.293579, 37.727280 ], [ -80.277100, 37.609880 ], [ -80.299072, 37.518440 ], [ -80.452881, 37.439974 ], [ -80.595703, 37.453057 ], [ -80.716553, 37.383253 ], [ -80.831909, 37.418163 ], [ -80.853882, 37.326489 ], [ -81.227417, 37.243448 ], [ -81.348267, 37.313383 ], [ -81.661377, 37.195331 ], [ -81.815186, 37.274053 ], [ -81.925049, 37.365791 ], [ -81.968994, 37.535866 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -83.073120, 34.976002 ], [ -82.435913, 35.178298 ], [ -81.513062, 35.169318 ], [ -81.046143, 35.124402 ], [ -81.035156, 35.034494 ], [ -80.936279, 35.101934 ], [ -80.776978, 34.930979 ], [ -80.782471, 34.818313 ], [ -79.672852, 34.804783 ], [ -78.552246, 33.861293 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -81.677856, 36.584658 ], [ -79.991455, 36.540536 ], [ -77.997437, 36.536123 ], [ -75.866089, 36.549362 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -88.165283, 34.998504 ], [ -88.093872, 34.804783 ], [ -88.269653, 33.509339 ], [ -88.445435, 31.910205 ], [ -88.417969, 30.382353 ] ] } }
|
||||
@@ -289,8 +283,6 @@
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -119.998169, 41.145570 ], [ -119.998169, 40.979898 ], [ -120.000916, 38.995707 ], [ -118.114014, 37.644685 ], [ -116.320496, 36.321764 ], [ -114.642334, 35.052484 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -114.029846, 36.993778 ], [ -114.035339, 40.979898 ], [ -114.035339, 41.145570 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -114.029846, 36.993778 ], [ -114.024353, 36.188875 ], [ -114.065552, 36.155618 ], [ -114.131470, 36.004673 ], [ -114.268799, 36.044658 ], [ -114.461060, 36.115690 ], [ -114.672546, 36.115690 ], [ -114.738464, 35.991341 ], [ -114.650574, 35.853440 ], [ -114.650574, 35.639441 ], [ -114.631348, 35.445009 ], [ -114.581909, 35.250105 ], [ -114.642334, 35.052484 ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -348,8 +340,6 @@
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -111.085510, 44.506300 ], [ -111.195374, 44.561120 ], [ -111.291504, 44.701850 ], [ -111.401367, 44.729174 ], [ -111.541443, 44.529801 ], [ -111.772156, 44.498464 ], [ -112.335205, 44.561120 ], [ -112.362671, 44.463191 ], [ -112.500000, 44.478871 ], [ -112.689514, 44.498464 ], [ -112.719727, 44.474951 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -111.049805, 42.002366 ], [ -112.500000, 41.998284 ], [ -112.719727, 41.996243 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -111.085510, 44.506300 ], [ -111.066284, 44.541548 ], [ -111.071777, 45.050240 ], [ -109.102478, 45.056061 ], [ -107.547913, 45.046359 ], [ -105.746155, 45.050240 ], [ -104.078979, 45.040537 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -104.026794, 45.956878 ], [ -101.250000, 45.962606 ], [ -101.030273, 45.964515 ] ] } }
|
||||
@@ -367,8 +357,6 @@
|
||||
{ "type": "FeatureCollection", "properties": { "zoom": 5, "x": 7, "y": 13 }, "features": [
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "MultiLineString", "coordinates": [ [ [ -91.098633, 32.138409 ], [ -91.128845, 32.015063 ], [ -91.205750, 31.952162 ], [ -91.321106, 31.858897 ], [ -91.411743, 31.651043 ], [ -91.502380, 31.407568 ], [ -91.623230, 31.297328 ], [ -91.584778, 31.048228 ], [ -90.700378, 31.015279 ], [ -90.000000, 31.012925 ], [ -89.780273, 31.012925 ] ], [ [ -89.780273, 30.892797 ], [ -89.788513, 30.848005 ], [ -89.854431, 30.682802 ], [ -89.791260, 30.557531 ], [ -89.780273, 30.548070 ] ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -94.010010, 32.138409 ], [ -93.999023, 31.952162 ], [ -93.999023, 31.942840 ], [ -93.834229, 31.830899 ], [ -93.694153, 31.442724 ], [ -93.578796, 31.215150 ], [ -93.490906, 31.078813 ], [ -93.587036, 30.713504 ], [ -93.650208, 30.604822 ], [ -93.738098, 30.365766 ], [ -93.663940, 30.299389 ], [ -93.666687, 30.099990 ], [ -93.817749, 29.969212 ], [ -93.919373, 29.821583 ], [ -93.836975, 29.690439 ] ] } }
|
||||
] }
|
||||
] }
|
||||
,
|
||||
@@ -412,8 +400,6 @@
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -90.219727, 31.015279 ], [ -90.000000, 31.012925 ], [ -89.758301, 31.012925 ], [ -89.788513, 30.848005 ], [ -89.854431, 30.682802 ], [ -89.791260, 30.557531 ], [ -89.659424, 30.441570 ], [ -89.604492, 30.175999 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -85.003967, 30.991737 ], [ -85.053406, 31.109389 ], [ -85.116577, 31.236289 ], [ -85.064392, 31.576196 ], [ -85.119324, 31.765537 ], [ -85.086365, 31.952162 ], [ -85.064392, 32.082575 ], [ -85.012207, 32.138409 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -88.423462, 32.138409 ], [ -88.442688, 31.952162 ], [ -88.448181, 31.912536 ], [ -88.417969, 30.384723 ] ] } }
|
||||
] }
|
||||
] }
|
||||
@@ -424,8 +410,6 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "MultiLineString", "coordinates": [ [ [ -90.219727, 36.467681 ], [ -90.112610, 36.461054 ], [ -90.030212, 36.337253 ], [ -90.219727, 36.155618 ] ], [ [ -90.219727, 36.022447 ], [ -90.000000, 36.022447 ], [ -89.662170, 36.022447 ] ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -89.662170, 36.022447 ], [ -89.673157, 35.940212 ], [ -89.774780, 35.799994 ], [ -89.950562, 35.701917 ], [ -89.989014, 35.536696 ], [ -90.000000, 35.527756 ], [ -90.148315, 35.404722 ], [ -90.134583, 35.113169 ], [ -90.219727, 35.045738 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -83.674622, 36.600094 ], [ -84.350281, 36.567012 ], [ -85.231934, 36.608914 ], [ -85.520325, 36.597889 ], [ -86.091614, 36.626550 ], [ -87.217712, 36.639774 ], [ -87.841187, 36.611118 ], [ -87.874146, 36.657403 ], [ -88.071899, 36.655200 ], [ -88.069153, 36.496390 ], [ -89.497375, 36.505221 ] ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "scalerank": 2, "featurecla": "Admin-1 boundary", "adm0_a3": "USA", "adm0_name": "United States of America", "mapcolor9": 1, "mapcolor13": 1 }, "geometry": { "type": "LineString", "coordinates": [ [ -78.530273, 39.055451 ], [ -78.750000, 38.903858 ], [ -78.892822, 38.779781 ], [ -78.964233, 38.822591 ], [ -79.175720, 38.554609 ], [ -79.222412, 38.464342 ], [ -79.365234, 38.425622 ], [ -79.516296, 38.496594 ], [ -79.648132, 38.573938 ], [ -79.744263, 38.356734 ], [ -79.914551, 38.179910 ], [ -79.963989, 38.030786 ], [ -80.156250, 37.900865 ], [ -80.293579, 37.727280 ], [ -80.277100, 37.609880 ], [ -80.299072, 37.518440 ], [ -80.455627, 37.442155 ], [ -80.595703, 37.455238 ], [ -80.719299, 37.383253 ], [ -80.831909, 37.418163 ], [ -80.853882, 37.328673 ], [ -81.227417, 37.245635 ], [ -81.348267, 37.315568 ], [ -81.664124, 37.195331 ], [ -81.815186, 37.276238 ], [ -81.927795, 37.365791 ], [ -81.971741, 37.535866 ] ] } }
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
"maxzoom": "1",
|
||||
"minzoom": "0",
|
||||
"name": "tests/ne_110m_populated_places/out/-z1_-M10000_--drop-smallest-as-needed.json.check.mbtiles",
|
||||
"strategies": "[{\"dropped_by_rate\":145,\"dropped_as_needed\":74,\"tile_size_desired\":32932},{\"dropped_as_needed\":200,\"tile_size_desired\":44398}]",
|
||||
"strategies": "[{\"dropped_by_rate\":145,\"dropped_as_needed\":75,\"tile_size_desired\":32932},{\"dropped_as_needed\":204,\"tile_size_desired\":44398}]",
|
||||
"type": "overlay",
|
||||
"version": "2"
|
||||
}, "features": [
|
||||
@@ -16,8 +16,6 @@
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 1, "NATSCALE": 300, "LABELRANK": 2, "FEATURECLA": "Populated place", "NAME": "Vancouver", "DIFFASCII": 0, "NAMEASCII": "Vancouver", "ADM0CAP": 0, "CAPALT": 0, "WORLDCITY": 0, "MEGACITY": 1, "SOV0NAME": "Canada", "SOV_A3": "CAN", "ADM0NAME": "Canada", "ADM0_A3": "CAN", "ADM1NAME": "British Columbia", "ISO_A2": "CA", "LATITUDE": 49.273417, "LONGITUDE": -123.121644, "CHANGED": 5, "NAMEDIFF": 0, "DIFFNOTE": "Changed scale rank.", "POP_MAX": 2313328, "POP_MIN": 603502, "POP_OTHER": 482002, "RANK_MAX": 12, "RANK_MIN": 11, "GEONAMEID": 6173331, "MEGANAME": "Vancouver", "LS_NAME": "Vancouver2", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 1590116, "MAX_POP20": 1588839, "MAX_POP50": 1590116, "MAX_POP300": 1590116, "MAX_POP310": 0, "MAX_NATSCA": 100, "MIN_AREAKM": 706, "MAX_AREAKM": 708, "MIN_AREAMI": 273, "MAX_AREAMI": 273, "MIN_PERKM": 398, "MAX_PERKM": 405, "MIN_PERMI": 248, "MAX_PERMI": 251, "MIN_BBXMIN": -123.283333, "MAX_BBXMIN": -123.283333, "MIN_BBXMAX": -122.708333, "MAX_BBXMAX": -122.708333, "MIN_BBYMIN": 49.1, "MAX_BBYMIN": 49.1, "MIN_BBYMAX": 49.383333, "MAX_BBYMAX": 49.383333, "MEAN_BBXC": -122.982768, "MEAN_BBYC": 49.228888, "COMPARE": 0, "GN_ASCII": "Vancouver", "FEATURE_CL": "P", "FEATURE_CO": "PPL", "ADMIN1_COD": 2, "GN_POP": 1837969, "ELEVATION": 0, "GTOPO30": 63, "TIMEZONE": "America/Vancouver", "GEONAMESNO": "Geonames ascii name + lat.d + long.d matching.", "UN_FID": 15, "UN_ADM0": "Canada", "UN_LAT": 49.27, "UN_LONG": -122.96, "POP1950": 556, "POP1955": 588, "POP1960": 620, "POP1965": 836, "POP1970": 1045, "POP1975": 1150, "POP1980": 1247, "POP1985": 1359, "POP1990": 1559, "POP1995": 1789, "POP2000": 1959, "POP2005": 2093, "POP2010": 2146, "POP2015": 2219, "POP2020": 2310, "POP2025": 2380, "POP2050": 2444 }, "geometry": { "type": "Point", "coordinates": [ -123.134766, 49.267805 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 0, "NATSCALE": 600, "LABELRANK": 1, "FEATURECLA": "Populated place", "NAME": "Los Angeles", "NAMEALT": "Los Angeles-Long Beach-Santa Ana", "DIFFASCII": 0, "NAMEASCII": "Los Angeles", "ADM0CAP": 0, "CAPALT": 0, "WORLDCITY": 1, "MEGACITY": 1, "SOV0NAME": "United States", "SOV_A3": "USA", "ADM0NAME": "United States of America", "ADM0_A3": "USA", "ADM1NAME": "California", "ISO_A2": "US", "LATITUDE": 33.989978, "LONGITUDE": -118.179981, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 12500000, "POP_MIN": 3694820, "POP_OTHER": 142265, "RANK_MAX": 14, "RANK_MIN": 12, "GEONAMEID": 5368361, "MEGANAME": "Los Angeles-Long Beach-Santa Ana", "LS_NAME": "Los Angeles1", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 4976870, "MAX_POP20": 6558538, "MAX_POP50": 14868745, "MAX_POP300": 14870543, "MAX_POP310": 14903021, "MAX_NATSCA": 300, "MIN_AREAKM": 1338, "MAX_AREAKM": 5803, "MIN_AREAMI": 517, "MAX_AREAMI": 2241, "MIN_PERKM": 534, "MAX_PERKM": 2202, "MIN_PERMI": 332, "MAX_PERMI": 1369, "MIN_BBXMIN": -118.991667, "MAX_BBXMIN": -118.966667, "MIN_BBXMAX": -117.857183, "MAX_BBXMAX": -117.008333, "MIN_BBYMIN": 33.391667, "MAX_BBYMIN": 33.862631, "MIN_BBYMAX": 34.241667, "MAX_BBYMAX": 34.333333, "MEAN_BBXC": -118.107478, "MEAN_BBYC": 33.980609, "COMPARE": 0, "GN_ASCII": "Los Angeles", "FEATURE_CL": "P", "FEATURE_CO": "PPL", "ADMIN1_COD": 0, "GN_POP": 3694820, "ELEVATION": 89, "GTOPO30": 115, "TIMEZONE": "America/Los_Angeles", "GEONAMESNO": "GeoNames match with ascii name + lat + long whole numbers.", "UN_FID": 547, "UN_ADM0": "United States of America", "UN_LAT": 34, "UN_LONG": -118.25, "POP1950": 4046, "POP1955": 5154, "POP1960": 6530, "POP1965": 7408, "POP1970": 8378, "POP1975": 8926, "POP1980": 9512, "POP1985": 10181, "POP1990": 10883, "POP1995": 11339, "POP2000": 11814, "POP2005": 12307, "POP2010": 12500, "POP2015": 12773, "POP2020": 13160, "POP2025": 13461, "POP2050": 13672, "CITYALT": "Los Angeles" }, "geometry": { "type": "Point", "coordinates": [ -118.125000, 33.943360 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 1, "NATSCALE": 300, "LABELRANK": 2, "FEATURECLA": "Admin-1 capital", "NAME": "Monterrey", "DIFFASCII": 0, "NAMEASCII": "Monterrey", "ADM0CAP": 0, "CAPALT": 0, "WORLDCITY": 0, "MEGACITY": 1, "SOV0NAME": "Mexico", "SOV_A3": "MEX", "ADM0NAME": "Mexico", "ADM0_A3": "MEX", "ADM1NAME": "Nuevo León", "ISO_A2": "MX", "LATITUDE": 25.669995, "LONGITUDE": -100.329985, "CHANGED": 5, "NAMEDIFF": 0, "DIFFNOTE": "Changed scale rank.", "POP_MAX": 3712000, "POP_MIN": 1122874, "POP_OTHER": 3225636, "RANK_MAX": 12, "RANK_MIN": 12, "GEONAMEID": 3995465, "MEGANAME": "Monterrey", "LS_NAME": "Monterrey", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 3296184, "MAX_POP20": 3296184, "MAX_POP50": 3296184, "MAX_POP300": 3296184, "MAX_POP310": 0, "MAX_NATSCA": 100, "MIN_AREAKM": 594, "MAX_AREAKM": 594, "MIN_AREAMI": 229, "MAX_AREAMI": 229, "MIN_PERKM": 208, "MAX_PERKM": 208, "MIN_PERMI": 130, "MAX_PERMI": 130, "MIN_BBXMIN": -100.5, "MAX_BBXMIN": -100.5, "MIN_BBXMAX": -100.125, "MAX_BBXMAX": -100.125, "MIN_BBYMIN": 25.575, "MAX_BBYMIN": 25.575, "MIN_BBYMAX": 25.85, "MAX_BBYMAX": 25.85, "MEAN_BBXC": -100.290632, "MEAN_BBYC": 25.71613, "COMPARE": 0, "GN_ASCII": "Monterrey", "FEATURE_CL": "P", "FEATURE_CO": "PPL", "ADMIN1_COD": 19, "GN_POP": 1122874, "ELEVATION": 0, "GTOPO30": 563, "TIMEZONE": "America/Monterrey", "GEONAMESNO": "Geonames ascii name + lat.d + long.d matching.", "UN_FID": 359, "UN_ADM0": "Mexico", "UN_LAT": 25.67, "UN_LONG": -100.31, "POP1950": 356, "POP1955": 498, "POP1960": 698, "POP1965": 943, "POP1970": 1267, "POP1975": 1589, "POP1980": 1992, "POP1985": 2273, "POP1990": 2594, "POP1995": 2961, "POP2000": 3266, "POP2005": 3579, "POP2010": 3712, "POP2015": 3901, "POP2020": 4140, "POP2025": 4298, "POP2050": 4413 }, "geometry": { "type": "Point", "coordinates": [ -100.283203, 25.641526 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 2, "NATSCALE": 200, "LABELRANK": 6, "FEATURECLA": "Admin-0 capital", "NAME": "Havana", "NAMEALT": "La Habana", "DIFFASCII": 0, "NAMEASCII": "Havana", "ADM0CAP": 1, "CAPALT": 0, "WORLDCITY": 0, "MEGACITY": 1, "SOV0NAME": "Cuba", "SOV_A3": "CUB", "ADM0NAME": "Cuba", "ADM0_A3": "CUB", "ADM1NAME": "Ciudad de la Habana", "ISO_A2": "CU", "LATITUDE": 23.131959, "LONGITUDE": -82.364182, "CHANGED": 5, "NAMEDIFF": 0, "DIFFNOTE": "Changed scale rank.", "POP_MAX": 2174000, "POP_MIN": 1990917, "POP_OTHER": 1930305, "RANK_MAX": 12, "RANK_MIN": 12, "GEONAMEID": 3553478, "MEGANAME": "La Habana", "LS_NAME": "Havana", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 1990917, "MAX_POP20": 2051170, "MAX_POP50": 2051170, "MAX_POP300": 2051170, "MAX_POP310": 0, "MAX_NATSCA": 100, "MIN_AREAKM": 323, "MAX_AREAKM": 362, "MIN_AREAMI": 125, "MAX_AREAMI": 140, "MIN_PERKM": 240, "MAX_PERKM": 286, "MIN_PERMI": 149, "MAX_PERMI": 177, "MIN_BBXMIN": -82.533333, "MAX_BBXMIN": -82.533333, "MIN_BBXMAX": -82.208333, "MAX_BBXMAX": -82.208333, "MIN_BBYMIN": 22.916667, "MAX_BBYMIN": 22.975161, "MIN_BBYMAX": 23.183333, "MAX_BBYMAX": 23.183333, "MEAN_BBXC": -82.354344, "MEAN_BBYC": 23.076845, "COMPARE": 0, "GN_ASCII": "Havana", "FEATURE_CL": "P", "FEATURE_CO": "PPLC", "ADMIN1_COD": 2, "GN_POP": 2163824, "ELEVATION": 0, "GTOPO30": 5, "TIMEZONE": "America/Havana", "GEONAMESNO": "GeoNames match general.", "UN_FID": 172, "UN_ADM0": "Cuba", "UN_LAT": 23.04, "UN_LONG": -82.41, "POP1950": 1116, "POP1955": 1289, "POP1960": 1436, "POP1965": 1598, "POP1970": 1779, "POP1975": 1848, "POP1980": 1913, "POP1985": 2005, "POP1990": 2108, "POP1995": 2183, "POP2000": 2187, "POP2005": 2189, "POP2010": 2174, "POP2015": 2159, "POP2020": 2151, "POP2025": 2150, "POP2050": 2150, "CITYALT": "Havana" }, "geometry": { "type": "Point", "coordinates": [ -82.353516, 23.079732 ] } }
|
||||
@@ -68,8 +66,6 @@
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 3, "NATSCALE": 110, "LABELRANK": 0, "FEATURECLA": "Admin-0 capital", "NAME": "Nukualofa", "DIFFASCII": 0, "NAMEASCII": "Nukualofa", "ADM0CAP": 1, "CAPALT": 0, "WORLDCITY": 0, "MEGACITY": 0, "SOV0NAME": "Tonga", "SOV_A3": "TON", "ADM0NAME": "Tonga", "ADM0_A3": "TON", "ISO_A2": "TO", "LATITUDE": -21.138512, "LONGITUDE": -175.220564, "CHANGED": 4, "NAMEDIFF": 0, "DIFFNOTE": "Location adjusted.", "POP_MAX": 42620, "POP_MIN": 23658, "POP_OTHER": 42620, "RANK_MAX": 7, "RANK_MIN": 7, "GEONAMEID": 4032402, "LS_NAME": "Nukualofa", "LS_MATCH": 1, "CHECKME": 5, "MAX_POP10": 42620, "MAX_POP20": 42620, "MAX_POP50": 42620, "MAX_POP300": 42620, "MAX_POP310": 0, "MAX_NATSCA": 100, "MIN_AREAKM": 15, "MAX_AREAKM": 15, "MIN_AREAMI": 6, "MAX_AREAMI": 6, "MIN_PERKM": 27, "MAX_PERKM": 27, "MIN_PERMI": 17, "MAX_PERMI": 17, "MIN_BBXMIN": -175.233333, "MAX_BBXMIN": -175.233333, "MIN_BBXMAX": -175.166667, "MAX_BBXMAX": -175.166667, "MIN_BBYMIN": -21.166667, "MAX_BBYMIN": -21.166667, "MIN_BBYMAX": -21.125, "MAX_BBYMAX": -21.125, "MEAN_BBXC": -175.206798, "MEAN_BBYC": -21.142325, "COMPARE": 0, "GN_ASCII": "Nuku`alofa", "FEATURE_CL": "P", "FEATURE_CO": "PPLC", "ADMIN1_COD": 2, "GN_POP": 22400, "ELEVATION": 0, "GTOPO30": -9999, "TIMEZONE": "Pacific/Tongatapu", "GEONAMESNO": "GeoNames match general.", "UN_FID": 0, "UN_LAT": 0, "UN_LONG": 0, "POP1950": 0, "POP1955": 0, "POP1960": 0, "POP1965": 0, "POP1970": 0, "POP1975": 0, "POP1980": 0, "POP1985": 0, "POP1990": 0, "POP1995": 0, "POP2000": 0, "POP2005": 0, "POP2010": 0, "POP2015": 0, "POP2020": 0, "POP2025": 0, "POP2050": 0 }, "geometry": { "type": "Point", "coordinates": [ -175.209961, -21.125498 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 3, "NATSCALE": 110, "LABELRANK": 0, "FEATURECLA": "Admin-0 capital", "NAME": "Apia", "DIFFASCII": 0, "NAMEASCII": "Apia", "ADM0CAP": 1, "CAPALT": 0, "WORLDCITY": 0, "MEGACITY": 0, "SOV0NAME": "Samoa", "SOV_A3": "WSM", "ADM0NAME": "Samoa", "ADM0_A3": "WSM", "ISO_A2": "WS", "LATITUDE": -13.841545, "LONGITUDE": -171.738642, "CHANGED": 4, "NAMEDIFF": 0, "DIFFNOTE": "Location adjusted.", "POP_MAX": 61916, "POP_MIN": 37708, "POP_OTHER": 0, "RANK_MAX": 8, "RANK_MIN": 7, "GEONAMEID": 3689793, "LS_NAME": "Apia", "LS_MATCH": 1, "CHECKME": 5, "MAX_POP10": 61916, "MAX_POP20": 61916, "MAX_POP50": 61916, "MAX_POP300": 61916, "MAX_POP310": 0, "MAX_NATSCA": 100, "MIN_AREAKM": 39, "MAX_AREAKM": 39, "MIN_AREAMI": 15, "MAX_AREAMI": 15, "MIN_PERKM": 51, "MAX_PERKM": 51, "MIN_PERMI": 32, "MAX_PERMI": 32, "MIN_BBXMIN": -171.825, "MAX_BBXMIN": -171.825, "MIN_BBXMAX": -171.716667, "MAX_BBXMAX": -171.716667, "MIN_BBYMIN": -13.866667, "MAX_BBYMIN": -13.866667, "MIN_BBYMAX": -13.8, "MAX_BBYMAX": -13.8, "MEAN_BBXC": -171.781117, "MEAN_BBYC": -13.837855, "COMPARE": 0, "GN_ASCII": "Apia", "FEATURE_CL": "P", "FEATURE_CO": "PPL", "ADMIN1_COD": 24, "GN_POP": 6940, "ELEVATION": 0, "GTOPO30": 1561, "TIMEZONE": "America/Bogota", "GEONAMESNO": "GeoNames match general.", "UN_FID": 0, "UN_LAT": 0, "UN_LONG": 0, "POP1950": 0, "POP1955": 0, "POP1960": 0, "POP1965": 0, "POP1970": 0, "POP1975": 0, "POP1980": 0, "POP1985": 0, "POP1990": 0, "POP1995": 0, "POP2000": 0, "POP2005": 0, "POP2010": 0, "POP2015": 0, "POP2020": 0, "POP2025": 0, "POP2050": 0 }, "geometry": { "type": "Point", "coordinates": [ -171.738281, -13.838080 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 3, "NATSCALE": 110, "LABELRANK": 7, "FEATURECLA": "Admin-0 capital", "NAME": "Quito", "DIFFASCII": 0, "NAMEASCII": "Quito", "ADM0CAP": 1, "CAPALT": 0, "WORLDCITY": 0, "MEGACITY": 1, "SOV0NAME": "Ecuador", "SOV_A3": "ECU", "ADM0NAME": "Ecuador", "ADM0_A3": "ECU", "ADM1NAME": "Pichincha", "ISO_A2": "EC", "LATITUDE": -0.214988, "LONGITUDE": -78.500051, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 1701000, "POP_MIN": 1399814, "POP_OTHER": 1435528, "RANK_MAX": 12, "RANK_MIN": 12, "GEONAMEID": 3652462, "MEGANAME": "Quito", "LS_NAME": "Quito", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 1472051, "MAX_POP20": 1892286, "MAX_POP50": 1892286, "MAX_POP300": 1892286, "MAX_POP310": 0, "MAX_NATSCA": 100, "MIN_AREAKM": 334, "MAX_AREAKM": 496, "MIN_AREAMI": 129, "MAX_AREAMI": 191, "MIN_PERKM": 233, "MAX_PERKM": 359, "MIN_PERMI": 145, "MAX_PERMI": 223, "MIN_BBXMIN": -78.591667, "MAX_BBXMIN": -78.591667, "MIN_BBXMAX": -78.291667, "MAX_BBXMAX": -78.291667, "MIN_BBYMIN": -0.391667, "MAX_BBYMIN": -0.30257, "MIN_BBYMAX": 0.025, "MAX_BBYMAX": 0.025, "MEAN_BBXC": -78.460061, "MEAN_BBYC": -0.198438, "COMPARE": 0, "GN_ASCII": "Quito", "FEATURE_CL": "P", "FEATURE_CO": "PPLC", "ADMIN1_COD": 18, "GN_POP": 1399814, "ELEVATION": 0, "GTOPO30": 2764, "TIMEZONE": "America/Guayaquil", "GEONAMESNO": "GeoNames match general.", "UN_FID": 178, "UN_ADM0": "Ecuador", "UN_LAT": -0.22, "UN_LONG": -78.52, "POP1950": 206, "POP1955": 257, "POP1960": 319, "POP1965": 399, "POP1970": 501, "POP1975": 628, "POP1980": 780, "POP1985": 936, "POP1990": 1088, "POP1995": 1217, "POP2000": 1357, "POP2005": 1593, "POP2010": 1701, "POP2015": 1846, "POP2020": 2035, "POP2025": 2189, "POP2050": 2316 }, "geometry": { "type": "Point", "coordinates": [ -78.486328, -0.219726 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 3, "NATSCALE": 110, "LABELRANK": 3, "FEATURECLA": "Admin-0 capital alt", "NAME": "Valparaiso", "NAMEALT": "Valparaíso", "DIFFASCII": 0, "NAMEASCII": "Valparaiso", "ADM0CAP": 0, "CAPALT": 1, "CAPIN": "Legislative cap", "WORLDCITY": 0, "MEGACITY": 1, "SOV0NAME": "Chile", "SOV_A3": "CHL", "ADM0NAME": "Chile", "ADM0_A3": "CHL", "ADM1NAME": "Valparaíso", "ISO_A2": "CL", "LATITUDE": -33.047764, "LONGITUDE": -71.621014, "CHANGED": 4, "NAMEDIFF": 0, "DIFFNOTE": "Changed scale rank.", "POP_MAX": 854000, "POP_MIN": 15938, "POP_OTHER": 130815, "RANK_MAX": 11, "RANK_MIN": 6, "GEONAMEID": 3445575, "MEGANAME": "Valparaíso", "LS_NAME": "Valparaiso2", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 144390, "MAX_POP20": 637860, "MAX_POP50": 637860, "MAX_POP300": 0, "MAX_POP310": 0, "MAX_NATSCA": 50, "MIN_AREAKM": 34, "MAX_AREAKM": 184, "MIN_AREAMI": 13, "MAX_AREAMI": 71, "MIN_PERKM": 33, "MAX_PERKM": 151, "MIN_PERMI": 21, "MAX_PERMI": 94, "MIN_BBXMIN": -71.658333, "MAX_BBXMIN": -71.658333, "MIN_BBXMAX": -71.57441, "MAX_BBXMAX": -71.325, "MIN_BBYMIN": -33.075, "MAX_BBYMIN": -33.075, "MIN_BBYMAX": -33.016667, "MAX_BBYMAX": -32.916667, "MEAN_BBXC": -71.541251, "MEAN_BBYC": -33.034648, "COMPARE": 0, "GN_ASCII": "Valparaiso", "FEATURE_CL": "P", "FEATURE_CO": "PPL", "ADMIN1_COD": 27, "GN_POP": 15938, "ELEVATION": 0, "GTOPO30": 405, "TIMEZONE": "America/Sao_Paulo", "GEONAMESNO": "GeoNames match general.", "UN_FID": 18, "UN_ADM0": "Chile", "UN_LAT": -33.02, "UN_LONG": -71.55, "POP1950": 328, "POP1955": 377, "POP1960": 433, "POP1965": 481, "POP1970": 532, "POP1975": 581, "POP1980": 635, "POP1985": 685, "POP1990": 733, "POP1995": 771, "POP2000": 803, "POP2005": 838, "POP2010": 854, "POP2015": 880, "POP2020": 922, "POP2025": 956, "POP2050": 982, "CITYALT": "Valparaiso" }, "geometry": { "type": "Point", "coordinates": [ -71.630859, -33.063924 ] } }
|
||||
@@ -90,8 +86,6 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 1, "NATSCALE": 300, "LABELRANK": 1, "FEATURECLA": "Populated place", "NAME": "San Francisco", "NAMEALT": "San Francisco-Oakland", "DIFFASCII": 0, "NAMEASCII": "San Francisco", "ADM0CAP": 0, "CAPALT": 0, "WORLDCITY": 1, "MEGACITY": 1, "SOV0NAME": "United States", "SOV_A3": "USA", "ADM0NAME": "United States of America", "ADM0_A3": "USA", "ADM1NAME": "California", "ISO_A2": "US", "LATITUDE": 37.740008, "LONGITUDE": -122.459978, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 3450000, "POP_MIN": 732072, "POP_OTHER": 27400, "RANK_MAX": 12, "RANK_MIN": 11, "GEONAMEID": 5391959, "MEGANAME": "San Francisco-Oakland", "LS_NAME": "San Francisco1", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 988636, "MAX_POP20": 1130999, "MAX_POP50": 1371285, "MAX_POP300": 4561697, "MAX_POP310": 4561697, "MAX_NATSCA": 300, "MIN_AREAKM": 218, "MAX_AREAKM": 1748, "MIN_AREAMI": 84, "MAX_AREAMI": 675, "MIN_PERKM": 126, "MAX_PERKM": 755, "MIN_PERMI": 78, "MAX_PERMI": 469, "MIN_BBXMIN": -122.516667, "MAX_BBXMIN": -122.516667, "MIN_BBXMAX": -122.358333, "MAX_BBXMAX": -121.733333, "MIN_BBYMIN": 37.191667, "MAX_BBYMIN": 37.575, "MIN_BBYMAX": 37.816667, "MAX_BBYMAX": 38.041667, "MEAN_BBXC": -122.301354, "MEAN_BBYC": 37.622288, "COMPARE": 0, "GN_ASCII": "San Francisco", "FEATURE_CL": "P", "FEATURE_CO": "PPL", "ADMIN1_COD": 0, "GN_POP": 732072, "ELEVATION": 16, "GTOPO30": 60, "TIMEZONE": "America/Los_Angeles", "GEONAMESNO": "GeoNames match with ascii name + lat + long whole numbers.", "UN_FID": 570, "UN_ADM0": "United States of America", "UN_LAT": 37.79, "UN_LONG": -122.38, "POP1950": 1855, "POP1955": 2021, "POP1960": 2200, "POP1965": 2361, "POP1970": 2529, "POP1975": 2590, "POP1980": 2656, "POP1985": 2805, "POP1990": 2961, "POP1995": 3095, "POP2000": 3236, "POP2005": 3387, "POP2010": 3450, "POP2015": 3544, "POP2020": 3684, "POP2025": 3803, "POP2050": 3898, "CITYALT": "San Francisco" }, "geometry": { "type": "Point", "coordinates": [ -122.431641, 37.753344 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 0, "NATSCALE": 600, "LABELRANK": 1, "FEATURECLA": "Populated place", "NAME": "Los Angeles", "NAMEALT": "Los Angeles-Long Beach-Santa Ana", "DIFFASCII": 0, "NAMEASCII": "Los Angeles", "ADM0CAP": 0, "CAPALT": 0, "WORLDCITY": 1, "MEGACITY": 1, "SOV0NAME": "United States", "SOV_A3": "USA", "ADM0NAME": "United States of America", "ADM0_A3": "USA", "ADM1NAME": "California", "ISO_A2": "US", "LATITUDE": 33.989978, "LONGITUDE": -118.179981, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 12500000, "POP_MIN": 3694820, "POP_OTHER": 142265, "RANK_MAX": 14, "RANK_MIN": 12, "GEONAMEID": 5368361, "MEGANAME": "Los Angeles-Long Beach-Santa Ana", "LS_NAME": "Los Angeles1", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 4976870, "MAX_POP20": 6558538, "MAX_POP50": 14868745, "MAX_POP300": 14870543, "MAX_POP310": 14903021, "MAX_NATSCA": 300, "MIN_AREAKM": 1338, "MAX_AREAKM": 5803, "MIN_AREAMI": 517, "MAX_AREAMI": 2241, "MIN_PERKM": 534, "MAX_PERKM": 2202, "MIN_PERMI": 332, "MAX_PERMI": 1369, "MIN_BBXMIN": -118.991667, "MAX_BBXMIN": -118.966667, "MIN_BBXMAX": -117.857183, "MAX_BBXMAX": -117.008333, "MIN_BBYMIN": 33.391667, "MAX_BBYMIN": 33.862631, "MIN_BBYMAX": 34.241667, "MAX_BBYMAX": 34.333333, "MEAN_BBXC": -118.107478, "MEAN_BBYC": 33.980609, "COMPARE": 0, "GN_ASCII": "Los Angeles", "FEATURE_CL": "P", "FEATURE_CO": "PPL", "ADMIN1_COD": 0, "GN_POP": 3694820, "ELEVATION": 89, "GTOPO30": 115, "TIMEZONE": "America/Los_Angeles", "GEONAMESNO": "GeoNames match with ascii name + lat + long whole numbers.", "UN_FID": 547, "UN_ADM0": "United States of America", "UN_LAT": 34, "UN_LONG": -118.25, "POP1950": 4046, "POP1955": 5154, "POP1960": 6530, "POP1965": 7408, "POP1970": 8378, "POP1975": 8926, "POP1980": 9512, "POP1985": 10181, "POP1990": 10883, "POP1995": 11339, "POP2000": 11814, "POP2005": 12307, "POP2010": 12500, "POP2015": 12773, "POP2020": 13160, "POP2025": 13461, "POP2050": 13672, "CITYALT": "Los Angeles" }, "geometry": { "type": "Point", "coordinates": [ -118.168945, 33.979809 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 1, "NATSCALE": 300, "LABELRANK": 1, "FEATURECLA": "Admin-1 capital", "NAME": "Denver", "NAMEALT": "Denver-Aurora", "DIFFASCII": 0, "NAMEASCII": "Denver", "ADM0CAP": 0, "CAPALT": 0, "WORLDCITY": 0, "MEGACITY": 1, "SOV0NAME": "United States", "SOV_A3": "USA", "ADM0NAME": "United States of America", "ADM0_A3": "USA", "ADM1NAME": "Colorado", "ISO_A2": "US", "LATITUDE": 39.739188, "LONGITUDE": -104.984016, "CHANGED": 5, "NAMEDIFF": 0, "DIFFNOTE": "Changed scale rank.", "POP_MAX": 2313000, "POP_MIN": 1548599, "POP_OTHER": 1521278, "RANK_MAX": 12, "RANK_MIN": 12, "GEONAMEID": 5419384, "MEGANAME": "Denver-Aurora", "LS_NAME": "Denver", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 1548599, "MAX_POP20": 2100407, "MAX_POP50": 2174327, "MAX_POP300": 2174327, "MAX_POP310": 0, "MAX_NATSCA": 100, "MIN_AREAKM": 909, "MAX_AREAKM": 1345, "MIN_AREAMI": 351, "MAX_AREAMI": 519, "MIN_PERKM": 371, "MAX_PERKM": 606, "MIN_PERMI": 231, "MAX_PERMI": 376, "MIN_BBXMIN": -105.241667, "MAX_BBXMIN": -105.241667, "MIN_BBXMAX": -104.866667, "MAX_BBXMAX": -104.708333, "MIN_BBYMIN": 39.5, "MAX_BBYMIN": 39.5, "MIN_BBYMAX": 39.958333, "MAX_BBYMAX": 40.025, "MEAN_BBXC": -104.993967, "MEAN_BBYC": 39.72985, "COMPARE": 0, "GN_ASCII": "Denver", "ADMIN1_COD": 0, "GN_POP": 0, "ELEVATION": 0, "GTOPO30": 0, "GEONAMESNO": "GeoNames match general + researched.", "UN_FID": 537, "UN_ADM0": "United States of America", "UN_LAT": 39.57, "UN_LONG": -105.07, "POP1950": 505, "POP1955": 641, "POP1960": 809, "POP1965": 923, "POP1970": 1054, "POP1975": 1198, "POP1980": 1356, "POP1985": 1437, "POP1990": 1528, "POP1995": 1747, "POP2000": 1998, "POP2005": 2241, "POP2010": 2313, "POP2015": 2396, "POP2020": 2502, "POP2025": 2590, "POP2050": 2661, "CITYALT": "Denver" }, "geometry": { "type": "Point", "coordinates": [ -104.985352, 39.740986 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 1, "NATSCALE": 300, "LABELRANK": 2, "FEATURECLA": "Admin-1 capital", "NAME": "Monterrey", "DIFFASCII": 0, "NAMEASCII": "Monterrey", "ADM0CAP": 0, "CAPALT": 0, "WORLDCITY": 0, "MEGACITY": 1, "SOV0NAME": "Mexico", "SOV_A3": "MEX", "ADM0NAME": "Mexico", "ADM0_A3": "MEX", "ADM1NAME": "Nuevo León", "ISO_A2": "MX", "LATITUDE": 25.669995, "LONGITUDE": -100.329985, "CHANGED": 5, "NAMEDIFF": 0, "DIFFNOTE": "Changed scale rank.", "POP_MAX": 3712000, "POP_MIN": 1122874, "POP_OTHER": 3225636, "RANK_MAX": 12, "RANK_MIN": 12, "GEONAMEID": 3995465, "MEGANAME": "Monterrey", "LS_NAME": "Monterrey", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 3296184, "MAX_POP20": 3296184, "MAX_POP50": 3296184, "MAX_POP300": 3296184, "MAX_POP310": 0, "MAX_NATSCA": 100, "MIN_AREAKM": 594, "MAX_AREAKM": 594, "MIN_AREAMI": 229, "MAX_AREAMI": 229, "MIN_PERKM": 208, "MAX_PERKM": 208, "MIN_PERMI": 130, "MAX_PERMI": 130, "MIN_BBXMIN": -100.5, "MAX_BBXMIN": -100.5, "MIN_BBXMAX": -100.125, "MAX_BBXMAX": -100.125, "MIN_BBYMIN": 25.575, "MAX_BBYMIN": 25.575, "MIN_BBYMAX": 25.85, "MAX_BBYMAX": 25.85, "MEAN_BBXC": -100.290632, "MEAN_BBYC": 25.71613, "COMPARE": 0, "GN_ASCII": "Monterrey", "FEATURE_CL": "P", "FEATURE_CO": "PPL", "ADMIN1_COD": 19, "GN_POP": 1122874, "ELEVATION": 0, "GTOPO30": 563, "TIMEZONE": "America/Monterrey", "GEONAMESNO": "Geonames ascii name + lat.d + long.d matching.", "UN_FID": 359, "UN_ADM0": "Mexico", "UN_LAT": 25.67, "UN_LONG": -100.31, "POP1950": 356, "POP1955": 498, "POP1960": 698, "POP1965": 943, "POP1970": 1267, "POP1975": 1589, "POP1980": 1992, "POP1985": 2273, "POP1990": 2594, "POP1995": 2961, "POP2000": 3266, "POP2005": 3579, "POP2010": 3712, "POP2015": 3901, "POP2020": 4140, "POP2025": 4298, "POP2050": 4413 }, "geometry": { "type": "Point", "coordinates": [ -100.327148, 25.681137 ] } }
|
||||
@@ -128,8 +122,6 @@
|
||||
{ "type": "FeatureCollection", "properties": { "layer": "in", "version": 2, "extent": 4096 }, "features": [
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 3, "NATSCALE": 110, "LABELRANK": 0, "FEATURECLA": "Admin-0 capital", "NAME": "Sao Tome", "DIFFASCII": 0, "NAMEASCII": "Sao Tome", "ADM0CAP": 1, "CAPALT": 0, "WORLDCITY": 0, "MEGACITY": 0, "SOV0NAME": "Sao Tome and Principe", "SOV_A3": "STP", "ADM0NAME": "Sao Tome and Principe", "ADM0_A3": "STP", "ISO_A2": "ST", "LATITUDE": 0.333402, "LONGITUDE": 6.733325, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 88219, "POP_MIN": 56166, "POP_OTHER": 88219, "RANK_MAX": 8, "RANK_MIN": 8, "GEONAMEID": 3388092, "LS_NAME": "Sao Tome", "LS_MATCH": 1, "CHECKME": 5, "MAX_POP10": 88219, "MAX_POP20": 88219, "MAX_POP50": 88219, "MAX_POP300": 88219, "MAX_POP310": 0, "MAX_NATSCA": 100, "MIN_AREAKM": 32, "MAX_AREAKM": 32, "MIN_AREAMI": 12, "MAX_AREAMI": 12, "MIN_PERKM": 44, "MAX_PERKM": 44, "MIN_PERMI": 28, "MAX_PERMI": 28, "MIN_BBXMIN": 6.691667, "MAX_BBXMIN": 6.691667, "MIN_BBXMAX": 6.75, "MAX_BBXMAX": 6.75, "MIN_BBYMIN": 0.3, "MAX_BBYMIN": 0.3, "MIN_BBYMAX": 0.391667, "MAX_BBYMAX": 0.391667, "MEAN_BBXC": 6.719032, "MEAN_BBYC": 0.338176, "COMPARE": 0, "GN_ASCII": "Sao Tome", "FEATURE_CL": "P", "FEATURE_CO": "PPL", "ADMIN1_COD": 22, "GN_POP": 6137, "ELEVATION": 0, "GTOPO30": 151, "TIMEZONE": "America/Fortaleza", "GEONAMESNO": "GeoNames match general.", "UN_FID": 0, "UN_LAT": 0, "UN_LONG": 0, "POP1950": 0, "POP1955": 0, "POP1960": 0, "POP1965": 0, "POP1970": 0, "POP1975": 0, "POP1980": 0, "POP1985": 0, "POP1990": 0, "POP1995": 0, "POP2000": 0, "POP2005": 0, "POP2010": 0, "POP2015": 0, "POP2020": 0, "POP2025": 0, "POP2050": 0 }, "geometry": { "type": "Point", "coordinates": [ 6.723633, 0.351560 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 3, "NATSCALE": 110, "LABELRANK": 7, "FEATURECLA": "Admin-0 capital", "NAME": "Libreville", "DIFFASCII": 0, "NAMEASCII": "Libreville", "ADM0CAP": 1, "CAPALT": 0, "WORLDCITY": 0, "MEGACITY": 0, "SOV0NAME": "Gabon", "SOV_A3": "GAB", "ADM0NAME": "Gabon", "ADM0_A3": "GAB", "ADM1NAME": "Estuaire", "ISO_A2": "GA", "LATITUDE": 0.385389, "LONGITUDE": 9.457965, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 578156, "POP_MIN": 483355, "POP_OTHER": 483522, "RANK_MAX": 11, "RANK_MIN": 10, "GEONAMEID": 2399697, "LS_NAME": "Libreville", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 483355, "MAX_POP20": 483355, "MAX_POP50": 483355, "MAX_POP300": 483355, "MAX_POP310": 0, "MAX_NATSCA": 100, "MIN_AREAKM": 108, "MAX_AREAKM": 108, "MIN_AREAMI": 42, "MAX_AREAMI": 42, "MIN_PERKM": 98, "MAX_PERKM": 98, "MIN_PERMI": 61, "MAX_PERMI": 61, "MIN_BBXMIN": 9.4, "MAX_BBXMIN": 9.4, "MIN_BBXMAX": 9.525, "MAX_BBXMAX": 9.525, "MIN_BBYMIN": 0.283333, "MAX_BBYMIN": 0.283333, "MIN_BBYMAX": 0.483333, "MAX_BBYMAX": 0.483333, "MEAN_BBXC": 9.47328, "MEAN_BBYC": 0.395238, "COMPARE": 0, "GN_ASCII": "Libreville", "FEATURE_CL": "P", "FEATURE_CO": "PPLC", "ADMIN1_COD": 1, "GN_POP": 578156, "ELEVATION": 0, "GTOPO30": -9999, "TIMEZONE": "Africa/Libreville", "GEONAMESNO": "GeoNames match general.", "UN_FID": 0, "UN_LAT": 0, "UN_LONG": 0, "POP1950": 0, "POP1955": 0, "POP1960": 0, "POP1965": 0, "POP1970": 0, "POP1975": 0, "POP1980": 0, "POP1985": 0, "POP1990": 0, "POP1995": 0, "POP2000": 0, "POP2005": 0, "POP2010": 0, "POP2015": 0, "POP2020": 0, "POP2025": 0, "POP2050": 0 }, "geometry": { "type": "Point", "coordinates": [ 9.448242, 0.395505 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 3, "NATSCALE": 110, "LABELRANK": 5, "FEATURECLA": "Admin-0 capital", "NAME": "Kampala", "DIFFASCII": 0, "NAMEASCII": "Kampala", "ADM0CAP": 1, "CAPALT": 0, "WORLDCITY": 0, "MEGACITY": 1, "SOV0NAME": "Uganda", "SOV_A3": "UGA", "ADM0NAME": "Uganda", "ADM0_A3": "UGA", "ADM1NAME": "Kampala", "ISO_A2": "UG", "LATITUDE": 0.316659, "LONGITUDE": 32.583324, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 1420000, "POP_MIN": 1353189, "POP_OTHER": 2153702, "RANK_MAX": 12, "RANK_MIN": 12, "GEONAMEID": 232422, "MEGANAME": "Kampala", "LS_NAME": "Kampala", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 2155592, "MAX_POP20": 2153391, "MAX_POP50": 2322955, "MAX_POP300": 2322955, "MAX_POP310": 0, "MAX_NATSCA": 100, "MIN_AREAKM": 405, "MAX_AREAKM": 465, "MIN_AREAMI": 156, "MAX_AREAMI": 180, "MIN_PERKM": 391, "MAX_PERKM": 470, "MIN_PERMI": 243, "MAX_PERMI": 292, "MIN_BBXMIN": 32.45, "MAX_BBXMIN": 32.5, "MIN_BBXMAX": 32.8, "MAX_BBXMAX": 32.8, "MIN_BBYMIN": 0.033333, "MAX_BBYMIN": 0.166719, "MIN_BBYMAX": 0.475, "MAX_BBYMAX": 0.475, "MEAN_BBXC": 32.614686, "MEAN_BBYC": 0.323809, "COMPARE": 0, "GN_ASCII": "Kampala", "FEATURE_CL": "P", "FEATURE_CO": "PPLC", "ADMIN1_COD": 18, "GN_POP": 1353189, "ELEVATION": 0, "GTOPO30": 1206, "TIMEZONE": "Africa/Kampala", "GEONAMESNO": "GeoNames match general.", "UN_FID": 507, "UN_ADM0": "Uganda", "UN_LAT": 0.32, "UN_LONG": 32.57, "POP1950": 95, "POP1955": 110, "POP1960": 137, "POP1965": 222, "POP1970": 340, "POP1975": 398, "POP1980": 469, "POP1985": 595, "POP1990": 755, "POP1995": 912, "POP2000": 1097, "POP2005": 1318, "POP2010": 1420, "POP2015": 1597, "POP2020": 1979, "POP2025": 2506, "POP2050": 3198 }, "geometry": { "type": "Point", "coordinates": [ 32.563477, 0.307616 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 3, "NATSCALE": 110, "LABELRANK": 8, "FEATURECLA": "Admin-0 capital", "NAME": "Mogadishu", "NAMEALT": "Muqdisho", "DIFFASCII": 0, "NAMEASCII": "Mogadishu", "ADM0CAP": 1, "CAPALT": 0, "WORLDCITY": 0, "MEGACITY": 1, "SOV0NAME": "Somalia", "SOV_A3": "SOM", "ADM0NAME": "Somalia", "ADM0_A3": "SOM", "ADM1NAME": "Banaadir", "ISO_A2": "SO", "LATITUDE": 2.066681, "LONGITUDE": 45.366678, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 1100000, "POP_MIN": 875388, "POP_OTHER": 849392, "RANK_MAX": 12, "RANK_MIN": 11, "GEONAMEID": 53654, "MEGANAME": "Muqdisho", "LS_NAME": "Mogadishu", "LS_MATCH": 1, "CHECKME": 5, "MAX_POP10": 875388, "MAX_POP20": 875388, "MAX_POP50": 875388, "MAX_POP300": 875388, "MAX_POP310": 0, "MAX_NATSCA": 100, "MIN_AREAKM": 99, "MAX_AREAKM": 99, "MIN_AREAMI": 38, "MAX_AREAMI": 38, "MIN_PERKM": 68, "MAX_PERKM": 68, "MIN_PERMI": 43, "MAX_PERMI": 43, "MIN_BBXMIN": 45.25, "MAX_BBXMIN": 45.25, "MIN_BBXMAX": 45.416667, "MAX_BBXMAX": 45.416667, "MIN_BBYMIN": 2, "MAX_BBYMIN": 2, "MIN_BBYMAX": 2.116667, "MAX_BBYMAX": 2.116667, "MEAN_BBXC": 45.331178, "MEAN_BBYC": 2.054239, "COMPARE": 0, "GN_ASCII": "Mogadishu", "FEATURE_CL": "P", "FEATURE_CO": "PPLC", "ADMIN1_COD": 2, "GN_POP": 2587183, "ELEVATION": 0, "GTOPO30": 39, "TIMEZONE": "Africa/Mogadishu", "GEONAMESNO": "GeoNames match general.", "UN_FID": 454, "UN_ADM0": "Somalia", "UN_LAT": 2.04, "UN_LONG": 45.34, "POP1950": 69, "POP1955": 73, "POP1960": 94, "POP1965": 146, "POP1970": 272, "POP1975": 445, "POP1980": 551, "POP1985": 747, "POP1990": 1035, "POP1995": 1147, "POP2000": 1201, "POP2005": 1415, "POP2010": 1100, "POP2015": 1500, "POP2020": 1794, "POP2025": 2142, "POP2050": 2529, "CITYALT": "Mogadishu" }, "geometry": { "type": "Point", "coordinates": [ 45.351562, 2.064982 ] } }
|
||||
@@ -168,8 +160,6 @@
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 3, "NATSCALE": 110, "LABELRANK": 8, "FEATURECLA": "Admin-0 capital", "NAME": "Ouagadougou", "DIFFASCII": 0, "NAMEASCII": "Ouagadougou", "ADM0CAP": 1, "CAPALT": 0, "WORLDCITY": 0, "MEGACITY": 1, "SOV0NAME": "Burkina Faso", "SOV_A3": "BFA", "ADM0NAME": "Burkina Faso", "ADM0_A3": "BFA", "ADM1NAME": "Kadiogo", "ISO_A2": "BF", "LATITUDE": 12.370316, "LONGITUDE": -1.524724, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 1149000, "POP_MIN": 835457, "POP_OTHER": 713874, "RANK_MAX": 12, "RANK_MIN": 11, "GEONAMEID": 2357048, "MEGANAME": "Ouagadougou", "LS_NAME": "Ouagadougou", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 835457, "MAX_POP20": 835457, "MAX_POP50": 835457, "MAX_POP300": 835457, "MAX_POP310": 0, "MAX_NATSCA": 100, "MIN_AREAKM": 236, "MAX_AREAKM": 236, "MIN_AREAMI": 91, "MAX_AREAMI": 91, "MIN_PERKM": 133, "MAX_PERKM": 133, "MIN_PERMI": 83, "MAX_PERMI": 83, "MIN_BBXMIN": -1.616667, "MAX_BBXMIN": -1.616667, "MIN_BBXMAX": -1.433333, "MAX_BBXMAX": -1.433333, "MIN_BBYMIN": 12.275, "MAX_BBYMIN": 12.275, "MIN_BBYMAX": 12.483333, "MAX_BBYMAX": 12.483333, "MEAN_BBXC": -1.521746, "MEAN_BBYC": 12.365975, "COMPARE": 0, "GN_ASCII": "Ouagadougou", "FEATURE_CL": "P", "FEATURE_CO": "PPLC", "ADMIN1_COD": 53, "GN_POP": 1086505, "ELEVATION": 0, "GTOPO30": 307, "TIMEZONE": "Africa/Ouagadougou", "GEONAMESNO": "GeoNames match general.", "UN_FID": 578, "UN_ADM0": "Burkina Faso", "UN_LAT": 12.48, "UN_LONG": -1.67, "POP1950": 33, "POP1955": 46, "POP1960": 59, "POP1965": 82, "POP1970": 111, "POP1975": 149, "POP1980": 257, "POP1985": 424, "POP1990": 537, "POP1995": 667, "POP2000": 828, "POP2005": 1044, "POP2010": 1149, "POP2015": 1324, "POP2020": 1676, "POP2025": 2111, "POP2050": 2632 }, "geometry": { "type": "Point", "coordinates": [ -1.538086, 12.382928 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 2, "NATSCALE": 200, "LABELRANK": 6, "FEATURECLA": "Admin-0 capital", "NAME": "Accra", "DIFFASCII": 0, "NAMEASCII": "Accra", "ADM0CAP": 1, "CAPALT": 0, "WORLDCITY": 0, "MEGACITY": 1, "SOV0NAME": "Ghana", "SOV_A3": "GHA", "ADM0NAME": "Ghana", "ADM0_A3": "GHA", "ADM1NAME": "Greater Accra", "ISO_A2": "GH", "LATITUDE": 5.550035, "LONGITUDE": -0.216716, "CHANGED": 5, "NAMEDIFF": 0, "DIFFNOTE": "Changed scale rank.", "POP_MAX": 2121000, "POP_MIN": 1963264, "POP_OTHER": 2334371, "RANK_MAX": 12, "RANK_MIN": 12, "GEONAMEID": 2306104, "MEGANAME": "Accra", "LS_NAME": "Accra", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 2359119, "MAX_POP20": 2941045, "MAX_POP50": 2941045, "MAX_POP300": 2941045, "MAX_POP310": 0, "MAX_NATSCA": 100, "MIN_AREAKM": 443, "MAX_AREAKM": 636, "MIN_AREAMI": 171, "MAX_AREAMI": 245, "MIN_PERKM": 244, "MAX_PERKM": 345, "MIN_PERMI": 152, "MAX_PERMI": 214, "MIN_BBXMIN": -0.35, "MAX_BBXMIN": -0.35, "MIN_BBXMAX": -0.098725, "MAX_BBXMAX": 0.033333, "MIN_BBYMIN": 5.516667, "MAX_BBYMIN": 5.516667, "MIN_BBYMAX": 5.775, "MAX_BBYMAX": 5.775, "MEAN_BBXC": -0.188893, "MEAN_BBYC": 5.637403, "COMPARE": 0, "GN_ASCII": "Accra", "FEATURE_CL": "P", "FEATURE_CO": "PPLC", "ADMIN1_COD": 1, "GN_POP": 1963264, "ELEVATION": 0, "GTOPO30": 104, "TIMEZONE": "Africa/Accra", "GEONAMESNO": "GeoNames match general.", "UN_FID": 196, "UN_ADM0": "Ghana", "UN_LAT": 5.55, "UN_LONG": -0.2, "POP1950": 177, "POP1955": 265, "POP1960": 393, "POP1965": 499, "POP1970": 631, "POP1975": 738, "POP1980": 863, "POP1985": 1013, "POP1990": 1197, "POP1995": 1415, "POP2000": 1674, "POP2005": 1984, "POP2010": 2121, "POP2015": 2332, "POP2020": 2688, "POP2025": 3041, "POP2050": 3382 }, "geometry": { "type": "Point", "coordinates": [ -0.219727, 5.572250 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 2, "NATSCALE": 200, "LABELRANK": 7, "FEATURECLA": "Admin-0 capital", "NAME": "Oslo", "DIFFASCII": 0, "NAMEASCII": "Oslo", "ADM0CAP": 1, "CAPALT": 0, "WORLDCITY": 1, "MEGACITY": 1, "SOV0NAME": "Kingdom of Norway", "SOV_A3": "NOR", "ADM0NAME": "Norway", "ADM0_A3": "NOR", "ADM1NAME": "Oslo", "ISO_A2": "NO", "LATITUDE": 59.91669, "LONGITUDE": 10.749979, "CHANGED": 4, "NAMEDIFF": 0, "DIFFNOTE": "Changed scale rank.", "POP_MAX": 835000, "POP_MIN": 580000, "POP_OTHER": 701804, "RANK_MAX": 11, "RANK_MIN": 11, "GEONAMEID": 3143244, "MEGANAME": "Oslo", "LS_NAME": "Oslo", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 731563, "MAX_POP20": 731563, "MAX_POP50": 762374, "MAX_POP300": 762374, "MAX_POP310": 0, "MAX_NATSCA": 100, "MIN_AREAKM": 329, "MAX_AREAKM": 362, "MIN_AREAMI": 127, "MAX_AREAMI": 140, "MIN_PERKM": 340, "MAX_PERKM": 390, "MIN_PERMI": 211, "MAX_PERMI": 243, "MIN_BBXMIN": 10.333333, "MAX_BBXMIN": 10.440355, "MIN_BBXMAX": 11.091667, "MAX_BBXMAX": 11.091667, "MIN_BBYMIN": 59.708333, "MAX_BBYMIN": 59.708333, "MIN_BBYMAX": 60.066667, "MAX_BBYMAX": 60.066667, "MEAN_BBXC": 10.756508, "MEAN_BBYC": 59.906118, "COMPARE": 0, "GN_ASCII": "Oslo", "FEATURE_CL": "P", "FEATURE_CO": "PPLC", "ADMIN1_COD": 12, "GN_POP": 580000, "ELEVATION": 0, "GTOPO30": 11, "TIMEZONE": "Europe/Oslo", "GEONAMESNO": "GeoNames match general.", "UN_FID": 397, "UN_ADM0": "Norway", "UN_LAT": 59.93, "UN_LONG": 10.71, "POP1950": 468, "POP1955": 533, "POP1960": 578, "POP1965": 610, "POP1970": 643, "POP1975": 644, "POP1980": 643, "POP1985": 662, "POP1990": 684, "POP1995": 729, "POP2000": 774, "POP2005": 816, "POP2010": 835, "POP2015": 858, "POP2020": 885, "POP2025": 909, "POP2050": 936 }, "geometry": { "type": "Point", "coordinates": [ 10.766602, 59.910976 ] } }
|
||||
,
|
||||
{ "type": "Feature", "properties": { "SCALERANK": 1, "NATSCALE": 300, "LABELRANK": 7, "FEATURECLA": "Admin-0 capital", "NAME": "Stockholm", "DIFFASCII": 0, "NAMEASCII": "Stockholm", "ADM0CAP": 1, "CAPALT": 0, "WORLDCITY": 1, "MEGACITY": 1, "SOV0NAME": "Sweden", "SOV_A3": "SWE", "ADM0NAME": "Sweden", "ADM0_A3": "SWE", "ADM1NAME": "Stockholm", "ISO_A2": "SE", "LATITUDE": 59.35076, "LONGITUDE": 18.097335, "CHANGED": 4, "NAMEDIFF": 0, "DIFFNOTE": "Location adjusted.", "POP_MAX": 1264000, "POP_MIN": 1253309, "POP_OTHER": 0, "RANK_MAX": 12, "RANK_MIN": 12, "GEONAMEID": 2673730, "MEGANAME": "Stockholm", "LS_NAME": "Stockholm", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 1337078, "MAX_POP20": 1337078, "MAX_POP50": 1337078, "MAX_POP300": 1337078, "MAX_POP310": 1337078, "MAX_NATSCA": 300, "MIN_AREAKM": 694, "MAX_AREAKM": 694, "MIN_AREAMI": 268, "MAX_AREAMI": 268, "MIN_PERKM": 629, "MAX_PERKM": 629, "MIN_PERMI": 391, "MAX_PERMI": 391, "MIN_BBXMIN": 17.775, "MAX_BBXMIN": 17.775, "MIN_BBXMAX": 18.408333, "MAX_BBXMAX": 18.408333, "MIN_BBYMIN": 59.091667, "MAX_BBYMIN": 59.091667, "MIN_BBYMAX": 59.558333, "MAX_BBYMAX": 59.558333, "MEAN_BBXC": 18.044982, "MEAN_BBYC": 59.32868, "COMPARE": 0, "GN_ASCII": "Stockholm", "FEATURE_CL": "P", "FEATURE_CO": "PPLC", "ADMIN1_COD": 26, "GN_POP": 1253309, "ELEVATION": 0, "GTOPO30": 20, "TIMEZONE": "Europe/Stockholm", "GEONAMESNO": "GeoNames match general.", "UN_FID": 467, "UN_ADM0": "Sweden", "UN_LAT": 59.33, "UN_LONG": 17.99, "POP1950": 741, "POP1955": 772, "POP1960": 805, "POP1965": 1003, "POP1970": 1035, "POP1975": 1015, "POP1980": 992, "POP1985": 1012, "POP1990": 1038, "POP1995": 1138, "POP2000": 1206, "POP2005": 1248, "POP2010": 1264, "POP2015": 1285, "POP2020": 1308, "POP2025": 1326, "POP2050": 1343 }, "geometry": { "type": "Point", "coordinates": [ 18.105469, 59.355596 ] } }
|
||||
|
||||
@@ -2100,7 +2100,9 @@ long long write_tile(FILE *geoms, std::atomic<long long> *geompos_in, char *meta
|
||||
}
|
||||
} else if (additional[A_DROP_SMALLEST_AS_NEEDED]) {
|
||||
add_sample_to(extents, sf.extent, extents_increment, seq);
|
||||
if (sf.extent + coalesced_area <= minextent && find_partial(partials, sf, which_partial, layer_unmaps, minextent)) {
|
||||
// search here is for LLONG_MAX, not minextent, because we are dropping features, not coalescing them,
|
||||
// so we shouldn't expect to find anything small that we can related this feature to.
|
||||
if (sf.extent + coalesced_area <= minextent && find_partial(partials, sf, which_partial, layer_unmaps, LLONG_MAX)) {
|
||||
preserve_attributes(arg->attribute_accum, sf, stringpool, pool_off, partials[which_partial]);
|
||||
strategy->dropped_as_needed++;
|
||||
continue;
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#ifndef VERSION_HPP
|
||||
#define VERSION_HPP
|
||||
|
||||
#define VERSION "v2.21.0"
|
||||
#define VERSION "v2.22.0"
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user