diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-02 19:17:33 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-02 19:17:33 +0200 |
| commit | 40e3f0a927b22fef64b6a59c006511b4ba243a07 (patch) | |
| tree | cde63d0487fe0112c1d9c243701a48d53075a30e /chimere/utils.py | |
| parent | 4bc82f3f73577118d3cc534eaf749d16321c552a (diff) | |
| parent | 58aba7b0661d51e98132e2ed1b726c865316b4a2 (diff) | |
| download | Chimère-40e3f0a927b22fef64b6a59c006511b4ba243a07.tar.bz2 Chimère-40e3f0a927b22fef64b6a59c006511b4ba243a07.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/admin.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/models.py
chimere/templates/chimere/main_map.html
chimere/templatetags/chimere_tags.py
chimere/views.py
Diffstat (limited to 'chimere/utils.py')
| -rw-r--r-- | chimere/utils.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chimere/utils.py b/chimere/utils.py index 423ea85..4cd6f45 100644 --- a/chimere/utils.py +++ b/chimere/utils.py @@ -222,6 +222,9 @@ class KMLManager(ImportManager): for item in placemark: if item.tag == ns + 'name': name = item.text + if not pl_id: + # if no ID is provided assume that name is a key + pl_id = name elif item.tag == ns + 'description': description = item.text elif item.tag == ns + 'Point': @@ -621,7 +624,8 @@ class OSMManager(ImportManager): for idx, item in enumerate(Marker.objects.filter(status='A', point__contained=bbox, categories=self.importer_instance.categories.all(), - not_for_osm=False, modified_since_import=True).all()): + not_for_osm=False, modified_since_import=True, + route=None).all()): dct = default_dct.copy() dct.update({'lon':item.point.x, 'lat':item.point.y}) |