diff options
Diffstat (limited to 'platform')
3 files changed, 3 insertions, 2 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'); diff --git a/platform/darwin/scripts/generate-style-code.js b/platform/darwin/scripts/generate-style-code.js index 84ee7ac263..a5f87f2d74 100644 --- a/platform/darwin/scripts/generate-style-code.js +++ b/platform/darwin/scripts/generate-style-code.js @@ -11,7 +11,7 @@ const cocoaConventions = require('./style-spec-cocoa-conventions-v8.json'); const prefix = 'MGL'; const suffix = 'StyleLayer'; -let spec = _.merge(require('../../../mapbox-gl-js/src/style-spec/reference/v8'), require('./style-spec-overrides-v8.json')); +let spec = _.merge(require('../../../scripts/style-spec'), require('./style-spec-overrides-v8.json')); // Temporarily ignore layer types defined in the style specification but not yet supported in mbgl. delete spec.layer.type.values.heatmap; |