Fixed landmark roundtripping

Author: 1ec5

MapboxGeocoder/MBPlacemark.swift

@@ -161,10 +161,9 @@ public class Placemark: NSObject, NSCopying, NSSecureCoding {
      The scope offers a general indication of the size or importance of the feature represented by the placemark – in other words, how local the feature is.
      */
     public var scope: PlacemarkScope {
-        let components = identifier.characters.split(".")
-        assert(components.count == 2)
-        let scopeCharacters = identifier.characters.split(".").first!
-        return PlacemarkScope(descriptions: [String(scopeCharacters)])
+        let components = identifier.componentsSeparatedByString(".")
+        assert(components.count > 0)
+        return PlacemarkScope(descriptions: [components.prefix(2).joinWithSeparator(".")]) ?? PlacemarkScope(descriptions: [components.first!]) ?? []
     }
 
     /**

MapboxGeocoder/MBPlacemarkScope.swift

@@ -4,7 +4,7 @@ extension PlacemarkScope: CustomStringConvertible {
     /**
      Initializes a placemark scope bitmask corresponding to the given array of string representations of scopes.
      */
-    public init(descriptions: [String]) {
+    public init?(descriptions: [String]) {
         var scope: PlacemarkScope = []
         for description in descriptions {
             switch description {
@@ -24,12 +24,13 @@ extension PlacemarkScope: CustomStringConvertible {
                 scope.insert(.Neighborhood)
             case "address":
                 scope.insert(.Address)
-            case "poi":
-                scope.insert(.PointOfInterest)
+                
             case "poi.landmark":
                 scope.insert(.Landmark)
+            case "poi":
+                scope.insert(.PointOfInterest)
             default:
-                break
+                return nil
             }
         }
         self.init(rawValue: scope.rawValue)
@@ -61,11 +62,11 @@ extension PlacemarkScope: CustomStringConvertible {
         if contains(.Address) {
             descriptions.append("address")
         }
-        if contains(.PointOfInterest) {
-            descriptions.append("poi")
-        }
+        
         if contains(.Landmark) {
             descriptions.append("poi.landmark")
+        } else if contains(.PointOfInterest) {
+            descriptions.append("poi")
         }
         return descriptions.joinWithSeparator(",")
     }

MapboxGeocoderTests/ForwardGeocodingTests.swift

@@ -81,9 +81,8 @@ class ForwardGeocodingTests: XCTestCase {
         options.allowedScopes = [.Region, .Place, .Locality, .PointOfInterest]
         options.allowedISOCountryCodes = ["NC"]
         let task = geocoder.geocode(options: options) { (placemarks, attribution, error) in
-            XCTAssertEqual(placemarks?.count, 0, "forward geocode should return no results for invalid query")
-            
-            XCTAssertEqual(attribution, "NOTICE: © 2016 Mapbox and its suppliers. All rights reserved. Use of this data is subject to the Mapbox Terms of Service (https://www.mapbox.com/about/maps/). This response and the information it contains may not be retained.")
+            XCTAssertNil(placemarks?.count, "forward geocode should return no results for invalid query")
+            XCTAssertNil(attribution)
 
             expection.fulfill()
         }