Changeset 1586 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-05-11T17:33:36+02:00 (15 years ago)

Author:

stoecker

Message:

fix hardcoded URL - patch by Gubaer

File:

• trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java (modified) (4 diffs)

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

@@ -8 +8 @@
 import java.util.Collection;
 import java.util.LinkedList;
+import java.util.regex.Pattern;
 
 import javax.swing.JOptionPane;
@@ -29 +30 @@
     }
 
+    /**
+     * replies the base URL for browsing the the history of an OSM primitive
+     * 
+     * @return the base URL, i.e. http://api.openstreetmap.org/browse
+     */
+    protected String getBaseURL() {
+        String baseUrl = Main.pref.get("osm-server.url", "http://api.openstreetmap.org/api");
+        Pattern pattern = Pattern.compile("/api/?$");
+        String ret =  pattern.matcher(baseUrl).replaceAll("/browse");
+        if (ret.equals(baseUrl)) {
+            System.out.println("WARNING: unexpected format of API base URL. Redirection to history page for OSM primitive will probably fail. API base URL is: " + baseUrl);
+        }
+        return ret;
+    }    
+    
     public void actionPerformed(ActionEvent e) {
-        final Collection<Object> sel = new LinkedList<Object>();
+        final Collection<Object> sel = new LinkedList<Object>();        
+        final String baseUrl  = getBaseURL();
         new AbstractVisitor() {
             public void visit(Node n) {
                 if(n.id <= 0) return;
-                OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/node/" + n.id + "/history");
+                OpenBrowser.displayUrl(baseUrl + "/node/" + n.id + "/history");
                 sel.add(n);
             }
@@ -40 +57 @@
             public void visit(Way w) {
                 if(w.id <= 0) return;
-                OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/way/" + w.id + "/history");
+                OpenBrowser.displayUrl(baseUrl + "/way/" + w.id + "/history");
                 sel.add(w);
             }
@@ -46 +63 @@
             public void visit(Relation e) {
                 if(e.id <= 0) return;
-                OpenBrowser.displayUrl("http://www.openstreetmap.org/browse/relation/" + e.id + "/history");
+                OpenBrowser.displayUrl(baseUrl + "/relation/" + e.id + "/history");
                 sel.add(e);
             }