Cleaned up some unreachable code. Added first test on the 'old' node controller.

[rails.git] / public / javascripts / map.js

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 7591d7d162b4e2b73c40449efab37256d77bee3b..c2ddf9c391fb7cb461a3c3f4aed48b933638989e 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -3,13 +3,26 @@ var map;
 var markers;
 var popup;
 
+var nonamekeys = {
+   'openstreetmap.org': '2f59745a6b525b4ebdb100891d5b6711',
+   'www.openstreetmap.org': 'fd093e52f0965d46bb1c6c6281022199',
+   'openstreetmap.com': '4c60e7f5f31c576a9bb8da71c8d61152',
+   'www.openstreetmap.com': '142f25a0770a51a9a400b3513834a199',
+   'openstreetmap.net': '687c58fd1d715596bfc94abe653d8ac0',
+   'www.openstreetmap.net': '0bd1654141c85d30b9c2ccdb5302f2e4'
+};
+
 OpenLayers._getScriptLocation = function () {
+  // Should really have this file as an erb, so that this can return 
+  // the real rails root
    return "/openlayers/";
 }
 
-function createMap(divName) {
+function createMap(divName, options) {
+   options = options || {};
+
    map = new OpenLayers.Map(divName, {
-      controls: [
+      controls: options.controls || [
          new OpenLayers.Control.ArgParser(),
          new OpenLayers.Control.Attribution(),
          new OpenLayers.Control.LayerSwitcher(),
@@ -18,7 +31,7 @@ function createMap(divName) {
          new OpenLayers.Control.ScaleLine()
       ],
       units: "m",
-      maxResolution: 156543,
+      maxResolution: 156543.0339,
       numZoomLevels: 20
    });
 
@@ -40,6 +53,18 @@ function createMap(divName) {
    });
    map.addLayer(cyclemap);
 
+   var nonamekey = nonamekeys[document.domain];
+   var noname = new OpenLayers.Layer.OSM("NoName", [
+      "http://a.tile.cloudmade.com/" + nonamekey + "/3/256/",
+      "http://b.tile.cloudmade.com/" + nonamekey + "/3/256/",
+      "http://c.tile.cloudmade.com/" + nonamekey + "/3/256/"
+   ], {
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true,
+      numZoomLevels: 19
+   });
+   map.addLayer(noname);
+
    var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", {
       displayOutsideMaxExtent: true,
       wrapDateLine: true
@@ -155,7 +180,11 @@ function setMapLayers(layerConfig) {
    for (var layers = map.getLayersBy("isBaseLayer", false), i = 0; i < layers.length; i++) {
       var c = layerConfig.charAt(l++);
 
-      layers[i].setVisibility(c == "T");
+      if (c == "T") {
+         layers[i].setVisibility(true);
+      } else if(c == "F") {
+         layers[i].setVisibility(false);
+      }
    }
 }