Merge pull request #16 from househappy/handle-alternate-wkt-formats

Handle WKT strings w/ varying whitespace
househappy · Jul 13, 2015 · 65b0938 · 65b0938
2 parents 04b42f0 + 4b2f040
commit 65b0938
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/MapPointMapper/Parser/Parser.swift b/MapPointMapper/Parser/Parser.swift
@@ -195,10 +195,10 @@ class Parser {
   :returns: stripped string instance
   */
   internal func stripExtraneousCharacters(input: NSString) -> NSString {
-    let regex = NSRegularExpression(pattern: "\\w+\\s+\\((.*)\\)", options: .CaseInsensitive, error: nil)
+    let regex = NSRegularExpression(pattern: "\\w+\\s*\\((.*)\\)", options: .CaseInsensitive, error: nil)
     let match: AnyObject? = regex?.matchesInString(input as String, options: .ReportCompletion, range: NSMakeRange(0, input.length)).first
     let range = match?.rangeAtIndex(1)
-    
+
     let loc = range?.location as Int!
     let len = range?.length as Int!
 

diff --git a/MapPointMapperTests/Parser/ParserTests.swift b/MapPointMapperTests/Parser/ParserTests.swift
@@ -10,13 +10,14 @@ import Cocoa
 import XCTest
 import MapKit
 
-let line         = "LINESTRING (30 10, 10 30, 40 40)"
-let polygon      = "POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))"
-let point        = "POINT (30 10)"
-let unknown      = "-30 20, -45 40, -10 15"
-let multiPolygon = "MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20)), ((15 5, 40 10, 10 20, 5 10, 15 5)))"
-let multiPoint   = "MULTIPOINT ((10 40), (40 30), (20 20), (30 10))"
-let multiLine    = "MULTILINESTRING ((10 10, 20 20, 10 40), (40 40, 30 30, 40 20, 30 10))"
+let line            = "LINESTRING (30 10, 10 30, 40 40)"
+let polygon         = "POLYGON ((30 10, 40 40, 20 40, 10 20, 30 10))"
+let point           = "POINT (30 10)"
+let point_alternate = "POINT(30 10)"
+let unknown         = "-30 20, -45 40, -10 15"
+let multiPolygon    = "MULTIPOLYGON (((30 20, 45 40, 10 40, 30 20)), ((15 5, 40 10, 10 20, 5 10, 15 5)))"
+let multiPoint      = "MULTIPOINT ((10 40), (40 30), (20 20), (30 10))"
+let multiLine       = "MULTILINESTRING ((10 10, 20 20, 10 40), (40 40, 30 30, 40 20, 30 10))"
 
 class ParserSpec: XCTestCase {
   var parser: Parser!
@@ -55,7 +56,21 @@ class ParserSpec: XCTestCase {
     XCTAssertEqual(first.first!, "30", "First item should be '30', was \(first.first!)")
     XCTAssertEqual(first.last!, "10", "Last item should be '10', was \(first.last!)")
   }
-
+
+  func testHandlesAlternativeWKTFormats() {
+    let formatted_first = [parser.stripExtraneousCharacters(point)].map({
+      self.parser.formatStandardGeoDataString($0)
+    })
+    let formatted_second = [parser.stripExtraneousCharacters(point_alternate)].map({
+      self.parser.formatStandardGeoDataString($0)
+    })
+
+    let first = formatted_first.first!
+    let second = formatted_second.first!
+    XCTAssertEqual(first.first!, second.first!, "First item should equal second, first was \(first.first!), second was \(second.first!)")
+    XCTAssertEqual(first.last!, second.last!, "First item should equal second, first was \(first.last!), second was \(second.last!)")
+  }
+
   func testParsingInput() {
     let parsedLine = parser.parseInput(line)