diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2018-01-10 16:04:06 -0800 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2018-01-24 08:35:31 -0800 |
commit | 9d1fa508a34f013573294794028f4ffa5a5f5f3d (patch) | |
tree | eb6ac03a51c5206040a2b46919c2c1433a292775 /platform/android | |
parent | 1a2c316f951ad4d19b0eb89eba2559801deaa385 (diff) | |
download | qtlocation-mapboxgl-9d1fa508a34f013573294794028f4ffa5a5f5f3d.tar.gz |
[build] Add temporary modifications to style spec + shaders
This ensures that the generated code matches what is checked in. Remove those temporary modifications once we add the features to master.
Diffstat (limited to 'platform/android')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java | 1 | ||||
-rw-r--r-- | platform/android/scripts/generate-style-code.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java index 1b9106afaf..6e644c5591 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java @@ -3592,6 +3592,7 @@ public class PropertyFactory { return new LayoutPropertyValue<>("text-optional", value); } + /** * If true, icons will display without their corresponding text when the text collides with other symbols and the icon does not. * diff --git a/platform/android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js index abc0796bc1..6c1b050b59 100644 --- a/platform/android/scripts/generate-style-code.js +++ b/platform/android/scripts/generate-style-code.js @@ -2,7 +2,7 @@ const fs = require('fs'); const ejs = require('ejs'); -const spec = require('../../../mapbox-gl-js/src/style-spec/reference/v8'); +const spec = require('../../../scripts/style-spec'); const _ = require('lodash'); require('../../../scripts/style-code'); |