Skip to content

Commit

Permalink
Update tests that have changed as a result of this logic cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@e-n-f
e-n-f committed Jul 17, 2023
1 parent 5d76df2 commit c3086ea
Show file tree
Hide file tree
Showing 43 changed files with 42,624 additions and 18,065 deletions.
13 changes: 5 additions & 8 deletions drop.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ int calc_feature_minzoom(struct index *ix, struct drop_state ds[], int maxzoom,
(additional[A_LINE_DROP] && ix->t == VT_LINE) ||
(additional[A_POLYGON_DROP] && ix->t == VT_POLYGON))) {
for (ssize_t i = 0; i <= maxzoom; i++) {
// This zoom level is now lighter on features than it should be.
// This zoom level is now lighter on features
ds[i].error -= 1.0;
// printf("z%zd: error %f with interval %f\n", i, ds[i].error, ds[i].interval);
}

ssize_t chosen = maxzoom + 1;
Expand All @@ -25,11 +24,10 @@ int calc_feature_minzoom(struct index *ix, struct drop_state ds[], int maxzoom,

// this feature now appears in this zoom level and all higher zoom levels,
// so each of them has this feature as its last feature, and each of them
// is now one feature heavier than before.
// is now one feature (which has a weight of `interval`) heavier than before.
for (ssize_t j = i; j <= maxzoom; j++) {
ds[j].previndex = ix->ix;
ds[j].error += ds[j].interval;
// printf("z%zd: now error %f\n", j, ds[j].error);
}

chosen = i;
Expand All @@ -47,9 +45,10 @@ int calc_feature_minzoom(struct index *ix, struct drop_state ds[], int maxzoom,
if (ix->ix - ds[i].previndex > ((1LL << (32 - i)) / preserve_point_density_threshold) * ((1LL << (32 - i)) / preserve_point_density_threshold)) {
feature_minzoom = i;

// this feature now appears in this zoom level and all higher zoom levels below `chosen`,
// this feature now appears in this zoom level and all higher zoom levels
// (below `chosen`, beyond which were already credited with this feature)
// so each of them has this feature as its last feature, and each of them
// is now one feature heavier than before.
// is now one feature (which has a weight of `interval`) heavier than before.
for (ssize_t j = i; j < chosen; j++) {
ds[j].previndex = ix->ix;
ds[j].error += ds[j].interval;
Expand All @@ -70,7 +69,6 @@ void prep_drop_states(struct drop_state ds[], int maxzoom, int basezoom, double
}

// Needs to be signed for interval calculation
// printf("prep! max %d, base %d, rate %f\n", maxzoom, basezoom, droprate);
for (ssize_t i = 0; i <= maxzoom; i++) {
ds[i].previndex = 0;
ds[i].interval = 1; // every feature appears in every zoom level at or above the basezoom
Expand All @@ -86,7 +84,6 @@ void prep_drop_states(struct drop_state ds[], int maxzoom, int basezoom, double
// ...
// basezoom - n: (droprate ^ n)
ds[i].interval = std::exp(std::log(droprate) * (basezoom - i));
// printf("%zd: interval %f\n", i, ds[i].interval);
}

ds[i].error = 0;
Expand Down
118 changes: 51 additions & 67 deletions ...te-attribute_%7b%22thesum%22%3a%22sum%22,%22theproduct%22%3a%22product%22}.json
View file

Large diffs are not rendered by default.

104 changes: 45 additions & 59 deletions ...ax_-Ethemin%3amin_-Ethemean%3amean_-Etheconcat%3aconcat_-Ethecomma%3acomma.json
View file

Large diffs are not rendered by default.

242 changes: 116 additions & 126 deletions tests/epsg-3857/out/-yNAME_-z5_-sEPSG%3a3857.json
View file

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions tests/multilayer/out/-ltogether_-z3.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"maxzoom": "3",
"minzoom": "0",
"name": "tests/multilayer/out/-ltogether_-z3.json.check.mbtiles",
"strategies": "[{\"dropped_by_rate\":8},{\"dropped_by_rate\":7},{\"dropped_by_rate\":5},{}]",
"strategies": "[{\"dropped_by_rate\":8},{\"dropped_by_rate\":7},{\"dropped_by_rate\":4},{}]",
"type": "overlay",
"version": "2"
}, "features": [
Expand Down Expand Up @@ -441,12 +441,12 @@
,
{ "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.474609, 30.713504 ], [ -81.914062, 30.826781 ], [ -82.001953, 30.789037 ], [ -82.001953, 30.448674 ], [ -82.133789, 30.334954 ], [ -82.221680, 30.524413 ], [ -84.858398, 30.713504 ], [ -84.990234, 30.977609 ] ] } }
,
{ "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.200195, 25.799891 ] } }
,
{ "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.124023, 38.925229 ], [ -77.519531, 39.095963 ], [ -77.431641, 39.198205 ], [ -77.739258, 39.334297 ] ] } }
,
{ "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": [ [ -75.761719, 39.707187 ], [ -79.453125, 39.707187 ] ] } }
,
{ "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": [ -76.992188, 38.891033 ] } }
,
{ "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.036133, 38.788345 ], [ -77.124023, 38.925229 ] ] } }
,
{ "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.036133, 38.788345 ], [ -76.904297, 38.891033 ], [ -77.036133, 38.993572 ], [ -77.124023, 38.925229 ] ] } }
Expand Down Expand Up @@ -681,6 +681,8 @@
,
{ "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": [ [ -84.309082, 34.976002 ], [ -85.627441, 34.976002 ] ] } }
,
{ "type": "Feature", "properties": { "SCALERANK": 1, "NATSCALE": 300, "LABELRANK": 1, "FEATURECLA": "Admin-1 capital", "NAME": "Atlanta", "DIFFASCII": 0, "NAMEASCII": "Atlanta", "ADM0CAP": 0, "CAPALT": 0, "WORLDCITY": 1, "MEGACITY": 1, "SOV0NAME": "United States", "SOV_A3": "USA", "ADM0NAME": "United States of America", "ADM0_A3": "USA", "ADM1NAME": "Georgia", "ISO_A2": "US", "LATITUDE": 33.830014, "LONGITUDE": -84.399949, "CHANGED": 0, "NAMEDIFF": 0, "POP_MAX": 4506000, "POP_MIN": 422908, "POP_OTHER": 2874096, "RANK_MAX": 12, "RANK_MIN": 10, "GEONAMEID": 4180439, "MEGANAME": "Atlanta", "LS_NAME": "Atlanta", "LS_MATCH": 1, "CHECKME": 0, "MAX_POP10": 2928128, "MAX_POP20": 3896411, "MAX_POP50": 3910939, "MAX_POP300": 3910939, "MAX_POP310": 3910939, "MAX_NATSCA": 300, "MIN_AREAKM": 2761, "MAX_AREAKM": 4086, "MIN_AREAMI": 1066, "MAX_AREAMI": 1578, "MIN_PERKM": 1494, "MAX_PERKM": 2459, "MIN_PERMI": 929, "MAX_PERMI": 1528, "MIN_BBXMIN": -84.875, "MAX_BBXMIN": -84.608333, "MIN_BBXMAX": -83.879976, "MAX_BBXMAX": -83.858333, "MIN_BBYMIN": 33.383333, "MAX_BBYMIN": 33.383333, "MIN_BBYMAX": 34.202715, "MAX_BBYMAX": 34.275, "MEAN_BBXC": -84.328739, "MEAN_BBYC": 33.851552, "COMPARE": 0, "GN_ASCII": "Atlanta", "FEATURE_CL": "P", "FEATURE_CO": "PPLA", "ADMIN1_COD": 0, "GN_POP": 422908, "ELEVATION": 320, "GTOPO30": 305, "TIMEZONE": "America/New_York", "GEONAMESNO": "GeoNames match general.", "UN_FID": 524, "UN_ADM0": "United States of America", "UN_LAT": 33.79, "UN_LONG": -84.34, "POP1950": 513, "POP1955": 631, "POP1960": 776, "POP1965": 959, "POP1970": 1182, "POP1975": 1386, "POP1980": 1625, "POP1985": 1879, "POP1990": 2184, "POP1995": 2781, "POP2000": 3542, "POP2005": 4307, "POP2010": 4506, "POP2015": 4695, "POP2020": 4888, "POP2025": 5035, "POP2050": 5151 }, "geometry": { "type": "Point", "coordinates": [ -84.396973, 33.833920 ] } }
,
{ "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": [ [ -84.990234, 30.977609 ], [ -85.122070, 31.222197 ], [ -85.056152, 31.578535 ], [ -85.122070, 31.765537 ], [ -85.056152, 32.082575 ], [ -84.902344, 32.249974 ], [ -85.122070, 32.750323 ], [ -85.627441, 34.976002 ] ] } }
,
{ "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": [ [ -84.814453, 39.095963 ], [ -84.484863, 39.078908 ], [ -84.309082, 38.976492 ], [ -84.023438, 38.754083 ], [ -83.825684, 38.685510 ], [ -83.671875, 38.599700 ], [ -83.430176, 38.634036 ], [ -83.254395, 38.582526 ], [ -82.858887, 38.651198 ], [ -82.770996, 38.513788 ], [ -82.573242, 38.410558 ] ] } }
Expand Down Expand Up @@ -715,12 +717,12 @@
,
{ "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.474609, 30.732393 ], [ -81.694336, 30.751278 ], [ -81.892090, 30.807911 ], [ -82.023926, 30.789037 ], [ -82.023926, 30.429730 ], [ -82.155762, 30.353916 ], [ -82.221680, 30.524413 ], [ -83.847656, 30.675715 ], [ -84.858398, 30.713504 ], [ -84.990234, 30.977609 ] ] } }
,
{ "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.222168, 25.780107 ] } }
,
{ "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.124023, 38.925229 ], [ -77.299805, 39.044786 ], [ -77.519531, 39.095963 ], [ -77.431641, 39.215231 ], [ -77.563477, 39.283294 ], [ -77.717285, 39.317300 ] ] } }
,
{ "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": [ [ -75.783691, 39.724089 ], [ -79.475098, 39.724089 ] ] } }
,
{ "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.891033 ] } }
,
{ "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.036133, 38.788345 ], [ -77.036133, 38.839708 ], [ -77.124023, 38.925229 ] ] } }
,
{ "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.036133, 38.788345 ], [ -76.904297, 38.873929 ], [ -77.036133, 38.976492 ], [ -77.124023, 38.925229 ] ] } }
Expand Down
Loading

0 comments on commit c3086ea

Please sign in to comment.