Merged 17256:18123 from trunk.

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

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index 9773ab348c4505ff881dbabeaba6c155828b6247..a25ab1614d655adcca53d1299c14d8f717a23b9d 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -13,12 +13,6 @@ var nonamekeys = {
    'www.openstreetmap.net': '0bd1654141c85d30b9c2ccdb5302f2e4'
 };
 
    '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, options) {
    options = options || {};
 
 function createMap(divName, options) {
    options = options || {};
 


@@ -28,8 +22,7 @@ function createMap(divName, options) {
          new OpenLayers.Control.Attribution(),
          new OpenLayers.Control.LayerSwitcher(),
          new OpenLayers.Control.Navigation(),
          new OpenLayers.Control.Attribution(),
          new OpenLayers.Control.LayerSwitcher(),
          new OpenLayers.Control.Navigation(),

-         new OpenLayers.Control.PanZoomBar(),
-         new OpenLayers.Control.ScaleLine()
+         new OpenLayers.Control.PanZoomBar()

       ],
       units: "m",
       maxResolution: 156543.0339,
       ],
       units: "m",
       maxResolution: 156543.0339,


@@ -37,26 +30,26 @@ function createMap(divName, options) {
       displayProjection: new OpenLayers.Projection("EPSG:4326")
    });
 
       displayProjection: new OpenLayers.Projection("EPSG:4326")
    });
 

-   var mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik", {
+   var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), {

       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(mapnik);
 
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(mapnik);
 

-   var osmarender = new OpenLayers.Layer.OSM.Osmarender("Osmarender", {
+   var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {

       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(osmarender);
 
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(osmarender);
 

-   var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle Map", {
+   var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {

       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(cyclemap);
 
    var nonamekey = nonamekeys[document.domain];
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(cyclemap);
 
    var nonamekey = nonamekeys[document.domain];

-   var noname = new OpenLayers.Layer.OSM("NoName", [
+   var noname = new OpenLayers.Layer.OSM(i18n("javascripts.map.base.noname"), [

       "http://a.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png",
       "http://b.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png",
       "http://c.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png"
       "http://a.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png",
       "http://b.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png",
       "http://c.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png"


@@ -67,7 +60,7 @@ function createMap(divName, options) {
    });
    map.addLayer(noname);
 
    });
    map.addLayer(noname);
 

-   var maplint = new OpenLayers.Layer.OSM.Maplint("Maplint", {
+   var maplint = new OpenLayers.Layer.OSM.Maplint(i18n("javascripts.map.overlays.maplint"), {

       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });


@@ -116,7 +109,8 @@ function addObjectToMap(url, zoom, callback) {
           strokeWidth: 3,
           strokeOpacity: 0.5,
           fillOpacity: 0.2,
           strokeWidth: 3,
           strokeOpacity: 0.5,
           fillOpacity: 0.2,

-          fillColor: "lightblue"
+          fillColor: "lightblue",
+          pointRadius: 6

       },
       projection: new OpenLayers.Projection("EPSG:4326"),
       displayInLayerSwitcher: false
       },
       projection: new OpenLayers.Projection("EPSG:4326"),
       displayInLayerSwitcher: false


@@ -145,16 +139,16 @@ function addObjectToMap(url, zoom, callback) {
          callback(extent);
       }
    });
          callback(extent);
       }
    });

-  
+

    map.addLayer(layer);
 
    layer.loadGML();
 }
 
 function addBoxToMap(boxbounds) {
    map.addLayer(layer);
 
    layer.loadGML();
 }
 
 function addBoxToMap(boxbounds) {

-   if(!vectors) {
+   if (!vectors) {

      // Be aware that IE requires Vector layers be initialised on page load, and not under deferred script conditions
      // Be aware that IE requires Vector layers be initialised on page load, and not under deferred script conditions

-     vectors = new OpenLayers.Layer.Vector("Box Layer", {
+     vectors = new OpenLayers.Layer.Vector("Boxes", {

         displayInLayerSwitcher: false
      });
      map.addLayer(vectors);
         displayInLayerSwitcher: false
      });
      map.addLayer(vectors);


@@ -165,7 +159,7 @@ function addBoxToMap(boxbounds) {
       strokeColor: '#ee9900',
       fillOpacity: 0
    });
       strokeColor: '#ee9900',
       fillOpacity: 0
    });

-   
+

    vectors.addFeatures(box);
 
    return box;
    vectors.addFeatures(box);
 
    return box;