diff options
| author | Anand Thakker <github@anandthakker.net> | 2017-11-06 23:08:59 -0500 |
|---|---|---|
| committer | Anand Thakker <github@anandthakker.net> | 2017-11-07 07:43:34 -0500 |
| commit | 77405b25b0e636a11b3fe73fd80face8fe5d1f5f (patch) | |
| tree | 054faf094000f57e00774e4e545263db516e90e9 | |
| parent | 1147387f843548947e5e495b915fd1a7460bb3fa (diff) | |
| download | qtlocation-mapboxgl-77405b25b0e636a11b3fe73fd80face8fe5d1f5f.tar.gz | |
Catch up with gl-js
- Disallow duplicate stops
- Ignore the no-token-replacement-for-expressions test
| m--------- | mapbox-gl-js | 0 | ||||
| -rw-r--r-- | platform/node/test/ignores.json | 3 | ||||
| -rw-r--r-- | src/mbgl/style/expression/interpolate.cpp | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/mapbox-gl-js b/mapbox-gl-js -Subproject bb0e8749598fe6b69c85db70c24fa39f0b1e0c6 +Subproject d8ad175f5e721bce705c6c0681047edaceb4bb4 diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json index 77bf2f5cc8..dd9679cde4 100644 --- a/platform/node/test/ignores.json +++ b/platform/node/test/ignores.json @@ -8,6 +8,8 @@ "query-tests/regressions/mapbox-gl-js#3534": "https://github.com/mapbox/mapbox-gl-native/issues/8193", "query-tests/regressions/mapbox-gl-js#4417": "https://github.com/mapbox/mapbox-gl-native/issues/8007", "query-tests/regressions/mapbox-gl-js#5554": "https://github.com/mapbox/mapbox-gl-native/pull/10103", + "query-tests/symbol/panned-after-insert": "https://github.com/mapbox/mapbox-gl-native/pull/10103", + "query-tests/symbol/rotated-after-insert": "https://github.com/mapbox/mapbox-gl-native/pull/10103", "query-tests/symbol/rotated-inside": "https://github.com/mapbox/mapbox-gl-native/pull/10103", "query-tests/symbol-features-in/pitched-screen": "https://github.com/mapbox/mapbox-gl-native/issues/6817", "query-tests/symbol-features-in/tilted-inside": "https://github.com/mapbox/mapbox-gl-native/issues/5056", @@ -67,6 +69,7 @@ "render-tests/regressions/mapbox-gl-js#3682": "https://github.com/mapbox/mapbox-gl-js/issues/3682", "render-tests/regressions/mapbox-gl-js#4647": "https://github.com/mapbox/mapbox-gl-native/pull/10103", "render-tests/regressions/mapbox-gl-js#5370": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9439", + "render-tests/regressions/mapbox-gl-js#5599": "https://github.com/mapbox/mapbox-gl-native/issues/10399", "render-tests/regressions/mapbox-gl-native#7357": "https://github.com/mapbox/mapbox-gl-native/issues/7357", "render-tests/runtime-styling/image-add-sdf": "https://github.com/mapbox/mapbox-gl-native/issues/9847", "render-tests/runtime-styling/paint-property-fill-flat-to-extrude": "https://github.com/mapbox/mapbox-gl-native/issues/6745", diff --git a/src/mbgl/style/expression/interpolate.cpp b/src/mbgl/style/expression/interpolate.cpp index c94e3ff64e..020aba9dce 100644 --- a/src/mbgl/style/expression/interpolate.cpp +++ b/src/mbgl/style/expression/interpolate.cpp @@ -133,7 +133,7 @@ ParseResult parseInterpolate(const Convertible& value, ParsingContext& ctx) { return ParseResult(); } - if (*label < previous) { + if (*label <= previous) { ctx.error( R"(Input/output pairs for "interpolate" expressions must be arranged with input values in strictly ascending order.)", i |