summaryrefslogtreecommitdiff
path: root/gpsd.php.in
diff options
context:
space:
mode:
authorBeat Bolli <bbolli@ewanet.ch>2012-04-09 14:30:15 +0200
committerEric S. Raymond <esr@thyrsus.com>2012-04-12 00:53:06 -0400
commit78d4684b24052a43a6b8614163257d7fdae7320d (patch)
tree4e0523e2125720e8f82f39befe65882c4db02d5c /gpsd.php.in
parente97d315667d0c7c735f919d2e0a26ca1475dc8fb (diff)
downloadgpsd-78d4684b24052a43a6b8614163257d7fdae7320d.tar.gz
gpsd.php: Fix OpenStreetMaps map display.
It looks like a lot more defaults can be used to show a meaningful map. The Layer.OSM.Osmarender object was undefined. See http://openlayers.org/dev/examples/osm.html for a basic OSM example. Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
Diffstat (limited to 'gpsd.php.in')
-rw-r--r--gpsd.php.in30
1 files changed, 9 insertions, 21 deletions
diff --git a/gpsd.php.in b/gpsd.php.in
index fe23c5d3..ec8f52c4 100644
--- a/gpsd.php.in
+++ b/gpsd.php.in
@@ -590,40 +590,28 @@ function gen_osm_head() {
global $GPS;
return <<<EOT
<script src="http://openlayers.org/api/OpenLayers.js" type="text/javascript"></script>
-<script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js" type="text/javascript"></script>
<script type="text/javascript">
<!--
- // Create a base icon for all of our markers that specifies the shadow, icon
- // dimensions, etc.
function Load() {
document.getElementById("map").firstChild.data = "";
- map = new OpenLayers.Map("map", {
+ var map = new OpenLayers.Map("map", {
controls: [
new OpenLayers.Control.Navigation(),
new OpenLayers.Control.PanZoomBar(),
new OpenLayers.Control.ScaleLine(),
new OpenLayers.Control.LayerSwitcher()
- ],
- maxResolution: 156543.0339,
- numZoomLevels: 20,
- units: 'm',
- projection: new OpenLayers.Projection("EPSG:900913"),
- displayProjection: new OpenLayers.Projection("EPSG:4326")
+ ]
});
- var layerMapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik");
- map.addLayer(layerMapnik);
+ var layer = new OpenLayers.Layer.OSM("Open Street Map");
+ map.addLayer(layer);
- var layerTilesAtHome = new OpenLayers.Layer.OSM.Osmarender("Osmarender");
- map.addLayer(layerTilesAtHome);
+ var center = new OpenLayers.LonLat({$GLOBALS['lon']}, {$GLOBALS['lat']})
+ .transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
+ map.setCenter(center, 12);
- center = new OpenLayers.LonLat({$GLOBALS['lon']}, {$GLOBALS['lat']}).transform(new OpenLayers.Projection("EPSG:4326"), map.getProjectionObject());
-
- markers = new OpenLayers.Layer.Markers( "Markers" );
- centermarker = new OpenLayers.Marker(center);
- markers.addMarker(centermarker);
+ var markers = new OpenLayers.Layer.Markers("Markers");
+ markers.addMarker(new OpenLayers.Marker(center));
map.addLayer(markers);
-
- map.setCenter(center, 17);
}
-->
</script>