Merge pull request #582 from openmobilemaps/feature/multiselect

Add multiselect flag for geometry layers (fill, line)
openmobilemaps · Jan 26, 2024 · b191d91 · b191d91
2 parents aaf1f32 + d446ed0
commit b191d91
Show file tree

Hide file tree

Showing 19 changed files with 113 additions and 19 deletions.
diff --git a/...apscore/shared/map/layers/tiled/vector/Tiled2dMapVectorLayerSelectionCallbackInterface.kt b/...apscore/shared/map/layers/tiled/vector/Tiled2dMapVectorLayerSelectionCallbackInterface.kt
diff --git a/...oid/jni/map/layers/tiled/vector/NativeTiled2dMapVectorLayerSelectionCallbackInterface.cpp b/...oid/jni/map/layers/tiled/vector/NativeTiled2dMapVectorLayerSelectionCallbackInterface.cpp
diff --git a/...droid/jni/map/layers/tiled/vector/NativeTiled2dMapVectorLayerSelectionCallbackInterface.h b/...droid/jni/map/layers/tiled/vector/NativeTiled2dMapVectorLayerSelectionCallbackInterface.h
diff --git a/bridging/ios/MCTiled2dMapVectorLayerSelectionCallbackInterface+Private.mm b/bridging/ios/MCTiled2dMapVectorLayerSelectionCallbackInterface+Private.mm
diff --git a/bridging/ios/MCTiled2dMapVectorLayerSelectionCallbackInterface.h b/bridging/ios/MCTiled2dMapVectorLayerSelectionCallbackInterface.h
diff --git a/djinni/map/layers/tiled/vector/tiled_vector_layer.djinni b/djinni/map/layers/tiled/vector/tiled_vector_layer.djinni
@@ -92,6 +92,7 @@ vector_layer_feature_info = record {
 
 tiled_2d_map_vector_layer_selection_callback_interface = interface +c +j +o {
     did_select_feature(feature_info: vector_layer_feature_info, layer_identifier: string, coord: coord): bool;
+    did_multi_select_layer_features(feature_infos: list<vector_layer_feature_info>, layer_identifier: string, coord: coord): bool;
     did_click_background_confirmed(coord: coord) : bool;
 }
 

diff --git a/shared/public/BackgroundVectorLayerDescription.h b/shared/public/BackgroundVectorLayerDescription.h
@@ -65,7 +65,7 @@ class BackgroundVectorLayerDescription: public VectorLayerDescription {
                                      BackgroundVectorStyle style,
                                      std::optional<int32_t> renderPassIndex,
                                      std::shared_ptr<Value> interactable):
-    VectorLayerDescription(identifier, "", "", 0, 0, nullptr, renderPassIndex, interactable),
+    VectorLayerDescription(identifier, "", "", 0, 0, nullptr, renderPassIndex, interactable, false),
     style(style) {};
 
     std::unique_ptr<VectorLayerDescription> clone() override {

diff --git a/shared/public/LineVectorLayerDescription.h b/shared/public/LineVectorLayerDescription.h
@@ -133,14 +133,15 @@ class LineVectorLayerDescription: public VectorLayerDescription {
                                std::shared_ptr<Value> filter,
                                LineVectorStyle style,
                                std::optional<int32_t> renderPassIndex,
-                               std::shared_ptr<Value> interactable):
-    VectorLayerDescription(identifier, source, sourceId, minZoom, maxZoom, filter, renderPassIndex, interactable),
+                               std::shared_ptr<Value> interactable,
+                               bool multiselect):
+    VectorLayerDescription(identifier, source, sourceId, minZoom, maxZoom, filter, renderPassIndex, interactable, multiselect),
     style(style) {};
 
     std::unique_ptr<VectorLayerDescription> clone() override {
         return std::make_unique<LineVectorLayerDescription>(identifier, source, sourceLayer, minZoom, maxZoom,
                                                             filter ? filter->clone() : nullptr, style, renderPassIndex,
-                                                            interactable ? interactable->clone() : nullptr);
+                                                            interactable ? interactable->clone() : nullptr, multiselect);
     }
 
     virtual UsedKeysCollection getUsedKeys() const override {

diff --git a/shared/public/PolygonVectorLayerDescription.h b/shared/public/PolygonVectorLayerDescription.h
@@ -98,14 +98,15 @@ class PolygonVectorLayerDescription: public VectorLayerDescription {
                                   std::shared_ptr<Value> filter,
                                   PolygonVectorStyle style,
                                   std::optional<int32_t> renderPassIndex,
-                                  std::shared_ptr<Value> interactable):
-    VectorLayerDescription(identifier, source, sourceId, minZoom, maxZoom, filter, renderPassIndex, interactable),
+                                  std::shared_ptr<Value> interactable,
+                                  bool multiselect):
+    VectorLayerDescription(identifier, source, sourceId, minZoom, maxZoom, filter, renderPassIndex, interactable, multiselect),
     style(style) {};
 
     std::unique_ptr<VectorLayerDescription> clone() override {
         return std::make_unique<PolygonVectorLayerDescription>(identifier, source, sourceLayer, minZoom, maxZoom,
                                                                filter ? filter->clone() : nullptr, style, renderPassIndex,
-                                                               interactable ? interactable->clone() : nullptr);
+                                                               interactable ? interactable->clone() : nullptr, multiselect);
     }
 
     virtual UsedKeysCollection getUsedKeys() const override {

diff --git a/shared/public/RasterVectorLayerDescription.h b/shared/public/RasterVectorLayerDescription.h
@@ -144,7 +144,7 @@ class RasterVectorLayerDescription: public VectorLayerDescription  {
                                  bool underzoom,
                                  bool overzoom,
                                  std::optional<::RectCoord> bounds):
-    VectorLayerDescription(identifier, source, "", minZoom, maxZoom, nullptr, renderPassIndex, interactable),
+    VectorLayerDescription(identifier, source, "", minZoom, maxZoom, nullptr, renderPassIndex, interactable, false),
     style(style), url(url), underzoom(underzoom), overzoom(overzoom), adaptScaleToScreen(adaptScaleToScreen), numDrawPreviousLayers(numDrawPreviousLayers),
     maskTiles(maskTiles), zoomLevelScaleFactor(zoomLevelScaleFactor), bounds(bounds) {};
 

diff --git a/shared/public/SymbolVectorLayerDescription.h b/shared/public/SymbolVectorLayerDescription.h
@@ -510,7 +510,7 @@ class SymbolVectorLayerDescription: public VectorLayerDescription {
                                  SymbolVectorStyle style,
                                  std::optional<int32_t> renderPassIndex,
                                  std::shared_ptr<Value> interactable):
-    VectorLayerDescription(identifier, source, sourceId, minZoom, maxZoom, filter, renderPassIndex, interactable),
+    VectorLayerDescription(identifier, source, sourceId, minZoom, maxZoom, filter, renderPassIndex, interactable, false),
     style(style) {};
 
     std::unique_ptr<VectorLayerDescription> clone() override {

diff --git a/shared/public/Tiled2dMapVectorLayerSelectionCallbackInterface.h b/shared/public/Tiled2dMapVectorLayerSelectionCallbackInterface.h
@@ -5,6 +5,7 @@
 
 #include "Coord.h"
 #include <string>
+#include <vector>
 
 struct VectorLayerFeatureInfo;
 
@@ -14,5 +15,7 @@ class Tiled2dMapVectorLayerSelectionCallbackInterface {
 
     virtual bool didSelectFeature(const VectorLayerFeatureInfo & featureInfo, const std::string & layerIdentifier, const ::Coord & coord) = 0;
 
+    virtual bool didMultiSelectLayerFeatures(const std::vector<VectorLayerFeatureInfo> & featureInfos, const std::string & layerIdentifier, const ::Coord & coord) = 0;
+
     virtual bool didClickBackgroundConfirmed(const ::Coord & coord) = 0;
 };
diff --git a/shared/public/Tiled2dMapVectorTile.h b/shared/public/Tiled2dMapVectorTile.h
@@ -77,6 +77,7 @@ class Tiled2dMapVectorTile : public ActorObject,
     double dpFactor = 1.0;
 
     std::weak_ptr<Tiled2dMapVectorLayerSelectionCallbackInterface> selectionDelegate;
+    bool multiselect = false;
 
     const std::shared_ptr<Tiled2dMapVectorStateManager> featureStateManager;
 };
diff --git a/shared/public/VectorLayerDescription.h b/shared/public/VectorLayerDescription.h
@@ -26,6 +26,7 @@ class VectorLayerDescription {
     int maxZoom;
     std::shared_ptr<Value> filter;
     std::optional<int32_t> renderPassIndex;
+    bool multiselect;
 
     virtual VectorLayerType getType() = 0;
 
@@ -58,15 +59,17 @@ class VectorLayerDescription {
                            int maxZoom,
                            std::shared_ptr<Value> filter,
                            std::optional<int32_t> renderPassIndex,
-                           std::shared_ptr<Value> interactable):
+                           std::shared_ptr<Value> interactable,
+                           bool multiselect):
             identifier(identifier),
             source(source),
             sourceLayer(sourceId),
             minZoom(minZoom),
             maxZoom(maxZoom),
             filter(filter),
             renderPassIndex(renderPassIndex),
-            interactable(interactable) {}
+            interactable(interactable),
+            multiselect(multiselect) {}
 
     virtual ~VectorLayerDescription() = default;
 

diff --git a/shared/src/map/layers/tiled/vector/Tiled2dMapVectorLayerParserHelper.cpp b/shared/src/map/layers/tiled/vector/Tiled2dMapVectorLayerParserHelper.cpp
@@ -223,6 +223,7 @@ Tiled2dMapVectorLayerParserResult Tiled2dMapVectorLayerParserHelper::parseStyleJ
 
         std::optional<int32_t> renderPassIndex;
         std::shared_ptr<Value> interactable = globalIsInteractable;
+        bool layerMultiselect = false;
 
         std::shared_ptr<Value> blendMode;
         if (val["metadata"].is_object()) {
@@ -232,6 +233,9 @@ Tiled2dMapVectorLayerParserResult Tiled2dMapVectorLayerParserHelper::parseStyleJ
             if (!val["metadata"]["interactable"].is_null()) {
                 interactable = parser.parseValue(val["metadata"]["interactable"]);
             }
+            if (!val["metadata"]["multiselect"].is_null()) {
+                layerMultiselect = val["metadata"].value("multiselect", false);
+            }
             if (!val["metadata"]["blend-mode"].is_null()) {
                 blendMode = parser.parseValue(val["metadata"]["blend-mode"]);
             }
@@ -301,7 +305,8 @@ Tiled2dMapVectorLayerParserResult Tiled2dMapVectorLayerParserHelper::parseStyleJ
                     filter,
                     style,
                     renderPassIndex,
-                    interactable);
+                    interactable,
+                    layerMultiselect);
 
             layers.push_back(layerDesc);
 
