[FIX] base_geolocalize allow to use Openstreetmap instead of Google

- Change API provider to prevent invalid API calls
- Move geo_find methods into base.geocoder object to ease inheritance
- Add system parameter to allow use of another provider

fixes #x26924
fixes #x6929

1 files changed, 15 insertions, 4 deletions

diff --git a/addons/website_crm_partner_assign/models/crm_lead.py b/addons/website_crm_partner_assign/models/crm_lead.py
index 215b96e9457..49cbc6fdb27 100644
--- a/addons/website_crm_partner_assign/models/crm_lead.py
+++ b/addons/website_crm_partner_assign/models/crm_lead.py
@@ -81,15 +81,26 @@ class CrmLead(models.Model):
                 'partner_longitude': longitude
             })
             return True
+        geo_obj = self.env['base.geocoder']
         # Don't pass context to browse()! We need country name in english below
         for lead in self:
             if lead.partner_latitude and lead.partner_longitude:
                 continue
             if lead.country_id:
-                apikey = self.env['ir.config_parameter'].sudo().get_param('google.api_key_geocode')
-                result = self.env['res.partner']._geo_localize(apikey,
-                                                               lead.street, lead.zip, lead.city,
-                                                               lead.state_id.name, lead.country_id.name)
+                result = geo_obj.geo_find(geo_obj.geo_query_address(
+                    street=lead.street,
+                    zip=lead.zip,
+                    city=lead.city,
+                    state=lead.state_id.name,
+                    country=lead.country_id.name))
+
+                if result is None:
+                    result = geo_obj.geo_find(geo_obj.geo_query_address(
+                        city=lead.city,
+                        state=lead.state_id.name,
+                        country=lead.country_id.name
+                    ))
+
                 if result:
                     lead.write({
                         'partner_latitude': result[0],