Localise notes interface

[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 8aa9868b32441b9b7f6caae419a637fa6db027bc..4c1a849dc25d5f4a4572ac74e649515a378eb0e1 100644 (file)
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -81,6 +81,8 @@ function createMap(divName, options) {
      map.updateSize();
    });
 
      map.updateSize();
    });
 

+   $("#" + divName).trigger("initialised");
+

    return map;
 }
 
    return map;
 }
 


@@ -106,13 +108,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: {


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

-      delete popup;

    }
 }
 
    }
 }
 


@@ -204,10 +205,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());
 }


@@ -224,7 +221,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() {