From 905b58cdf4c859c68945a3a8416ef36561192594 Mon Sep 17 00:00:00 2001 From: Erica Fischer Date: Fri, 15 Nov 2024 13:14:30 -0800 Subject: [PATCH] Reducing attribute tagging within tippecanoe-overzoom (#296) * Strip out unwanted attributes earlier in the process * Skip aggregations whose attributes have been excluded * Forgot one * Add some more tests * Update version and changelog --- CHANGELOG.md | 4 + Makefile | 33 ++++- clip.cpp | 135 ++++++++++-------- tests/pbf/bin-11-327-791-ids-zip.pbf.out.json | 7 + tests/pbf/yearbuilt-accum-bldgsqft.pbf.json | 7 + version.hpp | 2 +- 6 files changed, 127 insertions(+), 61 deletions(-) create mode 100644 tests/pbf/bin-11-327-791-ids-zip.pbf.out.json create mode 100644 tests/pbf/yearbuilt-accum-bldgsqft.pbf.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 5423f1b6..8713a49f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 2.70.0 + +* Performance improvements to tippecanoe-overzoom with attribute exclusion + # 2.69.0 * Fix crash when the first bin gets clipped away diff --git a/Makefile b/Makefile index 93754f37..be1b08ce 100644 --- a/Makefile +++ b/Makefile @@ -368,10 +368,16 @@ overzoom-test: tippecanoe-overzoom cmp tests/pbf/bin-11-327-791.pbf.out.json.check tests/pbf/bin-11-327-791.pbf.out.json rm tests/pbf/bin-11-327-791.pbf.out.json.check tests/pbf/bin-11-327-791.pbf.out # Binning by id - ./tippecanoe-overzoom -o tests/pbf/bin-11-327-791-ids.pbf.out --assign-to-bins tests/pbf/sf-zips.json --bin-by-id bin-ids tests/pbf/yearbuilt.pbf 11/327/791 11/327/791 + ./tippecanoe-overzoom -o tests/pbf/bin-11-327-791-ids.pbf.out --assign-to-bins tests/pbf/sf-zips.json --bin-by-id-list bin-ids tests/pbf/yearbuilt.pbf 11/327/791 11/327/791 ./tippecanoe-decode tests/pbf/bin-11-327-791-ids.pbf.out 11 327 791 > tests/pbf/bin-11-327-791-ids.pbf.out.json.check cmp tests/pbf/bin-11-327-791-ids.pbf.out.json.check tests/pbf/bin-11-327-791-ids.pbf.out.json rm tests/pbf/bin-11-327-791-ids.pbf.out.json.check tests/pbf/bin-11-327-791-ids.pbf.out + # Binning by id, attribute stripping + # Note that it still works even if we exclude the ID that we are binning by + ./tippecanoe-overzoom -yZCTA5CE10 -ytippecanoe:count -o tests/pbf/bin-11-327-791-ids-zip.pbf.out --assign-to-bins tests/pbf/sf-zips.json --bin-by-id-list bin-ids tests/pbf/yearbuilt.pbf 11/327/791 11/327/791 + ./tippecanoe-decode tests/pbf/bin-11-327-791-ids-zip.pbf.out 11 327 791 > tests/pbf/bin-11-327-791-ids-zip.pbf.out.json.check + cmp tests/pbf/bin-11-327-791-ids-zip.pbf.out.json.check tests/pbf/bin-11-327-791-ids-zip.pbf.out.json + rm tests/pbf/bin-11-327-791-ids-zip.pbf.out.json.check tests/pbf/bin-11-327-791-ids-zip.pbf.out # Binning with longitude wraparound problems ./tippecanoe-overzoom -o tests/pbf/0-0-0-pop-2-0-1.pbf.out --accumulate-numeric-attributes=tippecanoe --assign-to-bins tests/pbf/h3-2-0-1.geojson tests/pbf/0-0-0.pbf 2/0/1 2/0/1 ./tippecanoe-decode tests/pbf/0-0-0-pop-2-0-1.pbf.out 2 0 1 > tests/pbf/0-0-0-pop-2-0-1.pbf.out.json.check @@ -618,11 +624,36 @@ accumulate-test: # the cluster sizes still add up to the 243 original features test `./tippecanoe-decode -c tests/pbf/bins-0-0-0.pbf 0 0 0 | sed 's/.*clustered:cluster_size": //' | awk '{sum += $$1} END {print sum}'` == 243 # + # Binning with attribute stripping + ./tippecanoe-overzoom -y clustered:count:POP1950 -y clustered:sum:POP1950 -y POP1950 -y clustered:cluster_size --assign-to-bins tests/pbf/h3-0-0-0.geojson --accumulate-numeric-attributes=clustered --accumulate-attribute '{"clustered:cluster_size":"sum"}' -o tests/pbf/bins-0-0-0.pbf tests/pbf/accum.dir/0/0/0.pbf 0/0/0 0/0/0 + # Now there are 30 bins with POP1950 clusters + test `./tippecanoe-decode -c tests/pbf/bins-0-0-0.pbf 0 0 0 | grep 'clustered:count:POP1950' | wc -l` == 41 + # There are none with bare POP1950 (which is expected; we should only have summary statistics) + test `./tippecanoe-decode -c tests/pbf/bins-0-0-0.pbf 0 0 0 | grep -v 'clustered:count:POP1950' | grep 'POP1950' | wc -l` == 0 + # And 4 with no POP1950 at all + test `./tippecanoe-decode -c tests/pbf/bins-0-0-0.pbf 0 0 0 | grep -v 'POP1950' | wc -l` == 3 + # + # the clustered and megatile-filtered and binned POP1950s add up to 161590 + test `./tippecanoe-decode -c tests/pbf/bins-0-0-0.pbf 0 0 0 | grep 'clustered:sum:POP1950' | sed 's/.*"clustered:sum:POP1950": //' | awk '{sum += $$1} END {print sum}'` == 161590 + # which is the right global total + # Make sure we do *not* accumulate a numeric attribute that already has the magic prefix: + test `./tippecanoe-decode -c tests/pbf/bins-0-0-0.pbf 0 0 0 | grep sum:clustered:unrelated | wc -l` == 0 + # And those attributes do *not* make it onto the bins + test `./tippecanoe-decode -c tests/pbf/bins-0-0-0.pbf 0 0 0 | grep clustered:unrelated | wc -l` == 0 + # the cluster sizes still add up to the 243 original features + test `./tippecanoe-decode -c tests/pbf/bins-0-0-0.pbf 0 0 0 | sed 's/.*clustered:cluster_size": //' | awk '{sum += $$1} END {print sum}'` == 243 + # # # A tile where the counts and means were previously wrong: ./tippecanoe-overzoom --accumulate-numeric-attributes=felt -m -o tests/pbf/yearbuilt-accum.pbf tests/pbf/yearbuilt.pbf 0/0/0 0/0/0 ./tippecanoe-decode tests/pbf/yearbuilt-accum.pbf 0 0 0 > tests/pbf/yearbuilt-accum.pbf.json.check cmp tests/pbf/yearbuilt-accum.pbf.json.check tests/pbf/yearbuilt-accum.pbf.json + rm tests/pbf/yearbuilt-accum.pbf tests/pbf/yearbuilt-accum.pbf.json.check + # Same tile, with attribute stripping + ./tippecanoe-overzoom --accumulate-numeric-attributes=felt -y bldgsqft -y felt:sum:bldgsqft -m -o tests/pbf/yearbuilt-accum-bldgsqft.pbf tests/pbf/yearbuilt.pbf 0/0/0 0/0/0 + ./tippecanoe-decode tests/pbf/yearbuilt-accum-bldgsqft.pbf 0 0 0 > tests/pbf/yearbuilt-accum-bldgsqft.pbf.json.check + cmp tests/pbf/yearbuilt-accum-bldgsqft.pbf.json.check tests/pbf/yearbuilt-accum-bldgsqft.pbf.json + rm tests/pbf/yearbuilt-accum-bldgsqft.pbf tests/pbf/yearbuilt-accum-bldgsqft.pbf.json.check join-filter-test: tippecanoe tippecanoe-decode tile-join # Comes out different from the direct tippecanoe run because null attributes are lost diff --git a/clip.cpp b/clip.cpp index 3b1c4617..06d29c12 100644 --- a/clip.cpp +++ b/clip.cpp @@ -1127,7 +1127,30 @@ struct tile_feature { size_t seq = 0; }; -static void add_mean(mvt_feature &feature, mvt_layer &layer, std::string const &accumulate_numeric) { +static bool should_keep(std::string const &key, + std::set const &keep, + std::set const &exclude, + std::vector const &exclude_prefix) { + if (keep.size() == 0 || keep.find(key) != keep.end()) { + if (exclude.find(key) != exclude.end()) { + return false; + } + + for (auto const &prefix : exclude_prefix) { + if (starts_with(key, prefix)) { + return false; + } + } + + return true; + } + + return false; +} + +static void add_mean(mvt_feature &feature, mvt_layer &layer, std::string const &accumulate_numeric, + std::set const &keep, std::set const &exclude, + std::vector const &exclude_prefix) { std::string accumulate_numeric_colon = accumulate_numeric + ":"; std::unordered_map attributes; @@ -1156,7 +1179,10 @@ static void add_mean(mvt_feature &feature, mvt_layer &layer, std::string const & mvt_value mean; mean.type = mvt_double; mean.numeric_value.double_value = mvt_value_to_double(sum) / count_val; - layer.tag(feature, accumulate_numeric + ":mean:" + trunc, mean); + + if (should_keep(key, keep, exclude, exclude_prefix)) { + layer.tag(feature, accumulate_numeric + ":mean:" + trunc, mean); + } } } } @@ -1170,7 +1196,9 @@ static void preserve_numeric(const std::string &key, const mvt_value &val, std::set &keys, // key presence in the source feature std::map &numeric_out_field, // key index in the output feature std::unordered_map &attribute_accum_state, // accumulation state for preserve_attribute() - key_pool &key_pool) { + key_pool &key_pool, + std::set const &keep, std::set const &exclude, + std::vector const &exclude_prefix) { // If this is a numeric attribute, but there is also a prefix:sum (etc.) for the // same attribute, we want to use that one instead of this one. @@ -1203,6 +1231,10 @@ static void preserve_numeric(const std::string &key, const mvt_value &val, // and then put it back on for the output field std::string prefixed = accumulate_numeric + ":" + op.first + ":" + outkey; + if (!should_keep(prefixed, keep, exclude, exclude_prefix)) { + continue; + } + // Does it exist in the output feature already? auto prefixed_attr = numeric_out_field.find(prefixed); @@ -1263,27 +1295,6 @@ static void preserve_numeric(const std::string &key, const mvt_value &val, } } -static bool should_keep(std::string const &key, - std::set const &keep, - std::set const &exclude, - std::vector const &exclude_prefix) { - if (keep.size() == 0 || keep.find(key) != keep.end()) { - if (exclude.find(key) != exclude.end()) { - return false; - } - - for (auto const &prefix : exclude_prefix) { - if (starts_with(key, prefix)) { - return false; - } - } - - return true; - } - - return false; -} - static void handle_closepath_from_mvt(drawvec &geom) { // mvt geometries close polygons with a mvt_closepath operation // tippecanoe-internal geometries close polygons with a lineto to the initial point @@ -1306,7 +1317,7 @@ static bool feature_out(std::vector const &features, mvt_layer &ou std::vector const &exclude_prefix, std::unordered_map const &attribute_accum, std::string const &accumulate_numeric, - key_pool &key_pool, int buffer) { + key_pool &key_pool, int buffer, bool include_nonaggregate) { // Add geometry to output feature drawvec geom = features[0].geom; @@ -1357,22 +1368,22 @@ static bool feature_out(std::vector const &features, mvt_layer &ou std::vector full_values; std::map numeric_out_field; - for (size_t i = 0; i + 1 < features[0].tags.size(); i += 2) { - const std::string &key = features[0].layer->keys[features[0].tags[i]]; - auto f = attribute_accum.find(key); - if (f != attribute_accum.end()) { - // this attribute has an accumulator, so convert it - full_keys.push_back(key_pool.pool(features[0].layer->keys[features[0].tags[i]])); - full_values.push_back(features[0].layer->values[features[0].tags[i + 1]]); - } else if (accumulate_numeric.size() > 0 && features[0].layer->values[features[0].tags[i + 1]].is_numeric()) { - // convert numeric for accumulation - numeric_out_field.emplace(key, full_keys.size()); - full_keys.push_back(key_pool.pool(key)); - full_values.push_back(features[0].layer->values[features[0].tags[i + 1]]); - } else { - // otherwise just tag it directly onto the output feature - if (should_keep(features[0].layer->keys[features[0].tags[i]], keep, exclude, exclude_prefix)) { - outlayer.tag(outfeature, features[0].layer->keys[features[0].tags[i]], features[0].layer->values[features[0].tags[i + 1]]); + auto const &f = features[0]; + for (size_t i = 0; i + 1 < f.tags.size(); i += 2) { + const std::string &key = f.layer->keys[f.tags[i]]; + if (should_keep(key, keep, exclude, exclude_prefix)) { + if (attribute_accum.find(key) != attribute_accum.end()) { + // this attribute has an accumulator, so convert it + full_keys.push_back(key_pool.pool(f.layer->keys[f.tags[i]])); + full_values.push_back(f.layer->values[f.tags[i + 1]]); + } else if (accumulate_numeric.size() > 0 && f.layer->values[f.tags[i + 1]].is_numeric()) { + // convert numeric for accumulation + numeric_out_field.emplace(key, full_keys.size()); + full_keys.push_back(key_pool.pool(key)); + full_values.push_back(f.layer->values[f.tags[i + 1]]); + } else if (include_nonaggregate) { + // otherwise just tag it directly onto the output feature + outlayer.tag(outfeature, f.layer->keys[f.tags[i]], f.layer->values[f.tags[i + 1]]); } } } @@ -1386,22 +1397,26 @@ static bool feature_out(std::vector const &features, mvt_layer &ou for (size_t j = 0; j + 1 < features[i].tags.size(); j += 2) { const std::string &key = features[i].layer->keys[features[i].tags[j]]; - keys.insert(key); + if (should_keep(key, keep, exclude, exclude_prefix)) { + keys.insert(key); + } } for (size_t j = 0; j + 1 < features[i].tags.size(); j += 2) { const std::string &key = features[i].layer->keys[features[i].tags[j]]; - - auto f = attribute_accum.find(key); - if (f != attribute_accum.end()) { - mvt_value val = features[i].layer->values[features[i].tags[j + 1]]; - preserve_attribute(f->second, key, val, full_keys, full_values, attribute_accum_state, key_pool); - } else if (accumulate_numeric.size() > 0) { - const mvt_value &val = features[i].layer->values[features[i].tags[j + 1]]; - if (val.is_numeric()) { - preserve_numeric(key, val, full_keys, full_values, - accumulate_numeric, - keys, numeric_out_field, attribute_accum_state, key_pool); + if (should_keep(key, keep, exclude, exclude_prefix)) { + auto found = attribute_accum.find(key); + if (found != attribute_accum.end()) { + mvt_value val = features[i].layer->values[features[i].tags[j + 1]]; + preserve_attribute(found->second, key, val, full_keys, full_values, attribute_accum_state, key_pool); + } else if (accumulate_numeric.size() > 0) { + const mvt_value &val = features[i].layer->values[features[i].tags[j + 1]]; + if (val.is_numeric()) { + preserve_numeric(key, val, full_keys, full_values, + accumulate_numeric, + keys, numeric_out_field, attribute_accum_state, key_pool, + keep, exclude, exclude_prefix); + } } } } @@ -1417,9 +1432,9 @@ static bool feature_out(std::vector const &features, mvt_layer &ou } if (accumulate_numeric.size() > 0) { - add_mean(outfeature, outlayer, accumulate_numeric); + add_mean(outfeature, outlayer, accumulate_numeric, keep, exclude, exclude_prefix); } - } else { + } else if (include_nonaggregate) { for (size_t i = 0; i + 1 < features[0].tags.size(); i += 2) { if (should_keep(features[0].layer->keys[features[0].tags[i]], keep, exclude, exclude_prefix)) { outlayer.tag(outfeature, features[0].layer->keys[features[0].tags[i]], features[0].layer->values[features[0].tags[i + 1]]); @@ -1725,7 +1740,7 @@ mvt_tile assign_to_bins(mvt_tile &features, if (outfeatures[i].size() > 1) { if (feature_out(outfeatures[i], outlayer, keep, exclude, exclude_prefix, attribute_accum, - accumulate_numeric, key_pool, buffer)) { + accumulate_numeric, key_pool, buffer, true)) { mvt_feature &nfeature = outlayer.features.back(); mvt_value val; val.type = mvt_uint; @@ -1737,7 +1752,9 @@ mvt_tile assign_to_bins(mvt_tile &features, } else { attrname = accumulate_numeric + ":count"; } - outlayer.tag(nfeature, attrname, val); + if (should_keep(attrname, keep, exclude, exclude_prefix)) { + outlayer.tag(nfeature, attrname, val); + } } } } @@ -1886,7 +1903,7 @@ std::string overzoom(std::vector const &tiles, int nz, int nx, int if (flush_multiplier_cluster) { if (pending_tile_features.size() > 0) { - feature_out(pending_tile_features, *outlayer, keep, exclude, exclude_prefix, attribute_accum, accumulate_numeric, key_pool, -1); + feature_out(pending_tile_features, *outlayer, keep, exclude, exclude_prefix, attribute_accum, accumulate_numeric, key_pool, -1, bins.size() == 0); if (outlayer->features.size() >= feature_limit) { break; } @@ -1946,7 +1963,7 @@ std::string overzoom(std::vector const &tiles, int nz, int nx, int } if (pending_tile_features.size() > 0) { - feature_out(pending_tile_features, *outlayer, keep, exclude, exclude_prefix, attribute_accum, accumulate_numeric, key_pool, -1); + feature_out(pending_tile_features, *outlayer, keep, exclude, exclude_prefix, attribute_accum, accumulate_numeric, key_pool, -1, bins.size() == 0); pending_tile_features.clear(); if (outlayer->features.size() >= feature_limit) { break; diff --git a/tests/pbf/bin-11-327-791-ids-zip.pbf.out.json b/tests/pbf/bin-11-327-791-ids-zip.pbf.out.json new file mode 100644 index 00000000..4845f496 --- /dev/null +++ b/tests/pbf/bin-11-327-791-ids-zip.pbf.out.json @@ -0,0 +1,7 @@ +{ "type": "FeatureCollection", "properties": { "zoom": 11, "x": 327, "y": 791 }, "features": [ +{ "type": "FeatureCollection", "properties": { "layer": "parsed", "version": 2, "extent": 4096 }, "features": [ +{ "type": "Feature", "properties": { "ZCTA5CE10": "94129", "tippecanoe:count": 4 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -122.477818, 37.811005 ], [ -122.476444, 37.810869 ], [ -122.476101, 37.809648 ], [ -122.474728, 37.809241 ], [ -122.472668, 37.808970 ], [ -122.470608, 37.808563 ], [ -122.469234, 37.807750 ], [ -122.468719, 37.807071 ], [ -122.468376, 37.806800 ], [ -122.468204, 37.806936 ], [ -122.468204, 37.806665 ], [ -122.466660, 37.805851 ], [ -122.463570, 37.804901 ], [ -122.461681, 37.804901 ], [ -122.458420, 37.805444 ], [ -122.454472, 37.806529 ], [ -122.452412, 37.806258 ], [ -122.448120, 37.806936 ], [ -122.448120, 37.806393 ], [ -122.448463, 37.806122 ], [ -122.448292, 37.804766 ], [ -122.451553, 37.803409 ], [ -122.450180, 37.802867 ], [ -122.450008, 37.802460 ], [ -122.447605, 37.800697 ], [ -122.447262, 37.798527 ], [ -122.448120, 37.798255 ], [ -122.448292, 37.797848 ], [ -122.447948, 37.797441 ], [ -122.448635, 37.797441 ], [ -122.448635, 37.797034 ], [ -122.447948, 37.796899 ], [ -122.447948, 37.796492 ], [ -122.448978, 37.796356 ], [ -122.447433, 37.795814 ], [ -122.447433, 37.795542 ], [ -122.447777, 37.795407 ], [ -122.448635, 37.795542 ], [ -122.448978, 37.795000 ], [ -122.448635, 37.794728 ], [ -122.447948, 37.793101 ], [ -122.448463, 37.792829 ], [ -122.448635, 37.791880 ], [ -122.470951, 37.787267 ], [ -122.473354, 37.787132 ], [ -122.475586, 37.786725 ], [ -122.479877, 37.786860 ], [ -122.483826, 37.787674 ], [ -122.484512, 37.789167 ], [ -122.483997, 37.789709 ], [ -122.484341, 37.790116 ], [ -122.484341, 37.789709 ], [ -122.485027, 37.789574 ], [ -122.485886, 37.790795 ], [ -122.483654, 37.794050 ], [ -122.482109, 37.798527 ], [ -122.481766, 37.798527 ], [ -122.481937, 37.798798 ], [ -122.481594, 37.798798 ], [ -122.481766, 37.798933 ], [ -122.480221, 37.801375 ], [ -122.479877, 37.802867 ], [ -122.478676, 37.805444 ], [ -122.478333, 37.808156 ], [ -122.477818, 37.808428 ], [ -122.477989, 37.810598 ], [ -122.477646, 37.810598 ], [ -122.477818, 37.811005 ] ], [ [ -122.452583, 37.803274 ], [ -122.452412, 37.803138 ], [ -122.450008, 37.802460 ], [ -122.451210, 37.803138 ], [ -122.452583, 37.803274 ] ] ], [ [ [ -122.466145, 37.806393 ], [ -122.465973, 37.806258 ], [ -122.466660, 37.805851 ], [ -122.466145, 37.806393 ] ] ], [ [ [ -122.469921, 37.809377 ], [ -122.469406, 37.809106 ], [ -122.470093, 37.809241 ], [ -122.469921, 37.809377 ] ] ] ] } } +, +{ "type": "Feature", "properties": { "ZCTA5CE10": "94123", "tippecanoe:count": 2 }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -122.443142, 37.809784 ], [ -122.439537, 37.808835 ], [ -122.440910, 37.806936 ], [ -122.435760, 37.807614 ], [ -122.435589, 37.807207 ], [ -122.435589, 37.806936 ], [ -122.433014, 37.807343 ], [ -122.433014, 37.807071 ], [ -122.434387, 37.806936 ], [ -122.434044, 37.806800 ], [ -122.433014, 37.806936 ], [ -122.432842, 37.806800 ], [ -122.434044, 37.806665 ], [ -122.434044, 37.806393 ], [ -122.433872, 37.806122 ], [ -122.433872, 37.805851 ], [ -122.433701, 37.805580 ], [ -122.432671, 37.805715 ], [ -122.432327, 37.805986 ], [ -122.431641, 37.803274 ], [ -122.425289, 37.804088 ], [ -122.424946, 37.803138 ], [ -122.426491, 37.803003 ], [ -122.426319, 37.802053 ], [ -122.424774, 37.802324 ], [ -122.424603, 37.801239 ], [ -122.426147, 37.801104 ], [ -122.425976, 37.800154 ], [ -122.424431, 37.800426 ], [ -122.423744, 37.796628 ], [ -122.433529, 37.795407 ], [ -122.433357, 37.794457 ], [ -122.434902, 37.794322 ], [ -122.435074, 37.795271 ], [ -122.436790, 37.795000 ], [ -122.436619, 37.794050 ], [ -122.440739, 37.793508 ], [ -122.440910, 37.794457 ], [ -122.441769, 37.794322 ], [ -122.441597, 37.793372 ], [ -122.446404, 37.792829 ], [ -122.446232, 37.791880 ], [ -122.447605, 37.791744 ], [ -122.448635, 37.794728 ], [ -122.448978, 37.795000 ], [ -122.448635, 37.795542 ], [ -122.447777, 37.795407 ], [ -122.447433, 37.795542 ], [ -122.447433, 37.795814 ], [ -122.448978, 37.796356 ], [ -122.447948, 37.796492 ], [ -122.447948, 37.796899 ], [ -122.448635, 37.797034 ], [ -122.448635, 37.797441 ], [ -122.447948, 37.797441 ], [ -122.448292, 37.797848 ], [ -122.448120, 37.798255 ], [ -122.447262, 37.798527 ], [ -122.447605, 37.800697 ], [ -122.450008, 37.802460 ], [ -122.450180, 37.802867 ], [ -122.451553, 37.803409 ], [ -122.448292, 37.804766 ], [ -122.448463, 37.806122 ], [ -122.448120, 37.806393 ], [ -122.448120, 37.806936 ], [ -122.448635, 37.808563 ], [ -122.443142, 37.809784 ] ] ], [ [ [ -122.432842, 37.805986 ], [ -122.432842, 37.805851 ], [ -122.433872, 37.805851 ], [ -122.432842, 37.805986 ] ] ], [ [ [ -122.433529, 37.807614 ], [ -122.433529, 37.807478 ], [ -122.435589, 37.807207 ], [ -122.433529, 37.807614 ] ] ], [ [ [ -122.452583, 37.803274 ], [ -122.451210, 37.803138 ], [ -122.450008, 37.802460 ], [ -122.452583, 37.803274 ] ] ], [ [ [ -122.432842, 37.806393 ], [ -122.432842, 37.806122 ], [ -122.433872, 37.806122 ], [ -122.432842, 37.806393 ] ] ], [ [ [ -122.432842, 37.806665 ], [ -122.432842, 37.806529 ], [ -122.434044, 37.806393 ], [ -122.432842, 37.806665 ] ] ], [ [ [ -122.433701, 37.808156 ], [ -122.433701, 37.807885 ], [ -122.433872, 37.807885 ], [ -122.433701, 37.808156 ] ] ] ] } } +] } +] } diff --git a/tests/pbf/yearbuilt-accum-bldgsqft.pbf.json b/tests/pbf/yearbuilt-accum-bldgsqft.pbf.json new file mode 100644 index 00000000..8749b98a --- /dev/null +++ b/tests/pbf/yearbuilt-accum-bldgsqft.pbf.json @@ -0,0 +1,7 @@ +{ "type": "FeatureCollection", "properties": { "zoom": 0, "x": 0, "y": 0 }, "features": [ +{ "type": "FeatureCollection", "properties": { "layer": "parsed", "version": 2, "extent": 4096 }, "features": [ +{ "type": "Feature", "id": 510, "properties": { "bldgsqft": 1765, "felt:sum:bldgsqft": 4857699 }, "geometry": { "type": "Point", "coordinates": [ -122.343750, 37.718590 ] } } +, +{ "type": "Feature", "id": 514, "properties": { "bldgsqft": 3050 }, "geometry": { "type": "Point", "coordinates": [ -122.343750, 37.718590 ] } } +] } +] } diff --git a/version.hpp b/version.hpp index cfcc2f0a..f9ffe4ac 100644 --- a/version.hpp +++ b/version.hpp @@ -1,6 +1,6 @@ #ifndef VERSION_HPP #define VERSION_HPP -#define VERSION "v2.69.0" +#define VERSION "v2.70.0" #endif