From f47c5e8a12eb7c7575e38f216178ba72bc38c6a3 Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Wed, 20 Apr 2016 16:25:53 +0200
Subject: [PATCH] Back to not using region names in geocoding, it seems to
 disturb OSM...  :(

---
 app/models/event.rb       | 4 +++-
 app/models/orga.rb        | 4 +++-
 test/models/event_test.rb | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/models/event.rb b/app/models/event.rb
index 05362016..e7e4670e 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -97,7 +97,9 @@ class Event < ActiveRecord::Base
   end
 
   def full_address
-    [address, city, region.try(:name)].compact.join ', '
+    # Region seems to disturb openstreetmap :(
+    # [address, city, region.try(:name)].compact.join ', '
+    [address, city].compact.join ', '
   end
 
   def hashtags
diff --git a/app/models/orga.rb b/app/models/orga.rb
index aa49c452..6d587a61 100644
--- a/app/models/orga.rb
+++ b/app/models/orga.rb
@@ -79,7 +79,9 @@ class Orga < ActiveRecord::Base
   end
 
   def full_address
-    [address, city, region.try(:name)].compact.join ', '
+    # Region seems to disturb openstreetmap :(
+    # [address, city, region.try(:name)].compact.join ', '
+    [address, city].compact.join ', '
   end
 
   def to_s
diff --git a/test/models/event_test.rb b/test/models/event_test.rb
index 004e7b4e..e69c3f4c 100644
--- a/test/models/event_test.rb
+++ b/test/models/event_test.rb
@@ -118,6 +118,7 @@ class EventTest < ActiveSupport::TestCase
     @event.city = 'world'
     # Region is no longer used for geocoding..;
     # @event.region.name = 'all'
-    assert_equal 'hello, world, Alsace', @event.full_address
+    # assert_equal 'hello, world, Alsace', @event.full_address
+    assert_equal 'hello, world', @event.full_address
   end
 end