tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] geometry@0.8.0 / geojsonvt@6.0.0 (#5514)

Browse Source 
* [core] geometry.hpp 0.8.0

* geojsonvt @ 6.0.0

* Update platform deps, build scripts

* Perf optimizations/cleanup

* Rebase in geometry@080

* D.R.Y. etc

* Ensure fill annotation geometries have closed rings.

* Optimizations

* Update to geojsonvt @ 6.1.0 for clean handoff between geojson parsing and geojsonvt

* Apply close multi/poly geoms for line annotations as well
This commit is contained in:
Young Hahn
2016-07-06 17:29:34 -04:00
committed by GitHub
parent 903d609b40
commit 71a3b1d0db
29 changed files with 206 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mbgl/tile/vector_tile.cpp
View File

@@ -24,12 +24,12 @@ public:
FeatureType getType() const override { return type; }
optional<Value> getValue(const std::string&) const override;
std::unordered_map<std::string,Value> getProperties() const override;
optional<uint64_t> getID() const override;
optional<FeatureIdentifier> getID() const override;
GeometryCollection getGeometries() const override;
private:
const VectorTileLayer& layer;
optional<uint64_t> id;
optional<FeatureIdentifier> id;
FeatureType type = FeatureType::Unknown;
packed_iter_type tags_iter;
packed_iter_type geometry_iter;
@@ -120,7 +120,7 @@ VectorTileFeature::VectorTileFeature(protozero::pbf_reader feature_pbf, const Ve
while (feature_pbf.next()) {
switch (feature_pbf.tag()) {
case 1: // id
id = feature_pbf.get_uint64();
id = { feature_pbf.get_uint64() };
break;
case 2: // tags
tags_iter = feature_pbf.get_packed_uint32();
@@ -185,7 +185,7 @@ std::unordered_map<std::string,Value> VectorTileFeature::getProperties() const {
return properties;
}
optional<uint64_t> VectorTileFeature::getID() const {
optional<FeatureIdentifier> VectorTileFeature::getID() const {
return id;
}