Merge branch 'master' into notes

[rails.git] / app / assets / javascripts / map.js.erb

diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index 82826ebfbf5cf43e4a19cdf527bf245bd95d3868..c06c9c8eaf809cf0aecc9733da766b0458aeff2a 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -14,7 +14,7 @@ function createMap(divName, options) {
          new SimpleLayerSwitcher(),
          new OpenLayers.Control.Navigation(),
          new OpenLayers.Control.Zoom(),
          new SimpleLayerSwitcher(),
          new OpenLayers.Control.Navigation(),
          new OpenLayers.Control.Zoom(),

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

          new OpenLayers.Control.ScaleLine({geodesic: true})
       ],
       numZoomLevels: 20,
          new OpenLayers.Control.ScaleLine({geodesic: true})
       ],
       numZoomLevels: 20,


@@ -22,7 +22,7 @@ function createMap(divName, options) {
       theme: "<%= asset_path 'theme/openstreetmap/style.css' %>"
    });
 
       theme: "<%= asset_path 'theme/openstreetmap/style.css' %>"
    });
 

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

       attribution: "",
       keyid: "mapnik",
       displayOutsideMaxExtent: true,
       attribution: "",
       keyid: "mapnik",
       displayOutsideMaxExtent: true,


@@ -31,7 +31,7 @@ function createMap(divName, options) {
    });
    map.addLayer(mapnik);
 
    });
    map.addLayer(mapnik);
 

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

       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
       keyid: "cyclemap",
       displayOutsideMaxExtent: true,
       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
       keyid: "cyclemap",
       displayOutsideMaxExtent: true,


@@ -40,7 +40,7 @@ function createMap(divName, options) {
    });
    map.addLayer(cyclemap);
 
    });
    map.addLayer(cyclemap);
 

-   var transportmap = new OpenLayers.Layer.OSM.TransportMap(i18n("javascripts.map.base.transport_map"), {
+   var transportmap = new OpenLayers.Layer.OSM.TransportMap(I18n.t("javascripts.map.base.transport_map"), {

       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
       keyid: "transportmap",
       displayOutsideMaxExtent: true,
       attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
       keyid: "transportmap",
       displayOutsideMaxExtent: true,


@@ -49,7 +49,7 @@ function createMap(divName, options) {
    });
    map.addLayer(transportmap);
 
    });
    map.addLayer(transportmap);
 

-   var mapquest = new OpenLayers.Layer.OSM(i18n("javascripts.map.base.mapquest"), [
+   var mapquest = new OpenLayers.Layer.OSM(I18n.t("javascripts.map.base.mapquest"), [

       "http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
       "http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
       "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
       "http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
       "http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",
       "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png",


@@ -71,6 +71,16 @@ function createMap(divName, options) {
    });
    map.addLayer(markers);
 
    });
    map.addLayer(markers);
 

+   map.dataLayer = new OpenLayers.Layer(I18n.t('browse.start_rjs.data_layer_name'), {
+     visibility: false,
+     displayInLayerSwitcher: false
+   });
+   map.addLayer(map.dataLayer);
+
+   $("#" + divName).on("resized", function () {
+     map.updateSize();
+   });
+

    return map;
 }
 
    return map;
 }
 


@@ -96,13 +106,13 @@ function addMarkerToMap(position, icon, description) {
    return marker;
 }
 
    return marker;
 }
 

-function addObjectToMap(url, zoom, callback) {
+function addObjectToMap(object, zoom, callback) {

    var layer = new OpenLayers.Layer.Vector("Objects", {
       strategies: [ 
           new OpenLayers.Strategy.Fixed()
       ],
       protocol: new OpenLayers.Protocol.HTTP({
    var layer = new OpenLayers.Layer.Vector("Objects", {
       strategies: [ 
           new OpenLayers.Strategy.Fixed()
       ],
       protocol: new OpenLayers.Protocol.HTTP({

-          url: url,
+          url: OSM.apiUrl(object),

           format: new OpenLayers.Format.OSM()
       }),
       style: {
           format: new OpenLayers.Format.OSM()
       }),
       style: {


@@ -186,7 +196,6 @@ function openMapPopup(marker, description) {
 function closeMapPopup() {
    if (popup) {
       map.removePopup(popup);
 function closeMapPopup() {
    if (popup) {
       map.removePopup(popup);

-      delete popup;

    }
 }
 
    }
 }
 


@@ -194,10 +203,6 @@ function removeMarkerFromMap(marker){
    markers.removeMarker(marker);
 }
 
    markers.removeMarker(marker);
 }
 

-function removeBoxFromMap(box){
-   vectors.removeFeature(box);
-}
-

 function proj(x) {
     return x.clone().transform(epsg4326, map.getProjectionObject());
 }
 function proj(x) {
     return x.clone().transform(epsg4326, map.getProjectionObject());
 }


@@ -214,7 +219,7 @@ function setMapCenter(center, zoom) {
 }
 
 function getEventPosition(event) {
 }
 
 function getEventPosition(event) {

-   return map.getLonLatFromViewPortPx(event.xy).clone().transform(map.getProjectionObject(), epsg4326);
+   return unproj(map.getLonLatFromViewPortPx(event.xy));

 }
 
 function getMapLayers() {
 }
 
 function getMapLayers() {