summaryrefslogtreecommitdiff
path: root/platform/darwin
diff options
context:
space:
mode:
Diffstat (limited to 'platform/darwin')
-rw-r--r--platform/darwin/scripts/generate-style-code.js1
-rw-r--r--platform/darwin/src/MGLBackgroundStyleLayer.mm5
-rw-r--r--platform/darwin/src/MGLBaseStyleLayer.mm9
-rw-r--r--platform/darwin/src/MGLBaseStyleLayer_Private.h9
-rw-r--r--platform/darwin/src/MGLCircleStyleLayer.mm9
-rw-r--r--platform/darwin/src/MGLFillStyleLayer.mm9
-rw-r--r--platform/darwin/src/MGLLineStyleLayer.mm16
-rw-r--r--platform/darwin/src/MGLRasterStyleLayer.mm9
-rw-r--r--platform/darwin/src/MGLStyleLayer.mm.ejs2
-rw-r--r--platform/darwin/src/MGLSymbolStyleLayer.mm50
10 files changed, 7 insertions, 112 deletions
diff --git a/platform/darwin/scripts/generate-style-code.js b/platform/darwin/scripts/generate-style-code.js
index 29040d3c54..4a875f784a 100644
--- a/platform/darwin/scripts/generate-style-code.js
+++ b/platform/darwin/scripts/generate-style-code.js
@@ -219,7 +219,6 @@ global.setterImplementation = function(property, layerType) {
break;
default: throw new Error(`unknown type for ${property.name}`)
}
- implementation += "\n [self update];"
return implementation;
}
diff --git a/platform/darwin/src/MGLBackgroundStyleLayer.mm b/platform/darwin/src/MGLBackgroundStyleLayer.mm
index 32e2e7847e..adfa31e4ed 100644
--- a/platform/darwin/src/MGLBackgroundStyleLayer.mm
+++ b/platform/darwin/src/MGLBackgroundStyleLayer.mm
@@ -1,7 +1,7 @@
// This file is generated.
// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
-#import "MGLBaseStyleLayer_Private.h"
+#import "NSPredicate+MGLAdditions.h"
#import "MGLStyleLayer_Private.h"
#import "MGLStyleAttributeValue.h"
#import "MGLBackgroundStyleLayer.h"
@@ -33,7 +33,6 @@
- (void)setBackgroundColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)backgroundColor {
self.layer->setBackgroundColor(backgroundColor.mbgl_colorPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)backgroundColor {
@@ -42,7 +41,6 @@
- (void)setBackgroundPattern:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)backgroundPattern {
self.layer->setBackgroundPattern(backgroundPattern.mbgl_stringPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)backgroundPattern {
@@ -51,7 +49,6 @@
- (void)setBackgroundOpacity:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)backgroundOpacity {
self.layer->setBackgroundOpacity(backgroundOpacity.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)backgroundOpacity {
diff --git a/platform/darwin/src/MGLBaseStyleLayer.mm b/platform/darwin/src/MGLBaseStyleLayer.mm
index d9d57d661a..a747467739 100644
--- a/platform/darwin/src/MGLBaseStyleLayer.mm
+++ b/platform/darwin/src/MGLBaseStyleLayer.mm
@@ -1,6 +1,5 @@
#import "MGLBaseStyleLayer.h"
-#import "MGLBaseStyleLayer_Private.h"
#import "MGLStyleLayer_Private.h"
#import "MGLMapView_Private.h"
@@ -15,14 +14,6 @@
@synthesize mapView;
@synthesize layer;
-- (void)update
-{
- // A style layer's map view can be nil when first created at runtime
- // before being added to a map style. In these cases, just no-op since
- // the addition of the layer will trigger a visual refresh.
- if (self.mapView) self.mapView.mbglMap->update(mbgl::Update::RecalculateStyle | mbgl::Update::Classes);
-}
-
- (void)setVisible:(BOOL)visible
{
mbgl::style::VisibilityType v = visible
diff --git a/platform/darwin/src/MGLBaseStyleLayer_Private.h b/platform/darwin/src/MGLBaseStyleLayer_Private.h
deleted file mode 100644
index 0cbb076b35..0000000000
--- a/platform/darwin/src/MGLBaseStyleLayer_Private.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#import "MGLBaseStyleLayer.h"
-
-#import "NSPredicate+MGLAdditions.h"
-
-@interface MGLBaseStyleLayer (MGLBaseStyleLayer_Private)
-
-- (void)update;
-
-@end
diff --git a/platform/darwin/src/MGLCircleStyleLayer.mm b/platform/darwin/src/MGLCircleStyleLayer.mm
index 6c038318cc..a906407486 100644
--- a/platform/darwin/src/MGLCircleStyleLayer.mm
+++ b/platform/darwin/src/MGLCircleStyleLayer.mm
@@ -1,7 +1,7 @@
// This file is generated.
// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
-#import "MGLBaseStyleLayer_Private.h"
+#import "NSPredicate+MGLAdditions.h"
#import "MGLStyleLayer_Private.h"
#import "MGLStyleAttributeValue.h"
#import "MGLCircleStyleLayer.h"
@@ -43,7 +43,6 @@
- (void)setCircleRadius:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleRadius {
self.layer->setCircleRadius(circleRadius.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)circleRadius {
@@ -52,7 +51,6 @@
- (void)setCircleColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleColor {
self.layer->setCircleColor(circleColor.mbgl_colorPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)circleColor {
@@ -61,7 +59,6 @@
- (void)setCircleBlur:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleBlur {
self.layer->setCircleBlur(circleBlur.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)circleBlur {
@@ -70,7 +67,6 @@
- (void)setCircleOpacity:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleOpacity {
self.layer->setCircleOpacity(circleOpacity.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)circleOpacity {
@@ -79,7 +75,6 @@
- (void)setCircleTranslate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleTranslate {
self.layer->setCircleTranslate(circleTranslate.mbgl_offsetPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)circleTranslate {
@@ -88,7 +83,6 @@
- (void)setCircleTranslateAnchor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circleTranslateAnchor {
MGLSetEnumProperty(circleTranslateAnchor, CircleTranslateAnchor, TranslateAnchorType, MGLCircleStyleLayerCircleTranslateAnchor);
- [self update];
}
- (id <MGLStyleAttributeValue>)circleTranslateAnchor {
@@ -97,7 +91,6 @@
- (void)setCirclePitchScale:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)circlePitchScale {
MGLSetEnumProperty(circlePitchScale, CirclePitchScale, CirclePitchScaleType, MGLCircleStyleLayerCirclePitchScale);
- [self update];
}
- (id <MGLStyleAttributeValue>)circlePitchScale {
diff --git a/platform/darwin/src/MGLFillStyleLayer.mm b/platform/darwin/src/MGLFillStyleLayer.mm
index c54ddba428..6867c50f16 100644
--- a/platform/darwin/src/MGLFillStyleLayer.mm
+++ b/platform/darwin/src/MGLFillStyleLayer.mm
@@ -1,7 +1,7 @@
// This file is generated.
// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
-#import "MGLBaseStyleLayer_Private.h"
+#import "NSPredicate+MGLAdditions.h"
#import "MGLStyleLayer_Private.h"
#import "MGLStyleAttributeValue.h"
#import "MGLFillStyleLayer.h"
@@ -43,7 +43,6 @@
- (void)setFillAntialias:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)fillAntialias {
self.layer->setFillAntialias(fillAntialias.mbgl_boolPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)fillAntialias {
@@ -52,7 +51,6 @@
- (void)setFillOpacity:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)fillOpacity {
self.layer->setFillOpacity(fillOpacity.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)fillOpacity {
@@ -61,7 +59,6 @@
- (void)setFillColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)fillColor {
self.layer->setFillColor(fillColor.mbgl_colorPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)fillColor {
@@ -70,7 +67,6 @@
- (void)setFillOutlineColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)fillOutlineColor {
self.layer->setFillOutlineColor(fillOutlineColor.mbgl_colorPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)fillOutlineColor {
@@ -79,7 +75,6 @@
- (void)setFillTranslate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)fillTranslate {
self.layer->setFillTranslate(fillTranslate.mbgl_offsetPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)fillTranslate {
@@ -88,7 +83,6 @@
- (void)setFillTranslateAnchor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)fillTranslateAnchor {
MGLSetEnumProperty(fillTranslateAnchor, FillTranslateAnchor, TranslateAnchorType, MGLFillStyleLayerFillTranslateAnchor);
- [self update];
}
- (id <MGLStyleAttributeValue>)fillTranslateAnchor {
@@ -97,7 +91,6 @@
- (void)setFillPattern:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)fillPattern {
self.layer->setFillPattern(fillPattern.mbgl_stringPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)fillPattern {
diff --git a/platform/darwin/src/MGLLineStyleLayer.mm b/platform/darwin/src/MGLLineStyleLayer.mm
index ce9ad75f87..8c5af877fe 100644
--- a/platform/darwin/src/MGLLineStyleLayer.mm
+++ b/platform/darwin/src/MGLLineStyleLayer.mm
@@ -1,7 +1,7 @@
// This file is generated.
// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
-#import "MGLBaseStyleLayer_Private.h"
+#import "NSPredicate+MGLAdditions.h"
#import "MGLStyleLayer_Private.h"
#import "MGLStyleAttributeValue.h"
#import "MGLLineStyleLayer.h"
@@ -43,7 +43,6 @@
- (void)setLineCap:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineCap {
MGLSetEnumProperty(lineCap, LineCap, LineCapType, MGLLineStyleLayerLineCap);
- [self update];
}
- (id <MGLStyleAttributeValue>)lineCap {
@@ -52,7 +51,6 @@
- (void)setLineJoin:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineJoin {
MGLSetEnumProperty(lineJoin, LineJoin, LineJoinType, MGLLineStyleLayerLineJoin);
- [self update];
}
- (id <MGLStyleAttributeValue>)lineJoin {
@@ -61,7 +59,6 @@
- (void)setLineMiterLimit:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineMiterLimit {
self.layer->setLineMiterLimit(lineMiterLimit.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)lineMiterLimit {
@@ -70,7 +67,6 @@
- (void)setLineRoundLimit:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineRoundLimit {
self.layer->setLineRoundLimit(lineRoundLimit.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)lineRoundLimit {
@@ -81,7 +77,6 @@
- (void)setLineOpacity:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineOpacity {
self.layer->setLineOpacity(lineOpacity.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)lineOpacity {
@@ -90,7 +85,6 @@
- (void)setLineColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineColor {
self.layer->setLineColor(lineColor.mbgl_colorPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)lineColor {
@@ -99,7 +93,6 @@
- (void)setLineTranslate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineTranslate {
self.layer->setLineTranslate(lineTranslate.mbgl_offsetPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)lineTranslate {
@@ -108,7 +101,6 @@
- (void)setLineTranslateAnchor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineTranslateAnchor {
MGLSetEnumProperty(lineTranslateAnchor, LineTranslateAnchor, TranslateAnchorType, MGLLineStyleLayerLineTranslateAnchor);
- [self update];
}
- (id <MGLStyleAttributeValue>)lineTranslateAnchor {
@@ -117,7 +109,6 @@
- (void)setLineWidth:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineWidth {
self.layer->setLineWidth(lineWidth.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)lineWidth {
@@ -126,7 +117,6 @@
- (void)setLineGapWidth:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineGapWidth {
self.layer->setLineGapWidth(lineGapWidth.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)lineGapWidth {
@@ -135,7 +125,6 @@
- (void)setLineOffset:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineOffset {
self.layer->setLineOffset(lineOffset.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)lineOffset {
@@ -144,7 +133,6 @@
- (void)setLineBlur:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineBlur {
self.layer->setLineBlur(lineBlur.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)lineBlur {
@@ -153,7 +141,6 @@
- (void)setLineDasharray:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)lineDasharray {
self.layer->setLineDasharray(lineDasharray.mbgl_numberArrayPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)lineDasharray {
@@ -162,7 +149,6 @@
- (void)setLinePattern:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)linePattern {
self.layer->setLinePattern(linePattern.mbgl_stringPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)linePattern {
diff --git a/platform/darwin/src/MGLRasterStyleLayer.mm b/platform/darwin/src/MGLRasterStyleLayer.mm
index 37368c6577..dc70dfbde7 100644
--- a/platform/darwin/src/MGLRasterStyleLayer.mm
+++ b/platform/darwin/src/MGLRasterStyleLayer.mm
@@ -1,7 +1,7 @@
// This file is generated.
// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
-#import "MGLBaseStyleLayer_Private.h"
+#import "NSPredicate+MGLAdditions.h"
#import "MGLStyleLayer_Private.h"
#import "MGLStyleAttributeValue.h"
#import "MGLRasterStyleLayer.h"
@@ -33,7 +33,6 @@
- (void)setRasterOpacity:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)rasterOpacity {
self.layer->setRasterOpacity(rasterOpacity.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)rasterOpacity {
@@ -42,7 +41,6 @@
- (void)setRasterHueRotate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)rasterHueRotate {
self.layer->setRasterHueRotate(rasterHueRotate.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)rasterHueRotate {
@@ -51,7 +49,6 @@
- (void)setRasterBrightnessMin:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)rasterBrightnessMin {
self.layer->setRasterBrightnessMin(rasterBrightnessMin.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)rasterBrightnessMin {
@@ -60,7 +57,6 @@
- (void)setRasterBrightnessMax:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)rasterBrightnessMax {
self.layer->setRasterBrightnessMax(rasterBrightnessMax.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)rasterBrightnessMax {
@@ -69,7 +65,6 @@
- (void)setRasterSaturation:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)rasterSaturation {
self.layer->setRasterSaturation(rasterSaturation.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)rasterSaturation {
@@ -78,7 +73,6 @@
- (void)setRasterContrast:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)rasterContrast {
self.layer->setRasterContrast(rasterContrast.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)rasterContrast {
@@ -87,7 +81,6 @@
- (void)setRasterFadeDuration:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)rasterFadeDuration {
self.layer->setRasterFadeDuration(rasterFadeDuration.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)rasterFadeDuration {
diff --git a/platform/darwin/src/MGLStyleLayer.mm.ejs b/platform/darwin/src/MGLStyleLayer.mm.ejs
index 4e59c3c6cb..4615aeeb9b 100644
--- a/platform/darwin/src/MGLStyleLayer.mm.ejs
+++ b/platform/darwin/src/MGLStyleLayer.mm.ejs
@@ -6,7 +6,7 @@
// This file is generated.
// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
-#import "MGLBaseStyleLayer_Private.h"
+#import "NSPredicate+MGLAdditions.h"
#import "MGLStyleLayer_Private.h"
#import "MGLStyleAttributeValue.h"
#import "MGL<%- camelize(type) %>StyleLayer.h"
diff --git a/platform/darwin/src/MGLSymbolStyleLayer.mm b/platform/darwin/src/MGLSymbolStyleLayer.mm
index b0553ea425..1fb3a0a587 100644
--- a/platform/darwin/src/MGLSymbolStyleLayer.mm
+++ b/platform/darwin/src/MGLSymbolStyleLayer.mm
@@ -1,7 +1,7 @@
// This file is generated.
// Edit platform/darwin/scripts/generate-style-code.js, then run `make style-code-darwin`.
-#import "MGLBaseStyleLayer_Private.h"
+#import "NSPredicate+MGLAdditions.h"
#import "MGLStyleLayer_Private.h"
#import "MGLStyleAttributeValue.h"
#import "MGLSymbolStyleLayer.h"
@@ -43,7 +43,6 @@
- (void)setSymbolPlacement:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)symbolPlacement {
MGLSetEnumProperty(symbolPlacement, SymbolPlacement, SymbolPlacementType, MGLSymbolStyleLayerSymbolPlacement);
- [self update];
}
- (id <MGLStyleAttributeValue>)symbolPlacement {
@@ -52,7 +51,6 @@
- (void)setSymbolSpacing:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)symbolSpacing {
self.layer->setSymbolSpacing(symbolSpacing.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)symbolSpacing {
@@ -61,7 +59,6 @@
- (void)setSymbolAvoidEdges:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)symbolAvoidEdges {
self.layer->setSymbolAvoidEdges(symbolAvoidEdges.mbgl_boolPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)symbolAvoidEdges {
@@ -70,7 +67,6 @@
- (void)setIconAllowOverlap:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconAllowOverlap {
self.layer->setIconAllowOverlap(iconAllowOverlap.mbgl_boolPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconAllowOverlap {
@@ -79,7 +75,6 @@
- (void)setIconIgnorePlacement:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconIgnorePlacement {
self.layer->setIconIgnorePlacement(iconIgnorePlacement.mbgl_boolPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconIgnorePlacement {
@@ -88,7 +83,6 @@
- (void)setIconOptional:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconOptional {
self.layer->setIconOptional(iconOptional.mbgl_boolPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconOptional {
@@ -97,7 +91,6 @@
- (void)setIconRotationAlignment:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconRotationAlignment {
MGLSetEnumProperty(iconRotationAlignment, IconRotationAlignment, AlignmentType, MGLSymbolStyleLayerIconRotationAlignment);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconRotationAlignment {
@@ -106,7 +99,6 @@
- (void)setIconSize:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconSize {
self.layer->setIconSize(iconSize.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconSize {
@@ -115,7 +107,6 @@
- (void)setIconTextFit:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconTextFit {
MGLSetEnumProperty(iconTextFit, IconTextFit, IconTextFitType, MGLSymbolStyleLayerIconTextFit);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconTextFit {
@@ -124,7 +115,6 @@
- (void)setIconTextFitPadding:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconTextFitPadding {
self.layer->setIconTextFitPadding(iconTextFitPadding.mbgl_paddingPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconTextFitPadding {
@@ -133,7 +123,6 @@
- (void)setIconImage:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconImage {
self.layer->setIconImage(iconImage.mbgl_stringPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconImage {
@@ -142,7 +131,6 @@
- (void)setIconRotate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconRotate {
self.layer->setIconRotate(iconRotate.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconRotate {
@@ -151,7 +139,6 @@
- (void)setIconPadding:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconPadding {
self.layer->setIconPadding(iconPadding.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconPadding {
@@ -160,7 +147,6 @@
- (void)setIconKeepUpright:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconKeepUpright {
self.layer->setIconKeepUpright(iconKeepUpright.mbgl_boolPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconKeepUpright {
@@ -169,7 +155,6 @@
- (void)setIconOffset:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconOffset {
self.layer->setIconOffset(iconOffset.mbgl_offsetPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconOffset {
@@ -178,7 +163,6 @@
- (void)setTextPitchAlignment:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textPitchAlignment {
MGLSetEnumProperty(textPitchAlignment, TextPitchAlignment, AlignmentType, MGLSymbolStyleLayerTextPitchAlignment);
- [self update];
}
- (id <MGLStyleAttributeValue>)textPitchAlignment {
@@ -187,7 +171,6 @@
- (void)setTextRotationAlignment:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textRotationAlignment {
MGLSetEnumProperty(textRotationAlignment, TextRotationAlignment, AlignmentType, MGLSymbolStyleLayerTextRotationAlignment);
- [self update];
}
- (id <MGLStyleAttributeValue>)textRotationAlignment {
@@ -196,7 +179,6 @@
- (void)setTextField:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textField {
self.layer->setTextField(textField.mbgl_stringPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textField {
@@ -205,7 +187,6 @@
- (void)setTextFont:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textFont {
self.layer->setTextFont(textFont.mbgl_stringArrayPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textFont {
@@ -214,7 +195,6 @@
- (void)setTextSize:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textSize {
self.layer->setTextSize(textSize.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textSize {
@@ -223,7 +203,6 @@
- (void)setTextMaxWidth:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textMaxWidth {
self.layer->setTextMaxWidth(textMaxWidth.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textMaxWidth {
@@ -232,7 +211,6 @@
- (void)setTextLineHeight:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textLineHeight {
self.layer->setTextLineHeight(textLineHeight.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textLineHeight {
@@ -241,7 +219,6 @@
- (void)setTextLetterSpacing:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textLetterSpacing {
self.layer->setTextLetterSpacing(textLetterSpacing.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textLetterSpacing {
@@ -250,7 +227,6 @@
- (void)setTextJustify:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textJustify {
MGLSetEnumProperty(textJustify, TextJustify, TextJustifyType, MGLSymbolStyleLayerTextJustify);
- [self update];
}
- (id <MGLStyleAttributeValue>)textJustify {
@@ -259,7 +235,6 @@
- (void)setTextAnchor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textAnchor {
MGLSetEnumProperty(textAnchor, TextAnchor, TextAnchorType, MGLSymbolStyleLayerTextAnchor);
- [self update];
}
- (id <MGLStyleAttributeValue>)textAnchor {
@@ -268,7 +243,6 @@
- (void)setTextMaxAngle:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textMaxAngle {
self.layer->setTextMaxAngle(textMaxAngle.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textMaxAngle {
@@ -277,7 +251,6 @@
- (void)setTextRotate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textRotate {
self.layer->setTextRotate(textRotate.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textRotate {
@@ -286,7 +259,6 @@
- (void)setTextPadding:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textPadding {
self.layer->setTextPadding(textPadding.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textPadding {
@@ -295,7 +267,6 @@
- (void)setTextKeepUpright:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textKeepUpright {
self.layer->setTextKeepUpright(textKeepUpright.mbgl_boolPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textKeepUpright {
@@ -304,7 +275,6 @@
- (void)setTextTransform:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textTransform {
MGLSetEnumProperty(textTransform, TextTransform, TextTransformType, MGLSymbolStyleLayerTextTransform);
- [self update];
}
- (id <MGLStyleAttributeValue>)textTransform {
@@ -313,7 +283,6 @@
- (void)setTextOffset:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textOffset {
self.layer->setTextOffset(textOffset.mbgl_offsetPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textOffset {
@@ -322,7 +291,6 @@
- (void)setTextAllowOverlap:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textAllowOverlap {
self.layer->setTextAllowOverlap(textAllowOverlap.mbgl_boolPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textAllowOverlap {
@@ -331,7 +299,6 @@
- (void)setTextIgnorePlacement:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textIgnorePlacement {
self.layer->setTextIgnorePlacement(textIgnorePlacement.mbgl_boolPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textIgnorePlacement {
@@ -340,7 +307,6 @@
- (void)setTextOptional:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textOptional {
self.layer->setTextOptional(textOptional.mbgl_boolPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textOptional {
@@ -351,7 +317,6 @@
- (void)setIconOpacity:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconOpacity {
self.layer->setIconOpacity(iconOpacity.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconOpacity {
@@ -360,7 +325,6 @@
- (void)setIconColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconColor {
self.layer->setIconColor(iconColor.mbgl_colorPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconColor {
@@ -369,7 +333,6 @@
- (void)setIconHaloColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconHaloColor {
self.layer->setIconHaloColor(iconHaloColor.mbgl_colorPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconHaloColor {
@@ -378,7 +341,6 @@
- (void)setIconHaloWidth:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconHaloWidth {
self.layer->setIconHaloWidth(iconHaloWidth.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconHaloWidth {
@@ -387,7 +349,6 @@
- (void)setIconHaloBlur:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconHaloBlur {
self.layer->setIconHaloBlur(iconHaloBlur.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconHaloBlur {
@@ -396,7 +357,6 @@
- (void)setIconTranslate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconTranslate {
self.layer->setIconTranslate(iconTranslate.mbgl_offsetPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconTranslate {
@@ -405,7 +365,6 @@
- (void)setIconTranslateAnchor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)iconTranslateAnchor {
MGLSetEnumProperty(iconTranslateAnchor, IconTranslateAnchor, TranslateAnchorType, MGLSymbolStyleLayerIconTranslateAnchor);
- [self update];
}
- (id <MGLStyleAttributeValue>)iconTranslateAnchor {
@@ -414,7 +373,6 @@
- (void)setTextOpacity:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textOpacity {
self.layer->setTextOpacity(textOpacity.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textOpacity {
@@ -423,7 +381,6 @@
- (void)setTextColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textColor {
self.layer->setTextColor(textColor.mbgl_colorPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textColor {
@@ -432,7 +389,6 @@
- (void)setTextHaloColor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textHaloColor {
self.layer->setTextHaloColor(textHaloColor.mbgl_colorPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textHaloColor {
@@ -441,7 +397,6 @@
- (void)setTextHaloWidth:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textHaloWidth {
self.layer->setTextHaloWidth(textHaloWidth.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textHaloWidth {
@@ -450,7 +405,6 @@
- (void)setTextHaloBlur:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textHaloBlur {
self.layer->setTextHaloBlur(textHaloBlur.mbgl_floatPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textHaloBlur {
@@ -459,7 +413,6 @@
- (void)setTextTranslate:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textTranslate {
self.layer->setTextTranslate(textTranslate.mbgl_offsetPropertyValue);
- [self update];
}
- (id <MGLStyleAttributeValue>)textTranslate {
@@ -468,7 +421,6 @@
- (void)setTextTranslateAnchor:(id <MGLStyleAttributeValue, MGLStyleAttributeValue_Private>)textTranslateAnchor {
MGLSetEnumProperty(textTranslateAnchor, TextTranslateAnchor, TranslateAnchorType, MGLSymbolStyleLayerTextTranslateAnchor);
- [self update];
}
- (id <MGLStyleAttributeValue>)textTranslateAnchor {
View Lorry Controller Status