--- a/stopList.php
+++ b/stopList.php
@@ -1,101 +1,153 @@
 <?php
-include('common.inc.php');
+
+/*
+ *    Copyright 2010,2011 Alexander Sadleir 
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ */
+include ('include/common.inc.php');
+$stops = Array();
 
 function navbar() {
-   echo'
+    echo '
 		<div data-role="navbar">
 			<ul> 
-				<li><a href="stopList.php">Timing Points</a></li>
-				<li><a href="stopList.php?suburbs=yes">By Suburb</a></li>
+				<li><a href="stopList.php">Stops by Name</a></li>
+				<li><a href="stopList.php?bysuburbs=yes">By Suburb</a></li>
 				<li><a href="stopList.php?nearby=yes">Nearby Stops</a></li>
-				<li><a href="stopList.php?allstops=yes">All Stops</a></li> 
 			</ul>
                 </div>
 	';
 }
+
 // By suburb
-if (isset($_REQUEST['suburbs'])) {
-   include_header("Stops by Suburb","stopList");
-   navbar();
-   echo '  <ul data-role="listview" data-filter="true" data-inset="true" >';
-   foreach ($suburbs as $suburb) {
-         echo  '<li><a href="stopList.php?suburb='.urlencode($suburb).'">'.$suburb.'</a></li>';
-   }
-echo '</ul>';
+if (isset($bysuburbs)) {
+    include_header("Stops by Suburb", "stopList");
+    navbar();
+    echo '  <ul data-role="listview" data-filter="true" data-inset="true" >';
+    if (!isset($firstLetter)) {
+        foreach (range('A', 'Y') as $letter) { // no suburbs start with J, Q, U, V, X or Z
+            if ($letter != "J" && $letter != "Q" && $letter != "U" && $letter != "V" && $letter != "X") echo "<li><a href=\"stopList.php?firstLetter=$letter&amp;bysuburbs=yes\">$letter...</a></li>\n";
+        }
+    } else {
+        foreach ($suburbs as $suburb) {
+            if (startsWith($suburb, $firstLetter)) {
+                echo '<li><a href="stopList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
+            }
+        }
+    }
+    echo '</ul>';
 } else {
-// Timing Points / All stops
-
-if ($_REQUEST['allstops']) {
-   $url = $APIurl."/json/stops";
-   include_header("All Stops","stopList");
-   navbar();
-   	timePlaceSettings();
-} else if ($_REQUEST['nearby']) {
-   $url = $APIurl."/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15";
-include_header("Nearby Stops","stopList");
-   navbar();
-   timePlaceSettings(true);
-} else if ($_REQUEST['suburb']) {
-   $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
-   $url = $APIurl."/json/stopzonesearch?q=".$suburb;
-include_header("Stops in ".ucwords($suburb),"stopList");
-if (isMetricsOn()) {
-// Create a new Instance of the tracker
-$owa = new owa_php($config);
-// Set the ID of the site being tracked
-$owa->setSiteId($owaSiteID);
-// Create a new event object
-$event = $owa->makeEvent();
-// Set the Event Type, in this case a "video_play"
-$event->setEventType('view_stop_list_suburb');
-// Set a property
-$event->set('stop_list_suburb',$suburb);
-// Track the event
-$owa->trackEvent($event);
+    // Timing Points / All stops
+     if (isset($nearby)) {
+        $listType = 'nearby=yes';
+        include_header("Nearby Stops", "stopList", true, true);
+        trackEvent("Stop Lists", "Stops Nearby", $_SESSION['lat'] . "," . $_SESSION['lon']);
+        navbar();
+        if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
+            placeSettings();
+            include_footer();
+            die();
+        }
+        $stops = getNearbyStops($_SESSION['lat'], $_SESSION['lon'], 15);
+        echo '<div class="content-secondary">';
+        $stopPositions[] = Array(
+            $_SESSION['lat'],
+            $_SESSION['lon']
+        );
+        foreach ($stops as $sub_stop) {
+            $stopPositions[] = Array(
+                $sub_stop["stop_lat"],
+                $sub_stop["stop_lon"]
+            );
+        }
+        echo staticmap($stopPositions, true, true);
+        placeSettings();
+        echo '</div><div class="content-primary">';
+    } else if (isset($suburb)) {
+        $stops = getStopsBySuburb($suburb);
+        include_header("Stops in " . ucwords($suburb), "stopList");
+        navbar();
+        trackEvent("Stop Lists", "Stops By Suburb", $suburb);
+    } else {
+        $listType = 'allstops=yes';
+        $stops = getStops((isset($firstLetter)? $firstLetter : ""));
+        include_header("Stops by Name", "stopList");
+        navbar();
+    } 
+    echo '  <ul data-role="listview" data-filter="true" data-inset="true" >';
+    if (!isset($firstLetter) && !isset($suburb) && !isset($nearby)) { // all stops by letter
+        foreach (range('A', 'Y') as $letter) { // no streets start with X or Z
+            if ($letter != "X") echo "<li><a href=\"stopList.php?firstLetter=$letter&amp;$listType\">$letter...</a></li>\n";
+        }
+    } else {
+        //var_dump($stops);
+        $stopsGrouped = Array();
+        foreach ($stops as $key => $stop) {
+            if ($key + 1 >= sizeof($stops) || 
+                    stopCompare($stops[$key]["stop_name"]) != stopCompare($stops[$key + 1]["stop_name"])) {
+                if (sizeof($stopsGrouped) > 0) {
+                    // print and empty grouped stops
+                    // subsequent duplicates
+                    $stopsGrouped["stop_ids"][] = $stop['stop_id'];
+                    echo '<li>';
+                    echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '&stopcodes=' . implode(",", $stopsGrouped['stop_codes']) . '">';
+                    if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+                        echo '<span class="ui-li-count">' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>';
+                    }
+                    echo stopGroupTitle($stop['stop_name'],$stop['stop_desc']) . '<br><small>' . sizeof($stopsGrouped["stop_ids"]) . ' stops</small>';
+                    echo "</a></li>\n";
+                    flush();
+                    @ob_flush();
+                    $stopsGrouped = Array();
+                } else {
+                    // just a normal stop
+                    echo '<li>';
+                    echo '<a href="stop.php?stopid=' . $stop['stop_id'] . '&amp;stopcode=' . $stop['stop_code'] . '">';
+                    if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
+                        echo '<span class="ui-li-count">' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>';
+                    }
+                    echo $stop['stop_name'];
+                    echo "</a></li>\n";
+                    flush();
+                    @ob_flush();
+                }
+            } else {
+                // this is a duplicated line item
+                if ($key - 1 <= 0 || stopCompare($stops[$key]['stop_name']) != stopCompare($stops[$key - 1]['stop_name'])) {
+                    // first duplicate
+                    $stopsGrouped = Array(
+                        "name" => trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])),
+                        "stop_ids" => Array(
+                            $stop['stop_id']
+                        ),
+                        "stop_codes" => Array(
+                            $stop['stop_code']
+                        )
+                    );
+                } else {
+                    // subsequent duplicates
+                    $stopsGrouped["stop_ids"][] = $stop['stop_id'];
+                    
+                }
+            }
+        }
     }
