Changeset 6453 in josm for trunk

Timestamp:

2013-12-07T15:19:55+01:00 (11 years ago)

Author:

Don-vip

Message:

global use of osm website url and new url scheme

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• actions/AbstractInfoAction.java (modified) (2 diffs)
• actions/JumpToAction.java (modified) (1 diff)
• data/oauth/OAuthParameters.java (modified) (2 diffs)
• gui/MainApplication.java (modified) (2 diffs)
• gui/dialogs/changeset/query/UrlBasedQueryPanel.java (modified) (2 diffs)
• gui/layer/gpx/ConvertToDataLayerAction.java (modified) (1 diff)
• io/MessageNotifier.java (modified) (1 diff)
• tools/OsmUrlToBounds.java (modified) (2 diffs)

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

@@ -105 +105 @@
     /**
      * The JOSM website URL.
-     * @since 6143 
+     * @since 6143
      */
     public static final String JOSM_WEBSITE = "http://josm.openstreetmap.de";
-    
+
+    /**
+     * The OSM website URL.
+     * @since 6453
+     */
+    public static final String OSM_WEBSITE = "http://www.openstreetmap.org";
+
     /**
      * Replies true if JOSM currently displays a map view. False, if it doesn't, i.e. if

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

@@ -48 +48 @@
         if (ret.startsWith("http://api.openstreetmap.org/")) {
             ret = ret.substring("http://api.openstreetmap.org/".length());
-            ret = "http://www.openstreetmap.org/" + ret;
+            ret = Main.OSM_WEBSITE + "/" + ret;
         }
         return ret;
@@ -67 +67 @@
         if (ret.startsWith("http://api.openstreetmap.org/")) {
             ret = ret.substring("http://api.openstreetmap.org/".length());
-            ret = "http://www.openstreetmap.org/" + ret;
+            ret = Main.OSM_WEBSITE + "/" + ret;
         }
         return ret;

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

@@ -174 +174 @@
                 zoomLvl = (int)Math.round((-1) * Math.log(m/10000000)/Math.log(2));
 
-            int decimals = (int) Math.pow(10, (zoomLvl / 3));
-            dlat = Math.round(dlat * decimals);
-            dlat /= decimals;
-            dlon = Math.round(dlon * decimals);
-            dlon /= decimals;
-            url.setText("http://www.openstreetmap.org/#map="+zoomLvl+"/"+dlat+"/"+dlon);
-        } catch (NumberFormatException x) {}
+            url.setText(OsmUrlToBounds.getURL(dlat, dlon, zoomLvl));
+        } catch (NumberFormatException x) {
+            Main.debug(x.getMessage());
+        }
     }
 

trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java

@@ -10 +10 @@
 import oauth.signpost.basic.DefaultOAuthProvider;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.io.OsmApi;
@@ -31 +32 @@
      * The default OSM OAuth request token URL.
      */
-    static public final String DEFAULT_REQUEST_TOKEN_URL = "http://www.openstreetmap.org/oauth/request_token";
+    static public final String DEFAULT_REQUEST_TOKEN_URL = Main.OSM_WEBSITE + "/oauth/request_token";
     /**
      * The default OSM OAuth access token URL.
      */
-    static public final String DEFAULT_ACCESS_TOKEN_URL = "http://www.openstreetmap.org/oauth/access_token";
+    static public final String DEFAULT_ACCESS_TOKEN_URL = Main.OSM_WEBSITE + "/oauth/access_token";
     /**
      * The default OSM OAuth authorize URL.
      */
-    static public final String DEFAULT_AUTHORISE_URL = "http://www.openstreetmap.org/oauth/authorize";
+    static public final String DEFAULT_AUTHORISE_URL = Main.OSM_WEBSITE + "/oauth/authorize";
 
 

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -51 +51 @@
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.OsmUrlToBounds;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -122 +123 @@
                         tr("examples")+":\n"+
                         "\tjava -jar josm.jar track1.gpx track2.gpx london.osm\n"+
-                        "\tjava -jar josm.jar http://www.openstreetmap.org/index.html?lat=43.2&lon=11.1&zoom=13\n"+
+                        "\tjava -jar josm.jar "+OsmUrlToBounds.getURL(43.2, 11.1, 13)+"\n"+
                         "\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/OSM_errors_node-duplicate.xml\n"+
                         "\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n"+
                         "\tjava -Djosm.home=/home/user/.josm_dev -jar josm.jar\n"+
