This repository has been archived by the owner on Jun 21, 2023. It is now read-only.
Restore runtime styling code generation #179
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1ec5
commented
Feb 25, 2020
| var spec = module.exports = require('../vendor/mapbox-gl-native/mapbox-gl-js/src/style-spec/reference/v8'); | ||
|
|
||
| // FIXME: https://github.com/mapbox/mapbox-gl-native/issues/15008 | ||
| delete spec.layout_circle["circle-sort-key"]; |
There was a problem hiding this comment.
Ideally, gl-native would also centralize style specification overrides in scripts/style-spec.js so that this repository could simply require the file from that submodule instead of maintaining a separate copy.
Awesome. |
nishant-karajgikar
approved these changes
Feb 26, 2020
Updated path to style spec reference following spinoff from gl-native repository. Centralized overrides for not-yet-implemented layout properties. Removed overrides that have already been removed for mbgl in gl-native.
This reverts commit 73295e9d80a2a79869e6c0e38eae62fd358dd476.
1ec5
force-pushed
the
1ec5-style-code
branch
from
b99c887
to
e403a06
Compare
Merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed the
darwin-style-codemake rule, which synchronizes the iOS and macOS map SDKs’ headers and implementation with the latest style specification.mapbox/mapbox-gl-native#15177 suppressed three unimplemented properties from the style specification:
circle-sort-key,line-sort-key,fill-sort-key. However, it did so in three different places, one per platform. mapbox/mapbox-gl-native#15839 and mapbox/mapbox-gl-native#15875 removed only the override that affects code generation in mbgl, but not the corresponding overrides for Android and iOS/macOS. mapbox/mapbox-gl-native#10937 created scripts/style-spec.js as a central place for these overrides, so this PR moves the overrides back there.This PR also removes the overrides for
line-sort-keyandfill-sort-key, which were implemented in mapbox/mapbox-gl-native#15839. Now that the make rule works again, running it adds corresponding properties to the MGLFillStyleLayer and MGLLineStyleLayer classes.Finally, the “Nitpick Darwin code generation” build step has been reenabled. It fails whenever the style specification changes in a way that would require us to rerun
make darwin-style-code.Depends on #178. Before merging, change the base from 1ec5-macos to master and rebase onto master.
/cc @mapbox/maps-ios @mapbox/gl-core