nikdoof/vapemap
1
0
Fork 0
mirror of https://github.com/nikdoof/vapemap.git synced 2026-01-31 01:58:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't do geo lookups on import.

Browse Source
This commit is contained in:
Andrew Williams
2013-04-05 12:18:12 +01:00
parent b74a0b8bfc
commit fec82e3fe3
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/stores/management/commands/import_stores.py
View File

@@ -36,7 +36,7 @@ class Command(BaseCommand):
country, created = Country.objects.get_or_create(name=country) country, created = Country.objects.get_or_create(name=country)
county, created = County.objects.get_or_create(name=county, country=country) county, created = County.objects.get_or_create(name=county, country=country)
addr = Address(name=name, address1=addr1, address2=addr2, address3=addr3, city=city, county=county, country=country, postcode=postcode, geo_latitude=y, geo_longitude=x) addr = Address(name=name, address1=addr1, address2=addr2, address3=addr3, city=city, county=county, country=country, postcode=postcode, geo_latitude=y, geo_longitude=x)
addr.save() addr.save(no_lookup=True)
store = Store(name=name, address=addr, website=website, email=email, phone=phone) store = Store(name=name, address=addr, website=website, email=email, phone=phone)
if website: if website:
store.store_type = Store.STORE_TYPE_BOTH store.store_type = Store.STORE_TYPE_BOTH

3
app/stores/models/base.py
View File

@@ -187,7 +187,8 @@ class Address(models.Model):
return self.address_string return self.address_string
def save(self, **kwargs): def save(self, **kwargs):
if not self.geo_latitude and not self.geo_longitude: 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.address_string)
if res: if res:
self.geo_latitude, self.geo_longitude = res[1] self.geo_latitude, self.geo_longitude = res[1]

19
app/stores/tests.py
View File

@@ -122,3 +122,22 @@ class StoresStoreModelTestCase(TestCase):
def test_chain_name(self): def test_chain_name(self):
obj = Store(name='Test Store 3', address=self.addr) obj = Store(name='Test Store 3', address=self.addr)
self.assertEqual(str(obj), 'Test Store 3') self.assertEqual(str(obj), 'Test Store 3')
class StoresAddressModelTestCase(TestCase):
fixtures = ['countries']
def test_geo_lookup(self):
country = Country.objects.get(name='United Kingdom')
addr = Address(name='test', address1='Bridge Street', city='Warrington', country=country, postcode='WA3')
addr.save()
self.assertIsNotNone(addr.geo_latitude)
self.assertIsNotNone(addr.geo_longitude)
def test_skip_geo_lookup(self):
country = Country.objects.get(name='United Kingdom')
addr = Address(name='test', address1='Bridge Street', city='Warrington', country=country, postcode='WA3')
addr.save(no_lookup=True)
self.assertIsNone(addr.geo_latitude)
self.assertIsNone(addr.geo_longitude)