Changeset 9419 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-01-12T17:39:45+01:00 (10 years ago)

Author:

bastiK

Message:

add Albers Equal Area Projection and Polar Stereographic Projection (see #12186)
(imports pieces of code from the Geotools project)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• NavigatableComponent.java (modified) (2 diffs)
• util/HighlightHelper.java (modified) (1 diff)

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

@@ -311 +311 @@
     }
 
+    public ProjectionBounds getProjectionBounds(Rectangle r) {
+        EastNorth p1 = getEastNorth(r.x, r.y);
+        EastNorth p2 = getEastNorth(r.x + r.width, r.y + r.height);
+        ProjectionBounds pb = new ProjectionBounds(p1);
+        pb.extend(p2);
+        return pb;
+    }
+    
     /**
      * @param r rectangle
@@ -316 +324 @@
      */
     public Bounds getLatLonBounds(Rectangle r) {
-        // TODO Maybe this should be (optional) method of Projection implementation
-        EastNorth p1 = getEastNorth(r.x, r.y);
-        EastNorth p2 = getEastNorth(r.x + r.width, r.y + r.height);
-
-        Bounds result = new Bounds(Main.getProjection().eastNorth2latlon(p1));
-
-        double eastMin = Math.min(p1.east(), p2.east());
-        double eastMax = Math.max(p1.east(), p2.east());
-        double northMin = Math.min(p1.north(), p2.north());
-        double northMax = Math.max(p1.north(), p2.north());
-        double deltaEast = (eastMax - eastMin) / 10;
-        double deltaNorth = (northMax - northMin) / 10;
-
-        for (int i = 0; i < 10; i++) {
-            result.extend(Main.getProjection().eastNorth2latlon(new EastNorth(eastMin + i * deltaEast, northMin)));
-            result.extend(Main.getProjection().eastNorth2latlon(new EastNorth(eastMin + i * deltaEast, northMax)));
-            result.extend(Main.getProjection().eastNorth2latlon(new EastNorth(eastMin, northMin  + i * deltaNorth)));
-            result.extend(Main.getProjection().eastNorth2latlon(new EastNorth(eastMax, northMin  + i * deltaNorth)));
-        }
-
-        return result;
+        return Main.getProjection().getLatLonBoundsBox(getProjectionBounds(r));
     }
 

trunk/src/org/openstreetmap/josm/gui/util/HighlightHelper.java

@@ -14 +14 @@
 
 /**
- * This class stores the set of highlited primitives and
- * allows easy and fast change of highlighting
+ * This class stores the set of highlighted primitives and
+ * allows easy and fast change of highlighting.
  */
 public class HighlightHelper {