diff options
| -rw-r--r-- | bin/style.js | 46 | ||||
| -rw-r--r-- | include/llmr/style/filter_expression.hpp | 2 | ||||
| -rw-r--r-- | src/map/vector_tile.cpp | 2 | ||||
| -rw-r--r-- | src/style/filter_expression.cpp | 14 |
4 files changed, 32 insertions, 32 deletions
diff --git a/bin/style.js b/bin/style.js index c292a26927..46f6f5b2bf 100644 --- a/bin/style.js +++ b/bin/style.js @@ -1736,7 +1736,7 @@ module.exports = { "id": "country_label", "source": "mapbox", "source-layer": "country_label", - "filter": { "$type": "point" }, + "filter": { "$type": "Point" }, "render": { "type": "text", "text-field": "{name_en}", @@ -1761,7 +1761,7 @@ module.exports = { "id": "marine_label_line_1", "source": "mapbox", "source-layer": "marine_label", - "filter": { "$type": "line", "labelrank": 1 }, + "filter": { "$type": "LineString", "labelrank": 1 }, "render": { "type": "text", "text-field": "{name_en}", @@ -1791,7 +1791,7 @@ module.exports = { "id": "marine_label_line_2", "source": "mapbox", "source-layer": "marine_label", - "filter": { "$type": "line", "labelrank": 2 }, + "filter": { "$type": "LineString", "labelrank": 2 }, "render": { "type": "text", "text-field": "{name_en}", @@ -1820,7 +1820,7 @@ module.exports = { "id": "marine_label_line_3", "source": "mapbox", "source-layer": "marine_label", - "filter": { "$type": "line", "labelrank": 3 }, + "filter": { "$type": "LineString", "labelrank": 3 }, "render": { "type": "text", "text-field": "{name_en}", @@ -1849,7 +1849,7 @@ module.exports = { "id": "marine_label_line_other", "source": "mapbox", "source-layer": "marine_label", - "filter": { "$type": "line", "labelrank": [4, 5, 6] }, + "filter": { "$type": "LineString", "labelrank": [4, 5, 6] }, "render": { "type": "text", "text-field": "{name_en}", @@ -1878,7 +1878,7 @@ module.exports = { "id": "marine_label_point_1", "source": "mapbox", "source-layer": "marine_label", - "filter": { "$type": "point", "labelrank": 1 }, + "filter": { "$type": "Point", "labelrank": 1 }, "render": { "type": "text", "text-field": "{name_en}", @@ -1909,7 +1909,7 @@ module.exports = { "id": "marine_label_point_2", "source": "mapbox", "source-layer": "marine_label", - "filter": { "$type": "point", "labelrank": 2 }, + "filter": { "$type": "Point", "labelrank": 2 }, "render": { "type": "text", "text-field": "{name_en}", @@ -1940,7 +1940,7 @@ module.exports = { "id": "marine_label_point_3", "source": "mapbox", "source-layer": "marine_label", - "filter": { "$type": "point", "labelrank": 3 }, + "filter": { "$type": "Point", "labelrank": 3 }, "render": { "type": "text", "text-field": "{name_en}", @@ -1971,7 +1971,7 @@ module.exports = { "id": "marine_label_point_other", "source": "mapbox", "source-layer": "marine_label", - "filter": { "$type": "point", "labelrank": [4, 5, 6] }, + "filter": { "$type": "Point", "labelrank": [4, 5, 6] }, "render": { "type": "text", "text-field": "{name_en}", @@ -2002,7 +2002,7 @@ module.exports = { "id": "state_label", "source": "mapbox", "source-layer": "state_label", - "filter": { "$type": "point" }, + "filter": { "$type": "Point" }, "render": { "type": "text", "text-field": "{name_en}", @@ -2033,7 +2033,7 @@ module.exports = { "id": "place_label_city", "source": "mapbox", "source-layer": "place_label", - "filter": { "type": "city", "$type": "point" }, + "filter": { "type": "city", "$type": "Point" }, "render": { "type": "text", "text-field": "{name_en}", @@ -2064,7 +2064,7 @@ module.exports = { "id": "place_label_town", "source": "mapbox", "source-layer": "place_label", - "filter": { "type": "town", "$type": "point" }, + "filter": { "type": "town", "$type": "Point" }, "render": { "type": "text", "text-field": "{name_en}", @@ -2095,7 +2095,7 @@ module.exports = { "id": "place_label_village", "source": "mapbox", "source-layer": "place_label", - "filter": { "type": "village", "$type": "point" }, + "filter": { "type": "village", "$type": "Point" }, "render": { "type": "text", "text-field": "{name_en}", @@ -2126,7 +2126,7 @@ module.exports = { "id": "place_label_other", "source": "mapbox", "source-layer": "place_label", - "filter": { "type": ["hamlet", "suburb", "neighbourhood"], "$type": "point" }, + "filter": { "type": ["hamlet", "suburb", "neighbourhood"], "$type": "Point" }, "render": { "type": "text", "text-field": "{name_en}", @@ -2156,7 +2156,7 @@ module.exports = { "id": "road_label_1", "source": "mapbox", "source-layer": "road_label", - "filter": { "class": ["motorway", "main"], "$type": "line" }, + "filter": { "class": ["motorway", "main"], "$type": "LineString" }, "render": { "type": "text", "text-field": "{name_en}", @@ -2182,7 +2182,7 @@ module.exports = { "id": "road_label_2", "source": "mapbox", "source-layer": "road_label", - "filter": { "class": ["street", "street_limited"], "$type": "line" }, + "filter": { "class": ["street", "street_limited"], "$type": "LineString" }, "render": { "type": "text", "text-field": "{name_en}", @@ -2208,7 +2208,7 @@ module.exports = { "id": "road_label_3", "source": "mapbox", "source-layer": "road_label", - "filter": { "class": ["service", "driveway", "path"], "$type": "line" }, + "filter": { "class": ["service", "driveway", "path"], "$type": "LineString" }, "render": { "type": "text", "text-field": "{name_en}", @@ -2234,7 +2234,7 @@ module.exports = { "id": "contour_label", "source": "mapbox", "source-layer": "contour", - "filter": { "index": [5, 10], "$type": "line" }, + "filter": { "index": [5, 10], "$type": "LineString" }, "render": { "type": "text", "text-path": "curve", @@ -2259,7 +2259,7 @@ module.exports = { "id": "water_label", "source": "mapbox", "source-layer": "water_label", - "filter": { "$type": "point" }, + "filter": { "$type": "Point" }, "render": { "type": "text", "text-field": "{name_en}", @@ -2280,7 +2280,7 @@ module.exports = { "id": "waterway_label", "source": "mapbox", "source-layer": "waterway_label", - "filter": { "$type": "line" }, + "filter": { "$type": "LineString" }, "render": { "type": "text", "text-field": "{name_en}", @@ -2313,7 +2313,7 @@ module.exports = { "id": "poi_label_1-2", "source": "mapbox", "source-layer": "poi_label", - "filter": { "scalerank": [1, 2], "$type": "point" }, + "filter": { "scalerank": [1, 2], "$type": "Point" }, "render": { "type": "text", "text-field": "{name_en}", @@ -2362,7 +2362,7 @@ module.exports = { "id": "poi_label_3", "source": "mapbox", "source-layer": "poi_label", - "filter": { "scalerank": 3, "$type": "point" }, + "filter": { "scalerank": 3, "$type": "Point" }, "render": { "type": "text", "text-field": "{name_en}", @@ -2419,7 +2419,7 @@ module.exports = { "id": "poi_label_4", "source": "mapbox", "source-layer": "poi_label", - "filter": { "scalerank": 4, "$type": "point" }, + "filter": { "scalerank": 4, "$type": "Point" }, "render": { "type": "text", "text-field": "{name_en}", diff --git a/include/llmr/style/filter_expression.hpp b/include/llmr/style/filter_expression.hpp index 696aa04aeb..5c7a400d80 100644 --- a/include/llmr/style/filter_expression.hpp +++ b/include/llmr/style/filter_expression.hpp @@ -85,7 +85,7 @@ public: enum class GeometryType : uint8_t { Any, Point, - Line, + LineString, Polygon }; diff --git a/src/map/vector_tile.cpp b/src/map/vector_tile.cpp index fb42726681..a32db7fb35 100644 --- a/src/map/vector_tile.cpp +++ b/src/map/vector_tile.cpp @@ -272,7 +272,7 @@ void FilteredVectorTileLayer::iterator::operator++() { } else if (feature_pbf.tag == 3) { // geometry type switch (FeatureType(feature_pbf.varint())) { case FeatureType::Point: extractor.setType(FilterExpression::GeometryType::Point); break; - case FeatureType::LineString: extractor.setType(FilterExpression::GeometryType::Line); break; + case FeatureType::LineString: extractor.setType(FilterExpression::GeometryType::LineString); break; case FeatureType::Polygon: extractor.setType(FilterExpression::GeometryType::Polygon); break; default: break; } diff --git a/src/style/filter_expression.cpp b/src/style/filter_expression.cpp index 1a85b742e5..58483accac 100644 --- a/src/style/filter_expression.cpp +++ b/src/style/filter_expression.cpp @@ -175,10 +175,10 @@ std::ostream& operator <<(std::ostream &s, FilterExpression::Operator op) { std::ostream& operator <<(std::ostream &s, FilterExpression::GeometryType type) { switch (type) { - case FilterExpression::GeometryType::Point: s << "point"; break; - case FilterExpression::GeometryType::Line: s << "line"; break; - case FilterExpression::GeometryType::Polygon: s << "polygon"; break; - case FilterExpression::GeometryType::Any: s << "any"; break; + case FilterExpression::GeometryType::Point: s << "Point"; break; + case FilterExpression::GeometryType::LineString: s << "LineString"; break; + case FilterExpression::GeometryType::Polygon: s << "Polygon"; break; + case FilterExpression::GeometryType::Any: s << "<Any>"; break; } return s; } @@ -265,9 +265,9 @@ void FilterExpression::setGeometryType(GeometryType g) { } FilterExpression::GeometryType parseGeometryType(const std::string &geometry) { - if (geometry == "point") return FilterExpression::GeometryType::Point; - if (geometry == "line") return FilterExpression::GeometryType::Line; - if (geometry == "polygon") return FilterExpression::GeometryType::Polygon; + if (geometry == "Point") return FilterExpression::GeometryType::Point; + if (geometry == "LineString") return FilterExpression::GeometryType::LineString; + if (geometry == "Polygon") return FilterExpression::GeometryType::Polygon; return FilterExpression::GeometryType::Any; } |