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

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

Browse source
This commit is contained in:
Tom Hughes 2022-10-09 18:10:20 +01:00
commit 685eef338d
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/index/note.js
View file

@ -23,8 +23,9 @@ OSM.Note = function (map) {
page.pushstate = page.popstate = function (path, id) { page.pushstate = page.popstate = function (path, id) {
OSM.loadSidebarContent(path, function () { OSM.loadSidebarContent(path, function () {
initialize(path, id, function () { initialize(path, id, function () {
var data = $(".details").data(), var data = $(".details").data();
latLng = L.latLng(data.coordinates.split(",")); if (!data) return;
var latLng = L.latLng(data.coordinates.split(","));
if (!map.getBounds().contains(latLng)) moveToNote(); if (!map.getBounds().contains(latLng)) moveToNote();
}); });
}); });
@ -71,19 +72,22 @@ OSM.Note = function (map) {
var data = $(".details").data(); var data = $(".details").data();
if (data) {
map.addObject({ map.addObject({
type: "note", type: "note",
id: parseInt(id, 10), id: parseInt(id, 10),
latLng: L.latLng(data.coordinates.split(",")), latLng: L.latLng(data.coordinates.split(",")),
icon: noteIcons[data.status] icon: noteIcons[data.status]
}); });
}
if (callback) callback(); if (callback) callback();
} }
function moveToNote() { function moveToNote() {
var data = $(".details").data(), var data = $(".details").data();
latLng = L.latLng(data.coordinates.split(",")); if (!data) return;
var latLng = L.latLng(data.coordinates.split(","));
if (!window.location.hash || window.location.hash.match(/^#?c[0-9]+$/)) { if (!window.location.hash || window.location.hash.match(/^#?c[0-9]+$/)) {
OSM.router.withoutMoveListener(function () { OSM.router.withoutMoveListener(function () {