Changeset 8345 in josm for trunk/src/org/openstreetmap/josm/tools/Geometry.java
- Timestamp:
- 2015-05-11T10:52:33+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/tools/Geometry.java
r8342 r8345 449 449 CheckParameterUtil.ensureValidCoordinates(secondNode, "secondNode"); 450 450 451 double dy1 = (firstNode.getY() - commonNode.getY());452 double dy2 = (secondNode.getY() - commonNode.getY());453 double dx1 = (firstNode.getX() - commonNode.getX());454 double dx2 = (secondNode.getX() - commonNode.getX());451 double dy1 = firstNode.getY() - commonNode.getY(); 452 double dy2 = secondNode.getY() - commonNode.getY(); 453 double dx1 = firstNode.getX() - commonNode.getX(); 454 double dx2 = secondNode.getX() - commonNode.getX(); 455 455 456 456 return dy1 * dx2 - dx1 * dy2 > 0; … … 651 651 dlat = lat2 - lat1; 652 652 653 double a = (Math.pow(Math.sin(dlat/2), 2) + Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(dlon/2), 2));653 double a = Math.pow(Math.sin(dlat/2), 2) + Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(dlon/2), 2); 654 654 double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a)); 655 655 return 6367000 * c; … … 668 668 dlat = lat2 - lat1; 669 669 670 double a = (Math.pow(Math.sin(dlat/2), 2) + Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(dlon/2), 2));670 double a = Math.pow(Math.sin(dlat/2), 2) + Math.cos(lat1) * Math.cos(lat2) * Math.pow(Math.sin(dlon/2), 2); 671 671 double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a)); 672 672 return 6367000 * c;
Note:
See TracChangeset
for help on using the changeset viewer.
