From 17db5210bf60171ee7dbc15de77fdea53b8f0d4d Mon Sep 17 00:00:00 2001
From: Fredrik Karlsson <bjorn.fredrik.karlsson@gmail.com>
Date: Mon, 21 Nov 2016 14:32:05 +0100
Subject: [ios, macos] rename style spec properties

---
 platform/darwin/src/MGLFillStyleLayer.mm | 40 ++++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'platform/darwin/src/MGLFillStyleLayer.mm')

diff --git a/platform/darwin/src/MGLFillStyleLayer.mm b/platform/darwin/src/MGLFillStyleLayer.mm
index d670fd31e9..6f9c68f21f 100644
--- a/platform/darwin/src/MGLFillStyleLayer.mm
+++ b/platform/darwin/src/MGLFillStyleLayer.mm
@@ -97,16 +97,6 @@ namespace mbgl {
     return MGLStyleValueTransformer<bool, NSNumber *>().toStyleValue(propertyValue);
 }
 
-- (void)setFillOpacity:(MGLStyleValue<NSNumber *> *)fillOpacity {
-    auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue(fillOpacity);
-    _rawLayer->setFillOpacity(mbglValue);
-}
-
-- (MGLStyleValue<NSNumber *> *)fillOpacity {
-    auto propertyValue = _rawLayer->getFillOpacity() ?: _rawLayer->getDefaultFillOpacity();
-    return MGLStyleValueTransformer<float, NSNumber *>().toStyleValue(propertyValue);
-}
-
 - (void)setFillColor:(MGLStyleValue<MGLColor *> *)fillColor {
     auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue(fillColor);
     _rawLayer->setFillColor(mbglValue);
@@ -117,6 +107,16 @@ namespace mbgl {
     return MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toStyleValue(propertyValue);
 }
 
+- (void)setFillOpacity:(MGLStyleValue<NSNumber *> *)fillOpacity {
+    auto mbglValue = MGLStyleValueTransformer<float, NSNumber *>().toPropertyValue(fillOpacity);
+    _rawLayer->setFillOpacity(mbglValue);
+}
+
+- (MGLStyleValue<NSNumber *> *)fillOpacity {
+    auto propertyValue = _rawLayer->getFillOpacity() ?: _rawLayer->getDefaultFillOpacity();
+    return MGLStyleValueTransformer<float, NSNumber *>().toStyleValue(propertyValue);
+}
+
 - (void)setFillOutlineColor:(MGLStyleValue<MGLColor *> *)fillOutlineColor {
     auto mbglValue = MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toPropertyValue(fillOutlineColor);
     _rawLayer->setFillOutlineColor(mbglValue);
@@ -127,6 +127,16 @@ namespace mbgl {
     return MGLStyleValueTransformer<mbgl::Color, MGLColor *>().toStyleValue(propertyValue);
 }
 
+- (void)setFillPattern:(MGLStyleValue<NSString *> *)fillPattern {
+    auto mbglValue = MGLStyleValueTransformer<std::string, NSString *>().toPropertyValue(fillPattern);
+    _rawLayer->setFillPattern(mbglValue);
+}
+
+- (MGLStyleValue<NSString *> *)fillPattern {
+    auto propertyValue = _rawLayer->getFillPattern() ?: _rawLayer->getDefaultFillPattern();
+    return MGLStyleValueTransformer<std::string, NSString *>().toStyleValue(propertyValue);
+}
+
 - (void)setFillTranslate:(MGLStyleValue<NSValue *> *)fillTranslate {
     auto mbglValue = MGLStyleValueTransformer<std::array<float, 2>, NSValue *>().toPropertyValue(fillTranslate);
     _rawLayer->setFillTranslate(mbglValue);
@@ -147,15 +157,5 @@ namespace mbgl {
     return MGLStyleValueTransformer<mbgl::style::TranslateAnchorType, NSValue *, mbgl::style::TranslateAnchorType, MGLFillTranslateAnchor>().toEnumStyleValue(propertyValue);
 }
 
-- (void)setFillPattern:(MGLStyleValue<NSString *> *)fillPattern {
-    auto mbglValue = MGLStyleValueTransformer<std::string, NSString *>().toPropertyValue(fillPattern);
-    _rawLayer->setFillPattern(mbglValue);
-}
-
-- (MGLStyleValue<NSString *> *)fillPattern {
-    auto propertyValue = _rawLayer->getFillPattern() ?: _rawLayer->getDefaultFillPattern();
-    return MGLStyleValueTransformer<std::string, NSString *>().toStyleValue(propertyValue);
-}
-
 
 @end
-- 
cgit v1.2.1