Author: dom Date: 2007-07-05 22:33:52 +0100 (Thu, 05 Jul 2007) New Revision: 1113

Modified: sites/oxford.openguides.org/templates/map_index.tt sites/oxford.openguides.org/templates/node.tt Log: Use tile.openstreetmap.org instead

Modified: sites/oxford.openguides.org/templates/map_index.tt =================================================================== --- sites/oxford.openguides.org/templates/map_index.tt 2007-07-05 21:19:19 UTC (rev 1112) +++ sites/oxford.openguides.org/templates/map_index.tt 2007-07-05 21:33:52 UTC (rev 1113) @@ -28,16 +28,16 @@ var map = new GMap2(document.getElementById("map"));

var copycol = new GCopyrightCollection(""); - var copy = new GCopyright(1, new GLatLngBounds(new GLatLng(-90,-180),new GLatLng(90,180)), 0, "OpenStreetMap"); + var copy = new GCopyright(1, new GLatLngBounds(new GLatLng(-90,-180),new GLatLng(90,180)), 0, "&copy;2007 <a href='http://www.openstreetmap.org%3EOpenStreetMap</a> contributors"); copycol.addCopyright(copy); - var tileMapnik = new GTileLayer(copycol,1,17); - tileMapnik.myBaseURL = "http://mapnik.uberfoo.com/"; + var tileMapnik = new GTileLayer(copycol,1,18); + tileMapnik.myBaseURL = "http://tile.openstreetmap.org/"; tileMapnik.getTileUrl=MapnikGetTileUrl; tileMapnik.isPng = function () { return true;} tileMapnik.getOpacity = function() {return 1.0;}

var layer0 = [tileMapnik]; - var mapnikMap = new GMapType(layer0, G_SATELLITE_MAP.getProjection(), "Mapnik", G_SATELLITE_MAP); + var mapnikMap = new GMapType(layer0, G_SATELLITE_MAP.getProjection(), "OSM", G_SATELLITE_MAP); map.addMapType(mapnikMap);

map.addControl(new GLargeMapControl());

Modified: sites/oxford.openguides.org/templates/node.tt =================================================================== --- sites/oxford.openguides.org/templates/node.tt 2007-07-05 21:19:19 UTC (rev 1112) +++ sites/oxford.openguides.org/templates/node.tt 2007-07-05 21:33:52 UTC (rev 1113) @@ -17,16 +17,16 @@ var map = new GMap2(document.getElementById("map")); new GKeyboardHandler(map); var copycol = new GCopyrightCollection(""); - var copy = new GCopyright(1, new GLatLngBounds(new GLatLng(-90,-180),new GLatLng(90,180)), 0, "OpenStreetMap"); + var copy = new GCopyright(1, new GLatLngBounds(new GLatLng(-90,-180),new GLatLng(90,180)), 0, "<a href='http://www.openstreetmap.org%3EOpenStreetMap</a>"); copycol.addCopyright(copy); - var tileMapnik = new GTileLayer(copycol,1,17); - tileMapnik.myBaseURL = "http://mapnik.uberfoo.com/"; + var tileMapnik = new GTileLayer(copycol,1,18); + tileMapnik.myBaseURL = "http://tile.openstreetmap.org/"; tileMapnik.getTileUrl=MapnikGetTileUrl; tileMapnik.isPng = function () { return true;} tileMapnik.getOpacity = function() {return 1.0;}

var layer0 = [tileMapnik]; - var mapnikMap = new GMapType(layer0, G_SATELLITE_MAP.getProjection(), "Mapnik", G_SATELLITE_MAP); + var mapnikMap = new GMapType(layer0, G_SATELLITE_MAP.getProjection(), "OSM", G_SATELLITE_MAP); map.addMapType(mapnikMap);