Changeset 1797 in josm for trunk

Timestamp:

2009-07-16T00:41:38+02:00 (15 years ago)

Author:

framm

Message:

• minor changes in conjunction with the Walking Papers plugin.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AutoScaleAction.java (modified) (1 diff)
• gui/MapView.java (modified) (1 diff)
• gui/NavigatableComponent.java (modified) (5 diffs)
• tools/OsmUrlToBounds.java (modified) (3 diffs)

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

@@ -61 +61 @@
         if (Main.map != null) {
             BoundingXYVisitor bbox = getBoundingBox();
-            if (bbox != null) {
+            if (bbox != null && bbox.getBounds() != null) {
                 Main.map.mapView.recalculateCenterScale(bbox);
             }

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

@@ -321 +321 @@
      */
     public void recalculateCenterScale(BoundingXYVisitor box) {
-        if(box == null) {
+        if (box == null) {
             box = new BoundingXYVisitor();
         }
-        if(box.getBounds() == null) {
+        if (box.getBounds() == null) {
             box.visit(getProjection().getWorldBounds());
         }
-        if(!box.hasExtend()) {
+        if (!box.hasExtend()) {
             box.enlargeBoundingBox();
         }

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

@@ -138 +138 @@
      */
     public Point getPoint(EastNorth p) {
-        if(null == p)
+        if (null == p)
             return new Point();
         double x = (p.east()-center.east())/scale + getWidth()/2;
@@ -146 +146 @@
 
     public Point getPoint(LatLon latlon) {
-        if(latlon == null)
+        if (latlon == null)
             return new Point();
-        else if(latlon instanceof CachedLatLon)
+        else if (latlon instanceof CachedLatLon)
             return getPoint(((CachedLatLon)latlon).getEastNorth());
         else
@@ -165 +165 @@
 /* TODO: check that newCenter is really inside visible world and that scale is correct, don't allow zooming out to much */
         boolean rep = false;
-        if(!newCenter.equals(center))
-        {
+        if (!newCenter.equals(center)) {
             EastNorth oldCenter = center;
             center = newCenter;
@@ -172 +171 @@
             firePropertyChange("center", oldCenter, newCenter);
         }
-        if(scale != newScale)
-        {
+        if (scale != newScale) {
             double oldScale = scale;
             scale = newScale;
@@ -188 +186 @@
 
     public void zoomTo(LatLon newCenter) {
-        if(newCenter instanceof CachedLatLon)
+        if (newCenter instanceof CachedLatLon)
             zoomTo(((CachedLatLon)newCenter).getEastNorth(), scale);
         else

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

@@ -8 +8 @@
 
 public class OsmUrlToBounds {
+    
     public static Bounds parse(String url) {
         int i = url.indexOf('?');
@@ -56 +57 @@
     }
 
-    static public int getZoom(Bounds b)
-    {
+    static public int getZoom(Bounds b) {
         // convert to mercator (for calculation of zoom only)
         double latMin = Math.log(Math.tan(Math.PI/4.0+b.min.lat()/180.0*Math.PI/2.0))*180.0/Math.PI;
@@ -72 +72 @@
     }
 
-    static public String getURL(Bounds b)
-    {
+    static public String getURL(Bounds b) {
         return getURL(b.getCenter(), getZoom(b));
     }
 
-    static public String getURL(LatLon pos, int zoom)
-    {
+    static public String getURL(LatLon pos, int zoom) {
         // Truncate lat and lon to something more sensible
         int decimals = (int) Math.pow(10, (zoom / 3));