diff options
m--------- | mapbox-gl-js | 0 | ||||
-rwxr-xr-x | platform/android/scripts/generate-style-code.js | 5 | ||||
-rwxr-xr-x | platform/darwin/scripts/generate-style-code.js | 5 | ||||
-rw-r--r-- | platform/node/test/ignores.json | 3 | ||||
-rwxr-xr-x | scripts/generate-style-code.js | 5 |
5 files changed, 18 insertions, 0 deletions
diff --git a/mapbox-gl-js b/mapbox-gl-js -Subproject 8e77fc87ad0e477df7d01dc0534ddacc23358cd +Subproject 3abd5d518bade8d83eb609598b861432a83f869 diff --git a/platform/android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js index d7ab7e8827..8c34113de1 100755 --- a/platform/android/scripts/generate-style-code.js +++ b/platform/android/scripts/generate-style-code.js @@ -6,6 +6,11 @@ const ejs = require('ejs'); const spec = require('../../../scripts/style-spec'); const _ = require('lodash'); +// FIXME: https://github.com/mapbox/mapbox-gl-native/issues/15008 +delete spec.layout_circle["circle-sort-key"] +delete spec.layout_line["line-sort-key"] +delete spec.layout_fill["fill-sort-key"] + require('../../../scripts/style-code'); // Specification parsing // diff --git a/platform/darwin/scripts/generate-style-code.js b/platform/darwin/scripts/generate-style-code.js index 20ad86382c..37454cba54 100755 --- a/platform/darwin/scripts/generate-style-code.js +++ b/platform/darwin/scripts/generate-style-code.js @@ -14,6 +14,11 @@ const suffix = 'StyleLayer'; let spec = _.merge(require('../../../scripts/style-spec'), require('./style-spec-overrides-v8.json')); +// FIXME: https://github.com/mapbox/mapbox-gl-native/issues/15008 +delete spec.layout_circle["circle-sort-key"] +delete spec.layout_line["line-sort-key"] +delete spec.layout_fill["fill-sort-key"] + // Rename properties and keep `original` for use with setters and getters _.forOwn(cocoaConventions, function (properties, kind) { _.forOwn(properties, function (newName, oldName) { diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json index a97ee70325..4e4f537a23 100644 --- a/platform/node/test/ignores.json +++ b/platform/node/test/ignores.json @@ -98,6 +98,9 @@ "render-tests/remove-feature-state/vector-source": "https://github.com/mapbox/mapbox-gl-native/issues/12413", "render-tests/regressions/mapbox-gl-js#8026": "skip - js specific", "render-tests/fill-extrusion-geometry/linestring": "https://github.com/mapbox/mapbox-gl-native/pull/14240", + "render-tests/circle-sort-key/literal": "https://github.com/mapbox/mapbox-gl-native/issues/15008", + "render-tests/fill-sort-key/literal": "https://github.com/mapbox/mapbox-gl-native/issues/15008", + "render-tests/line-sort-key/literal": "https://github.com/mapbox/mapbox-gl-native/issues/15008", "query-tests/remove-feature-state/default": "https://github.com/mapbox/mapbox-gl-native/issues/12413", "query-tests/fill-extrusion/base-in": "https://github.com/mapbox/mapbox-gl-native/issues/13139", "query-tests/fill-extrusion/box-in": "https://github.com/mapbox/mapbox-gl-native/issues/13139", diff --git a/scripts/generate-style-code.js b/scripts/generate-style-code.js index aed676c990..1f26e6fd86 100755 --- a/scripts/generate-style-code.js +++ b/scripts/generate-style-code.js @@ -6,6 +6,11 @@ const ejs = require('ejs'); const spec = require('./style-spec'); const colorParser = require('csscolorparser'); +// FIXME: https://github.com/mapbox/mapbox-gl-native/issues/15008 +delete spec.layout_circle["circle-sort-key"] +delete spec.layout_line["line-sort-key"] +delete spec.layout_fill["fill-sort-key"] + require('./style-code'); function parseCSSColor(str) { |