Changeset 12445 in josm for trunk/src/org/openstreetmap/josm/data/projection/proj
 Timestamp:
 20170701T16:44:05+02:00 (2 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
r12013 r12445 160 160 * Constants used in the transformation. 161 161 */ 162 private double b, e;162 private double b, g; 163 163 164 164 /** … … 249 249 } 250 250 } 251 e= f += d;252 e= f * Math.pow(tsfn(latCenter, sinph0), b);251 g = f += d; 252 g = f * Math.pow(tsfn(latCenter, sinph0), b); 253 253 254 254 /* … … 288 288 final double h = Math.pow(tsfn(lat1, Math.sin(lat1)), b); 289 289 final double l = Math.pow(tsfn(lat2, Math.sin(lat2)), b); 290 final double fp = e/ h;290 final double fp = g / h; 291 291 final double p = (l  h) / (l + h); 292 double j = e * e;292 double j = g * g; 293 293 j = (j  l * h) / (j + l * h); 294 294 double diff = lon1  lon2; … … 379 379 double u, v; 380 380 if (Math.abs(Math.abs(y)  Math.PI/2.0) > EPSILON) { 381 double q = e/ Math.pow(tsfn(y, Math.sin(y)), b);381 double q = g / Math.pow(tsfn(y, Math.sin(y)), b); 382 382 double temp = 1.0 / q; 383 383 double s = 0.5 * (q  temp); … … 420 420 } else { 421 421 return new double[] { 422 cphi2(Math.pow( e/ Math.sqrt((1. + up) / (1.  up)), 1.0 / b)), //calculate t422 cphi2(Math.pow(g / Math.sqrt((1. + up) / (1.  up)), 1.0 / b)), //calculate t 423 423 Math.atan2(sp * cosgamma0  vp * singamma0, Math.cos(bra * u)) / b}; 424 424 }
Note: See TracChangeset
for help on using the changeset viewer.