X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4563244fd1cb43dca00b427e1f13ac890b7f00a0..dc931c4ac47b340c9a2a8d855fa57a290e838260:/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 a3fd53a68..98299070d 100644
--- a/app/assets/javascripts/map.js.erb
+++ b/app/assets/javascripts/map.js.erb
@@ -1,53 +1,3 @@
-// Leaflet extensions
-L.extend(L.LatLngBounds.prototype, {
- getSize: function () {
- return (this._northEast.lat - this._southWest.lat) *
- (this._northEast.lng - this._southWest.lng);
- },
-
- wrap: function () {
- return new L.LatLngBounds(this._southWest.wrap(), this._northEast.wrap());
- }
-});
-
-L.Icon.Default.imagePath = <%= "#{asset_prefix}/images".to_json %>;
-
-var objectLayer;
-var objectLoader;
-
-function mapLayers() {
- return [
- {
- klass: L.OSM.Mapnik,
- attribution: "",
- keyid: "mapnik",
- layerCode: "M",
- name: I18n.t("javascripts.map.base.standard")
- },
- {
- klass: L.OSM.CycleMap,
- attribution: "Tiles courtesy of Andy Allan",
- keyid: "cyclemap",
- layerCode: "C",
- name: I18n.t("javascripts.map.base.cycle_map")
- },
- {
- klass: L.OSM.TransportMap,
- attribution: "Tiles courtesy of Andy Allan",
- keyid: "transportmap",
- layerCode: "T",
- name: I18n.t("javascripts.map.base.transport_map")
- },
- {
- klass: L.OSM.MapQuestOpen,
- attribution: "Tiles courtesy of MapQuest ",
- keyid: "mapquest",
- layerCode: "Q",
- name: I18n.t("javascripts.map.base.mapquest")
- }
- ]
-}
-
function getUserIcon(url) {
return L.icon({
iconUrl: url || <%= asset_path('marker-red.png').to_json %>,
@@ -58,53 +8,3 @@ function getUserIcon(url) {
shadowSize: [41, 41]
});
}
-
-function addObjectToMap(object, map, options) {
- if (objectLoader) {
- objectLoader.abort();
- }
-
- if (objectLayer) {
- map.removeLayer(objectLayer);
- }
-
- objectLoader = $.ajax({
- url: OSM.apiUrl(object),
- dataType: "xml",
- success: function (xml) {
- objectLayer = new L.OSM.DataLayer(null, {
- styles: {
- node: options.style,
- way: options.style,
- area: options.style
- }
- });
-
- 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 (options.zoom) {
- map.fitBounds(bounds);
- }
-
- if (options.callback) {
- options.callback(bounds);
- }
-
- objectLayer.addTo(map);
- }
- });
-}