From 51629eeeceb8388dae3c1e735c123a86b9d7d65c Mon Sep 17 00:00:00 2001
From: George Kaklamanos <gkaklas1@gmail.com>
Date: Sat, 20 Feb 2016 14:42:47 +0200
Subject: [PATCH] Change map parameter to be array of coordinates.

---
 ShowStop.php    |  2 +-
 modules/map.php | 26 +++++++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ShowStop.php b/ShowStop.php
index e24131e..7c81894 100644
--- a/ShowStop.php
+++ b/ShowStop.php
@@ -29,7 +29,7 @@ if (isValidStop($_GET["stop"])){
     echo '<div id="routes" class="tab-pane fade in active" role="tabpanel">';
     PrintRoutes($_GET["stop"]);
     echo '</div><div id="map" class="tab-pane fade" role="tabpanel">';
-    ShowMap($stop['lat'],$stop['lon']);
+    ShowMap(array(array($stop['lat'],$stop['lon'])));
     echo '</div></div>';
 } else {
     echo '<span style="display:inline-block" class="alert alert-danger" role="alert">No such stop. <a href="javascript:history.back()">Go back?</a></span>';
diff --git a/modules/map.php b/modules/map.php
index 0b25bd0..3ec2dc8 100644
--- a/modules/map.php
+++ b/modules/map.php
@@ -2,11 +2,10 @@
 <script src="openlayers/ol.js"></script>
 
 <?php
-function ShowMap($lat,$lon){
+function ShowMap($coords){
 ?>
     <div id="mymap" style="width:300px;height:300px;overflow:hidden;"></div>
     <script>
-        var pos = new ol.proj.fromLonLat([<?=$lon?>, <?=$lat?>]);
         var style = new ol.style.Style({
             image: new ol.style.Circle({
                 fill: new ol.style.Fill({color: '#FF0000'}),
@@ -14,12 +13,25 @@ function ShowMap($lat,$lon){
                 radius: 5
             })
         });
-        var feat = new ol.Feature({
-            geometry: new ol.geom.Point(pos)
-        });
-        feat.setStyle(style);
+<?php 
+echo "var coordinates = [";
+for ($i=0; $i<count($coords)-1;$i++){
+    $loc = $coords[$i];
+    echo '['. $loc[1] . ',' . $loc[0] . '],';
+}
+echo '['. $coords[$i][1] . ',' . $coords[$i][0] . ']];';
+?>
+        var pos = new ol.proj.fromLonLat([coordinates[0][0],coordinates[0][1]]);
+        var features = [];
+        for(var i=0; i<coordinates.length; i++){
+            var feat = new ol.Feature({
+                geometry: new ol.geom.Point(new ol.proj.fromLonLat([coordinates[i][0],coordinates[i][1]]))
+            });
+            feat.setStyle(style);
+            features.push(feat);
+        }
 
-        var vectorSource = new ol.source.Vector({features:[feat]});
+        var vectorSource = new ol.source.Vector({features:features});
         var vectorLayer = new ol.layer.Vector({
             source: vectorSource,
             opacity: 0.5