Added new test case which demonstrates a bug

nigelhorne · Feb 24, 2018 · 8bf9f36 · 8bf9f36
1 parent f6c2e5a
commit 8bf9f36
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/Geo/Coder/Free.pm b/lib/Geo/Coder/Free.pm
@@ -170,7 +170,8 @@ sub geocode {
 		$country =~ s/^\s//g;
 		$country =~ s/\s$//g;
 	} elsif($self->{openaddr}) {
-		if($location =~ /^([\w\s\-]+)?,([\w\s]+),([\w\s]+),([\w\s]+),\s*(US|USA|United States|Canada)?$/) {
+		# if($location =~ /^([\w\s\-]+)?,([\w\s]+),([\w\s]+),([\w\s]+),\s*(US|USA|United States|Canada)?$/) {
+		if($location =~ /^([\w\s\-]+)?,([\w\s]+),([\w\s]+),([\w\s]+),\s*([\w\s]+)?$/) {
 			$street = $1;
 			$location = $2;
 			$county = $3;
@@ -184,7 +185,8 @@ sub geocode {
 			$state =~ s/\s$//g;
 			$country =~ s/^\s//g;
 			$country =~ s/\s$//g;
-		} elsif($location =~ /^([\w\s]+),([\w\s]+),([\w\s]+),\s*(US|USA|United States|Canada)?$/) {
+		# } elsif($location =~ /^([\w\s]+),([\w\s]+),([\w\s]+),\s*(US|USA|United States|Canada)?$/) {
+		} elsif($location =~ /^([\w\s]+),([\w\s]+),([\w\s]+),\s*([\w\s]+)?$/) {
 			$location = $1;
 			$county = $2;
 			$state = $3;
@@ -197,6 +199,13 @@ sub geocode {
 			$state =~ s/\s$//g;
 			$country =~ s/^\s//g;
 			$country =~ s/\s$//g;
+		} elsif($location =~ /^([\w\s]+),\s*([\w\s]+)?$/) {
+			$location = $1;
+			$country = $2;
+			$location =~ s/^\s//g;
+			$location =~ s/\s$//g;
+			$country =~ s/^\s//g;
+			$country =~ s/\s$//g;
 		} else {
 			# TODO: Parse full postal address
 			die 'TODO - add support for full addresses on openaddr';

diff --git a/t/openaddr.t b/t/openaddr.t
@@ -31,6 +31,9 @@ OPENADDR: {
 			delta_within($location->{latitude}, 53.55, 1e-2);
 			delta_within($location->{longitude}, -113.53, 1e-2);
 
+			$location = $geocoder->geocode('London, England');
+			ok(defined($location));
+
 			$location = $geocoder->geocode('Silver Spring, Maryland, USA');
 			ok(defined($location));
 			delta_within($location->{latitude}, 38.99, 1e-2);