Use G:C:Abbreviate in Local.pm

nigelhorne · Oct 8, 2020 · 6d05635 · 6d05635
1 parent 9055097
commit 6d05635
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/lib/Geo/Coder/Free.pm b/lib/Geo/Coder/Free.pm
@@ -102,8 +102,6 @@ sub new {
 			$alternatives->{$key} = join(', ', @{$value});
 		}
 	}
-	$abbreviations ||= Geo::Coder::Abbreviations->new();
-
 	my $rc = {
 		maxmind => Geo::Coder::Free::MaxMind->new(%param),
 		alternatives => $alternatives
@@ -312,6 +310,8 @@ sub run {
 sub _normalize($) {
 	my $street = shift;
 
+	$abbreviations ||= Geo::Coder::Abbreviations->new();
+
 	$street = uc($street);
 	if($street =~ /(.+)\s+(.+)\s+(.+)/) {
 		my $a;
@@ -332,6 +332,8 @@ sub _normalize($) {
 sub _abbreviate($) {
 	my $type = uc(shift);
 
+	$abbreviations ||= Geo::Coder::Abbreviations->new();
+
 	if(my $rc = $abbreviations->abbreviate($type)) {
 		return $rc;
 	}

diff --git a/lib/Geo/Coder/Free/Local.pm b/lib/Geo/Coder/Free/Local.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use Geo::Location::Point;
+use Geo::Coder::Free;
 use Geo::StreetAddress::US;
 use Lingua::EN::AddressParse;
 use Locale::CA;
@@ -153,13 +154,8 @@ sub geocode {
 			my %addr = ( 'location' => $l );
 			my $street = $c{'street_name'};
 			if(my $type = $c{'street_type'}) {
-				$type = uc($type);
-				if($type eq 'STREET') {
-					$street = "$street ST";
-				} elsif($type eq 'ROAD') {
-					$street = "$street RD";
-				} elsif($type eq 'AVENUE') {
-					$street = "$street AVE";
+				if(my $a = Geo::Coder::Free::_abbreviate($type)) {
+					$street .= " $a";
 				} else {
 					$street .= " $type";
 				}

diff --git a/lib/Geo/Coder/Free/OpenAddresses.pm b/lib/Geo/Coder/Free/OpenAddresses.pm
@@ -296,7 +296,7 @@ sub geocode {
 	}
 	if($ap) {
 		my $l = $location;
-		if($l =~ /(.+), (England|UK)$/) {
+		if($l =~ /(.+), (England|UK)$/i) {
 			$l = "$1, GB";
 		}
 		if(my $error = $ap->parse($l)) {
@@ -305,11 +305,11 @@ sub geocode {
 		} else {
 			my %c = $ap->components();
 			# ::diag(Data::Dumper->new([\%c])->Dump());
-			my %addr;
+			my %addr = ( 'location' => $l );
 			$street = $c{'street_name'};
 			if(my $type = $c{'street_type'}) {
 				if(my $a = Geo::Coder::Free::_abbreviate($type)) {
-					$street = "$street $a";
+					$street .= " $a";
 				} else {
 					$street .= " $type";
 				}

diff --git a/t/local.t b/t/local.t
@@ -1,4 +1,4 @@
-#!perl -wT
+#!perl -w
 
 use warnings;
 use strict;