Changeset 578

Timestamp:

02/17/10 14:18:14 (5 months ago)

Author:

olivier

Message:

geocoder: restrict search to geonames with PCL* feature code ; optimize

Files:

• trunk/telemeta/management/commands/telemeta-geocode.py (modified) (3 diffs)

trunk/telemeta/management/commands/telemeta-geocode.py

@@ -21 +21 @@
             raise CommandError("Unable to open %s" % datafile)
             
-        locations = Location.objects.filter(type=Location.COUNTRY)
+        locations = [l for l in Location.objects.filter(type=Location.COUNTRY)]
+
         i = 0
         geocoded = 0
-        total = locations.count()
+        total = len(locations)
         for line in datafile:
             (geonameid, name, asciiname, alternatenames, latitude, longitude, feature_class,
@@ -30 +31 @@
              admin4_code, population, elevation, gtopo30, timezone, modification_date) = line.strip().split("\t")
            
-            if feature_class == 'A':
+            if feature_code[0:3] == 'PCL':
                 names = [asciiname.lower()]
                 if alternatenames:
                     names.extend([unaccent(n).lower() for n in alternatenames.split(',')])
 
+                found = []
                 for l in locations:
                     if unaccent(l.name).lower() in names:
@@ -41 +43 @@
                         l.save()
                         geocoded += 1
+                        found.append(l)
+
+                for l in found:
+                    locations.remove(l)
 
             i += 1