Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[core] Support line within polygon in within expression #16220

Merged
merged 8 commits into from
Feb 21, 2020
Merged

[core] Support line within polygon in within expression #16220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d9f10e5
[core] Add support for "line within polygon"
zmiao Feb 17, 2020
b710939
[core] Move geometry within algorithm to util
zmiao Feb 18, 2020
29c3dc2
[core] Update unti tests. Remove unnecessary debugging code
zmiao Feb 18, 2020
a4f1c71
Bump gl-js version
zmiao Feb 19, 2020
83d653b
[core] Remove unnecessary includes, fix comments
zmiao Feb 19, 2020
30ce0bd
[test-runner] Add new metrics
zmiao Feb 19, 2020
15cd48e
[core] Add bounding box overlapping check before line within polygon …
zmiao Feb 20, 2020
436136f
Update changelog
zmiao Feb 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@

The `in expression` enables checking whether a Number/String/Boolean type item is in a String/Array and returns a boolean value.

- [core] Add support for using `within expression` with features having `'LineString'` geometry type. ([#16220](https://github.com/mapbox/mapbox-gl-native/pull/16220))

`within expression` now supports features with geometry types: `'Point'` or `'LineString'`.

### 🐞 Bug fixes

- [core] Don't provide multiple responses with the same data for 304 replies ([#16200](https://github.com/mapbox/mapbox-gl-native/pull/16200))
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,8 @@ add_library(
${PROJECT_SOURCE_DIR}/src/mbgl/util/font_stack.cpp
${PROJECT_SOURCE_DIR}/src/mbgl/util/geo.cpp
${PROJECT_SOURCE_DIR}/src/mbgl/util/geojson_impl.cpp
${PROJECT_SOURCE_DIR}/src/mbgl/util/geometry_within.cpp
${PROJECT_SOURCE_DIR}/src/mbgl/util/geometry_within.hpp
${PROJECT_SOURCE_DIR}/src/mbgl/util/grid_index.cpp
${PROJECT_SOURCE_DIR}/src/mbgl/util/grid_index.hpp
${PROJECT_SOURCE_DIR}/src/mbgl/util/hash.hpp
Expand Down
22 changes: 8 additions & 14 deletions include/mbgl/style/expression/within.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
#pragma once

#include <mbgl/style/conversion.hpp>
#include <mbgl/style/expression/expression.hpp>
#include <mbgl/style/expression/parsing_context.hpp>
#include <mbgl/util/geojson.hpp>

#include <memory>
#include <mbgl/util/geometry_within.hpp>
#include <mbgl/util/optional.hpp>

namespace mbgl {
namespace style {
namespace expression {

class Within final : public Expression {
public:
explicit Within(GeoJSON geojson);
explicit Within(GeoJSON geojson, Feature::geometry_type geometries_, WithinBBox polygonBBox_);

~Within() override;

Expand All @@ -23,21 +21,17 @@ class Within final : public Expression {

void eachChild(const std::function<void(const Expression&)>&) const override {}

bool operator==(const Expression& e) const override {
if (e.getKind() == Kind::Within) {
auto rhs = static_cast<const Within*>(&e);
return geoJSONSource == rhs->geoJSONSource;
}
return false;
}
bool operator==(const Expression& e) const override;

std::vector<optional<Value>> possibleOutputs() const override { return {{true}, {false}}; }
std::vector<optional<Value>> possibleOutputs() const override;

mbgl::Value serialize() const override;
std::string getOperator() const override { return "within"; }
std::string getOperator() const override;

private:
GeoJSON geoJSONSource;
Feature::geometry_type geometries;
WithinBBox polygonBBox;
};

} // namespace expression
Expand Down
2 changes: 1 addition & 1 deletion mapbox-gl-js
Open in desktop
Submodule mapbox-gl-js updated 9 files
+8 −6 src/geo/lng_lat_bounds.js
+11 −8 test/ignores.json
+1 −1 test/integration/expression-tests/within/invalid-geojson/test.json
+44 −0 test/integration/expression-tests/within/line-within-polygon/test.json
+32 −0 test/integration/expression-tests/within/non-supported/test.json
+1 −13 test/integration/expression-tests/within/point-within-polygon/test.json
+ − test/integration/render-tests/within/paint-line/expected.png
+199 −0 test/integration/render-tests/within/paint-line/style.json
+27 −0 test/unit/geo/lng_lat_bounds.test.js
35 changes: 35 additions & 0 deletions metrics/android-render-test-runner/render-tests/within/paint-line/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"network": [
[
"probeNetwork - default - end",
0,
0
],
[
"probeNetwork - default - start",
0,
0
]
],
"gfx": [
[
"probeGFX - default - end",
5,
4,
13,
1,
[
49152,
49152
],
[
286,
286
],
[
528,
528
]
]
]
}
35 changes: 35 additions & 0 deletions metrics/ios-render-test-runner/render-tests/within/paint-line/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"network": [
[
"probeNetwork - default - end",
0,
0
],
[
"probeNetwork - default - start",
0,
0
]
],
"gfx": [
[
"probeGFX - default - end",
5,
4,
13,
1,
[
49152,
49152
],
[
286,
286
],
[
528,
528
]
]
]
}
35 changes: 35 additions & 0 deletions metrics/linux-clang8-release/render-tests/within/paint-line/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"network": [
[
"probeNetwork - default - end",
0,
0
],
[
"probeNetwork - default - start",
0,
0
]
],
"gfx": [
[
"probeGFX - default - end",
5,
4,
13,
1,
[
49152,
49152
],
[
286,
286
],
[
528,
528
]
]
]
}
35 changes: 35 additions & 0 deletions metrics/linux-gcc8-release/render-tests/within/paint-line/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"network": [
[
"probeNetwork - default - end",
0,
0
],
[
"probeNetwork - default - start",
0,
0
]
],
"gfx": [
[
"probeGFX - default - end",
5,
4,
13,
1,
[
49152,
49152
],
[
286,
286
],
[
528,
528
]
]
]
}
Loading