Changeset 9970 in josm for trunk/src/org/openstreetmap/josm/data
- Timestamp:
- 2016-03-12T23:18:04+01:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java
r9171 r9970 70 70 try { 71 71 String xml = attributionLoader.updateIfRequiredString(); 72 List<Attribution> ret = parseAttributionText(new InputSource(new StringReader( (xml))));72 List<Attribution> ret = parseAttributionText(new InputSource(new StringReader(xml))); 73 73 if (attributionDownloadedTask != null) { 74 74 GuiHelper.runInEDT(attributionDownloadedTask); -
trunk/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java
r9669 r9970 7 7 import java.util.Map; 8 8 9 import org.openstreetmap.josm.tools.HttpClient; 10 9 11 import oauth.signpost.AbstractOAuthConsumer; 10 12 import oauth.signpost.AbstractOAuthProvider; 11 12 import org.openstreetmap.josm.tools.HttpClient;13 13 14 14 /** … … 54 54 @Override 55 55 protected HttpRequest wrap(Object request) { 56 return new HttpRequest(( (HttpClient) request));56 return new HttpRequest((HttpClient) request); 57 57 } 58 58 } -
trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
r9961 r9970 292 292 protected OsmPrimitive(long id, int version, boolean allowNegativeId) { 293 293 this(id, allowNegativeId); 294 this.version = (id > 0 ? version : 0);294 this.version = id > 0 ? version : 0; 295 295 setIncomplete(id > 0 && version == 0); 296 296 } -
trunk/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java
r9558 r9970 110 110 double cosphi = Math.cos(phi1); 111 111 double n = sinphi; 112 boolean secant = (Math.abs(phi1 - phi2) >= EPSILON);112 boolean secant = Math.abs(phi1 - phi2) >= EPSILON; 113 113 double m1 = msfn(sinphi, cosphi); 114 114 double q1 = qsfn(sinphi); … … 206 206 if (e >= EPSILON) { 207 207 final double con = e * sinphi; 208 return (one_es * (sinphi / (1. - con*con) -209 (0.5/e) * Math.log((1.-con) / (1.+con))) );208 return one_es * (sinphi / (1. - con*con) - 209 (0.5/e) * Math.log((1.-con) / (1.+con))); 210 210 } else { 211 211 return sinphi + sinphi; -
trunk/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java
r9636 r9970 258 258 if (e >= EPSILON) { 259 259 final double con = e * sinphi; 260 return ( (1.0 - e2) * (sinphi / (1.0 - con*con) -261 (0.5 / e) * Math.log((1.0 - con) / (1.0 + con))) );260 return (1.0 - e2) * (sinphi / (1.0 - con*con) - 261 (0.5 / e) * Math.log((1.0 - con) / (1.0 + con))); 262 262 } else { 263 263 return sinphi + sinphi; -
trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
r9558 r9970 381 381 u = AB * x; 382 382 } else { 383 u = ArB * Math.atan2( (S * cosgamma0 + V * singamma0), temp);383 u = ArB * Math.atan2(S * cosgamma0 + V * singamma0, temp); 384 384 } 385 385 } else { … … 408 408 y = Math.pow(E / Math.sqrt((1. + Up) / (1. - Up)), 1.0 / B); //calculate t 409 409 y = cphi2(y); 410 x = -Math.atan2( (Sp * cosgamma0 - Vp * singamma0), Math.cos(BrA * u)) / B;410 x = -Math.atan2(Sp * cosgamma0 - Vp * singamma0, Math.cos(BrA * u)) / B; 411 411 } 412 412 return new double[] {y, x}; -
trunk/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java
r9559 r9970 161 161 if (Math.abs(phi-phi0) < ITERATION_TOLERANCE) { 162 162 x = (Math.abs(rho) < EPSILON) ? 0.0 : Math.atan2(x, -y); 163 y = (southPole)? -phi : phi;163 y = southPole ? -phi : phi; 164 164 break; 165 165 } -
trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
r9558 r9970 137 137 138 138 /* NOTE: meridinal distance at latitudeOfOrigin is always 0 */ 139 y = (mlfn(y, sinphi, cosphi) - ml0 +139 y = mlfn(y, sinphi, cosphi) - ml0 + 140 140 sinphi * al * x * 141 141 FC2 * (1.0 + 142 142 FC4 * als * (5.0 - t + n*(9.0 + 4.0*n) + 143 143 FC6 * als * (61.0 + t * (t - 58.0) + n*(270.0 - 330.0*t) + 144 FC8 * als * (1385.0 + t * (t*(543.0 - t) - 3111.0))))) );144 FC8 * als * (1385.0 + t * (t*(543.0 - t) - 3111.0))))); 145 145 146 146 x = al*(FC1 + FC3 * als*(1.0 - t + n + -
trunk/src/org/openstreetmap/josm/data/validation/util/Entities.java
r8848 r9970 393 393 } 394 394 String value = mapNameToValue.get(entityContent); 395 entityValue = (value == null ? -1 : Integer.parseInt(value));395 entityValue = value == null ? -1 : Integer.parseInt(value); 396 396 } 397 397 }
Note:
See TracChangeset
for help on using the changeset viewer.