diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-08-29 12:00:08 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-06 14:29:22 -0700 |
commit | fe2a26225f3746381b36ad8b6c6a3ce7727bf655 (patch) | |
tree | 62507ffd6a28654a377469d35e21719ff7a12fdc /platform/darwin/src/MGLSymbolStyleLayer.mm | |
parent | 3a48c60813b18c092c8d8d75c80a318bdd8859bb (diff) | |
download | qtlocation-mapboxgl-fe2a26225f3746381b36ad8b6c6a3ce7727bf655.tar.gz |
[core, ios, android, qt] Observe style layer mutations rather than requiring SDKs to use Map::update
This paves the way for updates to filter and layout properties to trigger a source reload, without each SDK having to participate in the implementation.
Diffstat (limited to 'platform/darwin/src/MGLSymbolStyleLayer.mm')
-rw-r--r-- | platform/darwin/src/MGLSymbolStyleLayer.mm | 50 |
1 files changed, 1 insertions, 49 deletions
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 { |