Merge remote-tracking branch 'upstream/pull/5800'

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index abeb4d3e426d896526b914f665e5a04e506ec6a4..c81f92e72847477b021a486db1550fece9f48ca9 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -306,8 +306,7 @@ L.OSM.Map = L.Map.extend({
               way: objectStyle,
               area: objectStyle,
               changeset: changesetStyle
-            },
-            asynchronous: true
+            }
           });
 
           map._objectLayer.interestingNode = function (node, wayNodes, relationNodes) {

diff --git a/test/system/browse_test.rb b/test/system/browse_test.rb
index 15dc1cb9b53a538f71bf526b5e163b9f1502fdcc..3faf3b75fdd2960fc1ac1c1d8adc43de57e81305 100644 (file)
--- a/test/system/browse_test.rb
+++ b/test/system/browse_test.rb
@@ -10,4 +10,14 @@ class BrowseTest < ApplicationSystemTestCase
 
     assert_selector "#map .leaflet-overlay-pane path"
   end
+
+  test "map should center on a viewed node" do
+    node = create(:node, :lat => 59.55555, :lon => 29.55555)
+
+    visit node_path(node)
+
+    find("#map [aria-label='Share']").click
+    share_url = find_by_id("long_input").value
+    assert_match %r{map=\d+/59\.\d+/29\.\d+}, share_url
+  end
 end