diff options
| author | Lauren Budorick <lauren@mapbox.com> | 2018-04-16 17:38:53 -0700 |
|---|---|---|
| committer | Lauren Budorick <lauren@mapbox.com> | 2018-04-16 17:38:53 -0700 |
| commit | cfd97e5ceaa7b88d591bdb730ae1e9b70dcaa5f5 (patch) | |
| tree | 781f03674488d8a5cc1e8388d5b85c9a0766bb0c /platform/darwin/src/MGLStyleLayer.mm.ejs | |
| parent | 8b10bb38c0a7d6e0a1225e185acde5ec8a604bdc (diff) | |
| download | qtlocation-mapboxgl-cfd97e5ceaa7b88d591bdb730ae1e9b70dcaa5f5.tar.gz | |
Bump gl-js pin: ignore line-gradient properties + shaders, use new expression style-spec taxonomyupstream/expression-spec
Diffstat (limited to 'platform/darwin/src/MGLStyleLayer.mm.ejs')
| -rw-r--r-- | platform/darwin/src/MGLStyleLayer.mm.ejs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/darwin/src/MGLStyleLayer.mm.ejs b/platform/darwin/src/MGLStyleLayer.mm.ejs index ac7676a1cc..f9915bf408 100644 --- a/platform/darwin/src/MGLStyleLayer.mm.ejs +++ b/platform/darwin/src/MGLStyleLayer.mm.ejs @@ -121,7 +121,7 @@ namespace mbgl { - (void)set<%- camelize(property.name) %>:(NSExpression *)<%- objCName(property) %> { MGLAssertStyleLayerIsValid(); -<% if (property["property-function"]) { -%> +<% if (isDataDriven(property)) { -%> auto mbglValue = MGLStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue<mbgl::style::DataDrivenPropertyValue<<%- valueTransformerArguments(property)[0] %>>>(<%- objCName(property) %>); <% } else { -%> auto mbglValue = MGLStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue<mbgl::style::PropertyValue<<%- valueTransformerArguments(property)[0] %>>>(<%- objCName(property) %>); @@ -159,7 +159,7 @@ namespace mbgl { <% if (property.name === 'heatmap-color') { -%> auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue<mbgl::style::HeatmapColorPropertyValue>(heatmapColor); -<% } else if (property["property-function"]) { -%> +<% } else if (isDataDriven(property)) { -%> auto mbglValue = MGLStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue<mbgl::style::DataDrivenPropertyValue<<%- valueTransformerArguments(property)[0] %>>>(<%- objCName(property) %>); <% } else { -%> auto mbglValue = MGLStyleValueTransformer<<%- valueTransformerArguments(property).join(', ') %>>().toPropertyValue<mbgl::style::PropertyValue<<%- valueTransformerArguments(property)[0] %>>>(<%- objCName(property) %>); |