From 41882fcad2dbb363a3c1201731aa90e9caa75389 Mon Sep 17 00:00:00 2001
From: Aaron Parecki <aaron@parecki.com>
Date: Wed, 25 May 2016 09:44:36 -0700
Subject: [PATCH] fix merging esri config when generating a token

---
 lib/geocoder/lookups/esri.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/geocoder/lookups/esri.rb b/lib/geocoder/lookups/esri.rb
index 08523913..974ab07d 100644
--- a/lib/geocoder/lookups/esri.rb
+++ b/lib/geocoder/lookups/esri.rb
@@ -58,7 +58,7 @@ module Geocoder::Lookup
 
     def fetch_and_save_token!
       token_instance = Geocoder::EsriToken.generate_token(*configuration.api_key)
-      Geocoder.configure(:esri => {:token => token_instance})
+      Geocoder.configure(:esri => Geocoder.config[:esri].merge({:token => token_instance}))
     end
   end
 end
-- 
GitLab