--- a/display.php
+++ b/display.php
@@ -1,29 +1,50 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-<script type="text/javascript" src="http://loki.com/plugin/files/loki.js"></script>
     <script src="openlayers/OpenLayers.js"></script>
+ <SCRIPT TYPE="text/javascript" SRC="OpenStreetMap.js"></SCRIPT> 
     <script type="text/javascript">
-var map, layer;
-
-function aaa(a)
-{
-    var lonLat = new OpenLayers.LonLat(a.coords.longitude, a.coords.latitude).transform(new OpenLayers.Projection("EPSG:4326"), 
-map.getProjectionObject());
-    map.setCenter(lonLat, 13);
-
-}
-
-function handleError(a)
-{
-    alert("error in geoloc");
-}
 
 function init()
 {
     var extent = new OpenLayers.Bounds(148.98, -35.48, 149.25, -35.15);
-    map = new OpenLayers.Map('map');
-    layer = new OpenLayers.Layer.OSM("local", "http://10.0.1.153/tiles/${z}/${x}/${y}.png");
-    map.addLayer(layer);
+ 
+		// set up the map options
+		var options = 
+		{
+			   maxExtent: extent,
+			   numZoomLevels: 20, 
+		}; 
+ 
+		// create the ol map object
+		var map = new OpenLayers.Map('map', options);
+    
+var osmtiles = new OpenLayers.Layer.OSM("local", "http://10.0.1.154/tiles/${z}/${x}/${y}.png");
+// use http://open.atlas.free.fr/GMapsTransparenciesImgOver.php and http://code.google.com/p/googletilecutter/ to make tiles
+ var graphic = new OpenLayers.Layer.Image(
+                'Weekday Bus Map',
+                'weekday_bus_map.png',
+                new OpenLayers.Bounds(149.0, -35.47, 149.16, -35.16),
+                new OpenLayers.Size(1191, 2268),
+		{baseLayer: false}
+            );
+
+var nearmap = new OpenLayers.Layer.OSM.NearMap("NearMap");
+
+    var routes = new OpenLayers.Layer.GML("Routes", "displayroutes.kml.php", {
+        format: OpenLayers.Format.KML,
+        formatOptions: {
+            extractStyles: true,
+            extractAttributes: true,
+            maxDepth: 2
+        }
+    });
+var stopicon = new OpenLayers.Icon("http://maps.google.com/mapfiles/kml/pushpin/ylw-pushpin.png",new OpenLayers.Size(32,32));
+    var stops = new OpenLayers.Layer.GeoRSS("Stops", "displaystops.georss.php", { icon: stopicon });
+var timeicon = new OpenLayers.Icon("http://maps.google.com/mapfiles/kml/pushpin/grn-pushpin.png",new OpenLayers.Size(32,32));
+    var timepoints = new OpenLayers.Layer.GeoRSS("Timing Points", "displaytimepoints.georss.php", { icon: timeicon }); 
+
+	map.addLayers([osmtiles,stops,routes,timepoints,nearmap]);
+
     var lonLat = new OpenLayers.LonLat(149.11, -35.28).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
     map.setCenter(lonLat, 13);
     map.addControl( new OpenLayers.Control.LayerSwitcher({'ascending':false}));
@@ -36,47 +57,9 @@
     {
         displayProjection: new OpenLayers.Projection("EPSG:900913")
     }));
-    if (navigator.geolocation)
-    {
-        navigator.geolocation.getCurrentPosition(this.aaa, this.handleError);
-    }
-    else
-    {
-        var loki = LokiAPI();
-        loki.onSuccess = function (location)
-        {
-            var lonLat = new OpenLayers.LonLat(location.longitude, location.latitude).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
-            map.setCenter(lonLat, 13);
-        }
-        loki.onFailure = function (error)
-        {
-            loki.requestIPLocation(true, loki.NO_STREET_ADDRESS_LOOKUP)
-        }
-        loki.setKey('maxious.lambdacomplex.org');
-        loki.requestLocation(true, loki.NO_STREET_ADDRESS_LOOKUP);
-    }
-    map.addLayer(new OpenLayers.Layer.GML("KML", "displayroutes.kml.php", {
-        format: OpenLayers.Format.KML,
-        formatOptions: {
-            extractStyles: true,
-            extractAttributes: true,
-            maxDepth: 2
-        }
-    }));
-    map.addLayer(new OpenLayers.Layer.Vector("KML", {
-        projection: map.displayProjection,
-        strategies: [new OpenLayers.Strategy.Fixed()],
-        protocol: new OpenLayers.Protocol.HTTP(
-        {
-            url: "displaystops.kml.php",
-            format: new OpenLayers.Format.KML(
-            {
-                extractStyles: true,
-                extractAttributes: true
-            })
-        })
-    }));
+
 }
+ 
     </script>
 
   </head>

