Changeset 12131 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2017-05-13T01:12:44+02:00 (7 years ago)

Author:

Don-vip

Message:

see #11889, see #11924, see #13387 - use backported versions of Math.toDegrees/toRadians (more accurate and faster) - to revert when migrating to Java 9

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• coor/LatLon.java (modified) (1 diff)
• osm/visitor/paint/StyledMapRenderer.java (modified) (6 diffs)
• osm/visitor/paint/WireframeMapRenderer.java (modified) (2 diffs)
• validation/PaintVisitor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -8 +8 @@
 import static java.lang.Math.sin;
 import static java.lang.Math.sqrt;
-import static java.lang.Math.toRadians;
 import static org.openstreetmap.josm.data.projection.Ellipsoid.WGS84;
 import static org.openstreetmap.josm.tools.I18n.trc;
+import static org.openstreetmap.josm.tools.Utils.toRadians;
 
 import java.awt.geom.Area;

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -286 +286 @@
     static final int FLAG_OUTERMEMBER_OF_SELECTED = 8;
 
-    private static final double PHI = Math.toRadians(20);
+    private static final double PHI = Utils.toRadians(20);
     private static final double cosPHI = Math.cos(PHI);
     private static final double sinPHI = Math.sin(PHI);
@@ -978 +978 @@
             fromAngle = Math.atan(dy / dx);
         }
-        double fromAngleDeg = Math.toDegrees(fromAngle);
+        double fromAngleDeg = Utils.toDegrees(fromAngle);
 
         double vx = distanceFromVia * Math.cos(fromAngle);
@@ -1001 +1001 @@
         if (pFrom.x >= pVia.x && pFrom.y >= pVia.y) {
             if (!leftHandTraffic) {
-                vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg - 90));
-                vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg - 90));
+                vx2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg - 90));
+                vy2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg - 90));
             } else {
-                vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 90));
-                vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 90));
+                vx2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg + 90));
+                vy2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg + 90));
             }
             iconAngle = 270+fromAngleDeg;
@@ -1011 +1011 @@
         if (pFrom.x < pVia.x && pFrom.y >= pVia.y) {
             if (!leftHandTraffic) {
-                vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg));
-                vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg));
+                vx2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg));
+                vy2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg));
             } else {
-                vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 180));
-                vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 180));
+                vx2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg + 180));
+                vy2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg + 180));
             }
             iconAngle = 90-fromAngleDeg;
@@ -1021 +1021 @@
         if (pFrom.x < pVia.x && pFrom.y < pVia.y) {
             if (!leftHandTraffic) {
-                vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 90));
-                vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 90));
+                vx2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg + 90));
+                vy2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg + 90));
             } else {
-                vx2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg - 90));
-                vy2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg - 90));
+                vx2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg - 90));
+                vy2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg - 90));
             }
             iconAngle = 90+fromAngleDeg;
@@ -1031 +1031 @@
         if (pFrom.x >= pVia.x && pFrom.y < pVia.y) {
             if (!leftHandTraffic) {
-                vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg + 180));
-                vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg + 180));
+                vx2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg + 180));
+                vy2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg + 180));
             } else {
-                vx2 = distanceFromWay * Math.sin(Math.toRadians(fromAngleDeg));
-                vy2 = distanceFromWay * Math.cos(Math.toRadians(fromAngleDeg));
+                vx2 = distanceFromWay * Math.sin(Utils.toRadians(fromAngleDeg));
+                vy2 = distanceFromWay * Math.cos(Utils.toRadians(fromAngleDeg));
             }
             iconAngle = 270-fromAngleDeg;

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

@@ -32 +32 @@
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.draw.MapPath2D;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -90 +91 @@
 
     /** Helper variable for {@link #drawSegment} */
-    private static final ArrowPaintHelper ARROW_PAINT_HELPER = new ArrowPaintHelper(Math.toRadians(20), 10);
+    private static final ArrowPaintHelper ARROW_PAINT_HELPER = new ArrowPaintHelper(Utils.toRadians(20), 10);
 
     /** Helper variable for {@link #visit(Relation)} */

trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java

@@ -18 +18 @@
 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -144 +145 @@
         double cosT = 5 * Math.cos(t);
         double sinT = 5 * Math.sin(t);
-        int deg = (int) Math.toDegrees(t);
+        int deg = (int) Utils.toDegrees(t);
         if (selected) {
             g.setColor(getHighlightColor(color));