Ignore:
Timestamp:
2010-08-29T14:57:39+02:00 (9 years ago)
Author:
bastiK
Message:

fixed some issues with world bounds; add basic projection tests

Location:
trunk/src/org/openstreetmap/josm/data/projection
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/projection/Lambert.java

    r3385 r3480  
    230230    {
    231231        Bounds b= new Bounds(
    232                 new LatLon(zoneLimitsDegree[layoutZone][1] - cMaxOverlappingZonesDegree, -4.9074074074074059),
    233                 new LatLon(zoneLimitsDegree[layoutZone][0] + cMaxOverlappingZonesDegree, 10.2));
     232                new LatLon(Math.max(zoneLimitsDegree[layoutZone][1] - cMaxOverlappingZonesDegree, Math.toDegrees(cMinLatZone1Radian)), Math.toDegrees(cMinLonZonesRadian)),
     233                new LatLon(Math.min(zoneLimitsDegree[layoutZone][0] + cMaxOverlappingZonesDegree, Math.toDegrees(cMaxLatZone1Radian)), Math.toDegrees(cMaxLonZonesRadian)));
    234234        return b;
    235235    }
  • trunk/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java

    r3083 r3480  
    166166        double medLatZone = cMinLatZonesDegree + (layoutZone+1);
    167167        return new Bounds(
    168                 new LatLon(medLatZone - 1.0 - cMaxOverlappingZones, -4.9),
    169                 new LatLon(medLatZone + 1.0 + cMaxOverlappingZones, 10.2));
     168                new LatLon(Math.max(medLatZone - 1.0 - cMaxOverlappingZones, cMinLatZonesDegree), -4.9),
     169                new LatLon(Math.min(medLatZone + 1.0 + cMaxOverlappingZones, Math.toDegrees(cMaxLatZonesRadian)), 10.2));
    170170    }
    171171
  • trunk/src/org/openstreetmap/josm/data/projection/Puwg.java

    r3232 r3480  
    2929    private int zone = DEFAULT_ZONE;
    3030
    31     private static PuwgData[] Zones = new PuwgData[]{
     31    static PuwgData[] Zones = new PuwgData[]{
    3232        new Epsg2180(),
    3333        new Epsg2176(),
Note: See TracChangeset for help on using the changeset viewer.