-
Notifications
You must be signed in to change notification settings - Fork 1.3k
[core] Enable circle-sort-key property #15875
Conversation
218a134
to
31f9616
Compare
01e7367
to
190dafc
Compare
c640bab
to
9cf1846
Compare
ae7ea2b
to
1f266b4
Compare
@ahk the approach looks nice! 👍 I'll be able to give more thorough review after the rebase and once CI is passing (pls tell if I could help with that). |
31f9616
to
74b964b
Compare
Hey @pozdnyakov, rebase was no problem but I've spent a bit of time (unsuccessfully) trying to figure out why my PR doesn't pass CI. Anything stand out to you? I know the code formatting check is also failing but really the troubling thing is the segfault in the test runner on for example |
@@ -6,9 +6,6 @@ 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"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also remove these lines from the Darwin version of this script:
mapbox-gl-native/platform/darwin/scripts/generate-style-code.js
Lines 18 to 19 in 1f266b4
// FIXME: https://github.com/mapbox/mapbox-gl-native/issues/15008 | |
delete spec.layout_circle["circle-sort-key"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the future, these properties should be deleted in scripts/style-spec.js instead of both scripts/generate-style-code.js and platform/darwin/scripts/generate-style-code.js. This is the reason for the layout of indirection in scripts/style-spec.js.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now that most of platform/darwin/ has been deleted in favor of the sources in the mapbox/mapbox-gl-native-ios repository, mapbox/mapbox-gl-native-ios#272 will take care of deleting the remnants of this override.
58f2e01
to
6759618
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🚢
9e61ce5
to
90daf79
Compare
90daf79
to
145a630
Compare
145a630
to
af8a02a
Compare
af8a02a
to
cd717de
Compare
Adds support for
circle-sort-key
property, consistent withsymbol-sort-key
.Sorts drawing order by sort key both within-tile and cross-tile.
Fixes: #15008