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

Send dot-dropping through the same pipeline.

Browse Source 
The first feature in a tile can never be dropped, since there is
no previous feature to attach its properties to.

Remove the previous special case that reset the dropping counter
at the first feature within each tile proper (as opposed to the
first feature in each tile, including its buffer, which is now
the one that is guaranteed to be preserved).
This commit is contained in:
Eric Fischer
2018-02-23 17:19:54 -08:00
parent 7fe0c87806
commit a8a342f701
42 changed files with 18490 additions and 18041 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/multilayer/out/-nseparate_-z3.json
+2 -4
View File
@@ -464,7 +464,7 @@
{ "type": "FeatureCollection", "properties": { "layer": "places", "version": 2, "extent": 4096 }, "features": [
{ "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.788081 ] } }
,
{ "type": "Feature", "properties": { "SCALERANK": 1, "NATSCALE": 300, "LABELRANK": 1, "FEATURECLA": "Populated place", "NAME": "Miami", "DIFFASCII": 0, "NAMEASCII": "Miami", "ADM0CAP": 0, "CAPALT": 0, "WORLDCITY": 1, "MEGACITY": 1, "SOV0NAME": "United States", "SOV_A3": "USA", "ADM0NAME": "United States of America", "ADM0_A3": "USA", "ADM1NAME": "Florida", "ISO_A2": "US", "LATITUDE": 25.787611, "LONGITUDE": -80.224106, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 5585000, "POP_MIN": 382894, "POP_OTHER": 1037811, "RANK_MAX": 13, "RANK_MIN": 10, "GEONAMEID": 4164138, "MEGANAME": "Miami", "LS_NAME": "Miami", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 1122682, "MAX_POP20": 1443206, "MAX_POP50": 5187749, "MAX_POP300": 5187749, "MAX_POP310": 5187749, "MAX_NATSCA": 300, "MIN_AREAKM": 380, "MAX_AREAKM": 2907, "MIN_AREAMI": 147, "MAX_AREAMI": 1122, "MIN_PERKM": 156, "MAX_PERKM": 999, "MIN_PERMI": 97, "MAX_PERMI": 620, "MIN_BBXMIN": -80.466667, "MAX_BBXMIN": -80.441667, "MIN_BBXMAX": -80.175719, "MAX_BBXMAX": -80.025, "MIN_BBYMIN": 25.55, "MAX_BBYMIN": 25.725, "MIN_BBYMAX": 26.01406, "MAX_BBYMAX": 26.991667, "MEAN_BBXC": -80.236416, "MEAN_BBYC": 26.067179, "COMPARE": 0, "GN_ASCII": "Miami", "FEATURE_CL": "P", "FEATURE_CO": "PPL", "ADMIN1_COD": 0, "GN_POP": 382894, "ELEVATION": 2, "GTOPO30": 2, "TIMEZONE": "America/New_York", "GEONAMESNO": "Geonames ascii name + lat.d + long.d matching.", "UN_FID": 550, "UN_ADM0": "United States of America", "UN_LAT": 25.83, "UN_LONG": -80.27, "POP1950": 622, "POP1955": 924, "POP1960": 1361, "POP1965": 1709, "POP1970": 2141, "POP1975": 2590, "POP1980": 3122, "POP1985": 3521, "POP1990": 3969, "POP1995": 4431, "POP2000": 4946, "POP2005": 5438, "POP2010": 5585, "POP2015": 5755, "POP2020": 5969, "POP2025": 6141, "POP2050": 6272 }, "geometry": { "type": "Point", "coordinates": [ -80.244141, 25.799891 ] } }
{ "type": "Feature", "properties": { "SCALERANK": 0, "NATSCALE": 600, "LABELRANK": 1, "FEATURECLA": "Admin-0 capital", "NAME": "Washington, D.C.", "NAMEALT": "Washington D.C.", "DIFFASCII": 0, "NAMEASCII": "Washington, D.C.", "ADM0CAP": 1, "CAPALT": 0, "WORLDCITY": 1, "MEGACITY": 1, "SOV0NAME": "United States", "SOV_A3": "USA", "ADM0NAME": "United States of America", "ADM0_A3": "USA", "ADM1NAME": "District of Columbia", "ISO_A2": "US", "LATITUDE": 38.899549, "LONGITUDE": -77.009419, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 4338000, "POP_MIN": 552433, "POP_OTHER": 2175991, "RANK_MAX": 12, "RANK_MIN": 11, "GEONAMEID": 4140963, "MEGANAME": "Washington, D.C.", "LS_NAME": "Washington, D.C.", "LS_MATCH": 1, "CHECKME": 5, "MAX_POP10": 2182723, "MAX_POP20": 2240256, "MAX_POP50": 3764385, "MAX_POP300": 5678280, "MAX_POP310": 5678280, "MAX_NATSCA": 300, "MIN_AREAKM": 1114, "MAX_AREAKM": 3447, "MIN_AREAMI": 430, "MAX_AREAMI": 1331, "MIN_PERKM": 548, "MAX_PERKM": 1898, "MIN_PERMI": 341, "MAX_PERMI": 1179, "MIN_BBXMIN": -77.533333, "MAX_BBXMIN": -77.308333, "MIN_BBXMAX": -76.752653, "MAX_BBXMAX": -76.4, "MIN_BBYMIN": 38.666667, "MAX_BBYMIN": 38.754222, "MIN_BBYMAX": 39.241667, "MAX_BBYMAX": 39.533333, "MEAN_BBXC": -77.002668, "MEAN_BBYC": 39.007587, "COMPARE": 0, "GN_ASCII": "Washington", "FEATURE_CL": "P", "FEATURE_CO": "PPLC", "ADMIN1_COD": 0, "GN_POP": 552433, "ELEVATION": 7, "GTOPO30": 11, "TIMEZONE": "America/New_York", "GEONAMESNO": "GeoNames match general.", "UN_FID": 577, "UN_ADM0": "United States of America", "UN_LAT": 38.89, "UN_LONG": -76.95, "POP1950": 1298, "POP1955": 1539, "POP1960": 1823, "POP1965": 2135, "POP1970": 2488, "POP1975": 2626, "POP1980": 2777, "POP1985": 3063, "POP1990": 3376, "POP1995": 3651, "POP2000": 3949, "POP2005": 4241, "POP2010": 4338, "POP2015": 4464, "POP2020": 4636, "POP2025": 4778, "POP2050": 4889, "CITYALT": "Washington D.C." }, "geometry": { "type": "Point", "coordinates": [ -77.036133, 38.925229 ] } }
] }
] }
,
@@ -742,9 +742,7 @@
{ "type": "FeatureCollection", "properties": { "layer": "places", "version": 2, "extent": 4096 }, "features": [
{ "type": "Feature", "properties": { "SCALERANK": 1, "NATSCALE": 300, "LABELRANK": 1, "FEATURECLA": "Populated place", "NAME": "Chicago", "DIFFASCII": 0, "NAMEASCII": "Chicago", "ADM0CAP": 0, "CAPALT": 0, "WORLDCITY": 1, "MEGACITY": 1, "SOV0NAME": "United States", "SOV_A3": "USA", "ADM0NAME": "United States of America", "ADM0_A3": "USA", "ADM1NAME": "Illinois", "ISO_A2": "US", "LATITUDE": 41.829991, "LONGITUDE": -87.750055, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 8990000, "POP_MIN": 2841952, "POP_OTHER": 3635101, "RANK_MAX": 13, "RANK_MIN": 12, "GEONAMEID": 4887398, "MEGANAME": "Chicago", "LS_NAME": "Chicago", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 3747798, "MAX_POP20": 5069998, "MAX_POP50": 8416660, "MAX_POP300": 8416660, "MAX_POP310": 8450289, "MAX_NATSCA": 300, "MIN_AREAKM": 1345, "MAX_AREAKM": 4804, "MIN_AREAMI": 519, "MAX_AREAMI": 1855, "MIN_PERKM": 471, "MAX_PERKM": 2946, "MIN_PERMI": 293, "MAX_PERMI": 1830, "MIN_BBXMIN": -88.408333, "MAX_BBXMIN": -88.03629, "MIN_BBXMAX": -87.528138, "MAX_BBXMAX": -87.125, "MIN_BBYMIN": 41.391667, "MAX_BBYMIN": 41.458333, "MIN_BBYMAX": 42.000972, "MAX_BBYMAX": 42.491667, "MEAN_BBXC": -87.85874, "MEAN_BBYC": 41.832719, "COMPARE": 0, "GN_ASCII": "Chicago", "FEATURE_CL": "P", "FEATURE_CO": "PPL", "ADMIN1_COD": 0, "GN_POP": 2841952, "ELEVATION": 179, "GTOPO30": 181, "TIMEZONE": "America/Chicago", "GEONAMESNO": "GeoNames match with ascii name + lat + long whole numbers.", "UN_FID": 531, "UN_ADM0": "United States of America", "UN_LAT": 41.82, "UN_LONG": -87.64, "POP1950": 4999, "POP1955": 5565, "POP1960": 6183, "POP1965": 6639, "POP1970": 7106, "POP1975": 7160, "POP1980": 7216, "POP1985": 7285, "POP1990": 7374, "POP1995": 7839, "POP2000": 8333, "POP2005": 8820, "POP2010": 8990, "POP2015": 9211, "POP2020": 9516, "POP2025": 9756, "POP2050": 9932 }, "geometry": { "type": "Point", "coordinates": [ -87.758789, 41.836828 ] } }
,
{ "type": "Feature", "properties": { "SCALERANK": 1, "NATSCALE": 300, "LABELRANK": 1, "FEATURECLA": "Populated place", "NAME": "Miami", "DIFFASCII": 0, "NAMEASCII": "Miami", "ADM0CAP": 0, "CAPALT": 0, "WORLDCITY": 1, "MEGACITY": 1, "SOV0NAME": "United States", "SOV_A3": "USA", "ADM0NAME": "United States of America", "ADM0_A3": "USA", "ADM1NAME": "Florida", "ISO_A2": "US", "LATITUDE": 25.787611, "LONGITUDE": -80.224106, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 5585000, "POP_MIN": 382894, "POP_OTHER": 1037811, "RANK_MAX": 13, "RANK_MIN": 10, "GEONAMEID": 4164138, "MEGANAME": "Miami", "LS_NAME": "Miami", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 1122682, "MAX_POP20": 1443206, "MAX_POP50": 5187749, "MAX_POP300": 5187749, "MAX_POP310": 5187749, "MAX_NATSCA": 300, "MIN_AREAKM": 380, "MAX_AREAKM": 2907, "MIN_AREAMI": 147, "MAX_AREAMI": 1122, "MIN_PERKM": 156, "MAX_PERKM": 999, "MIN_PERMI": 97, "MAX_PERMI": 620, "MIN_BBXMIN": -80.466667, "MAX_BBXMIN": -80.441667, "MIN_BBXMAX": -80.175719, "MAX_BBXMAX": -80.025, "MIN_BBYMIN": 25.55, "MAX_BBYMIN": 25.725, "MIN_BBYMAX": 26.01406, "MAX_BBYMAX": 26.991667, "MEAN_BBXC": -80.236416, "MEAN_BBYC": 26.067179, "COMPARE": 0, "GN_ASCII": "Miami", "FEATURE_CL": "P", "FEATURE_CO": "PPL", "ADMIN1_COD": 0, "GN_POP": 382894, "ELEVATION": 2, "GTOPO30": 2, "TIMEZONE": "America/New_York", "GEONAMESNO": "Geonames ascii name + lat.d + long.d matching.", "UN_FID": 550, "UN_ADM0": "United States of America", "UN_LAT": 25.83, "UN_LONG": -80.27, "POP1950": 622, "POP1955": 924, "POP1960": 1361, "POP1965": 1709, "POP1970": 2141, "POP1975": 2590, "POP1980": 3122, "POP1985": 3521, "POP1990": 3969, "POP1995": 4431, "POP2000": 4946, "POP2005": 5438, "POP2010": 5585, "POP2015": 5755, "POP2020": 5969, "POP2025": 6141, "POP2050": 6272 }, "geometry": { "type": "Point", "coordinates": [ -80.244141, 25.799891 ] } }
,
{ "type": "Feature", "properties": { "SCALERANK": 0, "NATSCALE": 600, "LABELRANK": 1, "FEATURECLA": "Populated place", "NAME": "New York", "NAMEALT": "New York-Newark", "DIFFASCII": 0, "NAMEASCII": "New York", "ADM0CAP": 0, "CAPALT": 0, "CAPIN": "UN Headquarters", "WORLDCITY": 1, "MEGACITY": 1, "SOV0NAME": "United States", "SOV_A3": "USA", "ADM0NAME": "United States of America", "ADM0_A3": "USA", "ADM1NAME": "New York", "ISO_A2": "US", "LATITUDE": 40.749979, "LONGITUDE": -73.980017, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 19040000, "POP_MIN": 8008278, "POP_OTHER": 9292603, "RANK_MAX": 14, "RANK_MIN": 13, "GEONAMEID": 5128581, "MEGANAME": "New York-Newark", "LS_NAME": "New York", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 9376946, "MAX_POP20": 11947707, "MAX_POP50": 18788144, "MAX_POP300": 18788144, "MAX_POP310": 18924578, "MAX_NATSCA": 300, "MIN_AREAKM": 1137, "MAX_AREAKM": 8185, "MIN_AREAMI": 439, "MAX_AREAMI": 3160, "MIN_PERKM": 497, "MAX_PERKM": 4993, "MIN_PERMI": 309, "MAX_PERMI": 3102, "MIN_BBXMIN": -74.75, "MAX_BBXMIN": -74.091431, "MIN_BBXMAX": -73.574946, "MAX_BBXMAX": -72.716667, "MIN_BBYMIN": 39.808333, "MAX_BBYMIN": 40.566667, "MIN_BBYMAX": 41.057237, "MAX_BBYMAX": 41.941667, "MEAN_BBXC": -73.815782, "MEAN_BBYC": 40.813006, "COMPARE": 0, "GN_ASCII": "New York City", "FEATURE_CL": "P", "FEATURE_CO": "PPL", "ADMIN1_COD": 0, "GN_POP": 8008278, "ELEVATION": 10, "GTOPO30": 2, "TIMEZONE": "America/New_York", "GEONAMESNO": "GeoNames spatial join with similar names only.", "UN_FID": 555, "UN_ADM0": "United States of America", "UN_LAT": 40.7, "UN_LONG": -73.9, "POP1950": 12338, "POP1955": 13219, "POP1960": 14164, "POP1965": 15177, "POP1970": 16191, "POP1975": 15880, "POP1980": 15601, "POP1985": 15827, "POP1990": 16086, "POP1995": 16943, "POP2000": 17846, "POP2005": 18732, "POP2010": 19040, "POP2015": 19441, "POP2020": 19974, "POP2025": 20370, "POP2050": 20628, "CITYALT": "New York" }, "geometry": { "type": "Point", "coordinates": [ -74.003906, 40.763901 ] } }
{ "type": "Feature", "properties": { "SCALERANK": 0, "NATSCALE": 600, "LABELRANK": 1, "FEATURECLA": "Admin-0 capital", "NAME": "Washington, D.C.", "NAMEALT": "Washington D.C.", "DIFFASCII": 0, "NAMEASCII": "Washington, D.C.", "ADM0CAP": 1, "CAPALT": 0, "WORLDCITY": 1, "MEGACITY": 1, "SOV0NAME": "United States", "SOV_A3": "USA", "ADM0NAME": "United States of America", "ADM0_A3": "USA", "ADM1NAME": "District of Columbia", "ISO_A2": "US", "LATITUDE": 38.899549, "LONGITUDE": -77.009419, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 4338000, "POP_MIN": 552433, "POP_OTHER": 2175991, "RANK_MAX": 12, "RANK_MIN": 11, "GEONAMEID": 4140963, "MEGANAME": "Washington, D.C.", "LS_NAME": "Washington, D.C.", "LS_MATCH": 1, "CHECKME": 5, "MAX_POP10": 2182723, "MAX_POP20": 2240256, "MAX_POP50": 3764385, "MAX_POP300": 5678280, "MAX_POP310": 5678280, "MAX_NATSCA": 300, "MIN_AREAKM": 1114, "MAX_AREAKM": 3447, "MIN_AREAMI": 430, "MAX_AREAMI": 1331, "MIN_PERKM": 548, "MAX_PERKM": 1898, "MIN_PERMI": 341, "MAX_PERMI": 1179, "MIN_BBXMIN": -77.533333, "MAX_BBXMIN": -77.308333, "MIN_BBXMAX": -76.752653, "MAX_BBXMAX": -76.4, "MIN_BBYMIN": 38.666667, "MAX_BBYMIN": 38.754222, "MIN_BBYMAX": 39.241667, "MAX_BBYMAX": 39.533333, "MEAN_BBXC": -77.002668, "MEAN_BBYC": 39.007587, "COMPARE": 0, "GN_ASCII": "Washington", "FEATURE_CL": "P", "FEATURE_CO": "PPLC", "ADMIN1_COD": 0, "GN_POP": 552433, "ELEVATION": 7, "GTOPO30": 11, "TIMEZONE": "America/New_York", "GEONAMESNO": "GeoNames match general.", "UN_FID": 577, "UN_ADM0": "United States of America", "UN_LAT": 38.89, "UN_LONG": -76.95, "POP1950": 1298, "POP1955": 1539, "POP1960": 1823, "POP1965": 2135, "POP1970": 2488, "POP1975": 2626, "POP1980": 2777, "POP1985": 3063, "POP1990": 3376, "POP1995": 3651, "POP2000": 3949, "POP2005": 4241, "POP2010": 4338, "POP2015": 4464, "POP2020": 4636, "POP2025": 4778, "POP2050": 4889, "CITYALT": "Washington D.C." }, "geometry": { "type": "Point", "coordinates": [ -77.014160, 38.908133 ] } }
] }
] }
,