diff options
| author | zmiao <zmiao.jamie@gmail.com> | 2019-07-22 18:27:36 +0300 |
|---|---|---|
| committer | zmiao <zmiao.jamie@gmail.com> | 2019-07-22 18:27:36 +0300 |
| commit | 570b871b910aae375ce202398f205c6cda863f24 (patch) | |
| tree | 19a26845e1a30c0ca3896334ec269b5737b3f508 | |
| parent | 8cb116a73b88436d7ba56df084fb9a99d8a5ea67 (diff) | |
| download | qtlocation-mapboxgl-570b871b910aae375ce202398f205c6cda863f24.tar.gz | |
implement simple clusterOption exression
| -rw-r--r-- | include/mbgl/annotation/annotation.hpp | 1 | ||||
| -rw-r--r-- | include/mbgl/style/expression/expression.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/style/property_expression.hpp | 9 | ||||
| m--------- | platform/android/vendor/mapbox-events-android | 0 | ||||
| m--------- | platform/android/vendor/mapbox-gestures-android | 0 | ||||
| m--------- | platform/android/vendor/mapbox-java | 0 | ||||
| -rw-r--r-- | platform/glfw/glfw_view.cpp | 26 | ||||
| -rw-r--r-- | platform/glfw/helsinki_dots.hpp | 3384 | ||||
| -rw-r--r-- | src/mbgl/style/expression/compound_expression.cpp | 13 | ||||
| -rw-r--r-- | src/mbgl/style/expression/expression.cpp | 17 | ||||
| -rw-r--r-- | src/mbgl/style/expression/parsing_context.cpp | 3 | ||||
| -rw-r--r-- | src/mbgl/style/sources/geojson_source_impl.cpp | 100 |
12 files changed, 3531 insertions, 26 deletions
diff --git a/include/mbgl/annotation/annotation.hpp b/include/mbgl/annotation/annotation.hpp index fb9ea5eba2..17728741bb 100644 --- a/include/mbgl/annotation/annotation.hpp +++ b/include/mbgl/annotation/annotation.hpp @@ -4,7 +4,6 @@ #include <mbgl/util/variant.hpp> #include <mbgl/util/color.hpp> #include <mbgl/style/property_value.hpp> -#include <mbgl/style/property_value.hpp> #include <cstdint> #include <vector> diff --git a/include/mbgl/style/expression/expression.hpp b/include/mbgl/style/expression/expression.hpp index 5f66fc6dc7..9a2f7b3b41 100644 --- a/include/mbgl/style/expression/expression.hpp +++ b/include/mbgl/style/expression/expression.hpp @@ -23,6 +23,7 @@ public: std::string message; }; + class EvaluationContext { public: EvaluationContext() = default; @@ -43,6 +44,7 @@ public: optional<float> zoom; GeometryTileFeature const * feature = nullptr; optional<double> colorRampParameter; + optional<double> accumulated; // Contains formatted section object, std::unordered_map<std::string, Value>. const Value* formattedSection = nullptr; }; @@ -162,7 +164,7 @@ public: type::Type getType() const { return type; }; EvaluationResult evaluate(optional<float> zoom, const Feature& feature, optional<double> colorRampParameter) const; - + EvaluationResult evaluate(const Feature& feature) const; /** * Statically analyze the expression, attempting to enumerate possible outputs. Returns * an array of values plus the sentinel null optional value, used to indicate that the diff --git a/include/mbgl/style/property_expression.hpp b/include/mbgl/style/property_expression.hpp index 32983e2380..89a0cff418 100644 --- a/include/mbgl/style/property_expression.hpp +++ b/include/mbgl/style/property_expression.hpp @@ -52,6 +52,15 @@ public: T evaluate(float zoom) const { return evaluate(expression::EvaluationContext(zoom)); } + + T evaluate(mapbox::feature::feature<double>& f, T finalDefaultValue = T()) const { + const expression::EvaluationResult result = expression->evaluate(f); + if (result) { + const optional<T> typed = expression::fromExpressionValue<T>(*result); + return typed ? *typed : defaultValue ? *defaultValue : finalDefaultValue; + } + return defaultValue ? *defaultValue : finalDefaultValue; + } T evaluate(const GeometryTileFeature& feature, T finalDefaultValue) const { return evaluate(expression::EvaluationContext(&feature), finalDefaultValue); diff --git a/platform/android/vendor/mapbox-events-android b/platform/android/vendor/mapbox-events-android -Subproject 58fbec16cdedb909eb63c68e46708fe9268b6fe +Subproject 67b007f4265f32bf8db8ee3b78b2d467626e5a5 diff --git a/platform/android/vendor/mapbox-gestures-android b/platform/android/vendor/mapbox-gestures-android -Subproject 22910190e8374e1ad9494e9c98ffb027eafdd22 +Subproject 13212fd84879e8cf8af79ae44a6795f519d1c31 diff --git a/platform/android/vendor/mapbox-java b/platform/android/vendor/mapbox-java -Subproject 305f6a78d1c1c4ec45735b0cf98bd7c4ea4658f +Subproject fdd566432765232044e4a132db7a4d2c2f807da diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index 43c4de9759..b5fc7c0ce9 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -2,6 +2,7 @@ #include "glfw_backend.hpp" #include "glfw_renderer_frontend.hpp" #include "ny_route.hpp" +#include "helsinki_dots.hpp" #include <mbgl/annotation/annotation.hpp> #include <mbgl/style/style.hpp> @@ -20,6 +21,9 @@ #include <mbgl/gfx/backend.hpp> #include <mbgl/gfx/backend_scope.hpp> #include <mbgl/map/camera.hpp> +#include <mbgl/style/sources/geojson_source.hpp> +#include <mbgl/style/layers/circle_layer.hpp> +#include <mbgl/style/layers/symbol_layer.hpp> #include <mapbox/cheap_ruler.hpp> #include <mapbox/geometry.hpp> @@ -320,6 +324,28 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, } } } break; + case GLFW_KEY_F: { + using namespace mbgl::style; + GeoJSONOptions options; + options.cluster = true; + options.clusterRadius = 100; + + auto source = std::make_unique<GeoJSONSource>("dots", options); + source->setGeoJSON(mapbox::geojson::parse(mbgl::platform::glfw::dots)); + + auto& style = view->map->getStyle(); + style.addSource(std::move(source)); + + auto circleLayer = std::make_unique<mbgl::style::CircleLayer>("clusters", "dots"); + circleLayer->setCircleColor(mbgl::Color{ 1.0, 0.0, 0.0, 1.0 }); + style.addLayer(std::move(circleLayer)); + + auto symbolLayer = std::make_unique<mbgl::style::SymbolLayer>("test", "dots"); + using namespace mbgl::style::expression::dsl; + symbolLayer->setTextField(PropertyExpression<expression::Formatted>(toFormatted(get("max")))); + + style.addLayer(std::move(symbolLayer)); + } break; case GLFW_KEY_T: view->toggleCustomSource(); break; diff --git a/platform/glfw/helsinki_dots.hpp b/platform/glfw/helsinki_dots.hpp new file mode 100644 index 0000000000..f2cf08b71e --- /dev/null +++ b/platform/glfw/helsinki_dots.hpp @@ -0,0 +1,3384 @@ +#include <string> + +namespace mbgl { +namespace platform { +namespace glfw { + + constexpr const char* dots= R"( + { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "scalerank": 2, + "name": "Niagara Falls", + "comment": null, + "name_alt": null, + "lat_y": 43.087653, + "long_x": -79.044073, + "region": "North America", + "subregion": null, + "featureclass": "waterfall" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -79.04411780507252, + 43.08771393436908 + ] + }, + "id": 163 + }, + { + "type": "Feature", + "properties": { + "scalerank": 2, + "name": "Salto Angel", + "comment": null, + "name_alt": "Angel Falls", + "lat_y": 5.686836, + "long_x": -62.061848, + "region": "South America", + "subregion": null, + "featureclass": "waterfall" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -62.06181800038502, + 5.686896063275327 + ] + }, + "id": 164 + }, + { + "type": "Feature", + "properties": { + "scalerank": 2, + "name": "Iguazu Falls", + "comment": null, + "name_alt": null, + "lat_y": -25.568265, + "long_x": -54.582842, + "region": "South America", + "subregion": null, + "featureclass": "waterfall" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -54.58299719960377, + -25.568291925005923 + ] + }, + "id": 165 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Gees Gwardafuy", + "comment": null, + "name_alt": null, + "lat_y": 11.812855, + "long_x": 51.235173, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 51.258313644180184, + 11.822028799226407 + ] + }, + "id": 166 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Victoria Falls", + "comment": null, + "name_alt": null, + "lat_y": -17.77079, + "long_x": 25.460133, + "region": "Africa", + "subregion": null, + "featureclass": "waterfall" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 25.852793816021233, + -17.928033135943423 + ] + }, + "id": 167 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Wright I.", + "comment": null, + "name_alt": null, + "lat_y": -50.959168, + "long_x": -72.995002, + "region": "Antarctica", + "subregion": null, + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -116.89262854726002, + -74.06670501094342 + ] + }, + "id": 168 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Grant I.", + "comment": null, + "name_alt": null, + "lat_y": -50.959168, + "long_x": -72.995002, + "region": "Antarctica", + "subregion": null, + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -131.48540198476002, + -74.48272063594342 + ] + }, + "id": 169 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Newman I.", + "comment": null, + "name_alt": null, + "lat_y": -50.959168, + "long_x": -72.995002, + "region": "Antarctica", + "subregion": null, + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -145.68681800038502, + -75.59185149531842 + ] + }, + "id": 170 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Dean I.", + "comment": null, + "name_alt": null, + "lat_y": -50.959168, + "long_x": -72.995002, + "region": "Antarctica", + "subregion": null, + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -127.63438880116627, + -74.50066497188092 + ] + }, + "id": 171 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Cape Canaveral", + "comment": null, + "name_alt": null, + "lat_y": 28.483713, + "long_x": -80.534941, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -80.53625603636821, + 28.473056814472134 + ] + }, + "id": 172 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Cape Mendocino", + "comment": null, + "name_alt": null, + "lat_y": 40.350222, + "long_x": -124.323474, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -124.39201745043425, + 40.44222065537283 + ] + }, + "id": 173 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Cabo San Lucas", + "comment": null, + "name_alt": null, + "lat_y": 22.887711, + "long_x": -109.969843, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -109.96983801991627, + 22.887762762494077 + ] + }, + "id": 174 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Cape Churchill", + "comment": null, + "name_alt": null, + "lat_y": 58.752014, + "long_x": -93.182023, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -93.18211829335377, + 58.75208161015033 + ] + }, + "id": 175 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Cape Cod", + "comment": null, + "name_alt": null, + "lat_y": 41.734867, + "long_x": -69.964865, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -70.03687833567446, + 41.9914589934385 + ] + }, + "id": 176 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Cape May", + "comment": null, + "name_alt": null, + "lat_y": 37.2017, + "long_x": -75.926791, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -74.95121933164988, + 38.92969645987068 + ] + }, + "id": 177 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Cabo de Hornos", + "comment": null, + "name_alt": "Cape Horn", + "lat_y": -55.862824, + "long_x": -67.169425, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -67.16942298085377, + -55.86284758906842 + ] + }, + "id": 178 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Cape of Good Hope", + "comment": null, + "name_alt": null, + "lat_y": -34.307311, + "long_x": 18.441206, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 18.441294792583733, + -34.30718352656842 + ] + }, + "id": 179 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Cape Palmas", + "comment": null, + "name_alt": null, + "lat_y": 4.373924, + "long_x": -7.457356, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -7.457386848041267, + 4.373968817181577 + ] + }, + "id": 180 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Cape Verde", + "comment": null, + "name_alt": null, + "lat_y": 14.732312, + "long_x": -17.471776, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -17.471730109760017, + 14.732489324994077 + ] + }, + "id": 181 + }, + { + "type": "Feature", + "properties": { + "scalerank": 3, + "name": "Cap Bon", + "comment": null, + "name_alt": null, + "lat_y": 37.073954, + "long_x": 11.024061, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 11.024180534771233, + 37.07398102421283 + ] + }, + "id": 182 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Lands End", + "comment": null, + "name_alt": null, + "lat_y": 50.069677, + "long_x": -5.668629, + "region": "Europe", + "subregion": "British Isles", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -5.668629523822517, + 50.06970856327533 + ] + }, + "id": 186 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Cape York", + "comment": null, + "name_alt": null, + "lat_y": 76.218919, + "long_x": -68.218612, + "region": "North America", + "subregion": "Greenland", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -68.21861731679127, + 76.21887848515033 + ] + }, + "id": 187 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Nunap Isua", + "comment": null, + "name_alt": "Cape Farewell", + "lat_y": 59.862583, + "long_x": -43.90088, + "region": "North America", + "subregion": "Greenland", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -43.90080725819752, + 59.86267731327533 + ] + }, + "id": 188 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Cape Vohimena", + "comment": null, + "name_alt": null, + "lat_y": -25.546355, + "long_x": 45.158683, + "region": "Africa", + "subregion": "Indian Ocean", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 45.15870201914623, + -25.546319268755923 + ] + }, + "id": 189 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Vavau", + "comment": null, + "name_alt": null, + "lat_y": -18.590062, + "long_x": -173.976769, + "region": "Oceania", + "subregion": "Polynesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -173.97673499257252, + -18.590020440630923 + ] + }, + "id": 190 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "I. de Pascua", + "comment": null, + "name_alt": "Easter I.", + "lat_y": -27.102117, + "long_x": -109.367953, + "region": "Oceania", + "subregion": "Polynesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -109.36790930897877, + -27.102227471880923 + ] + }, + "id": 191 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Cape Agulhas", + "comment": null, + "name_alt": null, + "lat_y": -34.801182, + "long_x": 19.993472, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 19.993418816021233, + -34.80108001094342 + ] + }, + "id": 192 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Plain of Jars", + "comment": null, + "name_alt": null, + "lat_y": 20.550709, + "long_x": 101.890532, + "region": "Asia", + "subregion": null, + "featureclass": "plain" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 101.89063561289623, + 20.550909735150327 + ] + }, + "id": 193 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Cabo Corrientes", + "comment": null, + "name_alt": null, + "lat_y": 20.409471, + "long_x": -105.683581, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -105.67795873874799, + 20.420365114940253 + ] + }, + "id": 194 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Pt. Eugenia", + "comment": null, + "name_alt": null, + "lat_y": 27.861925, + "long_x": -115.07629, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -115.04623945046137, + 27.842887092585283 + ] + }, + "id": 195 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Point Conception", + "comment": null, + "name_alt": null, + "lat_y": 34.582313, + "long_x": -120.659016, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -120.46360036202867, + 34.46027592467621 + ] + }, + "id": 196 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Cape Hatteras", + "comment": null, + "name_alt": null, + "lat_y": 35.437762, + "long_x": -75.450543, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -75.54032952413311, + 35.24475263812895 + ] + }, + "id": 197 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Cape Sable", + "comment": null, + "name_alt": null, + "lat_y": 25.124896, + "long_x": -81.090442, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -81.09044348866627, + 25.124762274212827 + ] + }, + "id": 198 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Cape Hope", + "comment": null, + "name_alt": null, + "lat_y": 68.35638, + "long_x": -166.815582, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -166.81321268769543, + 68.35380207543972 + ] + }, + "id": 199 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Point Barrow", + "comment": null, + "name_alt": null, + "lat_y": 71.372637, + "long_x": -156.615894, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -156.4719492091668, + 71.40589128763096 + ] + }, + "id": 200 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Punta Negra", + "comment": null, + "name_alt": null, + "lat_y": -5.948875, + "long_x": -81.108252, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -81.10832678944752, + -5.948663018755923 + ] + }, + "id": 201 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Punta Lavapié", + "comment": null, + "name_alt": null, + "lat_y": -37.262867, + "long_x": -73.606377, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -73.60304396243782, + -37.17120002933805 + ] + }, + "id": 202 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Punta Galera", + "comment": null, + "name_alt": null, + "lat_y": 0.731221, + "long_x": -80.062205, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -80.06212317616627, + 0.731207586712827 + ] + }, + "id": 203 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Cap Lopez", + "comment": null, + "name_alt": null, + "lat_y": -0.604761, + "long_x": 8.726423, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 8.727299789450319, + -0.615086490513119 + ] + }, + "id": 204 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Cape Bobaomby", + "comment": null, + "name_alt": null, + "lat_y": -11.966598, + "long_x": 49.262904, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 49.26282799570873, + -11.966485284380923 + ] + }, + "id": 205 + }, + { + "type": "Feature", + "properties": { + "scalerank": 4, + "name": "Cap Blanc", + "comment": null, + "name_alt": null, + "lat_y": 20.822108, + "long_x": -17.052856, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -17.052906867572517, + 20.822088934369077 + ] + }, + "id": 206 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "South West Cape", + "comment": null, + "name_alt": null, + "lat_y": -43.510984, + "long_x": 146.054227, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 146.03379804609568, + -43.5404025683706 + ] + }, + "id": 207 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Howe", + "comment": null, + "name_alt": null, + "lat_y": -37.488775, + "long_x": 149.95853, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 149.95838463633373, + -37.48894622188092 + ] + }, + "id": 208 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Otway", + "comment": null, + "name_alt": null, + "lat_y": -38.857622, + "long_x": 143.565403, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 143.537005108191, + -38.85472383068997 + ] + }, + "id": 209 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Jaffa", + "comment": null, + "name_alt": null, + "lat_y": -36.944244, + "long_x": 139.690866, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 139.68061977964746, + -36.95624316107086 + ] + }, + "id": 210 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Carnot", + "comment": null, + "name_alt": null, + "lat_y": -34.920233, + "long_x": 135.656027, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 135.65378326897053, + -34.93870859313661 + ] + }, + "id": 211 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Byron", + "comment": null, + "name_alt": null, + "lat_y": -28.658282, + "long_x": 153.632849, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 153.62799176015545, + -28.66197417050363 + ] + }, + "id": 212 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Manifold", + "comment": null, + "name_alt": null, + "lat_y": -22.702081, + "long_x": 150.811228, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 150.81116783945873, + -22.702080987505923 + ] + }, + "id": 213 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape York", + "comment": null, + "name_alt": null, + "lat_y": -10.710859, + "long_x": 142.522018, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 142.52173912852123, + -10.710747979693423 + ] + }, + "id": 214 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Melville", + "comment": null, + "name_alt": null, + "lat_y": -14.163629, + "long_x": 144.506417, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 144.50660240977123, + -14.163506768755923 + ] + }, + "id": 215 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Arnhem", + "comment": null, + "name_alt": null, + "lat_y": -12.337984, + "long_x": 136.952429, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 136.91481885262823, + -12.295662864626316 + ] + }, + "id": 216 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "West Cape Howe", + "comment": null, + "name_alt": null, + "lat_y": -35.104301, + "long_x": 117.597011, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 117.59693444102123, + -35.10430266719342 + ] + }, + "id": 217 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Leeuwin", + "comment": null, + "name_alt": null, + "lat_y": -34.297841, + "long_x": 115.10633, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 115.1280088910596, + -34.328007092559645 + ] + }, + "id": 218 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Pasley", + "comment": null, + "name_alt": null, + "lat_y": -33.929054, + "long_x": 123.517283, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 123.51722252695873, + -33.92888762813092 + ] + }, + "id": 219 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Londonderry", + "comment": null, + "name_alt": null, + "lat_y": -13.713856, + "long_x": 126.964514, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 126.94130045687105, + -13.74290642667802 + ] + }, + "id": 220 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Steep Point", + "comment": null, + "name_alt": null, + "lat_y": -26.16822, + "long_x": 113.169959, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 113.14519563289093, + -26.157463616878637 + ] + }, + "id": 221 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "North West Cape", + "comment": null, + "name_alt": null, + "lat_y": -21.809776, + "long_x": 114.117534, + "region": "Oceania", + "subregion": "Australia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 114.16010761213809, + -21.801474697071743 + ] + }, + "id": 222 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cabo Gracias a Dios", + "comment": null, + "name_alt": null, + "lat_y": 14.994242, + "long_x": -83.15866, + "region": "North America", + "subregion": "Central America", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -83.15874182851002, + 14.994208074994077 + ] + }, + "id": 223 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Brewster", + "comment": null, + "name_alt": null, + "lat_y": 70.150754, + "long_x": -22.122616, + "region": "North America", + "subregion": "Greenland", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -22.122731086322517, + 70.15088532108783 + ] + }, + "id": 224 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Morris Jesup", + "comment": null, + "name_alt": null, + "lat_y": 83.626331, + "long_x": -32.491541, + "region": "North America", + "subregion": "Greenland", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -32.49150550038502, + 83.62628815311908 + ] + }, + "id": 225 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Grmsey", + "comment": null, + "name_alt": null, + "lat_y": 66.669359, + "long_x": -18.251096, + "region": "Europe", + "subregion": "Iceland", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -18.251088019916267, + 66.66937897343158 + ] + }, + "id": 226 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Surtsey", + "comment": null, + "name_alt": null, + "lat_y": 63.217764, + "long_x": -20.434929, + "region": "Europe", + "subregion": "Iceland", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -20.434803840228767, + 63.21771881718158 + ] + }, + "id": 227 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cap Est", + "comment": null, + "name_alt": null, + "lat_y": -15.274849, + "long_x": 50.499889, + "region": "Africa", + "subregion": "Indian Ocean", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 50.49976647227123, + -15.274956964068423 + ] + }, + "id": 228 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Cretin", + "comment": null, + "name_alt": null, + "lat_y": -6.637492, + "long_x": 147.852392, + "region": "Oceania", + "subregion": "Melanesia", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 147.85242760508373, + -6.637261651568423 + ] + }, + "id": 229 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Îles Chesterfield", + "comment": null, + "name_alt": null, + "lat_y": -19.20447, + "long_x": 159.95171, + "region": "Oceania", + "subregion": "Melanesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 159.95167076914623, + -19.204644464068423 + ] + }, + "id": 230 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Pagan", + "comment": null, + "name_alt": null, + "lat_y": 18.119631, + "long_x": 145.785087, + "region": "Oceania", + "subregion": "Micronesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 145.78492272227123, + 18.119635321087827 + ] + }, + "id": 231 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Wake I.", + "comment": null, + "name_alt": null, + "lat_y": 19.303497, + "long_x": 166.63626, + "region": "Oceania", + "subregion": "Micronesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 166.63624108164623, + 19.303595282025327 + ] + }, + "id": 232 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Tabiteuea", + "comment": null, + "name_alt": null, + "lat_y": -1.201405, + "long_x": 174.755207, + "region": "Oceania", + "subregion": "Micronesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 174.75513756602123, + -1.201348565630923 + ] + }, + "id": 233 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Aranuka", + "comment": null, + "name_alt": null, + "lat_y": 0.226766, + "long_x": 173.626286, + "region": "Oceania", + "subregion": "Micronesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 173.62623131602123, + 0.226752020306577 + ] + }, + "id": 234 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Nauru", + "comment": null, + "name_alt": null, + "lat_y": -0.505856, + "long_x": 166.930778, + "region": "Oceania", + "subregion": "Micronesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 166.93067467539623, + -0.505791925005923 + ] + }, + "id": 235 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Ebon", + "comment": null, + "name_alt": null, + "lat_y": 4.59977, + "long_x": 168.736432, + "region": "Oceania", + "subregion": "Micronesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 168.73633873789623, + 4.599798895306577 + ] + }, + "id": 236 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Jaluit", + "comment": null, + "name_alt": null, + "lat_y": 5.964455, + "long_x": 169.682894, + "region": "Oceania", + "subregion": "Micronesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 169.68299401133373, + 5.964483953900327 + ] + }, + "id": 237 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Mili", + "comment": null, + "name_alt": null, + "lat_y": 6.107334, + "long_x": 171.725875, + "region": "Oceania", + "subregion": "Micronesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 171.72584069102123, + 6.107489324994077 + ] + }, + "id": 238 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Majuro", + "comment": null, + "name_alt": null, + "lat_y": 7.118009, + "long_x": 171.159743, + "region": "Oceania", + "subregion": "Micronesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 171.15980065195873, + 7.117987371869077 + ] + }, + "id": 239 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Ailinglapalap", + "comment": null, + "name_alt": null, + "lat_y": 7.276392, + "long_x": 168.596926, + "region": "Oceania", + "subregion": "Micronesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 168.59693444102123, + 7.276495672650327 + ] + }, + "id": 240 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Kwajalein", + "comment": null, + "name_alt": null, + "lat_y": 8.746619, + "long_x": 167.735072, + "region": "Oceania", + "subregion": "Micronesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 167.73511803477123, + 8.746710516400327 + ] + }, + "id": 241 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Rongelap", + "comment": null, + "name_alt": null, + "lat_y": 11.164329, + "long_x": 166.869876, + "region": "Oceania", + "subregion": "Micronesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 166.86988365977123, + 11.164496160931577 + ] + }, + "id": 242 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Bikini", + "comment": null, + "name_alt": null, + "lat_y": 11.639231, + "long_x": 165.550698, + "region": "Oceania", + "subregion": "Micronesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 165.55042565195873, + 11.639288641400327 + ] + }, + "id": 243 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Reinga", + "comment": null, + "name_alt": null, + "lat_y": -34.432767, + "long_x": 172.7285, + "region": "Oceania", + "subregion": "New Zealand", + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 172.70558117137455, + -34.42039113947056 + ] + }, + "id": 244 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Kanton", + "comment": null, + "name_alt": null, + "lat_y": -2.757106, + "long_x": -171.71703, + "region": "Oceania", + "subregion": "Polynesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -171.71703040272877, + -2.757134698443423 + ] + }, + "id": 245 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Tabuaeran", + "comment": null, + "name_alt": "Fanning I.", + "lat_y": 3.866545, + "long_x": -159.326781, + "region": "Oceania", + "subregion": "Polynesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -159.32683264882252, + 3.866705633587827 + ] + }, + "id": 246 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Malden", + "comment": null, + "name_alt": null, + "lat_y": -4.042491, + "long_x": -154.983478, + "region": "Oceania", + "subregion": "Polynesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -154.98350989491627, + -4.042657159380923 + ] + }, + "id": 247 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Rarotonga", + "comment": null, + "name_alt": null, + "lat_y": -21.201867, + "long_x": -159.797637, + "region": "Oceania", + "subregion": "Polynesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -159.79771887929127, + -21.201836846880923 + ] + }, + "id": 248 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Rangiroa", + "comment": null, + "name_alt": null, + "lat_y": -15.2046, + "long_x": -147.773967, + "region": "Oceania", + "subregion": "Polynesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -147.77403723866627, + -15.204766534380923 + ] + }, + "id": 249 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Funafuti", + "comment": null, + "name_alt": null, + "lat_y": -8.491577, + "long_x": 179.19841, + "region": "Oceania", + "subregion": "Polynesia", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 179.19837487070873, + -8.491631768755923 + ] + }, + "id": 250 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "St. Croix", + "comment": null, + "name_alt": null, + "lat_y": 17.762944, + "long_x": -64.763088, + "region": "North America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -64.76317298085377, + 17.763006903119077 + ] + }, + "id": 251 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Grand Cayman", + "comment": null, + "name_alt": null, + "lat_y": 19.315829, + "long_x": -81.271416, + "region": "North America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -81.27159583241627, + 19.315802313275327 + ] + }, + "id": 252 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "San Salvador", + "comment": null, + "name_alt": null, + "lat_y": 24.052793, + "long_x": -74.492848, + "region": "North America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -74.49290930897877, + 24.052801824994077 + ] + }, + "id": 253 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Grenada", + "comment": null, + "name_alt": null, + "lat_y": 12.105978, + "long_x": -61.723079, + "region": "North America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -61.72319495351002, + 12.105963446087827 + ] + }, + "id": 254 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Barbuda", + "comment": null, + "name_alt": null, + "lat_y": 17.622525, + "long_x": -61.789243, + "region": "North America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -61.78929602772877, + 17.622626043744077 + ] + }, + "id": 255 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Antigua", + "comment": null, + "name_alt": null, + "lat_y": 17.040441, + "long_x": -61.775982, + "region": "North America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -61.77592932851002, + 17.040594793744077 + ] + }, + "id": 256 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Guadeloupe", + "comment": null, + "name_alt": null, + "lat_y": 16.180583, + "long_x": -61.656947, + "region": "North America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -61.65703284413502, + 16.180670477337827 + ] + }, + "id": 257 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Dominica", + "comment": null, + "name_alt": null, + "lat_y": 15.452943, + "long_x": -61.352652, + "region": "North America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -61.35271155507252, + 15.452887274212827 + ] + }, + "id": 258 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Martinique", + "comment": null, + "name_alt": null, + "lat_y": 14.672462, + "long_x": -61.008715, + "region": "North America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -61.00883948476002, + 14.672491766400327 + ] + }, + "id": 259 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Saint Lucia", + "comment": null, + "name_alt": null, + "lat_y": 13.918332, + "long_x": -60.982225, + "region": "North America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -60.98222815663502, + 13.918280340619077 + ] + }, + "id": 260 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Saint Vincent", + "comment": null, + "name_alt": null, + "lat_y": 13.270131, + "long_x": -61.207143, + "region": "North America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -61.20720374257252, + 13.270209051556577 + ] + }, + "id": 261 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Barbados", + "comment": null, + "name_alt": null, + "lat_y": 13.164326, + "long_x": -59.566742, + "region": "North America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -59.56682288319752, + 13.164252020306577 + ] + }, + "id": 262 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Tobago", + "comment": null, + "name_alt": null, + "lat_y": 11.259334, + "long_x": -60.677992, + "region": "South America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -60.67808997304127, + 11.259283758587827 + ] + }, + "id": 263 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Margarita", + "comment": null, + "name_alt": null, + "lat_y": 10.981467, + "long_x": -64.051401, + "region": "South America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -64.05144202382252, + 10.981512762494077 + ] + }, + "id": 264 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Curaao", + "comment": null, + "name_alt": null, + "lat_y": 12.185355, + "long_x": -68.999109, + "region": "North America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -68.99919593007252, + 12.185309149212827 + ] + }, + "id": 265 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Aruba", + "comment": null, + "name_alt": null, + "lat_y": 12.502849, + "long_x": -69.96488, + "region": "North America", + "subregion": "West Indies", + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -69.96501624257252, + 12.502752996869077 + ] + }, + "id": 266 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Ras Banäs", + "comment": null, + "name_alt": null, + "lat_y": 23.950592, + "long_x": 35.778059, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 35.77808678477123, + 23.950628973431577 + ] + }, + "id": 267 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Ponta das Salinas", + "comment": null, + "name_alt": null, + "lat_y": -12.832908, + "long_x": 12.928991, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 12.968705086077254, + -12.855718342716505 + ] + }, + "id": 268 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Ponta das Palmeirinhas", + "comment": null, + "name_alt": null, + "lat_y": -9.071387, + "long_x": 12.999549, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 13.033811372274608, + -9.099938228394153 + ] + }, + "id": 269 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cabo Bojador", + "comment": null, + "name_alt": null, + "lat_y": 26.157836, + "long_x": -14.473111, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -14.473194953510017, + 26.157965399212827 + ] + }, + "id": 270 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Comorin", + "comment": null, + "name_alt": null, + "lat_y": 8.143554, + "long_x": 77.471497, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 77.51210506924555, + 8.085338515340696 + ] + }, + "id": 271 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Dondra Head", + "comment": null, + "name_alt": null, + "lat_y": 5.947528, + "long_x": 80.616321, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 80.59180925571331, + 5.929580617022318 + ] + }, + "id": 272 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Yelizavety", + "comment": null, + "name_alt": null, + "lat_y": 54.416083, + "long_x": 142.720445, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 142.72059166758373, + 54.41620514530658 + ] + }, + "id": 273 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Pt. Yuzhnyy", + "comment": null, + "name_alt": null, + "lat_y": 57.733572, + "long_x": 156.796426, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 156.79664147227123, + 57.73346588749408 + ] + }, + "id": 274 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Sata", + "comment": null, + "name_alt": null, + "lat_y": 31.026941, + "long_x": 130.695089, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 130.69520104258373, + 31.026922918744077 + ] + }, + "id": 275 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Aniva", + "comment": null, + "name_alt": null, + "lat_y": 46.081706, + "long_x": 143.43487, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 143.43482506602123, + 46.08179352421283 + ] + }, + "id": 276 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Terpeniya", + "comment": null, + "name_alt": null, + "lat_y": 48.66928, + "long_x": 144.712582, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 144.71253502695873, + 48.66937897343158 + ] + }, + "id": 277 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Lopatka", + "comment": null, + "name_alt": null, + "lat_y": 50.914155, + "long_x": 156.651536, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 156.65162194102123, + 50.91412994999408 + ] + }, + "id": 278 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Ozernoy", + "comment": null, + "name_alt": null, + "lat_y": 57.7708, + "long_x": 163.246685, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 163.24683678477123, + 57.77088043827533 + ] + }, + "id": 279 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Olyutorskiy", + "comment": null, + "name_alt": null, + "lat_y": 59.960807, + "long_x": 170.31265, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 170.31287682383373, + 59.96082184452533 + ] + }, + "id": 280 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Navarin", + "comment": null, + "name_alt": null, + "lat_y": 62.327239, + "long_x": 179.074225, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 179.07422936289623, + 62.32727692265033 + ] + }, + "id": 281 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Lopatka", + "comment": null, + "name_alt": null, + "lat_y": 71.907853, + "long_x": 150.066042, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 150.06592858164623, + 71.90778229374408 + ] + }, + "id": 282 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Ince", + "comment": null, + "name_alt": null, + "lat_y": 42.084312, + "long_x": 34.983358, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 34.98328698008373, + 42.08417389530658 + ] + }, + "id": 283 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Ras Fartak", + "comment": null, + "name_alt": null, + "lat_y": 15.677412, + "long_x": 52.229105, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 52.2389696999939, + 15.65795249845498 + ] + }, + "id": 284 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Ras Sharbatat", + "comment": null, + "name_alt": null, + "lat_y": 18.164534, + "long_x": 56.56827, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 56.558165806017215, + 18.166986171245085 + ] + }, + "id": 285 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Ra's al Had", + "comment": null, + "name_alt": null, + "lat_y": 22.530158, + "long_x": 59.849134, + "region": "Asia", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 59.7995168175437, + 22.518675327148298 + ] + }, + "id": 286 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Hachijjima", + "comment": null, + "name_alt": null, + "lat_y": 33.109796, + "long_x": 139.804903, + "region": "Asia", + "subregion": null, + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 139.80482018320873, + 33.10980866093158 + ] + }, + "id": 287 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Nordkapp", + "comment": null, + "name_alt": null, + "lat_y": 71.18337, + "long_x": 25.662398, + "region": "Europe", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 25.66067519711473, + 71.15450206702127 + ] + }, + "id": 288 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cabo de São Vicentete", + "comment": null, + "name_alt": null, + "lat_y": 37.038304, + "long_x": -8.969391, + "region": "Europe", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -8.969410773822517, + 37.03827545780658 + ] + }, + "id": 289 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cabo Fisterra", + "comment": null, + "name_alt": null, + "lat_y": 42.952418, + "long_x": -9.267837, + "region": "Europe", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -9.26996282865152, + 42.92873605781255 + ] + }, + "id": 290 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape San Blas", + "comment": null, + "name_alt": null, + "lat_y": 29.713967, + "long_x": -85.270961, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -85.27092444569752, + 29.713995672650327 + ] + }, + "id": 291 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Sable", + "comment": null, + "name_alt": null, + "lat_y": 43.469097, + "long_x": -65.610769, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -65.61082923085377, + 43.46900055546283 + ] + }, + "id": 292 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Bauld", + "comment": null, + "name_alt": null, + "lat_y": 51.568576, + "long_x": -55.430306, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -55.43028723866627, + 51.56848786015033 + ] + }, + "id": 293 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape Fear", + "comment": null, + "name_alt": null, + "lat_y": 33.867949, + "long_x": -77.990568, + "region": "North America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -77.99058997304127, + 33.86798737186908 + ] + }, + "id": 294 + }, + + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Miquelon", + "comment": null, + "name_alt": null, + "lat_y": 46.929526, + "long_x": -56.329884, + "region": "North America", + "subregion": null, + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -56.32988440663502, + 46.92938873905658 + ] + }, + "id": 296 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cabo Orange", + "comment": null, + "name_alt": null, + "lat_y": 4.125735, + "long_x": -51.242144, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -51.26287766987179, + 4.135614177285231 + ] + }, + "id": 298 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cabo de Santa Marta Grande", + "comment": null, + "name_alt": null, + "lat_y": -28.558078, + "long_x": -48.735526, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -48.80338037734664, + -28.57198267323537 + ] + }, + "id": 299 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Punta del Este", + "comment": null, + "name_alt": null, + "lat_y": -34.975503, + "long_x": -54.933154, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -54.94628769070382, + -34.96658679840526 + ] + }, + "id": 300 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cabo San Antonio", + "comment": null, + "name_alt": null, + "lat_y": -36.381052, + "long_x": -56.655377, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -56.716792100626165, + -36.40959917438929 + ] + }, + "id": 301 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cabo Corrientes", + "comment": null, + "name_alt": null, + "lat_y": -38.135985, + "long_x": -57.546212, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -57.56252349612641, + -38.066376942128464 + ] + }, + "id": 302 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Punta Rasa", + "comment": null, + "name_alt": null, + "lat_y": -40.834718, + "long_x": -62.282201, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -62.25911745789756, + -40.72626411656719 + ] + }, + "id": 303 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cabo Dos Bahías", + "comment": null, + "name_alt": null, + "lat_y": -44.9887, + "long_x": -65.615952, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -65.5438334451688, + -44.89439847091873 + ] + }, + "id": 304 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cabo Delgado", + "comment": null, + "name_alt": null, + "lat_y": -10.670103, + "long_x": 40.624309, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 40.62440026133373, + -10.670098565630923 + ] + }, + "id": 305 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Ponta da Barra", + "comment": null, + "name_alt": null, + "lat_y": -23.829888, + "long_x": 35.515696, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 35.51563561289623, + -23.830010675005923 + ] + }, + "id": 306 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Ponta São Sebastio", + "comment": null, + "name_alt": null, + "lat_y": -22.118899, + "long_x": 35.480417, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 35.48023522227123, + -22.118829034380923 + ] + }, + "id": 307 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Ras Cantin", + "comment": null, + "name_alt": null, + "lat_y": 32.581636, + "long_x": -9.273918, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -9.273915168353767, + 32.58161041874408 + ] + }, + "id": 308 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Ras Kasr", + "comment": null, + "name_alt": null, + "lat_y": 18.076817, + "long_x": 38.573746, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 38.58027735871919, + 18.075167704493374 + ] + }, + "id": 309 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Ponta de Jericoacoara", + "comment": null, + "name_alt": null, + "lat_y": -2.85044, + "long_x": -40.067208, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -39.991649927946355, + -2.851822991583529 + ] + }, + "id": 310 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cabo de São Roque", + "comment": null, + "name_alt": null, + "lat_y": -5.193476, + "long_x": -35.447654, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -35.50994900651512, + -5.156866121305913 + ] + }, + "id": 311 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Ponta da Baleia", + "comment": null, + "name_alt": null, + "lat_y": -17.710136, + "long_x": -39.157619, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -39.14557867836578, + -17.678753845220847 + ] + }, + "id": 312 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cabo de São Tomé", + "comment": null, + "name_alt": null, + "lat_y": -21.996382, + "long_x": -41.009692, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -40.98763990313761, + -21.971754611783773 + ] + }, + "id": 313 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cabo Frio", + "comment": null, + "name_alt": null, + "lat_y": -22.869501, + "long_x": -41.962188, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -41.89015627474056, + -22.759730815669258 + ] + }, + "id": 314 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cabo San Diego", + "comment": null, + "name_alt": null, + "lat_y": -54.6406, + "long_x": -65.21365, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -65.21361243397877, + -54.64067962031842 + ] + }, + "id": 315 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cabo Tres Puntas", + "comment": null, + "name_alt": null, + "lat_y": -47.237629, + "long_x": -65.774707, + "region": "South America", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -65.74439816328368, + -47.328778975372465 + ] + }, + "id": 316 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cap Saint André", + "comment": null, + "name_alt": null, + "lat_y": -16.174457, + "long_x": 44.467405, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 44.46729576914623, + -16.174493096880923 + ] + }, + "id": 317 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape St. Lucia", + "comment": null, + "name_alt": null, + "lat_y": -28.552694, + "long_x": 32.367221, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 32.36732018320873, + -28.552666925005923 + ] + }, + "id": 318 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "Cape St. Francis", + "comment": null, + "name_alt": null, + "lat_y": -34.171766, + "long_x": 24.817688, + "region": "Africa", + "subregion": null, + "featureclass": "cape" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 24.84143613032799, + -34.18861022316314 + ] + }, + "id": 319 + }, + { + "type": "Feature", + "properties": { + "scalerank": 5, + "name": "I. de Cozumel", + "comment": null, + "name_alt": null, + "lat_y": 20.444687, + "long_x": -86.880555, + "region": "North America", + "subregion": null, + "featureclass": "island" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -86.88060462147877, + 20.444708563275327 + ] + }, + "id": 323 + } + ] + } + )"; + +} // namespace glfw +} // namespace platform +} // namespace mbgl diff --git a/src/mbgl/style/expression/compound_expression.cpp b/src/mbgl/style/expression/compound_expression.cpp index cc1d58025b..6ca6eec850 100644 --- a/src/mbgl/style/expression/compound_expression.cpp +++ b/src/mbgl/style/expression/compound_expression.cpp @@ -368,6 +368,18 @@ const auto& lineProgressCompoundExpression() { return signature; } +const auto& accumulatedCompoundExpression() { + static auto signature = detail::makeSignature("accumulated", [](const EvaluationContext& params) -> Result<double> { + if (!params.accumulated) { + return EvaluationError { + "The 'accumulated' expression is unavailable in the current evaluation context." + }; + } + return *(params.accumulated); + }); + return signature; +} + const auto& hasContextCompoundExpression() { static auto signature = detail::makeSignature("has", [](const EvaluationContext& params, const std::string& key) -> Result<bool> { if (!params.feature) { @@ -870,6 +882,7 @@ MAPBOX_ETERNAL_CONSTEXPR const auto compoundExpressionRegistry = mapbox::eternal { "zoom", zoomCompoundExpression }, { "heatmap-density", heatmapDensityCompoundExpression }, { "line-progress", lineProgressCompoundExpression }, + { "accumulated", accumulatedCompoundExpression}, { "has", hasContextCompoundExpression }, { "has", hasObjectCompoundExpression }, { "get", getContextCompoundExpression }, diff --git a/src/mbgl/style/expression/expression.cpp b/src/mbgl/style/expression/expression.cpp index 1e5b1581d2..e826cf6ec0 100644 --- a/src/mbgl/style/expression/expression.cpp +++ b/src/mbgl/style/expression/expression.cpp @@ -5,13 +5,13 @@ namespace mbgl { namespace style { namespace expression { - + class GeoJSONFeature : public GeometryTileFeature { public: const Feature& feature; - - GeoJSONFeature(const Feature& feature_) : feature(feature_) {} - + + GeoJSONFeature( const Feature& feature_) : feature(feature_) {} + FeatureType getType() const override { return apply_visitor(ToFeatureType(), feature.geometry); } @@ -26,13 +26,18 @@ public: return optional<mbgl::Value>(); } }; - - + + EvaluationResult Expression::evaluate(optional<float> zoom, const Feature& feature, optional<double> colorRampParameter) const { GeoJSONFeature f(feature); return this->evaluate(EvaluationContext(zoom, &f, colorRampParameter)); } +EvaluationResult Expression::evaluate(const Feature& feature) const{ + GeoJSONFeature f(feature); + return this->evaluate(EvaluationContext(&f)); +} + } // namespace expression } // namespace style } // namespace mbgl diff --git a/src/mbgl/style/expression/parsing_context.cpp b/src/mbgl/style/expression/parsing_context.cpp index a7c04f563d..6ce3a9bfaa 100644 --- a/src/mbgl/style/expression/parsing_context.cpp +++ b/src/mbgl/style/expression/parsing_context.cpp @@ -73,7 +73,8 @@ bool isConstant(const Expression& expression) { return isFeatureConstant(expression) && isGlobalPropertyConstant(expression, std::array<std::string, 2>{{"zoom", "heatmap-density"}}) && - isGlobalPropertyConstant(expression, std::array<std::string, 2>{{"zoom", "line-progress"}}); + isGlobalPropertyConstant(expression, std::array<std::string, 2>{{"zoom", "line-progress"}}) && + isGlobalPropertyConstant(expression, std::array<std::string, 2>{{"zoom", "accumulated"}}); } using namespace mbgl::style::conversion; diff --git a/src/mbgl/style/sources/geojson_source_impl.cpp b/src/mbgl/style/sources/geojson_source_impl.cpp index 24ac1d7976..e1d3edbe08 100644 --- a/src/mbgl/style/sources/geojson_source_impl.cpp +++ b/src/mbgl/style/sources/geojson_source_impl.cpp @@ -1,21 +1,35 @@ +#include <mbgl/style/conversion_impl.hpp> +#include <mbgl/style/expression/compound_expression.hpp> +#include <mbgl/style/expression/dsl.hpp> +#include <mbgl/style/expression/expression.hpp> +#include <mbgl/style/expression/literal.hpp> +#include <mbgl/style/expression/parsing_context.hpp> +#include <mbgl/style/property_expression.hpp> #include <mbgl/style/sources/geojson_source_impl.hpp> -#include <mbgl/util/constants.hpp> #include <mbgl/tile/tile_id.hpp> +#include <mbgl/util/constants.hpp> #include <mbgl/util/string.hpp> +#include <rapidjson/document.h> +#include <rapidjson/error/en.h> #include <mapbox/geojsonvt.hpp> #include <supercluster.hpp> +#include <mbgl/style/conversion/json.hpp> +#include <mbgl/style/conversion/constant.hpp> +#include <mbgl/style/conversion/property_value.hpp> +#include <mbgl/style/expression/dsl.hpp> #include <cmath> +#include <functional> namespace mbgl { namespace style { class GeoJSONVTData : public GeoJSONData { public: - GeoJSONVTData(const GeoJSON& geoJSON, - const mapbox::geojsonvt::Options& options) - : impl(geoJSON, options) {} + GeoJSONVTData(const GeoJSON& geoJSON, const mapbox::geojsonvt::Options& options) + : impl(geoJSON, options) { + } mapbox::feature::feature_collection<int16_t> getTile(const CanonicalTileID& tileID) final { return impl.getTile(tileID.z, tileID.x, tileID.y).features; @@ -25,9 +39,8 @@ public: return {}; } - mapbox::feature::feature_collection<double> getLeaves(const std::uint32_t, - const std::uint32_t, - const std::uint32_t) final { + mapbox::feature::feature_collection<double> + getLeaves(const std::uint32_t, const std::uint32_t, const std::uint32_t) final { return {}; } @@ -43,7 +56,8 @@ class SuperclusterData : public GeoJSONData { public: SuperclusterData(const mapbox::feature::feature_collection<double>& features, const mapbox::supercluster::Options& options) - : impl(features, options) {} + : impl(features, options) { + } mapbox::feature::feature_collection<int16_t> getTile(const CanonicalTileID& tileID) final { return impl.getTile(tileID.z, tileID.x, tileID.y); @@ -54,8 +68,8 @@ public: } mapbox::feature::feature_collection<double> getLeaves(const std::uint32_t cluster_id, - const std::uint32_t limit, - const std::uint32_t offset) final { + const std::uint32_t limit, + const std::uint32_t offset) final { return impl.getLeaves(cluster_id, limit, offset); } @@ -68,22 +82,74 @@ private: }; GeoJSONSource::Impl::Impl(std::string id_, GeoJSONOptions options_) - : Source::Impl(SourceType::GeoJSON, std::move(id_)), - options(std::move(options_)) { + : Source::Impl(SourceType::GeoJSON, std::move(id_)), options(std::move(options_)) { +} + +std::unique_ptr<style::expression::Expression> +createExpression(const char* op, std::vector<std::unique_ptr<style::expression::Expression>> args) { + style::expression::ParsingContext ctx; + style::expression::ParseResult result = + style::expression::createCompoundExpression(op, std::move(args), ctx); + assert(result); + return std::move(*result); } GeoJSONSource::Impl::Impl(const Impl& other, const GeoJSON& geoJSON) - : Source::Impl(other), - options(other.options) { + : Source::Impl(other), options(other.options) { constexpr double scale = util::EXTENT / util::tileSize; - if (options.cluster - && geoJSON.is<mapbox::feature::feature_collection<double>>() - && !geoJSON.get<mapbox::feature::feature_collection<double>>().empty()) { + if (options.cluster && geoJSON.is<mapbox::feature::feature_collection<double>>() && + !geoJSON.get<mapbox::feature::feature_collection<double>>().empty()) { mapbox::supercluster::Options clusterOptions; clusterOptions.maxZoom = options.clusterMaxZoom; clusterOptions.extent = util::EXTENT; clusterOptions.radius = ::round(scale * options.clusterRadius); + // process here, taking the cluster propeties into consideration + + using namespace mbgl::style::expression::dsl; + using namespace mbgl; + using namespace mbgl::style; + + using JSValue = rapidjson::GenericValue<rapidjson::UTF8<>, rapidjson::CrtAllocator>; + + +// std::unordered_map<std::string, const char*> +// properties{{std::string("max"), expr1}}; + const char* expr1 = R"(["get", "scalerank"])"; + rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> document; + document.Parse<0>(expr1); + assert(!document.HasParseError()); + expression::ParsingContext ctx; +// optional<expression::TypeAnnotationOption> typeAnnotationOption; + const JSValue* expression = &document; + expression::ParseResult parsed = ctx.parseExpression(mbgl::style::conversion::Convertible(expression)); + auto mapExpression = PropertyExpression<double>(std::move(*parsed)); + + const char* expr2 = R"(["+",["accumulated"], ["get", "max"]])"; + rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> document2; + document2.Parse<0>(expr2); + assert(!document2.HasParseError()); + expression::ParsingContext ctx2; + // optional<expression::TypeAnnotationOption> typeAnnotationOption; + const JSValue* expression2 = &document2; + expression::ParseResult parsed2 = ctx.parseExpression(mbgl::style::conversion::Convertible(expression2)); + auto reduceExpression = PropertyExpression<double>(std::move(*parsed2)); + + +// auto mapExpression = PropertyExpression<double>(get("scalerank")); +// auto reduceExpression = PropertyExpression<double>(get("max")); + clusterOptions.map = [&](const mapbox::feature::property_map& properties) -> + mapbox::feature::property_map {mapbox::feature::property_map ret{}; + auto feature = mapbox::feature::feature<double>(); + feature.properties = properties; + ret["max"] = mapExpression.evaluate(feature); + return ret; + }; + clusterOptions.reduce = [&](mapbox::feature::property_map & toReturn, const mapbox::feature::property_map &toFill){ + auto feature = mapbox::feature::feature<double>(); + feature.properties = toFill; + toReturn["max"] = reduceExpression.evaluate( feature); + }; data = std::make_shared<SuperclusterData>( geoJSON.get<mapbox::feature::feature_collection<double>>(), clusterOptions); } else { |