[freeside-commits] branch master updated. e7b2e4ef48c2fdc509dba13495d2910c90564929

[Mark Wells]

The branch, master has been updated
       via  e7b2e4ef48c2fdc509dba13495d2910c90564929 (commit)
      from  b61064b3e9a58881a7ad1c4febff3244fc5a4bcc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e7b2e4ef48c2fdc509dba13495d2910c90564929
Author: Mark Wells <mark at freeside.biz>
Date:   Mon Sep 30 19:32:23 2013 -0700

    start support for TomTom geocoding, #13763

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index bb43b45..4d5b6bf 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -4189,8 +4189,9 @@ and customer address. Include units.',
     'description' => 'Method for standardizing customer addresses.',
     'type'        => 'select',
     'select_hash' => [ '' => '', 
-                       'usps' => 'U.S. Postal Service',
+                       'usps'     => 'U.S. Postal Service',
                        'ezlocate' => 'EZLocate',
+                       'tomtom'   => 'TomTom',
                      ],
   },
 
@@ -4209,6 +4210,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'tomtom-userid',
+    'section'     => 'UI',
+    'description' => 'TomTom geocoding service API key.  See <a href="http://www.tomtom.com/">the TomTom website</a> to obtain a key.',
+    'type'        => 'text',
+  },
+
+  {
     'key'         => 'ezlocate-userid',
     'section'     => 'UI',
     'description' => 'User ID for EZ-Locate service.  See <a href="http://www.geocode.com/">the TomTom website</a> for access and pricing information.',
diff --git a/FS/FS/Misc/Geo.pm b/FS/FS/Misc/Geo.pm
index a93d98f..4dd6dc6 100644
--- a/FS/FS/Misc/Geo.pm
+++ b/FS/FS/Misc/Geo.pm
@@ -10,6 +10,7 @@ use HTML::TokeParser;
 use URI::Escape 3.31;
 use Data::Dumper;
 use FS::Conf;
+use Locale::Country;
 
 FS::UID->install_callback( sub {
   $conf = new FS::Conf;
@@ -410,6 +411,52 @@ sub standardize_ezlocate {
   \%result;
 }
 
+sub standardize_tomtom {
+  # post-2013 TomTom API
+  # much better, but incompatible with ezlocate
+  my $self = shift;
+  my $location = shift;
+  my $class = 'Geo::TomTom::Geocoding';
+  eval "use $class";
+  die $@ if $@;
+
+  my $key = $conf->config('tomtom-userid')
+    or die "no tomtom-userid configured\n";
+
+  my $country = code2country($location->{country});
+  my $result = $class->query(
+    key => $key,
+    T   => $location->{address1},
+    L   => $location->{city},
+    AA  => $location->{state},
+    PC  => $location->{zip},
+    CC  => country2code($country, LOCALE_CODE_ALPHA_3),
+  );
+  unless ( $result->is_success ) {
+    die "TomTom geocoding error: ".$result->message."\n";
+  }
+  my ($match) = $result->locations;
+  if (!$match) {
+    die "Location not found.\n";
+  }
+  warn "tomtom returned match:\n".Dumper($match) if $DEBUG > 1;
+  my $tract = join('.', $match->{censusTract} =~ /(....)(..)/);
+  return +{
+    address1    => join(' ', $match->{houseNumber}, $match->{street}),
+    address2    => $location->{address2}, # XXX still need a solution to this
+    city        => $match->{city},
+    state       => $match->{state},
+    country     => country2code($match->{country}, LOCALE_CODE_ALPHA_2),
+    zip         => ($match->{standardPostalCode} || $match->{postcode}),
+    latitude    => $match->{latitude},
+    longitude   => $match->{longitude},
+    censustract => $match->{censusStateCode}.
+                   $match->{censusFipsCountyCode}.
+                   $tract,
+    addr_clean  => 'Y',
+  };
+}
+
 =back
 
 =cut

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm     |   10 +++++++++-
 FS/FS/Misc/Geo.pm |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletions(-)