X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/19bac47e5f282ccd532fc29a68faa04928c72353..a1af4d5de13e8a2094089453cbae6478739bd2c8:/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 2e72046d1..98299070d 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -1,198 +1,10 @@
-// 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;
-  },
-
-  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;
-  }
-});
-
-var map;
-
-var layers = [
-  {
-    urlTemplate: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-    attribution: "",
-    keyid: "mapnik",
-    layerCode: "M",
-    name: I18n.t("javascripts.map.base.standard")
-  },
-  {
-    urlTemplate: 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png',
-    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")
-  },
-  {
-    urlTemplate: 'http://{s}.tile2.opencyclemap.org/transport/{z}/{x}/{y}.png',
-    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")
-  },
-  {
-    urlTemplate: 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png',
-    subdomains: '1234',
-    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) {
-  map = L.map(divName, options);
-
-  if (map.attributionControl) {
-    map.attributionControl.setPrefix(''); // For tmcw
-  }
-
-  var layersControl = L.control.layers();
-
-  if (!options || options.layerControl !== false) {
-    layersControl.addTo(map);
-  }
-
-  for (var i = 0; i < layers.length; i++) {
-    layers[i].layer = L.tileLayer(layers[i].urlTemplate, layers[i]);
-    if (i == 0) {
-      layers[i].layer.addTo(map);
-    }
-    layersControl.addBaseLayer(layers[i].layer, layers[i].name);
-  }
-
-  $("#" + divName).on("resized", function () {
-    map.invalidateSize();
-  });
-
-  return map;
-}
-
-function getArrowIcon() {
+function getUserIcon(url) {
   return L.icon({
-    iconUrl: <%= asset_path('arrow.png').to_json %>,
-    iconSize: [25, 22],
-    iconAnchor: [22, 20]
-  });
-}
-
-function addMarkerToMap(position, icon, description) {
-  var marker = L.marker(position, icon ? {icon: icon} : null).addTo(map);
-
-  if (description) {
-    marker.bindPopup(description);
-  }
-
-  return marker;
-}
-
-function removeMarkerFromMap(marker) {
-  map.removeLayer(marker);
-}
-
-function addObjectToMap(object, zoom, callback) {
-  $.ajax({
-    url: OSM.apiUrl(object),
-    dataType: "xml",
-    success: function (xml) {
-      var layer = new L.OSM(xml, {
-        style: {
-          strokeColor: "blue",
-          strokeWidth: 3,
-          strokeOpacity: 0.5,
-          fillOpacity: 0.2,
-          fillColor: "lightblue",
-          pointRadius: 6
-        }
-      });
-
-      var bounds = layer.getBounds();
-
-      if (zoom) {
-        map.fitBounds(bounds);
-      }
-
-      if (callback) {
-        callback(bounds);
-      }
-
-      layer.addTo(map);
-    }
+    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 addBoxToMap(bounds) {
-  var box = L.rectangle(bounds, {
-    weight: 2,
-    color: '#e90',
-    fillOpacity: 0
-  });
-
-  box.addTo(map);
-
-  return box;
-}
-
-function getMapBaseLayer() {
-  for (var i = 0; i < layers.length; i++) {
-    if (map.hasLayer(layers[i].layer)) {
-      return layers[i];
-    }
-  }
-}
-
-function getMapLayers() {
-  for (var i = 0; i < layers.length; i++) {
-    if (map.hasLayer(layers[i].layer)) {
-      return layers[i].layerCode;
-    }
-  }
-
-  return "";
-}
-
-function setMapLayers(layerConfig) {
-  for (var i = 0; i < layers.length; i++) {
-    if (~layerConfig.indexOf(layers[i].layerCode)) {
-      map.addLayer(layers[i].layer);
-    } else {
-      map.removeLayer(layers[i].layer);
-    }
-  }
-}