X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/648f23259680f55d233656413679c58eec98c985..3458d881af4584e44d72bb682771e3c7a3cf6e68:/app/assets/javascripts/map.js.erb?ds=sidebyside

diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb
index ce75c1700..8b621e3ae 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -1,89 +1,62 @@
 // Leaflet extensions
-L.LatLngBounds.include({
-  getSouthLat: function () {
-    return this._southWest.lat;
-  },
-
-  getWestLng: function () {
-    return this._southWest.lng;
-  },
-
-  getNorthLat: function () {
-    return this._northEast.lat;
-  },
-
-  getEastLng: function () {
-    return this._northEast.lng;
-  },
-
-  toBBOX: function () {
-    var decimal = 6;
-    var mult = Math.pow(10, decimal);
-    var xmin = Math.round(this.getWestLng() * mult) / mult;
-    var ymin = Math.round(this.getSouthLat() * mult) / mult;
-    var xmax = Math.round(this.getEastLng() * mult) / mult;
-    var ymax = Math.round(this.getNorthLat() * mult) / mult;
-    return xmin + "," + ymin + "," + xmax + "," + ymax;
-  },
-
+L.extend(L.LatLngBounds.prototype, {
   getSize: function () {
     return (this._northEast.lat - this._southWest.lat) *
            (this._northEast.lng - this._southWest.lng);
-  }
-});
-
-L.Bounds.include({
-  getWidth: function () {
-   return this.max.x - this.min.x;
   },
 
-  getHeight: function () {
-   return this.max.y - this.min.y;
+  wrap: function () {
+    return new L.LatLngBounds(this._southWest.wrap(), this._northEast.wrap());
   }
 });
 
 L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
 
 var map;
+var layers;
+var objectLayer;
+var objectLoader;
 
-var layers = [
-  {
-    klass: L.OSM.Mapnik,
-    attribution: "",
-    keyid: "mapnik",
-    layerCode: "M",
-    name: I18n.t("javascripts.map.base.standard")
-  },
-  {
-    klass: L.OSM.CycleMap,
-    attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
-    keyid: "cyclemap",
-    layerCode: "C",
-    name: I18n.t("javascripts.map.base.cycle_map")
-  },
-  {
-    klass: L.OSM.TransportMap,
-    attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
-    keyid: "transportmap",
-    layerCode: "T",
-    name: I18n.t("javascripts.map.base.transport_map")
-  },
-  {
-    klass: L.OSM.MapQuestOpen,
-    attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
-    keyid: "mapquest",
-    layerCode: "Q",
-    name: I18n.t("javascripts.map.base.mapquest")
+function createMap(divName, options) {
+  if (!layers) {
+    layers = [
+      {
+        klass: L.OSM.Mapnik,
+        attribution: "",
+        keyid: "mapnik",
+        layerCode: "M",
+        name: I18n.t("javascripts.map.base.standard")
+      },
+      {
+        klass: L.OSM.CycleMap,
+        attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+        keyid: "cyclemap",
+        layerCode: "C",
+        name: I18n.t("javascripts.map.base.cycle_map")
+      },
+      {
+        klass: L.OSM.TransportMap,
+        attribution: "Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+        keyid: "transportmap",
+        layerCode: "T",
+        name: I18n.t("javascripts.map.base.transport_map")
+      },
+      {
+        klass: L.OSM.MapQuestOpen,
+        attribution: "Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
+        keyid: "mapquest",
+        layerCode: "Q",
+        name: I18n.t("javascripts.map.base.mapquest")
+      }
+    ];
   }
-];
 
-function createMap(divName, options) {
-  options = $.extend({zoomControl: false, panZoomControl: true, layerControl: true}, options);
+  options = $.extend({zoomControl: true, panZoomControl: true, layerControl: true}, options);
 
   map = L.map(divName, $.extend({}, options, {panControl: false, zoomsliderControl: false, maxZoom: 18}));
 
   if (map.attributionControl) {
-    map.attributionControl.setPrefix(''); // For tmcw
+    map.attributionControl.setPrefix('');
   }
 
   if (options.panZoomControl) {
@@ -95,16 +68,16 @@ function createMap(divName, options) {
 
   if (options.layerControl) {
     layersControl.addTo(map);
+    map.layersControl = layersControl;
   }
 
   for (var i = 0; i < layers.length; i++) {
     layers[i].layer = new (layers[i].klass)(layers[i]);
-    if (i == 0) {
-      layers[i].layer.addTo(map);
-    }
     layersControl.addBaseLayer(layers[i].layer, layers[i].name);
   }
 
+  layers[0].layer.addTo(map);
+
   $("#" + divName).on("resized", function () {
     map.invalidateSize();
   });
@@ -112,20 +85,31 @@ function createMap(divName, options) {
   return map;
 }
 
-function getArrowIcon() {
+function getUserIcon(url) {
   return L.icon({
-    iconUrl: <%= asset_path('arrow.png').to_json %>,
-    iconSize: [25, 22],
-    iconAnchor: [22, 20]
+    iconUrl: url || <%= asset_path('marker-red.png').to_json %>,
+    iconSize: [25, 41],
+    iconAnchor: [12, 41],
+    popupAnchor: [1, -34],
+    shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>,
+    shadowSize: [41, 41]
   });
 }
 
 function addObjectToMap(object, zoom, callback) {
-  $.ajax({
+  if (objectLoader) {
+    objectLoader.abort();
+  }
+
+  if (objectLayer) {
+    map.removeLayer(objectLayer);
+  }
+
+  objectLoader = $.ajax({
     url: OSM.apiUrl(object),
     dataType: "xml",
     success: function (xml) {
-      var layer = new L.OSM.DataLayer(xml, {
+      objectLayer = new L.OSM.DataLayer(null, {
         style: {
           strokeColor: "blue",
           strokeWidth: 3,
@@ -136,7 +120,21 @@ function addObjectToMap(object, zoom, callback) {
         }
       });
 
-      var bounds = layer.getBounds();
+      objectLayer.interestingNode = function (node, ways, relations) {
+        if (object.type === "node") {
+          return true;
+        } else if (object.type === "relation") {
+          for (var i = 0; i < relations.length; i++)
+            if (relations[i].members.indexOf(node) != -1)
+              return true;
+        } else {
+          return false;
+        }
+      };
+
+      objectLayer.addData(xml);
+
+      var bounds = objectLayer.getBounds();
 
       if (zoom) {
         map.fitBounds(bounds);
@@ -146,7 +144,7 @@ function addObjectToMap(object, zoom, callback) {
         callback(bounds);
       }
 
-      layer.addTo(map);
+      objectLayer.addTo(map);
     }
   });
 }
@@ -172,21 +170,26 @@ function getMapBaseLayer() {
 }
 
 function getMapLayers() {
+  var layerConfig = "";
   for (var i = 0; i < layers.length; i++) {
     if (map.hasLayer(layers[i].layer)) {
-      return layers[i].layerCode;
+      layerConfig += layers[i].layerCode;
     }
   }
-
-  return "";
+  return layerConfig;
 }
 
 function setMapLayers(layerConfig) {
+  var foundLayer = false;
   for (var i = 0; i < layers.length; i++) {
-    if (~layerConfig.indexOf(layers[i].layerCode)) {
+    if (layerConfig.indexOf(layers[i].layerCode) >= 0) {
       map.addLayer(layers[i].layer);
+      foundLayer = true;
     } else {
       map.removeLayer(layers[i].layer);
     }
   }
+  if (!foundLayer) {
+    map.addLayer(layers[0].layer);
+  }
 }