Merge pull request #5449 from AntonKhorev/edit-preferences

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

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 02ed318acffc89eded8d0dccad99a682c8e2d05f..e0c2ee60b47fb0ddd5251ac520b3c8e234f8ebca 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -130,11 +130,14 @@ L.OSM.Map = L.Map.extend({
   },
 
   getMapBaseLayerId: function () {
   },
 
   getMapBaseLayerId: function () {

-    var baseLayerId;
-    this.eachLayer(function (layer) {
-      if (layer.options && layer.options.layerId) baseLayerId = layer.options.layerId;
-    });
-    return baseLayerId;
+    const layer = this.getMapBaseLayer();
+    if (layer) return layer.options.layerId;
+  },
+
+  getMapBaseLayer: function () {
+    for (const layer of this.baseLayers) {
+      if (this.hasLayer(layer)) return layer;
+    }

   },
 
   getUrl: function (marker) {
   },
 
   getUrl: function (marker) {


@@ -264,7 +267,7 @@ L.OSM.Map = L.Map.extend({
 
     this.removeObject();
 
 
     this.removeObject();
 

-    if (object.type === "note") {
+    if (object.type === "note" || object.type === "changeset") {

       this._objectLoader = {
         abort: function () {}
       };
       this._objectLoader = {
         abort: function () {}
       };


@@ -272,18 +275,27 @@ L.OSM.Map = L.Map.extend({
       this._object = object;
       this._objectLayer = L.featureGroup().addTo(this);
 
       this._object = object;
       this._objectLayer = L.featureGroup().addTo(this);
 

-      L.circleMarker(object.latLng, haloStyle).addTo(this._objectLayer);
+      if (object.type === "note") {
+        L.circleMarker(object.latLng, haloStyle).addTo(this._objectLayer);

 
 

-      if (object.icon) {
-        L.marker(object.latLng, {
-          icon: object.icon,
-          opacity: 1,
-          interactive: true
-        }).addTo(this._objectLayer);
+        if (object.icon) {
+          L.marker(object.latLng, {
+            icon: object.icon,
+            opacity: 1,
+            interactive: true
+          }).addTo(this._objectLayer);
+        }
+      } else if (object.type === "changeset") {
+        if (object.bbox) {
+          L.rectangle([
+            [object.bbox.minlat, object.bbox.minlon],
+            [object.bbox.maxlat, object.bbox.maxlon]
+          ], changesetStyle).addTo(this._objectLayer);
+        }

       }
 
       if (callback) callback(this._objectLayer.getBounds());
       }
 
       if (callback) callback(this._objectLayer.getBounds());

-    } else { // element or changeset handled by L.OSM.DataLayer
+    } else { // element handled by L.OSM.DataLayer

       var map = this;
       this._objectLoader = $.ajax({
         url: OSM.apiUrl(object),
       var map = this;
       this._objectLoader = $.ajax({
         url: OSM.apiUrl(object),


@@ -300,13 +312,11 @@ L.OSM.Map = L.Map.extend({
             }
           });
 
             }
           });
 

-          map._objectLayer.interestingNode = function (node, ways, relations) {
+          map._objectLayer.interestingNode = function (node, wayNodes, relationNodes) {

             if (object.type === "node") {
               return true;
             } else if (object.type === "relation") {
             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;
-              }
+              return Boolean(relationNodes[node.id]);

             } else {
               return false;
             }
             } else {
               return false;
             }