From e0ba49494ec637c35b1a55a9358247df3be7fc71 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Sat, 6 Apr 2013 22:18:40 +0100
Subject: [PATCH] Remove address_string, make full_address cleanout invalid
 items.

---
 app/stores/models/base.py                     | 16 ++++------------
 app/stores/templates/stores/store_detail.html |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/stores/models/base.py b/app/stores/models/base.py
index 9e4032d..e058f25 100644
--- a/app/stores/models/base.py
+++ b/app/stores/models/base.py
@@ -164,19 +164,11 @@ class Address(models.Model):
             self.address2,
             self.address3,
             self.city,
-            self.county.name,
+            self.county,
             self.postcode,
             self.country.name,
-            ]
-        return ', '.join([f for f in fields if f])
-
-    @property
-    def address_string(self):
-        return u', '.join([
-            self.address1,
-            self.postcode,
-            unicode(self.country),
-        ])
+        ]
+        return ', '.join([f.strip() for f in fields if f and f.strip() != ''])
 
     @property
     def geo_location(self):
@@ -190,7 +182,7 @@ class Address(models.Model):
     def save(self, **kwargs):
         no_lookup = kwargs.pop('no_lookup', None)
         if not no_lookup and not self.geo_latitude and not self.geo_longitude:
-            res = caching_geo_lookup(self.address_string)
+            res = caching_geo_lookup(self.full_address)
             if res:
                 self.geo_latitude, self.geo_longitude = res[1]
         return super(Address, self).save(**kwargs)
diff --git a/app/stores/templates/stores/store_detail.html b/app/stores/templates/stores/store_detail.html
index f6226be..c67e57b 100644
--- a/app/stores/templates/stores/store_detail.html
+++ b/app/stores/templates/stores/store_detail.html
@@ -104,7 +104,7 @@ $(document).ready(function(){initialize_map_store()});
 
         <div id="map-canvas-store" style="width: 300px; height: 300px;" class="map">
             <noscript>
-                <img alt="Map of {{ store.address.address_string }}" src="https://maps.google.com/maps/api/staticmap?center={{ store.address.geo_latitude }},{{ store.address.geo_longitude }}&zoom=16&markers={{ store.address.geo_latitude }},{{ store.address.geo_longitude }}&size=300x300&sensor=false">
+                <img alt="Map of {{ store.address.full_address }}" src="https://maps.google.com/maps/api/staticmap?center={{ store.address.geo_latitude }},{{ store.address.geo_longitude }}&zoom=16&markers={{ store.address.geo_latitude }},{{ store.address.geo_longitude }}&size=300x300&sensor=false">
             </noscript>
         </div>
     </div>