[all] Push querySourceFeatures back out to Map

Once Source and RendererSource are split, Source will no longer have access to tiles.
This commit is contained in:
John Firebaugh
2017-04-25 12:56:59 -07:00
parent a235032098
commit c2b00378b7
23 changed files with 70 additions and 61 deletions

View File

@@ -286,7 +286,6 @@ set(MBGL_CORE_FILES
include/mbgl/style/light.hpp
include/mbgl/style/position.hpp
include/mbgl/style/property_value.hpp
include/mbgl/style/query.hpp
include/mbgl/style/source.hpp
include/mbgl/style/transition_options.hpp
include/mbgl/style/types.hpp

View File

@@ -194,6 +194,7 @@ public:
// Feature queries
std::vector<Feature> queryRenderedFeatures(const ScreenCoordinate&, const RenderedQueryOptions& options = {});
std::vector<Feature> queryRenderedFeatures(const ScreenBox&, const RenderedQueryOptions& options = {});
std::vector<Feature> querySourceFeatures(const std::string& sourceID, const SourceQueryOptions& options = {});
AnnotationIDs queryPointAnnotations(const ScreenBox&);

View File

@@ -19,4 +19,15 @@ public:
optional<style::Filter> filter;
};
/**
* Options for query source features
*/
class SourceQueryOptions {
public:
// Required for VectorSource, ignored for GeoJSONSource
optional<std::vector<std::string>> sourceLayers;
optional<style::Filter> filter;
};
}

View File

@@ -1,24 +0,0 @@
#pragma once
#include <mbgl/util/optional.hpp>
#include <mbgl/style/filter.hpp>
#include <string>
#include <vector>
namespace mbgl {
namespace style {
/**
* Options for query source features
*/
class SourceQueryOptions {
public:
// Required for VectorSource, ignored for GeoJSONSource
optional<std::vector<std::string>> sourceLayers;
optional<style::Filter> filter;
};
} // namespace style
} // namespace mbgl

View File

@@ -6,7 +6,6 @@
#include <mbgl/util/range.hpp>
#include <mbgl/util/any.hpp>
#include <mbgl/style/types.hpp>
#include <mbgl/style/query.hpp>
#include <memory>
#include <string>
@@ -59,8 +58,6 @@ public:
optional<std::string> getAttribution() const;
optional<Range<uint8_t>> getZoomRange() const;
std::vector<Feature> querySourceFeatures(const SourceQueryOptions& options = {});
// Private implementation
class Impl;
const std::unique_ptr<Impl> baseImpl;

View File

@@ -102,8 +102,10 @@ namespace android {
using namespace mbgl::android::conversion;
using namespace mbgl::android::geojson;
auto filter = toFilter(env, jfilter);
auto features = source.querySourceFeatures({ {}, filter });
std::vector<mbgl::Feature> features;
if (map) {
features = map->querySourceFeatures(source.getID(), { {}, toFilter(env, jfilter) });
}
return *convert<jni::Array<jni::Object<Feature>>, std::vector<mbgl::Feature>>(env, features);
}

View File

@@ -40,9 +40,10 @@ namespace android {
using namespace mbgl::android::conversion;
using namespace mbgl::android::geojson;
mbgl::optional<std::vector<std::string>> sourceLayerIds = { toVector(env, jSourceLayerIds) };
auto filter = toFilter(env, jfilter);
auto features = source.querySourceFeatures({ sourceLayerIds, filter });
std::vector<mbgl::Feature> features;
if (map) {
features = map->querySourceFeatures(source.getID(), { toVector(env, jSourceLayerIds), toFilter(env, jfilter) });
}
return *convert<jni::Array<jni::Object<Feature>>, std::vector<mbgl::Feature>>(env, features);
}

View File

@@ -95,7 +95,10 @@ const MGLShapeSourceOption MGLShapeSourceOptionSimplificationTolerance = @"MGLSh
optionalFilter = predicate.mgl_filter;
}
std::vector<mbgl::Feature> features = self.rawSource->querySourceFeatures({ {}, optionalFilter });
std::vector<mbgl::Feature> features;
if (self.mapView) {
features = self.mapView.mbglMap->querySourceFeatures(self.rawSource->getID(), { {}, optionalFilter });
}
return MGLFeaturesFromMBGLFeatures(features);
}

View File

@@ -10,6 +10,8 @@
// special internal source types like mbgl::AnnotationSource.
@property (nonatomic, readonly) mbgl::style::Source *rawSource;
@property (nonatomic, readonly, weak) MGLMapView *mapView;
@end
@implementation MGLSource {
@@ -48,12 +50,14 @@
"to the style more than once is invalid.", self, mapView.style];
}
_mapView = mapView;
mapView.mbglMap->addSource(std::move(_pendingSource));
}
- (void)removeFromMapView:(MGLMapView *)mapView {
if (self.rawSource == mapView.mbglMap->getSource(self.identifier.UTF8String)) {
_pendingSource = mapView.mbglMap->removeSource(self.identifier.UTF8String);
_mapView = nil;
}
}