@@ -360,7 +365,7 @@ Tiled2dMapVectorLayerParserResult Tiled2dMapVectorLayerParserHelper::parseStyleJ
                                                                             filter,
                                                                             style,
                                                                             renderPassIndex,
-                                                                            interactable);
+                                                                            interactable); // in-layer layerMultiselect not yet supported
             layers.push_back(layerDesc);
         } else if (val["type"] == "fill") {
 
@@ -379,7 +384,8 @@ Tiled2dMapVectorLayerParserResult Tiled2dMapVectorLayerParserHelper::parseStyleJ
                                                                              filter,
                                                                              style,
                                                                              renderPassIndex,
-                                                                             interactable);
+                                                                             interactable,
+                                                                             layerMultiselect);
 
             layers.push_back(layerDesc);
         }

diff --git a/shared/src/map/layers/tiled/vector/tiles/Tiled2dMapVectorTile.cpp b/shared/src/map/layers/tiled/vector/tiles/Tiled2dMapVectorTile.cpp
@@ -26,6 +26,8 @@ Tiled2dMapVectorTile::Tiled2dMapVectorTile(const std::weak_ptr<MapInterface> &ma
     if (auto strongMapInterface = mapInterface.lock()) {
         dpFactor = strongMapInterface->getCamera()->getScreenDensityPpi() / 160.0;
     }
+
+    multiselect = description->multiselect;
 }
 
 void Tiled2dMapVectorTile::updateVectorLayerDescription(const std::shared_ptr<VectorLayerDescription> &description,

diff --git a/shared/src/map/layers/tiled/vector/tiles/line/Tiled2dMapVectorLineTile.cpp b/shared/src/map/layers/tiled/vector/tiles/line/Tiled2dMapVectorLineTile.cpp
@@ -409,17 +409,23 @@ bool Tiled2dMapVectorLineTile::onClickConfirmed(const Vec2F &posScreen) {
 
     auto lineDescription = std::static_pointer_cast<LineVectorLayerDescription>(description);
 
+    std::vector<VectorLayerFeatureInfo> featureInfos;
     for (auto const &[lineCoordinateVector, featureContext]: hitDetection) {
         for (auto const &coordinates: lineCoordinateVector) {
             auto lineWidth = lineDescription->style.getLineWidth(EvaluationContext(zoomIdentifier, dpFactor, featureContext, featureStateManager));
             if (LineHelper::pointWithin(coordinates, point, lineWidth, coordinateConverter)) {
-                if (strongSelectionDelegate->didSelectFeature(featureContext->getFeatureInfo(), description->identifier, point)) {
+                if (multiselect) {
+                    featureInfos.push_back(featureContext->getFeatureInfo());
+                } else if (strongSelectionDelegate->didSelectFeature(featureContext->getFeatureInfo(), description->identifier, point)) {
                     return true;
                 }
             }
         }
     }
 
+    if (multiselect && !featureInfos.empty()) {
+        return strongSelectionDelegate->didMultiSelectLayerFeatures(featureInfos, description->identifier, point);
+    }
 
     return false;
 }