[enh] import all vegoresto tags and display them in another manner

Author: Psycojoker

restaurant/management/commands/import-vegoresto.py

@@ -2,6 +2,7 @@
 from django.core.management.base import BaseCommand
 
 from restaurant.models import Restaurant
+from restaurant.utils import VG_TAGS
 from BeautifulSoup import BeautifulSoup
 import urllib2
 from dateutil.parser import parse
@@ -10,22 +11,14 @@
 
 source_url = 'http://vegoresto.fr/restos-fichier-xml/'
 
-VG_TAGS = {
-        'sans_gluten': 'gluten-free',
-        'vege': 'vegetarian',
-        'vegan': 'vegan',
-        'vegan_friendly': 'vegan-friendly'
-        }
-
-
 def parse_vg_tags(tags):
     result = set()
 
     for t in filter(None, map(lambda x: x.strip(), tags.split('|'))):
         try:
             result.add(VG_TAGS[t])
         except KeyError:
-            print "WARNING: Unknown tag %s" % t
+            result.add(t)
 
     return result
 

restaurant/templates/restopopup.mustache

@@ -4,4 +4,4 @@
 {{#resto.website}} <a href="{{ resto.website }}">{{ resto.website }}</a><br> {{/resto.website}}
 <a href="https://maps.google.com/maps?saddr=&daddr={{ resto.lat }},{{ resto.lon }}" target="_blank">Itinéraire (via Google Maps)</a><br> <!-- keep in sync with the resto detail page -->
 <i><a href="restaurant/{{ resto.id }}/">Plus d'informations</a></i>
-<p>{{#resto.tags}}<span class="label label-success">{{.}}</span> {{/resto.tags}}</p>
+<p>{{#resto.tags}}<span class="label label-success">{{.}}</span> {{/resto.tags}} {{#resto.other_tags}}<span class="label label-info">{{.}}</span> {{/resto.other_tags}}</p>

restaurant/utils.py

@@ -0,0 +1,6 @@
+VG_TAGS = {
+    'sans_gluten': 'gluten-free',
+    'vege': 'vegetarian',
+    'vegan': 'vegan',
+    'vegan_friendly': 'vegan-friendly'
+}

restaurant/views.py

@@ -2,6 +2,7 @@
 from django.http import HttpResponse
 
 from .models import Restaurant
+from .utils import VG_TAGS
 
 
 def restaurants_json(request):
@@ -15,7 +16,8 @@ def restaurants_json(request):
         "id": x.id,
         "national_phone_number": x.get_national_phone_number(),
         "international_phone_number": x.get_international_phone_number(),
-        "tags": [tag["name"] for tag in x.tags.all().values("name")],
+        "tags": [tag["name"] for tag in x.tags.all().values("name") if tag["name"] in VG_TAGS.values()],
+        "other_tags": [tag["name"] for tag in x.tags.all().values("name") if tag["name"] not in VG_TAGS.values()],
     } for x in Restaurant.objects.filter(lat__isnull=False, lon__isnull=False, active=True)], indent=4))
 
     # optimisation note: .prefetch_related("tags") makes request slower here