From 807084d550ee55a54c2b0db7d25c1f441693d198 Mon Sep 17 00:00:00 2001 From: Jiri Vlasak Date: Thu, 21 Sep 2023 08:31:27 +0200 Subject: [PATCH v2 2/2] Closing note comment based on the OSM instance URL --- src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java index 8282a6444a..ed2de52b84 100644 --- a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java +++ b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java @@ -428,12 +428,12 @@ public class NotesDialog extends ToggleDialog implements LayerChangeListener, No Note note = displayList.getSelectedValue(); String changesetUrl = ""; 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(); + if (cs.getComment().indexOf(noteUrlShort) > -1 || cs.getComment().indexOf(noteUrlLong) > -1) { + changesetUrl = "https://" + hostUrl + "/changeset/" + cs.getId(); } } } -- 2.30.2