From 7f6944f6176464afba5e9065ab1f36749332a17f Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 16 May 2016 10:15:37 -0700 Subject: [PATCH] [core] Fix properties of GeoJSON layers in queryRenderedFeatures --- src/mbgl/tile/geojson_tile.cpp | 12 ++++++------ src/mbgl/tile/geojson_tile.hpp | 7 +++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp index 9162cedf1..81d2cb514 100644 --- a/src/mbgl/tile/geojson_tile.cpp +++ b/src/mbgl/tile/geojson_tile.cpp @@ -6,8 +6,8 @@ namespace mbgl { GeoJSONTileFeature::GeoJSONTileFeature(FeatureType type_, GeometryCollection&& geometries_, - GeoJSONTileFeature::Tags&& tags_) - : type(type_), geometries(std::move(geometries_)), tags(std::move(tags_)) { + Feature::property_map&& properties_) + : type(type_), geometries(std::move(geometries_)), properties(std::move(properties_)) { } FeatureType GeoJSONTileFeature::getType() const { @@ -15,8 +15,8 @@ FeatureType GeoJSONTileFeature::getType() const { } optional GeoJSONTileFeature::getValue(const std::string& key) const { - auto it = tags.find(key); - if (it != tags.end()) { + auto it = properties.find(key); + if (it != properties.end()) { return optional(it->second); } return optional(); @@ -89,10 +89,10 @@ std::unique_ptr convertTile(const mapbox::geojsonvt::Tile& tile) { } } - GeoJSONTileFeature::Tags tags{ feature.tags.begin(), feature.tags.end() }; + Feature::property_map properties { feature.tags.begin(), feature.tags.end() }; features.emplace_back(std::make_shared( - featureType, std::move(geometry), std::move(tags))); + featureType, std::move(geometry), std::move(properties))); } layer = std::make_unique(std::move(features)); diff --git a/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp index 768f00548..6a490c39a 100644 --- a/src/mbgl/tile/geojson_tile.hpp +++ b/src/mbgl/tile/geojson_tile.hpp @@ -19,17 +19,16 @@ namespace mbgl { class GeoJSONTileFeature : public GeometryTileFeature { public: - using Tags = std::unordered_map; - - GeoJSONTileFeature(FeatureType, GeometryCollection&&, Tags&& = Tags{}); + GeoJSONTileFeature(FeatureType, GeometryCollection&&, Feature::property_map&&); FeatureType getType() const override; optional getValue(const std::string&) const override; + Feature::property_map getProperties() const override { return properties; } GeometryCollection getGeometries() const override; private: const FeatureType type; const GeometryCollection geometries; - const Tags tags; + const Feature::property_map properties; }; class GeoJSONTileLayer : public GeometryTileLayer {