Changeset 18403 in josm for trunk/src

Timestamp:

2022-03-21T22:01:04+01:00 (3 years ago)

Author:

taylor.smock

Message:

fix #21953: Remember custom overpass servers

This was caused by not adding the new server to the HistoryComboBox list
prior to saving the list.

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/server/OverpassServerPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/server/OverpassServerPanel.java

@@ -16 +16 @@
 import org.openstreetmap.josm.io.OverpassDownloadReader;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -51 +52 @@
      */
     public final void saveToPreferences() {
-        OverpassDownloadReader.OVERPASS_SERVER.put(overpassServer.getText());
+        // Get the new server -- add the trailing `/` if it does not exist to avoid duplicate entries.
+        // Other code locations assume that the URL has a trailing `/` as well.
+        String newServer = Utils.strip(overpassServer.getText());
+        if (!newServer.endsWith("/")) {
+            newServer += "/";
+        }
+        OverpassDownloadReader.OVERPASS_SERVER.put(newServer);
+        // Ensure that the new overpass server is added to history
+        overpassServer.setText(newServer);
+        overpassServer.addCurrentItemToHistory();
         overpassServer.getModel().prefs().save(OverpassDownloadReader.OVERPASS_SERVER_HISTORY);
         OverpassDownloadReader.FOR_MULTI_FETCH.put(forMultiFetch.isSelected());