Simplified enumeration expressions

mapbox · Apr 24, 2018 · a5328a5 · a5328a5
1 parent d59b750
commit a5328a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Examples/Swift/CustomViewController.swift b/Examples/Swift/CustomViewController.swift
@@ -140,8 +140,8 @@ class CustomViewController: UIViewController, MGLMapViewDelegate, AVSpeechSynthe
             // Style the line
             line.lineColor = NSExpression(forConstantValue: UIColor(red:0.00, green:0.45, blue:0.74, alpha:0.9))
             line.lineWidth = NSExpression(forConstantValue: 5)
-            line.lineCap = NSExpression(forConstantValue: NSValue(mglLineCap: .round))
-            line.lineJoin = NSExpression(forConstantValue: NSValue(mglLineJoin: .round))
+            line.lineCap = NSExpression(forConstantValue: "round")
+            line.lineJoin = NSExpression(forConstantValue: "round")
 
             // Add source and layer
             style.addSource(lineSource)

diff --git a/MapboxNavigation/NavigationMapView.swift b/MapboxNavigation/NavigationMapView.swift
@@ -1033,8 +1033,8 @@ open class NavigationMapView: MGLMapView, UIGestureRecognizerDelegate {
             symbol.textHaloWidth = NSExpression(forConstantValue: 1)
             symbol.textHaloColor = NSExpression(forConstantValue: UIColor.white)
             symbol.textOpacity = NSExpression(forConstantValue: 0.75)
-            symbol.textAnchor = NSExpression(forConstantValue: NSValue(mglTextAnchor: .bottomLeft))
-            symbol.textJustification = NSExpression(forConstantValue: NSValue(mglTextJustification: .left))
+            symbol.textAnchor = NSExpression(forConstantValue: "bottom-left")
+            symbol.textJustification = NSExpression(forConstantValue: "left")
 
             let circle = MGLCircleStyleLayer(identifier: instructionCircle, source: sourceShape)
             circle.circleRadius = NSExpression(forConstantValue: 5)