From fdfe846cad0ccce52825b3f641d0a155adb9687b Mon Sep 17 00:00:00 2001
From: Jerrad Thramer <jerrad.thramer@mapbox.com>
Date: Fri, 8 Dec 2017 12:09:45 -0700
Subject: [PATCH] Oh, I see what that does now.

---
 MapboxDirections/Extensions/String.swift | 3 +++
 MapboxDirections/MBRouteOptions.swift    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/MapboxDirections/Extensions/String.swift b/MapboxDirections/Extensions/String.swift
index 452da2110..724bf2ac4 100644
--- a/MapboxDirections/Extensions/String.swift
+++ b/MapboxDirections/Extensions/String.swift
@@ -2,4 +2,7 @@ import Foundation
 
 extension String {
     var isNotEmpty: Bool { return !isEmpty }
+    var nonEmptyString: String? {
+        return isNotEmpty ? self : nil
+    }
 }
diff --git a/MapboxDirections/MBRouteOptions.swift b/MapboxDirections/MBRouteOptions.swift
index b0d2de5b0..7e1a993e5 100644
--- a/MapboxDirections/MBRouteOptions.swift
+++ b/MapboxDirections/MBRouteOptions.swift
@@ -484,7 +484,7 @@ open class RouteOptions: NSObject, NSSecureCoding, NSCopying{
                 let location = api["location"] as! [Double]
                 let coordinate = CLLocationCoordinate2D(geoJSON: location)
                 let possibleAPIName = api["name"] as? String
-                let apiName = (possibleAPIName?.isEmpty ?? true) ? nil : possibleAPIName!
+                let apiName = possibleAPIName?.nonEmptyString
                 return Waypoint(coordinate: coordinate, name: local.name ?? apiName)
             }
         }