-   navbar();
-} else {
-   $url = $APIurl."/json/timingpoints";
-   include_header("Timing Points / Major Stops","stopList");
-   navbar();
-   	timePlaceSettings();
+    echo '</ul>';
+    if (isset($nearby)) {
+        echo '</div>';
 }
-        echo '<div class="noscriptnav"> Go to letter: ';
-foreach(range('A','Z') as $letter) 
-{ 
-   echo "<a href=\"#$letter\">$letter</a>&nbsp;"; 
-}
-echo "</div>
-	<script>
-$('.noscriptnav').hide();
-        </script>";
-echo '  <ul data-role="listview" data-filter="true" data-inset="true" >';
-$contents = json_decode(getPage($url));
-debug(print_r($contents,true));
-foreach ($contents as $key => $row) {
-    $stopName[$key]  = $row[1];
-}
-
-// Sort the stops by name
-array_multisort($stopName, SORT_ASC, $contents);
-
-$firstletter = "";
-foreach ($contents as $row)
-{
-    if (substr($row[1],0,1) != $firstletter){
-        echo "<a name=$firstletter></a>";
-        $firstletter = substr($row[1],0,1);
-    }
-      echo  '<li><a href="stop.php?stopid='.$row[0].'">';
-      if (isset($_SESSION['lat']) && isset($_SESSION['lon'])){
-	 echo '<span class="ui-li-count">'.floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])).'m away</span>';
-      }
-      echo bracketsMeanNewLine($row[1]);
-      echo '</a></li>';
-        }
-echo '</ul>';
 }
 include_footer();
 ?>
 
-