Changeset 31830 in osm

Timestamp:

2015-12-15T17:42:22+01:00 (10 years ago)

Author:

floscher

Message:

[proj4j] Implement new method org.openstreetmap.josm.data.projection.Projection.getWorldBoundsBoxEastNorth()

File:

• applications/editors/josm/plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/Proj4JProjection.java (modified) (4 diffs)

applications/editors/josm/plugins/proj4j/src/org/openstreetmap/josm/plugins/proj4j/Proj4JProjection.java

@@ -5 +5 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -20 +21 @@
     public Proj4JProjection(String crsCode) {
         this.crsCode = crsCode;
-        
+
         org.osgeo.proj4j.CRSFactory crsFactory =
                 new org.osgeo.proj4j.CRSFactory();
@@ -86 +87 @@
 
     @Override
+    public ProjectionBounds getWorldBoundsBoxEastNorth() {
+      // TODO: Check if this method does, what it should do. For now it's just a workaround to fix the failing build.
+      // This code is a simplified version of org.openstreetmap.josm.data.projection.AbstractProjection.getWorldBoundsBoxEastNorth()
+      Bounds b = getWorldBoundsLatLon();
+      // add 4 corners
+      ProjectionBounds result = new ProjectionBounds(latlon2eastNorth(b.getMin()));
+      result.extend(latlon2eastNorth(b.getMax()));
+      result.extend(latlon2eastNorth(new LatLon(b.getMinLat(), b.getMaxLon())));
+      result.extend(latlon2eastNorth(new LatLon(b.getMaxLat(), b.getMinLon())));
+      // and trace along the outline
+      double dLon = (b.getMaxLon() - b.getMinLon()) / 1000;
+      double dLat = (b.getMaxLat() - b.getMinLat()) / 1000;
+      for (double lon=b.getMinLon(); lon<b.getMaxLon(); lon += dLon) {
+          result.extend(latlon2eastNorth(new LatLon(b.getMinLat(), lon)));
+          result.extend(latlon2eastNorth(new LatLon(b.getMaxLat(), lon)));
+      }
+      for (double lat=b.getMinLat(); lat<b.getMaxLat(); lat += dLat) {
+          result.extend(latlon2eastNorth(new LatLon(lat, b.getMinLon())));
+          result.extend(latlon2eastNorth(new LatLon(lat, b.getMaxLon())));
+      }
+      return result;
+    }
+
+    @Override
     public Bounds getWorldBoundsLatLon() {
         org.osgeo.proj4j.proj.Projection proj = proj4jCRS.getProjection();
@@ -96 +121 @@
 
         @Override
-        public double getMetersPerUnit() {              
+        public double getMetersPerUnit() {
                 return 1.0 / proj4jCRS.getProjection().getFromMetres();
         }