From 0f8f165f377d6ef5a7bd6c94c20299a4de6ffc93 Mon Sep 17 00:00:00 2001 From: Jiri Vlasak Date: Thu, 21 Sep 2023 08:31:27 +0200 Subject: [PATCH 2/2] Closing note comment based on the OSM instance URL --- src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java index 8282a6444a..5d0a5c59b6 100644 --- a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java +++ b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java @@ -430,10 +430,11 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener, No if (note != null) { Boolean isDefaultOsmInstance = Config.getUrls().getDefaultOsmApiUrl().equals(OsmApi.getOsmApi().getServerUrl()); String noteUrlShort = "osm.org/note/" + note.getId(); - String noteUrlLong = "openstreetmap.org/note/" + note.getId(); + String hostUrl = OsmApi.getOsmApi().getHost().substring(4); // substring removes "api." + String noteUrlLong = hostUrl + "/note/" + note.getId(); for (Changeset cs: ChangesetCache.getInstance().getChangesets()) { if (isDefaultOsmInstance && (cs.getComment().indexOf(noteUrlShort) > -1 || cs.getComment().indexOf(noteUrlLong) > -1)) { - changesetUrl = "https://www.osm.org/changeset/" + cs.getId(); + changesetUrl = "https://" + hostUrl + "/changeset/" + cs.getId(); } } } -- 2.30.2