Use new overpass geometry output support to get geometeries

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

diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js.erb
index dec544d336b133beb2e2d86b33d4025c15565663..b4767f96be506062172ae763d00a45e3eabd8075 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js.erb
+++ b/app/assets/javascripts/leaflet.map.js.erb
@@ -24,19 +24,19 @@ L.OSM.Map = L.Map.extend({
         name: I18n.t("javascripts.map.base.standard")
       }),
       new L.OSM.CycleMap({
         name: I18n.t("javascripts.map.base.standard")
       }),
       new L.OSM.CycleMap({

-        attribution: copyright + ". Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+        attribution: copyright + ". Tiles courtesy of <a href='http://www.thunderforest.com/' target='_blank'>Andy Allan</a>",

         code: "C",
         keyid: "cyclemap",
         name: I18n.t("javascripts.map.base.cycle_map")
       }),
       new L.OSM.TransportMap({
         code: "C",
         keyid: "cyclemap",
         name: I18n.t("javascripts.map.base.cycle_map")
       }),
       new L.OSM.TransportMap({

-        attribution: copyright + ". Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+        attribution: copyright + ". Tiles courtesy of <a href='http://www.thunderforest.com/' target='_blank'>Andy Allan</a>",

         code: "T",
         keyid: "transportmap",
         name: I18n.t("javascripts.map.base.transport_map")
       }),
       new L.OSM.MapQuestOpen({
         code: "T",
         keyid: "transportmap",
         name: I18n.t("javascripts.map.base.transport_map")
       }),
       new L.OSM.MapQuestOpen({

-        attribution: copyright + ". Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
+        attribution: copyright + ". Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='https://developer.mapquest.com/content/osm/mq_logo.png'>",

         code: "Q",
         keyid: "mapquest",
         name: I18n.t("javascripts.map.base.mapquest")
         code: "Q",
         keyid: "mapquest",
         name: I18n.t("javascripts.map.base.mapquest")


@@ -91,7 +91,7 @@ L.OSM.Map = L.Map.extend({
   },
 
   getUrl: function(marker) {
   },
 
   getUrl: function(marker) {

-    var precision = zoomPrecision(this.getZoom()),
+    var precision = OSM.zoomPrecision(this.getZoom()),

         params = {};
 
     if (marker && this.hasLayer(marker)) {
         params = {};
 
     if (marker && this.hasLayer(marker)) {


@@ -100,10 +100,6 @@ L.OSM.Map = L.Map.extend({
       params.mlon = latLng.lng.toFixed(precision);
     }
 
       params.mlon = latLng.lng.toFixed(precision);
     }
 

-    if (this._object) {
-      params[this._object.type] = this._object.id;
-    }
-

     var url = 'http://' + OSM.SERVER_URL + '/',
       query = querystring.stringify(params),
       hash = OSM.formatHash(this);
     var url = 'http://' + OSM.SERVER_URL + '/',
       query = querystring.stringify(params),
       hash = OSM.formatHash(this);


@@ -152,6 +148,11 @@ L.OSM.Map = L.Map.extend({
     }
 
     var params = {};
     }
 
     var params = {};

+    var layers = this.getLayersCode().replace('M', '');
+
+    if (layers) {
+      params.layers = layers;
+    }

 
     if (marker && this.hasLayer(marker)) {
       params.m = '';
 
     if (marker && this.hasLayer(marker)) {
       params.m = '';


@@ -169,7 +170,7 @@ L.OSM.Map = L.Map.extend({
     return str;
   },
 
     return str;
   },
 

-  addObject: function(object) {
+  addObject: function(object, callback) {

     var objectStyle = {
       color: "#FF6200",
       weight: 4,
     var objectStyle = {
       color: "#FF6200",
       weight: 4,


@@ -178,10 +179,11 @@ L.OSM.Map = L.Map.extend({
     };
 
     var changesetStyle = {
     };
 
     var changesetStyle = {

-      weight: 1,
+      weight: 4,

       color: '#FF9500',
       opacity: 1,
       color: '#FF9500',
       opacity: 1,

-      fillOpacity: 0
+      fillOpacity: 0,
+      clickable: false

     };
 
     this._object = object;
     };
 
     this._object = object;


@@ -218,13 +220,7 @@ L.OSM.Map = L.Map.extend({
         map._objectLayer.addData(xml);
         map._objectLayer.addTo(map);
 
         map._objectLayer.addData(xml);
         map._objectLayer.addTo(map);
 

-        var bounds = map._objectLayer.getBounds();
-        if (bounds.isValid()) {
-          OSM.route.moveListenerOff();
-          map.once('moveend', OSM.route.moveListenerOn);
-
-          map.fitBounds(bounds);
-        }
+        if (callback) callback(map._objectLayer.getBounds());

       }
     });
   },
       }
     });
   },


@@ -241,6 +237,11 @@ L.OSM.Map = L.Map.extend({
       zoom: this.getZoom(),
       layers: this.getLayersCode()
     }
       zoom: this.getZoom(),
       layers: this.getLayersCode()
     }

+  },
+
+  setState: function(state, options) {
+    if (state.center) this.setView(state.center, state.zoom, options);
+    if (state.layers) this.updateLayers(state.layers);

   }
 });
 
   }
 });
 


@@ -249,8 +250,7 @@ L.Icon.Default.imagePath = "/images";
 L.Icon.Default.imageUrls = {
   "/images/marker-icon.png": "<%= asset_path("images/marker-icon.png") %>",
   "/images/marker-icon-2x.png": "<%= asset_path("images/marker-icon-2x.png") %>",
 L.Icon.Default.imageUrls = {
   "/images/marker-icon.png": "<%= asset_path("images/marker-icon.png") %>",
   "/images/marker-icon-2x.png": "<%= asset_path("images/marker-icon-2x.png") %>",

-  "/images/marker-shadow.png": "<%= asset_path("images/marker-shadow.png") %>",
-  "/images/marker-shadow-2x.png": "<%= asset_path("images/marker-shadow-2x.png") %>"
+  "/images/marker-shadow.png": "<%= asset_path("images/marker-shadow.png") %>"

 };
 
 L.extend(L.Icon.Default.prototype, {
 };
 
 L.extend(L.Icon.Default.prototype, {