cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2022-10-09 18:10:17 +01:00
commit 206b6c9aef
2 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/leaflet.map.js
View file

@ -261,11 +261,13 @@ L.OSM.Map = L.Map.extend({
L.circleMarker(object.latLng, haloStyle).addTo(this._objectLayer); L.circleMarker(object.latLng, haloStyle).addTo(this._objectLayer);
L.marker(object.latLng, { if (object.icon) {
icon: object.icon, L.marker(object.latLng, {
opacity: 1, icon: object.icon,
interactive: true opacity: 1,
}).addTo(this._objectLayer); interactive: true
}).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 or changeset handled by L.OSM.DataLayer

19
test/system/index_test.rb
View file

@ -18,4 +18,23 @@ class IndexTest < ApplicationSystemTestCase
find("#sidebar .btn-close").click find("#sidebar .btn-close").click
assert_no_selector "#editanchor[href*='?note=#{note.id}#']" assert_no_selector "#editanchor[href*='?note=#{note.id}#']"
end end
test "can navigate from hidden note to visible note" do
sign_in_as(create(:moderator_user))
hidden_note = create(:note, :status => "hidden")
create(:note_comment, :note => hidden_note, :body => "this-is-a-hidden-note")
position = (1.003 * GeoRecord::SCALE).to_i
visible_note = create(:note, :latitude => position, :longitude => position)
create(:note_comment, :note => visible_note, :body => "this-is-a-visible-note")
visit root_path(:anchor => "map=15/1/1") # view place of hidden note in case it is not rendered during browse_note_path(hidden_note)
visit browse_note_path(hidden_note)
find(".leaflet-control.control-layers .control-button").click
find("#map-ui .overlay-layers .form-check-label", :text => "Map Notes").click
visible_note_marker = find(".leaflet-marker-icon[title=this-is-a-visible-note]")
assert_selector "#sidebar", :text => "this-is-a-hidden-note"
visible_note_marker.click
assert_selector "#sidebar", :text => "this-is-a-visible-note"
end
end end