Adding fixed or mobile type and test

marmelroy · Nov 21, 2015 · b17390b · b17390b
1 parent e74f1ec
commit b17390b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/PhoneNumberKit/Constants.swift b/PhoneNumberKit/Constants.swift
@@ -59,6 +59,7 @@ public enum PNParsingError:  ErrorType {
 
  - FixedLine: Fixed line numbers
  - Mobile: Mobile numbers
+ - FixedOrMobile: Either fixed or mobile numbers if we can't tell conclusively.
  - Pager: Pager numbers
  - PersonalNumber: Personal number numbers
  - PremiumRate: Premium rate numbers
@@ -72,6 +73,7 @@ public enum PNParsingError:  ErrorType {
 public enum PNPhoneNumberType {
     case FixedLine
     case Mobile
+    case FixedOrMobile
     case Pager
     case PersonalNumber
     case PremiumRate

diff --git a/PhoneNumberKit/PhoneNumberParser.swift b/PhoneNumberKit/PhoneNumberParser.swift
@@ -113,7 +113,15 @@ class PhoneNumberParser {
             return .Unknown
         }
         if (isNumberMatchingDesc(nationalNumber, numberDesc: metadata.fixedLine)) {
-            return .FixedLine
+            if metadata.fixedLine?.nationalNumberPattern == metadata.mobile?.nationalNumberPattern {
+                return .FixedOrMobile
+            }
+            else if (isNumberMatchingDesc(nationalNumber, numberDesc: metadata.mobile)) {
+                return .FixedOrMobile
+            }
+            else {
+                return .FixedLine
+            }
         }
         if (isNumberMatchingDesc(nationalNumber, numberDesc: metadata.mobile)) {
             return .Mobile

diff --git a/PhoneNumberKitTests/PhoneNumberKitTests.swift b/PhoneNumberKitTests/PhoneNumberKitTests.swift
@@ -31,6 +31,19 @@ class PhoneNumberKitTests: XCTestCase {
             XCTAssert(true)
         }
     }
+
+    // Invalid american number, GitHub issue #9 by lobodin
+    func testAmbiguousFixedOrMobileNumber() {
+        do {
+            let phoneNumber = try PhoneNumber(rawNumber: "+16307792428", region: "US")
+            print(phoneNumber.toE164())
+            XCTAssertEqual(phoneNumber.type, PNPhoneNumberType.FixedOrMobile)
+        }
+        catch {
+            XCTFail()
+        }
+    }
+
 
     // Italian number with a leading zero
     func testItalianLeadingZero() {