Ignore:
Timestamp:
2012-05-12T19:11:58+02:00 (8 years ago)
Author:
bastiK
Message:

no rounding for projection bounds, to avoid 42 being dispayed as 41.99999999999

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

Legend:

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

    r5072 r5235  
    4747        return new Bounds(
    4848                new LatLon(49.51, 2.54),
    49                 new LatLon(51.50, 6.40));
     49                new LatLon(51.50, 6.40), false);
    5050    }
    5151
  • trunk/src/org/openstreetmap/josm/data/projection/BelgianLambert2008.java

    r5072 r5235  
    4646        return new Bounds(
    4747                new LatLon(49.51, 2.54),
    48                 new LatLon(51.50, 6.40));
     48                new LatLon(51.50, 6.40), false);
    4949    }
    5050
  • trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

    r5234 r5235  
    343343                parseAngle(numStr[0], "minlon (+bounds)"),
    344344                parseAngle(numStr[3], "maxlat (+bounds)"),
    345                 parseAngle(numStr[2], "maxlon (+bounds)"));
     345                parseAngle(numStr[2], "maxlon (+bounds)"), false);
    346346    }
    347347
  • trunk/src/org/openstreetmap/josm/data/projection/Epsg3008.java

    r5066 r5235  
    5454    public Bounds getWorldBoundsLatLon() {
    5555        return new Bounds(
    56                 new LatLon(55.2, 12.1),     // new LatLon(-90.0, -180.0),
    57                 new LatLon(62.26, 14.65));  // new LatLon(90.0, 180.0));
     56                new LatLon(55.2, 12.1),
     57                new LatLon(62.26, 14.65), false);
    5858    }
    5959
  • trunk/src/org/openstreetmap/josm/data/projection/Epsg4326.java

    r2516 r5235  
    4444        return new Bounds(
    4545                new LatLon(-90.0, -180.0),
    46                 new LatLon(90.0, 180.0));
     46                new LatLon(90.0, 180.0), false);
    4747    }
    4848
  • trunk/src/org/openstreetmap/josm/data/projection/GaussKrueger.java

    r5234 r5235  
    1717
    1818    private static Bounds[] bounds = {
    19         new Bounds(new LatLon(-5, 3.5), new LatLon(85, 8.5)),
    20         new Bounds(new LatLon(-5, 6.5), new LatLon(85, 11.5)),
    21         new Bounds(new LatLon(-5, 9.5), new LatLon(85, 14.5)),
    22         new Bounds(new LatLon(-5, 12.5), new LatLon(85, 17.5)),
     19        new Bounds(new LatLon(-5, 3.5), new LatLon(85, 8.5), false),
     20        new Bounds(new LatLon(-5, 6.5), new LatLon(85, 11.5), false),
     21        new Bounds(new LatLon(-5, 9.5), new LatLon(85, 14.5), false),
     22        new Bounds(new LatLon(-5, 12.5), new LatLon(85, 17.5), false),
    2323    };
    2424
  • trunk/src/org/openstreetmap/josm/data/projection/Lambert.java

    r5234 r5235  
    143143        Bounds b= new Bounds(
    144144                new LatLon(Math.max(zoneLimitsDegree[layoutZone][1] - cMaxOverlappingZonesDegree, Math.toDegrees(cMinLatZone1Radian)), Math.toDegrees(cMinLonZonesRadian)),
    145                 new LatLon(Math.min(zoneLimitsDegree[layoutZone][0] + cMaxOverlappingZonesDegree, Math.toDegrees(cMaxLatZone1Radian)), Math.toDegrees(cMaxLonZonesRadian)));
     145                new LatLon(Math.min(zoneLimitsDegree[layoutZone][0] + cMaxOverlappingZonesDegree, Math.toDegrees(cMaxLatZone1Radian)), Math.toDegrees(cMaxLonZonesRadian)),
     146                false);
    146147        return b;
    147148    }
  • trunk/src/org/openstreetmap/josm/data/projection/Lambert93.java

    r5066 r5235  
    4545        return new Bounds(
    4646                new LatLon(41.0, -5.5),
    47                 new LatLon(51.0, 10.2));
     47                new LatLon(51.0, 10.2), false);
    4848    }
    4949
  • trunk/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java

    r5234 r5235  
    9090        return new Bounds(
    9191                new LatLon(Math.max(medLatZone - 1.0 - cMaxOverlappingZones, cMinLatZonesDegree), -5.5),
    92                 new LatLon(Math.min(medLatZone + 1.0 + cMaxOverlappingZones, Math.toDegrees(cMaxLatZonesRadian)), 10.2));
     92                new LatLon(Math.min(medLatZone + 1.0 + cMaxOverlappingZones, Math.toDegrees(cMaxLatZonesRadian)), 10.2),
     93                false);
    9394    }
    9495
  • trunk/src/org/openstreetmap/josm/data/projection/LambertEST.java

    r5066 r5235  
    6363        return new Bounds(
    6464                new LatLon(56.05, 21.64),
    65                 new LatLon(61.13, 28.58));
     65                new LatLon(61.13, 28.58), false);
    6666    }
    6767
  • trunk/src/org/openstreetmap/josm/data/projection/Mercator.java

    r5066 r5235  
    6060        return new Bounds(
    6161                new LatLon(-85.05112877980659, -180.0),
    62                 new LatLon(85.05112877980659, 180.0));
     62                new LatLon(85.05112877980659, 180.0), false);
    6363    }
    6464
  • trunk/src/org/openstreetmap/josm/data/projection/Puwg.java

    r5234 r5235  
    121121            return new Bounds(
    122122                    new LatLon(49.00, 14.12),
    123                     new LatLon(54.84, 24.15));
     123                    new LatLon(54.84, 24.15), false);
    124124        }
    125125
     
    164164            return new Bounds(
    165165                    new LatLon(49.00, (3 * getZone()) - 1.5),
    166                     new LatLon(54.84, (3 * getZone()) + 1.5));
     166                    new LatLon(54.84, (3 * getZone()) + 1.5), false);
    167167        }
    168168
  • trunk/src/org/openstreetmap/josm/data/projection/SwissGrid.java

    r5234 r5235  
    6363    @Override
    6464    public Bounds getWorldBoundsLatLon() {
    65         return new Bounds(new LatLon(45.7, 5.7), new LatLon(47.9, 10.6));
     65        return new Bounds(new LatLon(45.7, 5.7), new LatLon(47.9, 10.6), false);
    6666    }
    6767
  • trunk/src/org/openstreetmap/josm/data/projection/TransverseMercatorLV.java

    r5066 r5235  
    5656        return new Bounds(
    5757                new LatLon(-90.0, -180.0),
    58                 new LatLon(90.0, 180.0));
     58                new LatLon(90.0, 180.0), false);
    5959    }
    6060}
  • trunk/src/org/openstreetmap/josm/data/projection/UTM.java

    r5234 r5235  
    100100            return new Bounds(
    101101                    new LatLon(-5.0, getUtmCentralMeridianDeg(getzone())-5.0),
    102                     new LatLon(85.0, getUtmCentralMeridianDeg(getzone())+5.0));
     102                    new LatLon(85.0, getUtmCentralMeridianDeg(getzone())+5.0), false);
    103103        else
    104104            return new Bounds(
    105105                    new LatLon(-85.0, getUtmCentralMeridianDeg(getzone())-5.0),
    106                     new LatLon(5.0, getUtmCentralMeridianDeg(getzone())+5.0));
     106                    new LatLon(5.0, getUtmCentralMeridianDeg(getzone())+5.0), false);
    107107    }
    108108
  • trunk/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java

    r5234 r5235  
    1919public class UTM_France_DOM extends AbstractProjection {
    2020
    21     private final static Bounds FortMarigotBounds = new Bounds( new LatLon(17.6,-63.25), new LatLon(18.5,-62.5));
    22     private final static Bounds SainteAnneBounds = new Bounds( new LatLon(15.8,-61.9), new LatLon(16.6,-60.9));
    23     private final static Bounds MartiniqueBounds = new Bounds( new LatLon(14.25,-61.25), new LatLon(15.025,-60.725));
    24     private final static Bounds ReunionBounds = new Bounds( new LatLon(-25.92,37.58), new LatLon(-10.6, 58.27));
    25     private final static Bounds GuyaneBounds = new Bounds( new LatLon(2.16 , -54.0), new LatLon(9.06 , -49.62));
     21    private final static Bounds FortMarigotBounds = new Bounds( new LatLon(17.6,-63.25), new LatLon(18.5,-62.5), false);
     22    private final static Bounds SainteAnneBounds = new Bounds( new LatLon(15.8,-61.9), new LatLon(16.6,-60.9), false);
     23    private final static Bounds MartiniqueBounds = new Bounds( new LatLon(14.25,-61.25), new LatLon(15.025,-60.725), false);
     24    private final static Bounds ReunionBounds = new Bounds( new LatLon(-25.92,37.58), new LatLon(-10.6, 58.27), false);
     25    private final static Bounds GuyaneBounds = new Bounds( new LatLon(2.16 , -54.0), new LatLon(9.06 , -49.62), false);
    2626    private final static Bounds[] utmBounds = { FortMarigotBounds, SainteAnneBounds, MartiniqueBounds, ReunionBounds, GuyaneBounds };
    2727
Note: See TracChangeset for help on using the changeset viewer.