View File

@@ -43,6 +43,14 @@ struct SourceWrapper {
*/
@property (nonatomic, readonly) mbgl::style::Source *rawSource;
/**
The map view whose style currently contains the source.
If the source is not currently part of any map view’s style, this property is
set to `nil`.
*/
@property (nonatomic, readonly, weak) MGLMapView *mapView;
/**
Adds the mbgl source that this object represents to the mbgl map.

View File

@@ -3,9 +3,11 @@
#import "MGLFeature_Private.h"
#import "MGLSource_Private.h"
#import "MGLTileSource_Private.h"
#import "MGLMapView_Private.h"
#import "NSPredicate+MGLAdditions.h"
#import "NSURL+MGLAdditions.h"
#include <mbgl/map/map.hpp>
#include <mbgl/style/sources/vector_source.hpp>
@interface MGLVectorSource ()
@@ -59,7 +61,10 @@
optionalFilter = predicate.mgl_filter;
}
std::vector<mbgl::Feature> features = self.rawSource->querySourceFeatures({ optionalSourceLayerIDs, optionalFilter });
std::vector<mbgl::Feature> features;
if (self.mapView) {
features = self.mapView.mbglMap->querySourceFeatures(self.rawSource->getID(), { optionalSourceLayerIDs, optionalFilter });
}
return MGLFeaturesFromMBGLFeatures(features);
}

View File

@@ -7,7 +7,7 @@
#include <mbgl/map/transform_state.hpp>
#include <mbgl/annotation/annotation_manager.hpp>
#include <mbgl/style/style.hpp>
#include <mbgl/style/source.hpp>
#include <mbgl/style/source_impl.hpp>
#include <mbgl/style/layer.hpp>
#include <mbgl/style/light.hpp>
#include <mbgl/style/observer.hpp>
@@ -868,6 +868,15 @@ std::vector<Feature> Map::queryRenderedFeatures(const ScreenBox& box, const Rend
);
}
std::vector<Feature> Map::querySourceFeatures(const std::string& sourceID, const SourceQueryOptions& options) {
if (!impl->style) return {};
const style::Source* source = impl->style->getSource(sourceID);
if (!source) return {};
return source->baseImpl->querySourceFeatures(options);
}
AnnotationIDs Map::queryPointAnnotations(const ScreenBox& box) {
RenderedQueryOptions options;
options.layerIDs = {{ AnnotationManager::PointLayerID }};

View File

@@ -22,9 +22,5 @@ optional<Range<uint8_t>> Source::getZoomRange() const {
return baseImpl->getZoomRange();
}
std::vector<Feature> Source::querySourceFeatures(const SourceQueryOptions& options) {
return baseImpl->querySourceFeatures(options);
}
} // namespace style
} // namespace mbgl

View File

@@ -10,7 +10,6 @@
#include <mbgl/util/tile_cover.hpp>
#include <mbgl/util/enum.hpp>
#include <mbgl/map/query.hpp>
#include <mbgl/style/query.hpp>
#include <mbgl/algorithm/update_renderables.hpp>
#include <mbgl/algorithm/generate_clip_ids.hpp>

View File

@@ -7,7 +7,7 @@
#include <mbgl/tile/tile.hpp>
#include <mbgl/tile/tile_cache.hpp>
#include <mbgl/style/types.hpp>
#include <mbgl/style/query.hpp>
#include <mbgl/map/query.hpp>
#include <mbgl/util/noncopyable.hpp>
#include <mbgl/util/mat4.hpp>

View File

@@ -1,6 +1,6 @@
#include <mbgl/tile/geojson_tile.hpp>
#include <mbgl/tile/geometry_tile_data.hpp>
#include <mbgl/style/query.hpp>
#include <mbgl/map/query.hpp>
#include <mbgl/style/style.hpp>
#include <mbgl/style/update_parameters.hpp>
@@ -98,7 +98,7 @@ void GeoJSONTile::setNecessity(Necessity) {}
void GeoJSONTile::querySourceFeatures(
std::vector<Feature>& result,
const style::SourceQueryOptions& options) {
const SourceQueryOptions& options) {
// Ignore the sourceLayer, there is only one
auto layer = getData()->getLayer({});

View File

@@ -21,7 +21,7 @@ public:
void querySourceFeatures(
std::vector<Feature>& result,
const style::SourceQueryOptions&) override;
const SourceQueryOptions&) override;
};
} // namespace mbgl

View File

@@ -18,7 +18,6 @@
#include <mbgl/map/query.hpp>
#include <mbgl/util/run_loop.hpp>
#include <mbgl/style/filter_evaluator.hpp>
#include <mbgl/style/query.hpp>
#include <mbgl/util/logging.hpp>
#include <iostream>
@@ -191,7 +190,7 @@ void GeometryTile::queryRenderedFeatures(
void GeometryTile::querySourceFeatures(
std::vector<Feature>& result,
const style::SourceQueryOptions& options) {
const SourceQueryOptions& options) {
// Data not yet available
if (!data) {

View File

@@ -19,11 +19,11 @@ class GeometryTileData;
class FeatureIndex;
class CollisionTile;
class RenderLayer;
class SourceQueryOptions;
namespace style {
class Style;
class UpdateParameters;
class SourceQueryOptions;
} // namespace style
class GeometryTile : public Tile, public GlyphRequestor, IconRequestor {
@@ -58,7 +58,7 @@ public:
void querySourceFeatures(
std::vector<Feature>& result,
const style::SourceQueryOptions&) override;
const SourceQueryOptions&) override;
void cancel() override;

View File

@@ -4,7 +4,6 @@
#include <mbgl/util/string.hpp>
#include <mbgl/util/logging.hpp>
#include <mbgl/map/query.hpp>
#include <mbgl/style/query.hpp>
namespace mbgl {
@@ -38,6 +37,6 @@ void Tile::queryRenderedFeatures(
void Tile::querySourceFeatures(
std::vector<Feature>&,
const style::SourceQueryOptions&) {}
const SourceQueryOptions&) {}
} // namespace mbgl

View File

@@ -22,10 +22,10 @@ class TransformState;
class TileObserver;
class PlacementConfig;
class RenderedQueryOptions;
class SourceQueryOptions;
class RenderLayer;
namespace style {
class SourceQueryOptions;
} // namespace style
class Tile : private util::noncopyable {
@@ -60,7 +60,7 @@ public:
virtual void querySourceFeatures(
std::vector<Feature>& result,
const style::SourceQueryOptions&);
const SourceQueryOptions&);
void setTriedOptional();

View File

@@ -86,7 +86,7 @@ TEST(Query, QueryRenderedFeaturesFilter) {
TEST(Query, QuerySourceFeatures) {
QueryTest test;
auto features1 = test.map.getSource("source3")->querySourceFeatures();
auto features1 = test.map.querySourceFeatures("source3");
EXPECT_EQ(features1.size(), 1u);
}
@@ -94,15 +94,15 @@ TEST(Query, QuerySourceFeaturesOptionValidation) {
QueryTest test;
// GeoJSONSource, doesn't require a layer id
auto features = test.map.getSource("source3")->querySourceFeatures();
auto features = test.map.querySourceFeatures("source3");
ASSERT_EQ(features.size(), 1u);
// VectorSource, requires a layer id
features = test.map.getSource("source5")->querySourceFeatures();
features = test.map.querySourceFeatures("source5");
ASSERT_EQ(features.size(), 0u);
// RasterSource, not supported
features = test.map.getSource("source6")->querySourceFeatures();
features = test.map.querySourceFeatures("source6");
ASSERT_EQ(features.size(), 0u);
}
@@ -110,15 +110,15 @@ TEST(Query, QuerySourceFeaturesFilter) {
QueryTest test;
const EqualsFilter eqFilter = { "key1", std::string("value1") };
auto features1 = test.map.getSource("source4")->querySourceFeatures({{}, { eqFilter }});
auto features1 = test.map.querySourceFeatures("source4", {{}, { eqFilter }});
EXPECT_EQ(features1.size(), 1u);
const IdentifierNotEqualsFilter idNotEqFilter = { std::string("feature1") };
auto features2 = test.map.getSource("source4")->querySourceFeatures({{}, { idNotEqFilter }});
auto features2 = test.map.querySourceFeatures("source4", {{}, { idNotEqFilter }});
EXPECT_EQ(features2.size(), 0u);
const GreaterThanFilter gtFilter = { "key2", 1.0 };
auto features3 = test.map.getSource("source4")->querySourceFeatures({{}, { gtFilter }});
auto features3 = test.map.querySourceFeatures("source4", {{}, { gtFilter }});
EXPECT_EQ(features3.size(), 1u);
}

View File

@@ -6,8 +6,8 @@
#include <mbgl/util/default_thread_pool.hpp>
#include <mbgl/util/run_loop.hpp>
#include <mbgl/map/transform.hpp>
#include <mbgl/map/query.hpp>
#include <mbgl/style/style.hpp>
#include <mbgl/style/query.hpp>
#include <mbgl/style/update_parameters.hpp>
#include <mbgl/style/layers/symbol_layer.hpp>
#include <mbgl/renderer/symbol_bucket.hpp>