- Timestamp:
- 2015-12-13T12:13:26+01:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/projection/Projections.java
r9104 r9108 107 107 Ellipsoid.Clarke1880, -263.0, 6.0, 431.0)); 108 108 datums.put("GGRS87", new ThreeParameterDatum( 109 "Greek Geodetic Reference System 1987", "GGRS87", 109 "Greek Geodetic Reference System 1987", "GGRS87", 110 110 Ellipsoid.GRS80, -199.87, 74.79, 246.62)); 111 datums.put("hermannskogel", new ThreeParameterDatum(111 datums.put("hermannskogel", new ThreeParameterDatum( 112 112 "Hermannskogel", "hermannskogel", 113 113 Ellipsoid.Bessel1841, 653.0, -212.0, 449.0)); … … 119 119 Ellipsoid.Hayford, 59.47, -5.04, 187.44, 0.47, -0.1, 1.024, -4.5993)); 120 120 datums.put("OSGB36", new SevenParameterDatum( 121 "Airy 1830", "OSGB36", 121 "Airy 1830", "OSGB36", 122 122 Ellipsoid.Airy, 446.448, -125.157, 542.060, 0.1502, 0.2470, 0.8421, -20.4894)); 123 123 datums.put("potsdam", new SevenParameterDatum( -
trunk/src/org/openstreetmap/josm/data/projection/proj/DoubleStereographic.java
r9100 r9108 63 63 double e2 = ellps.e2; 64 64 R = sqrt(1-e2) / (1 - e2*pow(sin(phi0), 2)); 65 n = sqrt(1 + ellps.eb2 * pow(cos(phi0), 4));65 n = sqrt(1 + ellps.eb2 * pow(cos(phi0), 4)); 66 66 double S1 = (1 + sin(phi0)) / (1 - sin(phi0)); 67 67 double S2 = (1 - e * sin(phi0)) / (1 + e * sin(phi0)); -
trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
r9107 r9108 27 27 import org.openstreetmap.josm.data.imagery.ImageryInfo; 28 28 import org.openstreetmap.josm.data.projection.Projections; 29 import org.openstreetmap.josm.gui.preferences.projection.ProjectionChoice;30 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;31 29 import org.openstreetmap.josm.io.UTFInputStreamReader; 32 30 import org.openstreetmap.josm.tools.Predicate; -
trunk/src/org/openstreetmap/josm/tools/Geometry.java
r9099 r9108 975 975 /** 976 976 * Calculate area and perimeter length of a polygon. 977 * 977 * 978 978 * Uses current projection; units are that of the projected coordinates. 979 * 979 * 980 980 * @param nodes the list of nodes representing the polygon 981 981 * @return area and perimeter … … 988 988 int numSegments = closed ? nodes.size() - 1 : nodes.size(); 989 989 EastNorth p1 = nodes.get(0).getEastNorth(); 990 for (int i =1; i<=numSegments; i++) {990 for (int i = 1; i <= numSegments; i++) { 991 991 EastNorth p2 = nodes.get(i == numSegments ? 0 : i).getEastNorth(); 992 992 area += p1.east() * p2.north() - p2.east() * p1.north();
Note:
See TracChangeset
for help on using the changeset viewer.