Changeset 11262 in josm for trunk/src/org

Timestamp:

2016-11-16T13:53:46+01:00 (8 years ago)

Author:

simon04

Message:

fix #13982 - Wrong links to OSM website if different API is used

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (3 diffs)
• io/OsmServerHistoryReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -1392 +1392 @@
 
     /**
+     * Returns the OSM website URL depending on the selected {@link OsmApi}.
+     * @return the OSM website URL depending on the selected {@link OsmApi}
+     */
+    private static String getOSMWebsiteDependingOnSelectedApi() {
+        final String api = OsmApi.getOsmApi().getServerUrl();
+        if (OsmApi.DEFAULT_API_URL.equals(api)) {
+            return getOSMWebsite();
+        } else {
+            return api.replaceAll("/api$", "");
+        }
+    }
+
+    /**
      * Replies the base URL for browsing information about a primitive.
      * @return the base URL, i.e. https://www.openstreetmap.org
@@ -1398 +1411 @@
     public static String getBaseBrowseUrl() {
         if (Main.pref != null)
-            return Main.pref.get("osm-browse.url", getOSMWebsite());
-        return getOSMWebsite();
+            return Main.pref.get("osm-browse.url", getOSMWebsiteDependingOnSelectedApi());
+        return getOSMWebsiteDependingOnSelectedApi();
     }
 
@@ -1409 +1422 @@
     public static String getBaseUserUrl() {
         if (Main.pref != null)
-            return Main.pref.get("osm-user.url", getOSMWebsite() + "/user");
-        return getOSMWebsite() + "/user";
+            return Main.pref.get("osm-user.url", getOSMWebsiteDependingOnSelectedApi() + "/user");
+        return getOSMWebsiteDependingOnSelectedApi() + "/user";
     }
 

trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java

@@ -61 +61 @@
         try {
             progressMonitor.indeterminateSubTask(tr("Contacting OSM Server..."));
-            StringBuilder sb = new StringBuilder();
-            sb.append(primitiveType.getAPIName())
-            .append('/').append(id).append("/history");
+            final String urlStr = primitiveType.getAPIName() + '/' + id + "/history";
 
-            try (InputStream in = getInputStream(sb.toString(), progressMonitor.createSubTaskMonitor(1, true))) {
+            try (InputStream in = getInputStream(urlStr, progressMonitor.createSubTaskMonitor(1, true))) {
                 if (in == null)
                     return null;