From 4f80f0d3db9bf0af3570c26ac3ae9da34a18f832 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 21 Dec 2011 21:19:11 +0000
Subject: [PATCH] eval fatal geocoding errors, turn them into warnings,
 RT#15539

---
 FS/FS/geocode_Mixin.pm | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/FS/FS/geocode_Mixin.pm b/FS/FS/geocode_Mixin.pm
index 9ac8e7a88..d821c8031 100644
--- a/FS/FS/geocode_Mixin.pm
+++ b/FS/FS/geocode_Mixin.pm
@@ -143,15 +143,20 @@ sub set_coord {
   #my $module = FS::Conf->new->config('geocode_module') || 'Geo::Coder::Googlev3';
 
   my $geocoder = Geo::Coder::Googlev3->new;
-  my $location = $geocoder->geocode( location =>
-    $self->get($pre.'address1'). ','.
-    ( $self->get($pre.'address2') ? $self->get($pre.'address2').',' : '' ).
-    $self->get($pre.'city'). ','.
-    $self->get($pre.'state'). ','.
-    code2country($self->get($pre.'country'))
-  );
-
-  #errors?
+
+  my $location = eval {
+    $geocoder->geocode( location =>
+      $self->get($pre.'address1'). ','.
+      ( $self->get($pre.'address2') ? $self->get($pre.'address2').',' : '' ).
+      $self->get($pre.'city'). ','.
+      $self->get($pre.'state'). ','.
+      code2country($self->get($pre.'country'))
+    );
+  };
+  if ( $@ ) {
+    warn "geocoding error: $@\n";
+    return;
+  }
 
   my $geo_loc = $location->{'geometry'}{'location'} or return;
   if ( $geo_loc->{'lat'} && $geo_loc->{'lng'} ) {
-- 
2.11.0