From 37266beec240f8b1a811f826d51e01e02bf9d22a Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Sun, 2 Jul 2017 12:25:43 +0200
Subject: [PATCH] Attempt to use, again, the region, in the reverse geocoding
 process

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

diff --git a/app/models/event.rb b/app/models/event.rb
index 853ed0f8..5e861a2b 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -91,8 +91,8 @@ class Event < ApplicationRecord
 
   def full_address
     # Region seems to disturb openstreetmap :(
-    # [address, city, region.try(:name)].compact.join ', '
-    [address, city].compact.join ', '
+    # address, city].compact.join ', '
+    [address, city, region.try(:name)].compact.join ', '
   end
 
   def hashtags
diff --git a/app/models/orga.rb b/app/models/orga.rb
index a5ef06b7..7c4c12d2 100644
--- a/app/models/orga.rb
+++ b/app/models/orga.rb
@@ -87,8 +87,8 @@ class Orga < ApplicationRecord
 
   def full_address
     # Region seems to disturb openstreetmap :(
-    # [address, city, region.try(:name)].compact.join ', '
-    [address, city].compact.join ', '
+    # [address, city].compact.join ', '
+    [address, city, region.try(:name)].compact.join ', '
   end
 
   def to_s
diff --git a/test/models/event_test.rb b/test/models/event_test.rb
index a176caa7..ef4fbbcd 100644
--- a/test/models/event_test.rb
+++ b/test/models/event_test.rb
@@ -120,7 +120,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', @event.full_address
+    # assert_equal 'hello, world', @event.full_address
+    assert_equal 'hello, world, Alsace', @event.full_address
   end
 end