X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5ac70d894634f35ad26ac7be12e115ed57ad7a83..c3c16bf59186524c23f11809520e701942596471:/public/javascripts/map.js

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 63c4e4915..369df8987 100644
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -2,63 +2,43 @@ var map;
 var markers;
 var popup;
 
+OpenLayers._getScriptLocation = function () {
+   return "/openlayers/";
+}
+   
 function createMap(divName) {
-   OpenLayers.Util.onImageLoadError = function() {
-      this.src = OpenLayers.Util.getImagesLocation() + "404.png";
-   }
-
-   map = new OpenLayers.Map(divName,
-                            { maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
-                              numZoomLevels: 19,
-                              maxResolution: 156543,
-                              units: 'm',
-                              projection: "EPSG:41001" });
-
-   var mapnik = new OpenLayers.Layer.TMS("Mapnik",
-                                         ["http://a.tile.openstreetmap.org/","http://b.tile.openstreetmap.org/","http://c.tile.openstreetmap.org/"],
-                                         { type: 'png', getURL: getTileURL, displayOutsideMaxExtent: true });
+   map = new OpenLayers.Map(divName, {
+      controls: [
+         new OpenLayers.Control.ArgParser(), 
+         new OpenLayers.Control.Attribution(),
+         new OpenLayers.Control.LayerSwitcher(),
+         new OpenLayers.Control.Navigation(), 
+         new OpenLayers.Control.PanZoomBar()
+      ]
+   });
+
+   var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", { displayOutsideMaxExtent: true });
    map.addLayer(mapnik);
 
-   var osmarender = new OpenLayers.Layer.TMS("Osmarender",
-                                             "http://tah.openstreetmap.org/Tiles/tile.php/",
-                                             { type: 'png', getURL: getTileURL, displayOutsideMaxExtent: true });
+   var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", { displayOutsideMaxExtent: true });
    map.addLayer(osmarender);
 
-   markers = new OpenLayers.Layer.Markers("markers", { visibility: false });
+   var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", { displayOutsideMaxExtent: true });
+   map.addLayer(maplint);
+
+   var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels);
+   markers = new OpenLayers.Layer.Markers("Markers", { 
+      displayInLayerSwitcher: false, numZoomLevels: numZoomLevels,
+      maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508),
+      maxResolution: 156543,
+      units: "m",
+      projection: "EPSG:41001"
+   });
    map.addLayer(markers);
 
-   map.addControl(new OpenLayers.Control.LayerSwitcher());
-
    return map;
 }
 
-function getTileURL(bounds) {
-   var res = this.map.getResolution();
-   var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
-   var y = Math.round((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
-   var z = this.map.getZoom();
-   var limit = Math.pow(2, z);
-
-   if (y < 0 || y >= limit)
-   {
-     return OpenLayers.Util.getImagesLocation() + "404.png";
-   }
-   else
-   {
-     x = ((x % limit) + limit) % limit;
-
-     var url = this.url;
-     var path = z + "/" + x + "/" + y + "." + this.type;
-
-     if (url instanceof Array)
-     {
-        url = this.selectUrl(path, url);
-     }
-
-     return url + path;
-   }
-}
-
 function getArrowIcon() {
    var size = new OpenLayers.Size(25, 22);
    var offset = new OpenLayers.Pixel(-30, -27);
@@ -71,7 +51,6 @@ function addMarkerToMap(position, icon, description) {
    var marker = new OpenLayers.Marker(position, icon);
 
    markers.addMarker(marker);
-   markers.setVisibility(true);
 
    if (description) {
       marker.events.register("click", marker, function() { openMapPopup(marker, description) });