Changeset 9534 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2016-01-19T00:07:17+01:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/projection/proj
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java
r9532 r9534 163 163 final double eccnth = 0.5 * e; 164 164 double phi = (Math.PI/2) - 2.0 * Math.atan(ts); 165 for (int i =0; i<MAXIMUM_ITERATIONS; i++) {165 for (int i = 0; i < MAXIMUM_ITERATIONS; i++) { 166 166 final double con = e * Math.sin(phi); 167 167 final double dphi = (Math.PI/2) - 2.0*Math.atan(ts * Math.pow((1-con)/(1+con), eccnth)) - phi; -
trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
r9532 r9534 115 115 * </ul> 116 116 * 117 * @author Gerald I. Evenden (for original code in Proj4) 118 * @author Rueben Schulz 119 * 117 120 * @see <A HREF="http://mathworld.wolfram.com/MercatorProjection.html">Oblique Mercator projection on MathWorld</A> 118 121 * @see <A HREF="http://www.remotesensing.org/geotiff/proj_list/hotine_oblique_mercator.html">"hotine_oblique_mercator" on RemoteSensing.org</A> 119 122 * @see <A HREF="http://www.remotesensing.org/geotiff/proj_list/oblique_mercator.html">"oblique_mercator" on RemoteSensing.org</A> 120 *121 * @author Gerald I. Evenden (for original code in Proj4)122 * @author Rueben Schulz123 123 */ 124 124 public class ObliqueMercator extends AbstractProj implements ICentralMeridianProvider { … … 307 307 azimuth = Math.toRadians(params.alpha); 308 308 if ((azimuth > -1.5*Math.PI && azimuth < -0.5*Math.PI) || 309 (azimuth > 0.5*Math.PI && azimuth < 1.5*Math.PI)) 310 {311 throw new ProjectionConfigurationException(tr("Illegal value for parameter ''{0}'': {1}", "alpha", Double.toString(params.alpha)));309 (azimuth > 0.5*Math.PI && azimuth < 1.5*Math.PI)) { 310 throw new ProjectionConfigurationException( 311 tr("Illegal value for parameter ''{0}'': {1}", "alpha", Double.toString(params.alpha))); 312 312 } 313 313 if (params.gamma != null) { … … 388 388 x = v * cosrot + u * sinrot; 389 389 y = u * cosrot - v * sinrot; 390 return new double[] {x, y};390 return new double[] {x, y}; 391 391 } 392 392
Note:
See TracChangeset
for help on using the changeset viewer.