diff options
Diffstat (limited to 'src/mbgl/style/property_fallback.cpp')
| -rw-r--r-- | src/mbgl/style/property_fallback.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/mbgl/style/property_fallback.cpp b/src/mbgl/style/property_fallback.cpp index 5fc3ce1f04..2827fd6149 100644 --- a/src/mbgl/style/property_fallback.cpp +++ b/src/mbgl/style/property_fallback.cpp @@ -9,14 +9,12 @@ const std::map<PropertyKey, PropertyValue> PropertyFallbackValue::properties = { { PropertyKey::FillOpacity, defaultStyleProperties<FillProperties>().opacity }, { PropertyKey::FillColor, defaultStyleProperties<FillProperties>().fill_color }, // no FillOutlineColor on purpose. - { PropertyKey::FillTranslateX, defaultStyleProperties<FillProperties>().translate[0] }, - { PropertyKey::FillTranslateY, defaultStyleProperties<FillProperties>().translate[1] }, + { PropertyKey::FillTranslate, defaultStyleProperties<FillProperties>().translate }, { PropertyKey::FillTranslateAnchor, defaultStyleProperties<FillProperties>().translateAnchor }, { PropertyKey::LineOpacity, defaultStyleProperties<LineProperties>().opacity }, { PropertyKey::LineColor, defaultStyleProperties<LineProperties>().color }, - { PropertyKey::LineTranslateX, defaultStyleProperties<LineProperties>().translate[0] }, - { PropertyKey::LineTranslateY, defaultStyleProperties<LineProperties>().translate[1] }, + { PropertyKey::LineTranslate, defaultStyleProperties<LineProperties>().translate }, { PropertyKey::LineTranslateAnchor, defaultStyleProperties<LineProperties>().translateAnchor }, { PropertyKey::LineWidth, defaultStyleProperties<LineProperties>().width }, { PropertyKey::LineGapWidth, defaultStyleProperties<LineProperties>().gap_width }, @@ -29,8 +27,7 @@ const std::map<PropertyKey, PropertyValue> PropertyFallbackValue::properties = { { PropertyKey::IconHaloColor, defaultStyleProperties<SymbolProperties>().icon.halo_color }, { PropertyKey::IconHaloWidth, defaultStyleProperties<SymbolProperties>().icon.halo_width }, { PropertyKey::IconHaloBlur, defaultStyleProperties<SymbolProperties>().icon.halo_blur }, - { PropertyKey::IconTranslateX, defaultStyleProperties<SymbolProperties>().icon.translate[0] }, - { PropertyKey::IconTranslateY, defaultStyleProperties<SymbolProperties>().icon.translate[1] }, + { PropertyKey::IconTranslate, defaultStyleProperties<SymbolProperties>().icon.translate }, { PropertyKey::IconTranslateAnchor, defaultStyleProperties<SymbolProperties>().icon.translate_anchor }, { PropertyKey::TextOpacity, defaultStyleProperties<SymbolProperties>().text.opacity }, @@ -39,8 +36,7 @@ const std::map<PropertyKey, PropertyValue> PropertyFallbackValue::properties = { { PropertyKey::TextHaloColor, defaultStyleProperties<SymbolProperties>().text.halo_color }, { PropertyKey::TextHaloWidth, defaultStyleProperties<SymbolProperties>().text.halo_width }, { PropertyKey::TextHaloBlur, defaultStyleProperties<SymbolProperties>().text.halo_blur }, - { PropertyKey::TextTranslateX, defaultStyleProperties<SymbolProperties>().text.translate[0] }, - { PropertyKey::TextTranslateY, defaultStyleProperties<SymbolProperties>().text.translate[1] }, + { PropertyKey::TextTranslate, defaultStyleProperties<SymbolProperties>().text.translate }, { PropertyKey::TextTranslateAnchor, defaultStyleProperties<SymbolProperties>().text.translate_anchor }, { PropertyKey::RasterOpacity, defaultStyleProperties<RasterProperties>().opacity }, @@ -72,8 +68,7 @@ const std::map<PropertyKey, PropertyValue> PropertyFallbackValue::properties = { { PropertyKey::IconRotate, defaultLayoutProperties<StyleBucketSymbol>().icon.rotate }, { PropertyKey::IconPadding, defaultLayoutProperties<StyleBucketSymbol>().icon.padding }, { PropertyKey::IconKeepUpright, defaultLayoutProperties<StyleBucketSymbol>().icon.keep_upright }, - { PropertyKey::IconOffsetX, defaultLayoutProperties<StyleBucketSymbol>().icon.offset[0] }, - { PropertyKey::IconOffsetY, defaultLayoutProperties<StyleBucketSymbol>().icon.offset[1] }, + { PropertyKey::IconOffset, defaultLayoutProperties<StyleBucketSymbol>().icon.offset }, { PropertyKey::TextRotationAlignment, defaultLayoutProperties<StyleBucketSymbol>().text.rotation_alignment }, { PropertyKey::TextField, defaultLayoutProperties<StyleBucketSymbol>().text.field }, @@ -89,8 +84,7 @@ const std::map<PropertyKey, PropertyValue> PropertyFallbackValue::properties = { { PropertyKey::TextPadding, defaultLayoutProperties<StyleBucketSymbol>().text.padding }, { PropertyKey::TextKeepUpright, defaultLayoutProperties<StyleBucketSymbol>().text.keep_upright }, { PropertyKey::TextTransform, defaultLayoutProperties<StyleBucketSymbol>().text.transform }, - { PropertyKey::TextOffsetX, defaultLayoutProperties<StyleBucketSymbol>().text.offset[0] }, - { PropertyKey::TextOffsetY, defaultLayoutProperties<StyleBucketSymbol>().text.offset[1] }, + { PropertyKey::TextOffset, defaultLayoutProperties<StyleBucketSymbol>().text.offset }, { PropertyKey::TextAllowOverlap, defaultLayoutProperties<StyleBucketSymbol>().text.allow_overlap }, { PropertyKey::TextIgnorePlacement, defaultLayoutProperties<StyleBucketSymbol>().text.ignore_placement }, { PropertyKey::TextOptional, defaultLayoutProperties<StyleBucketSymbol>().text.optional }, |