Changeset 7678 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2014-10-30T16:49:19+01:00 (10 years ago)

Author:

stoecker

Message:

fix #9059 - no more assumptions about URL for element browsing - use OSM website as default and hidden option for changes

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AbstractInfoAction.java (modified) (1 diff)
• HistoryInfoWebAction.java (modified) (2 diffs)
• InfoWebAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java

@@ -32 +32 @@
     public AbstractInfoAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register, String toolbarId, boolean installAdapters) {
         super(name, iconName, tooltip, shortcut, register, toolbarId, installAdapters);
-    }
-
-    /**
-     * Replies the base URL for browsing information about about a primitive.
-     *
-     * @return the base URL, i.e. https://www.openstreetmap.org
-     */
-    public static String getBaseBrowseUrl() {
-        String baseUrl = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
-        Pattern pattern = Pattern.compile("/api/?$");
-        String ret = pattern.matcher(baseUrl).replaceAll("");
-        if (ret.equals(baseUrl)) {
-            Main.warn(tr("Unexpected format of API base URL. Redirection to info or history page for OSM object will probably fail. API base URL is: ''{0}''",baseUrl));
-        }
-        for (String prefix : new String[]{"http://api.openstreetmap.org/", "https://api.openstreetmap.org/"}) {
-            if (ret.startsWith(prefix)) {
-                ret = Main.getOSMWebsite() + "/" + ret.substring(prefix.length());
-                break;
-            }
-        }
-        return ret;
-    }
-
-    /**
-     * Replies the base URL for browsing information about a user.
-     *
-     * @return the base URL, i.e. https://www.openstreetmap.org/user
-     */
-    public static String getBaseUserUrl() {
-        String baseUrl = Main.pref.get("osm-server.url", OsmApi.DEFAULT_API_URL);
-        Pattern pattern = Pattern.compile("/api/?$");
-        String ret =  pattern.matcher(baseUrl).replaceAll("/user");
-        if (ret.equals(baseUrl)) {
-            Main.warn(tr("Unexpected format of API base URL. Redirection to user page for OSM user will probably fail. API base URL is: ''{0}''",baseUrl));
-        }
-        for (String prefix : new String[]{"http://api.openstreetmap.org/", "https://api.openstreetmap.org/"}) {
-            if (ret.startsWith(prefix)) {
-                ret = Main.getOSMWebsite() + "/" + ret.substring(prefix.length());
-                break;
-            }
-        }
-        return ret;
     }
 

trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java

@@ -7 +7 @@
 import java.awt.event.KeyEvent;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -25 +26 @@
     protected  String createInfoUrl(Object infoObject) {
         OsmPrimitive primitive = (OsmPrimitive) infoObject;
-        return getBaseBrowseUrl() + "/" + OsmPrimitiveType.from(primitive).getAPIName() + "/" + primitive.getId() + "/history";
+        return Main.getBaseBrowseUrl() + "/" + OsmPrimitiveType.from(primitive).getAPIName() + "/" + primitive.getId() + "/history";
     }
 }

trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java

@@ -7 +7 @@
 import java.awt.event.KeyEvent;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -25 +26 @@
     protected  String createInfoUrl(Object infoObject) {
         OsmPrimitive primitive = (OsmPrimitive)infoObject;
-        return getBaseBrowseUrl() + "/" + OsmPrimitiveType.from(primitive).getAPIName() + "/" + primitive.getId();
+        return Main.getBaseBrowseUrl() + "/" + OsmPrimitiveType.from(primitive).getAPIName() + "/" + primitive.getId();
     }
 }