Added custom validator for UTF-8 strings.

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

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index bc2e9086326dbbbe1b24b6bdbc9da474c1ef9b7b..c2ddf9c391fb7cb461a3c3f4aed48b933638989e 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -3,12 +3,24 @@ var map;
 var markers;
 var popup;
 
 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 () {
 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, options) {
    return "/openlayers/";
 }
 
 function createMap(divName, options) {

-   if (!options) { options = {} }
+   options = options || {};
+

    map = new OpenLayers.Map(divName, {
       controls: options.controls || [
          new OpenLayers.Control.ArgParser(),
    map = new OpenLayers.Map(divName, {
       controls: options.controls || [
          new OpenLayers.Control.ArgParser(),


@@ -35,6 +47,24 @@ function createMap(divName, options) {
    });
    map.addLayer(osmarender);
 
    });
    map.addLayer(osmarender);
 

+   var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle Map", {
+      displayOutsideMaxExtent: true,
+      wrapDateLine: true
+   });
+   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
    var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", {
       displayOutsideMaxExtent: true,
       wrapDateLine: true


@@ -110,38 +140,50 @@ function setMapExtent(extent) {
    map.zoomToExtent(extent.clone().transform(epsg4326, map.getProjectionObject()));
 }
 
    map.zoomToExtent(extent.clone().transform(epsg4326, map.getProjectionObject()));
 }
 

+function getMapExtent(extent) {
+   return map.getExtent().clone().transform(map.getProjectionObject(), epsg4326);
+}
+

 function getEventPosition(event) {
    return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);
 }
 
 function getMapLayers() {
 function getEventPosition(event) {
    return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);
 }
 
 function getMapLayers() {

-   var layers = "";
+   var layerConfig = "";

 
 

-   for (var i=0; i< this.map.layers.length; i++) {
-      var layer = this.map.layers[i];
+   for (var layers = map.getLayersBy("isBaseLayer", true), i = 0; i < layers.length; i++) {
+      layerConfig += layers[i] == map.baseLayer ? "B" : "0";
+   }

 
 

-      if (layer.isBaseLayer) {
-         layers += (layer == this.map.baseLayer) ? "B" : "0";
-      } else {
-         layers += (layer.getVisibility()) ? "T" : "F";
-      }
+   for (var layers = map.getLayersBy("isBaseLayer", false), i = 0; i < layers.length; i++) {
+      layerConfig += layers[i].getVisibility() ? "T" : "F";

    }
 
    }
 

-   return layers;
+   return layerConfig;

 }
 
 }
 

-function setMapLayers(layers) {
-   for (var i=0; i < layers.length; i++) {
-      var layer = map.layers[i];
+function setMapLayers(layerConfig) {
+   var l = 0;
+
+   for (var layers = map.getLayersBy("isBaseLayer", true), i = 0; i < layers.length; i++) {
+      var c = layerConfig.charAt(l++);
+
+      if (c == "B") {
+         map.setBaseLayer(layers[i]);
+      }
+   }
+
+   while (layerConfig.charAt(l) == "B" || layerConfig.charAt(l) == "0") {
+      l++;
+   }

 
 

-      if (layer) {
-         var c = layers.charAt(i);
+   for (var layers = map.getLayersBy("isBaseLayer", false), i = 0; i < layers.length; i++) {
+      var c = layerConfig.charAt(l++);

 
 

-         if (c == "B") {
-            map.setBaseLayer(layer);
-         } else if ( (c == "T") || (c == "F") ) {
-            layer.setVisibility(c == "T");
-         }
+      if (c == "T") {
+         layers[i].setVisibility(true);
+      } else if(c == "F") {
+         layers[i].setVisibility(false);

       }
    }
 }
       }
    }
 }