From 0042f0b9f5de7151f14300f02a559b6ecb48a507 Mon Sep 17 00:00:00 2001 From: Juha Alanen Date: Thu, 29 Aug 2019 13:40:01 +0300 Subject: [glfw] Add feature state support --- platform/glfw/glfw_view.cpp | 80 +++++++++++++++++++++++++++++++++++++++++++++ platform/glfw/glfw_view.hpp | 2 ++ 2 files changed, 82 insertions(+) diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index 43c4de9759..7d05bab43a 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -6,10 +6,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -323,6 +325,48 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, case GLFW_KEY_T: view->toggleCustomSource(); break; + case GLFW_KEY_F: { + using namespace mbgl; + using namespace mbgl::style; + using namespace mbgl::style::expression::dsl; + + auto& style = view->map->getStyle(); + if (!style.getSource("states")) { + std::string url = "https://docs.mapbox.com/mapbox-gl-js/assets/us_states.geojson"; + auto source = std::make_unique("states"); + source->setURL(url); + style.addSource(std::move(source)); + + mbgl::CameraOptions cameraOptions; + cameraOptions.center = mbgl::LatLng { 42.619626, -103.523181 }; + cameraOptions.zoom = 3; + cameraOptions.pitch = 0; + cameraOptions.bearing = 0; + view->map->jumpTo(cameraOptions); + } + + auto layer = style.getLayer("state-fills"); + if (!layer) { + auto fillLayer = std::make_unique("state-fills", "states"); + fillLayer->setFillColor(mbgl::Color{ 0.0, 0.0, 1.0, 0.5 }); + fillLayer->setFillOpacity(PropertyExpression(createExpression(R"(["case", ["boolean", ["feature-state", "hover"], false], 1, 0.5])"))); + style.addLayer(std::move(fillLayer)); + } else { + layer->setVisibility(layer->getVisibility() == mbgl::style::VisibilityType::Visible ? + mbgl::style::VisibilityType::None : mbgl::style::VisibilityType::Visible); + } + + layer = style.getLayer("state-borders"); + if (!layer) { + auto borderLayer = std::make_unique("state-borders", "states"); + borderLayer->setLineColor(mbgl::Color{ 0.0, 0.0, 1.0, 1.0 }); + borderLayer->setLineWidth(PropertyExpression(createExpression(R"(["case", ["boolean", ["feature-state", "hover"], false], 2, 1])"))); + style.addLayer(std::move(borderLayer)); + } else { + layer->setVisibility(layer->getVisibility() == mbgl::style::VisibilityType::Visible ? + mbgl::style::VisibilityType::None : mbgl::style::VisibilityType::Visible); + } + } break; } } @@ -537,6 +581,7 @@ void GLFWView::onMouseClick(GLFWwindow *window, int button, int action, int modi } view->lastClick = now; } + } } @@ -558,6 +603,41 @@ void GLFWView::onMouseMove(GLFWwindow *window, double x, double y) { } view->lastX = x; view->lastY = y; + + auto& style = view->map->getStyle(); + if (style.getLayer("state-fills")) { + auto screenCoordinate = mbgl::ScreenCoordinate { view->lastX, view->lastY }; + const mbgl::RenderedQueryOptions queryOptions({{{ "state-fills" }}, {}}); + auto result = view->rendererFrontend->getRenderer()->queryRenderedFeatures(screenCoordinate, queryOptions); + using namespace mbgl; + FeatureState newState; + + if (result.size() > 0) { + FeatureIdentifier id = result[0].id; + optional idStr = featureIDtoString(id); + + if (idStr) { + if (view->featureID && (*view->featureID != *idStr)) { + newState["hover"] = false; + view->rendererFrontend->getRenderer()->setFeatureState("states", { }, *view->featureID, newState); + view->featureID = nullopt; + } + + if (!view->featureID) { + newState["hover"] = true; + view->featureID = featureIDtoString(id); + view->rendererFrontend->getRenderer()->setFeatureState("states", { }, *view->featureID, newState); + } + } + } else { + if (view->featureID) { + newState["hover"] = false; + view->rendererFrontend->getRenderer()->setFeatureState("states", { }, *view->featureID, newState); + view->featureID = nullopt; + } + } + view->invalidate(); + } } void GLFWView::onWindowFocus(GLFWwindow *window, int focused) { diff --git a/platform/glfw/glfw_view.hpp b/platform/glfw/glfw_view.hpp index 54b89ba2d9..cc7c821810 100644 --- a/platform/glfw/glfw_view.hpp +++ b/platform/glfw/glfw_view.hpp @@ -4,6 +4,7 @@ #include #include #include +#include struct GLFWwindow; class GLFWBackend; @@ -134,4 +135,5 @@ private: GLFWwindow *window = nullptr; bool dirty = false; + mbgl::optional featureID; }; -- cgit v1.2.1