Changeset 9579 in josm


Ignore:
Timestamp:
2016-01-23T14:11:05+01:00 (4 years ago)
Author:
bastiK
Message:

fix bounds that are too large and make tests fail (see #12186)

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data_nodist/projection/josm-epsg

    r9568 r9579  
    4040<2973> +proj=utm +zone=20 +ellps=intl +towgs84=126.926,547.939,130.409,-2.7867,5.16124,-0.85844,13.82265 +units=m +bounds=-61.25,14.25,-60.725,15.025  <>
    4141# UTM France (DOM) Reunion
    42 <2975> +proj=utm +zone=40 +south +ellps=GRS80 +nadgrids=null +units=m +bounds=37.58,-25.92,58.27,-10.6  <>
     42<2975> +proj=utm +zone=40 +south +ellps=GRS80 +nadgrids=null +units=m +bounds=51,-25.92,58.27,-10.6  <>
    4343# Monte Mario / Italy zone 1
    4444<3003> +proj=tmerc +lat_0=0 +lon_0=9 +k=0.9996 +x_0=1500000 +y_0=0 +ellps=intl +units=m +bounds=5,36,13,48 <>
  • trunk/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java

    r9124 r9579  
    4343    private double b0;
    4444    private double k;
     45    private double phi0;
    4546
    4647    private static final double EPSILON = 1e-11;
     
    5556
    5657    private void initialize(double lat_0) {
    57         double phi0 = toRadians(lat_0);
     58        phi0 = toRadians(lat_0);
    5859        kR = sqrt(1 - ellps.e2) / (1 - (ellps.e2 * pow(sin(phi0), 2)));
    5960        alpha = sqrt(1 + (ellps.eb2 * pow(cos(phi0), 4)));
     
    118119    @Override
    119120    public Bounds getAlgorithmBounds() {
    120         return new Bounds(-85, -179, 85, 179, false);
     121        if (phi0 > 0) {
     122            return new Bounds(-10, -40, 85, 40, false);
     123        } else {
     124            return new Bounds(-85, -40, 10, 40, false);
     125        }
    121126    }
    122127}
Note: See TracChangeset for help on using the changeset viewer.