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

Show only description as a marker tooltip in note layer

Browse source
This commit is contained in:
Anton Khorev 2025-01-29 17:57:26 +03:00
parent 09e802b86c
commit db08587325
2 changed files with 48 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/index/layers/notes.js
View file

@ -40,9 +40,16 @@ OSM.initializeNotesLayer = function (map) {
if (marker) {
marker.setIcon(noteIcons[feature.properties.status]);
} else {
let title;
const description = feature.properties.comments[0];
if (description?.action === "opened") {
title = description.text;
}
marker = L.marker(feature.geometry.coordinates.reverse(), {
icon: noteIcons[feature.properties.status],
title: feature.properties.comments[0].text,
title,
opacity: 0.8,
interactive: true
});

40
test/system/note_layer_test.rb Normal file
View file

@ -0,0 +1,40 @@
require "application_system_test_case"
class NoteLayerTest < ApplicationSystemTestCase
test "note marker should have description as a title" do
position = (1.1 * GeoRecord::SCALE).to_i
create(:note, :latitude => position, :longitude => position) do |note|
create(:note_comment, :note => note, :body => "Note description")
end
visit root_path(:anchor => "map=18/1.1/1.1&layers=N")
all "img.leaflet-marker-icon", :count => 1 do |marker|
assert_equal "Note description", marker["title"]
end
end
test "note marker should not have a title if the note has no visible description" do
position = (1.1 * GeoRecord::SCALE).to_i
create(:note, :latitude => position, :longitude => position) do |note|
create(:note_comment, :note => note, :body => "Note description is hidden", :visible => false)
create(:note_comment, :note => note, :body => "Note comment visible", :event => "commented")
end
visit root_path(:anchor => "map=18/1.1/1.1&layers=N")
all "img.leaflet-marker-icon", :count => 1 do |marker|
assert_equal "", marker["title"]
end
end
test "note marker should not have a title if the note has no visible description and comments" do
position = (1.1 * GeoRecord::SCALE).to_i
create(:note, :latitude => position, :longitude => position) do |note|
create(:note_comment, :note => note, :body => "Note description is hidden", :visible => false)
end
visit root_path(:anchor => "map=18/1.1/1.1&layers=N")
all "img.leaflet-marker-icon", :count => 1 do |marker|
assert_equal "", marker["title"]
end
end
end