-                        "\tjava -Xmx400m -jar josm.jar\n\n"+
+                        "\tjava -Xmx1024m -jar josm.jar\n\n"+
                         tr("Parameters --download, --downloadgps, and --selection are processed in this order.")+"\n"+
                         tr("Make sure you load some data if you use --selection.")+"\n"

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java

@@ -21 +21 @@
 import javax.swing.event.HyperlinkListener;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.io.ChangesetQuery;
@@ -71 +72 @@
                 + "<p><strong>" + tr("Examples") + "</strong></p>"
                 + "<ul>"
-                + "<li><a href=\"http://www.openstreetmap.org/browse/changesets?open=true\">http://www.openstreetmap.org/browse/changesets?open=true</a></li>"
+                + "<li><a href=\""+Main.OSM_WEBSITE+"/browse/changesets?open=true\">"+Main.OSM_WEBSITE+"/browse/changesets?open=true</a></li>"
                 + "<li><a href=\"http://api.openstreetmap.org/api/0.6/changesets?open=true\">http://api.openstreetmap.org/api/0.6/changesets?open=true</a></li>"
                 + "</ul>"

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java

@@ -43 +43 @@
         JPanel msg = new JPanel(new GridBagLayout());
         msg.add(new JLabel(tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here:</html>")), GBC.eol());
-        msg.add(new UrlLabel(tr("http://www.openstreetmap.org/traces"), 2), GBC.eop());
+        msg.add(new UrlLabel(Main.OSM_WEBSITE + "/traces", 2), GBC.eop());
         if (!ConditionalOptionPaneUtil.showConfirmationDialog("convert_to_data", Main.parent, msg, tr("Warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, JOptionPane.OK_OPTION)) {
             return;

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

@@ -67 +67 @@
                             JPanel panel = new JPanel(new GridBagLayout());
                             panel.add(new JLabel(trn("You have {0} unread message.", "You have {0} unread messages.", unread, unread)), GBC.eol());
-                            panel.add(new UrlLabel("http://www.openstreetmap.org/user/"+userInfo.getDisplayName()+"/inbox", tr("Click here to see your inbox.")), GBC.eol());
+                            panel.add(new UrlLabel(Main.OSM_WEBSITE + "/user/"+userInfo.getDisplayName()+"/inbox", tr("Click here to see your inbox.")), GBC.eol());
                             panel.setOpaque(false);
                             new Notification().setContent(panel)

trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -249 +249 @@
 
     /**
-     * Return OSM URL for given area
+     * Return OSM URL for given area.
      *
      * @param b bounds of the area
      * @return link to display that area in OSM map
      */
-    static public String getURL(Bounds b) {
+    public static String getURL(Bounds b) {
         return getURL(b.getCenter(), getZoom(b));
     }
 
     /**
-     * Return OSM URL for given position and zoom
+     * Return OSM URL for given position and zoom.
      *
      * @param pos center position of area
@@ -265 +265 @@
      * @return link to display that area in OSM map
      */
-    static public String getURL(LatLon pos, int zoom) {
+    public static String getURL(LatLon pos, int zoom) {
+        return getURL(pos.lat(), pos.lon(), zoom);
+    }
+
+    /**
+     * Return OSM URL for given lat/lon and zoom.
+     *
+     * @param dlat center latitude of area
+     * @param dlon center longitude of area
+     * @param zoom zoom depth of display
+     * @return link to display that area in OSM map
+     * 
+     * @since 6453
+     */
+    public static String getURL(double dlat, double dlon, int zoom) {
         // Truncate lat and lon to something more sensible
         int decimals = (int) Math.pow(10, (zoom / 3));
-        double lat = (Math.round(pos.lat() * decimals));
+        double lat = (Math.round(dlat * decimals));
         lat /= decimals;
-        double lon = (Math.round(pos.lon() * decimals));
+        double lon = (Math.round(dlon * decimals));
         lon /= decimals;
-        return "http://www.openstreetmap.org/?lat="+lat+"&lon="+lon+"&zoom="+zoom;
+        return Main.OSM_WEBSITE + "/#map="+zoom+"/"+lat+"/"+lon;
     }
 }