Merge lp:~dalkvist/ppvalbok/gpx-support into lp:ppvalbok

[Mattias Dalkvist]

[Mattias Dalkvist (dalkvist)]

added links from municipality pages to gps files with the sations

=== modified file 'ballot_system/urls.py'
--- ballot_system/urls.py	2009-05-11 11:48:16 +0000
+++ ballot_system/urls.py	2009-05-11 19:04:44 +0000
@@ -8,6 +8,7 @@
     url(r'^email/([0-9]+)/$', views.email, name="email"),
     url(r'^valj-kommun/([0-9]{5})/$', views.choose_municipality, name="choose-municipality"),
     url(r'^kommun/([0-9a-z_-]+)/$', views.municipality, name="municipality"),
+    url(r'^kommun/([0-9a-z_-]+)/([0-9a-z_-]+).gpx$', views.gpx, name="gpx"),
     url(r'^kommun/([0-9a-z_-]+)/fortidslokal/([0-9a-z_-]+)/$', views.earlystation, name="earlystation"),
     url(r'^kommun/([0-9a-z_-]+)/fortidslokal/([0-9a-z_-]+)/save/$', views.save_earlystation, name="earlystation-save"),
     url(r'^kommun/([0-9a-z_-]+)/fortidslokal/([0-9a-z_-]+)/tack/$', views.book_earlystation_thanks, name="earlystation-thanks"),

=== modified file 'ballot_system/views.py'
--- ballot_system/views.py	2009-05-11 11:48:16 +0000
+++ ballot_system/views.py	2009-05-11 19:04:44 +0000
@@ -102,10 +102,34 @@
     return direct_to_template(request, 'view_municipality.html',
                               {'municipality_name': municipality.name,
                                'municipality_slug': municipality.slug,
+                               'gpx': municipality.slug,
+                               'gpxall': municipality.slug + '-all',
+                               'gpxearly': municipality.slug + '-early',
                                'early_stations': earlystations,
                                'stations': stations,
                                'may_edit': stations[0].region.regiondata.user_may_edit(request.user)})
 
+def gpx(request, slug, type):
+    """
+    Show voting stations in the specified municipality
+    """
+    municipality = get_object_or_404(Municipality, slug=slug)
+    earlystations = \
+        EarlyVotingStation.objects.filter(municipality=municipality).order_by('name')
+    stations = VotingStation.objects.filter(municipality=municipality).order_by('name')
+
+    if type == municipality.slug + '-early':
+        stations = None
+    
+    if type == municipality.slug:
+        earlystations = None
+    
+    return direct_to_template(request, 'wpt.gpx',
+                              {'municipality_name': municipality.name,
+                               'municipality_slug': municipality.slug,
+                               'early_stations': earlystations,
+                               'stations': stations,})
+
 def earlystation(request, municipality_slug, station_slug):
     """
     Show earlyvoting station details

=== modified file 'templates/view_municipality.html'
--- templates/view_municipality.html	2009-05-08 22:09:27 +0000
+++ templates/view_municipality.html	2009-05-11 19:04:44 +0000
@@ -91,6 +91,12 @@
 		{% endfor %}
 	</div>
 </div>
+<div id="gpx" style="clear:both;"
+   <div> Vallokalerna GPS (.gpx) (högerklicka -> spara som)</div>
+     <a href="{% url gpx municipality_slug gpxall %}">Alla</a>
+     <a href="{% url gpx municipality_slug gpxearly %}">Förtidsröstningslokaler</a>
+     <a href="{% url gpx municipality_slug gpx %}">Valdagen</a>
+</div>
 {% endblock %}
 
 {% block postscript %}

=== added file 'templates/wpt.gpx'
--- templates/wpt.gpx	1970-01-01 00:00:00 +0000
+++ templates/wpt.gpx	2009-05-11 19:04:44 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<gpx xmlns="http://www.topografix.com/GPX/1/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"     xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">
+     {% if early_stations %}				       
+     {% for station in early_stations %}
+     <wpt lat="{{ station.lat }}" lon="{{ station.lon }}" >
+       	      {% if station.name %}
+	      <name>Förtidslokal - {{  station.name }}</name>
+	      {% endif %}
+    </wpt>
+    {% endfor %}
+    {% endif %}
+     {% if stations %}				       
+     {% for station in stations %}
+     <wpt lat="{{ station.lat }}" lon="{{ station.lon }}" >
+       	      {% if station.name %}
+	      <name>{{  station.name }}</name>
+	      {% endif %}
+    </wpt>
+    {% endfor %}
+    {% endif %}
+</gpx>
\ No newline at end of file