From 84c60a9402cf226245063c3131af51a67ddc0317 Mon Sep 17 00:00:00 2001
From: michigg <michael-guenther.goetz@stud.uni-bamberg.de>
Date: Wed, 18 Oct 2017 17:06:41 +0200
Subject: [PATCH] try fix positioning

---
 ofu_app/apps/donar/urls.py                    |  1 +
 ofu_app/apps/donar/views.py                   |  6 +++-
 ofu_app/static/js/donar/vgn.js                | 36 ++++++++-----------
 ofu_app/templates/donar/vgn_connections.jinja |  8 ++---
 4 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/ofu_app/apps/donar/urls.py b/ofu_app/apps/donar/urls.py
index d66b963..9df780e 100644
--- a/ofu_app/apps/donar/urls.py
+++ b/ofu_app/apps/donar/urls.py
@@ -26,4 +26,5 @@ urlpatterns = [
 
     # VGN
     url(r'^bus/$', views.bus_connections, name='vgn-bus'),
+    url(r'^bus/(?P<vgn_coords>.+)/(?P<position>.+)/$', views.vgn_redirect, name='vgn-redirect'),
 ]
diff --git a/ofu_app/apps/donar/views.py b/ofu_app/apps/donar/views.py
index a43b942..fb884fb 100644
--- a/ofu_app/apps/donar/views.py
+++ b/ofu_app/apps/donar/views.py
@@ -1,4 +1,4 @@
-from django.shortcuts import render
+from django.shortcuts import render, redirect
 
 from apps.donar.models import Room
 from apps.donar.models import VGN_Coords
@@ -32,3 +32,7 @@ def show_room(request, room):
 def bus_connections(request):
     locations = VGN_Coords.objects.all()
     return render(request, 'donar/vgn_connections.jinja', {'locations': locations})
+
+
+def vgn_redirect(request, position, vgn_coords):
+    return redirect('https://www.vgn.de/verbindungen/?to=' + position + '&td=' + vgn_coords)
diff --git a/ofu_app/static/js/donar/vgn.js b/ofu_app/static/js/donar/vgn.js
index c256641..1d3c7a0 100644
--- a/ofu_app/static/js/donar/vgn.js
+++ b/ofu_app/static/js/donar/vgn.js
@@ -3,25 +3,28 @@
  */
 document.addEventListener('DOMContentLoaded', loadVGNPos);
 
+function loadVGNPos() {
+    document.getElementById('vgn-links').style.visibility = "hidden";
+    getPos();
+}
+
 function getPos() {
-    var lat = 49.90734;
-    var lon = 10.90459;
+    lat = 49.90734;
+    lon = 10.90459;
     if (navigator.geolocation) {
         var geo_option = {
             enableHighAccuracy: true
         };
         navigator.geolocation.getCurrentPosition(function (position) {
-            lat = position.coords.latitude;
-            lon = position.coords.longitude;
-            document.getElementById('position').innerHTML = "Lat:" + pos['lat'] + " Lon: " + pos['lon']
+            getVGNCoords(position.coords.latitude, position.coords.longitude)
         }, function (err) {
+            console.log(err);
+            document.getElementById('err').textContent = "Leider konnte Ihre Position nicht ermittelt werden.";
         }, geo_option)
     }
-    return {'lat': lat, 'lon': lon};
 }
 function loadData(url) {
-    var address = document.getElementById('nav_data').getAttribute('data-address')
-
+    console.log("LOAD DATA")
     var xhttp = new XMLHttpRequest();
     xhttp.onreadystatechange = function () {
         if (this.readyState == 4 && this.status == 200) {
@@ -34,28 +37,19 @@ function loadData(url) {
 
 
 function getVGNCoords(lat, lon) {
-    console.log("getVGNCoords: " + lat + "/" + lon)
+    console.log("getVGNCoords: " + lat + "/" + lon);
     var url = "https://www.vgn.de/ib/site/tools/VN_PointDetail.php?Edition=de&lat=" + lat + "&lon=" + lon + "&mode=fnSetFromEFA&mode2=origin&_=1508264908632";
     loadData(url);
 }
 
-function loadVGNPos() {
-    document.getElementsByTagName('body')[0].style.visibility = "hidden"
-    pos = getPos()
-    console.log(pos)
-
-    getVGNCoords(pos['lat'], pos['lon'])
-}
-
 function setVGNLinks(response) {
     var type = response['ident']['type'];
     var startpoint = response['ident']['name'];
-    console.log("Startpoint" + startpoint)
+    console.log("Startpoint" + startpoint);
     var connections = document.getElementsByClassName('connection');
-    var destinations = document.getElementsByClassName('destination')
     for (var i = 0; i < connections.length; i++) {
-        connections[i].href = 'https://www.vgn.de/verbindungen/?to=' + startpoint + '&td=' + destinations[i].innerHTML;
+        connections[i].href = connections[i].href.replace('position', startpoint);
         console.log(connections[i].href)
     }
-    document.getElementsByTagName('body')[0].style.visibility = "visible"
+    document.getElementById('vgn-links').style.visibility = "visible"
 }
\ No newline at end of file
diff --git a/ofu_app/templates/donar/vgn_connections.jinja b/ofu_app/templates/donar/vgn_connections.jinja
index 535ebeb..89a0b31 100644
--- a/ofu_app/templates/donar/vgn_connections.jinja
+++ b/ofu_app/templates/donar/vgn_connections.jinja
@@ -7,14 +7,14 @@
     <p class="text-center">Donar</p>
 {% endblock %}
 {% block content %}
-    <p id="position"></p>
-    <div class="row">
+    <p id="err"></p>
+    <div id="vgn-links" class="row">
         {% if locations %}
             {% for location in locations %}
                 <div class="col-12 p-1">
                     <div class="p-2 border border-dark rounded-3 border border-dark rounded bg-light text-dark">
-                        <a class="connection" href="">{{ location.name }}</a>
-                        <p class="destination" hidden>{{ location.coords }}</p>
+                        <a class="connection"
+                           href="{{ url('vgn-redirect', args=[location.coords, 'position']) }}">{{ location.name }}</a>
                     </div>
                 </div>
             {% endfor %}