Changeset 12131 in josm for trunk/src

Timestamp:

2017-05-13T01:12:44+02:00 (8 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

Files:

• actions/OrthogonalizeAction.java (modified) (2 diffs)
• actions/mapmode/DrawAction.java (modified) (3 diffs)
• actions/mapmode/DrawSnapHelper.java (modified) (3 diffs)
• data/coor/LatLon.java (modified) (1 diff)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (6 diffs)
• data/osm/visitor/paint/WireframeMapRenderer.java (modified) (2 diffs)
• data/validation/PaintVisitor.java (modified) (2 diffs)
• gui/bbox/TileSelectionBBoxChooser.java (modified) (2 diffs)
• gui/layer/geoimage/GeoImageLayer.java (modified) (1 diff)
• gui/layer/gpx/DownloadAlongTrackAction.java (modified) (2 diffs)
• gui/layer/gpx/GpxDrawHelper.java (modified) (1 diff)
• gui/mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)
• gui/util/RotationAngle.java (modified) (2 diffs)
• tools/ImageProvider.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

@@ -33 +33 @@
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -68 +69 @@
      * Current policy is to except just everything, no matter how strange the result would be.
      */
-    private static final double TOLERANCE1 = Math.toRadians(45.);   // within a way
-    private static final double TOLERANCE2 = Math.toRadians(45.);   // ways relative to each other
+    private static final double TOLERANCE1 = Utils.toRadians(45.);   // within a way
+    private static final double TOLERANCE2 = Utils.toRadians(45.);   // ways relative to each other
 
     /**

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -76 +76 @@
     private static final Color ORANGE_TRANSPARENT = new Color(Color.ORANGE.getRed(), Color.ORANGE.getGreen(), Color.ORANGE.getBlue(), 128);
 
-    private static final ArrowPaintHelper START_WAY_INDICATOR = new ArrowPaintHelper(Math.toRadians(90), 8);
+    private static final ArrowPaintHelper START_WAY_INDICATOR = new ArrowPaintHelper(Utils.toRadians(90), 8);
 
     static final CachingProperty<Boolean> USE_REPEATED_SHORTCUT
@@ -839 +839 @@
 
 
-        double curHdg = Math.toDegrees(getCurrentBaseNode().getEastNorth()
+        double curHdg = Utils.toDegrees(getCurrentBaseNode().getEastNorth()
                 .heading(currentMouseEastNorth));
         double baseHdg = -1;
@@ -845 +845 @@
             EastNorth en = previousNode.getEastNorth();
             if (en != null) {
-                baseHdg = Math.toDegrees(en.heading(getCurrentBaseNode().getEastNorth()));
+                baseHdg = Utils.toDegrees(en.heading(getCurrentBaseNode().getEastNorth()));
             }
         }

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawSnapHelper.java

@@ -30 +30 @@
 import org.openstreetmap.josm.gui.draw.SymbolShape;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.tools.Utils;
 
 class DrawSnapHelper {
@@ -377 +378 @@
         LatLon mouseLatLon = Main.map.mapView.getProjection().eastNorth2latlon(snapPoint);
         double distance = this.drawAction.getCurrentBaseNode().getCoor().greatCircleDistance(mouseLatLon);
-        double hdg = Math.toDegrees(p0.heading(snapPoint));
+        double hdg = Utils.toDegrees(p0.heading(snapPoint));
         // heading of segment from current to calculated point, not to mouse position
 
@@ -485 +486 @@
 
         double hdg = segmentPoint1.heading(segmentPoint2);
-        hdg = Math.toDegrees(hdg);
+        hdg = Utils.toDegrees(hdg);
         if (hdg < 0) {
             hdg += 360;

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));

trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java

@@ -53 +53 @@
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -184 +185 @@
     protected LatLon getNorthWestLatLonOfTile(Point tile, int zoom) {
         double lon = tile.x / Math.pow(2.0, zoom) * 360.0 - 180;
-        double lat = Math.toDegrees(Math.atan(Math.sinh(Math.PI - (2.0 * Math.PI * tile.y) / Math.pow(2.0, zoom))));
+        double lat = Utils.toDegrees(Math.atan(Math.sinh(Math.PI - (2.0 * Math.PI * tile.y) / Math.pow(2.0, zoom))));
         return new LatLon(lat, lon);
     }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -589 +589 @@
                     double rightdir = (headdir > 270) ? headdir - 270 : headdir + 90;
 
-                    double ptx = p.x + Math.cos(Math.toRadians(headdir)) * arrowlength;
-                    double pty = p.y + Math.sin(Math.toRadians(headdir)) * arrowlength;
-
-                    double ltx = p.x + Math.cos(Math.toRadians(leftdir)) * arrowwidth/2;
-                    double lty = p.y + Math.sin(Math.toRadians(leftdir)) * arrowwidth/2;
-
-                    double rtx = p.x + Math.cos(Math.toRadians(rightdir)) * arrowwidth/2;
-                    double rty = p.y + Math.sin(Math.toRadians(rightdir)) * arrowwidth/2;
+                    double ptx = p.x + Math.cos(Utils.toRadians(headdir)) * arrowlength;
+                    double pty = p.y + Math.sin(Utils.toRadians(headdir)) * arrowlength;
+
+                    double ltx = p.x + Math.cos(Utils.toRadians(leftdir)) * arrowwidth/2;
+                    double lty = p.y + Math.sin(Utils.toRadians(leftdir)) * arrowwidth/2;
+
+                    double rtx = p.x + Math.cos(Utils.toRadians(rightdir)) * arrowwidth/2;
+                    double rty = p.y + Math.sin(Utils.toRadians(rightdir)) * arrowwidth/2;
 
                     g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -86 +87 @@
         }
         double avglat = latsum / latcnt;
-        double scale = Math.cos(Math.toRadians(avglat));
+        double scale = Math.cos(Utils.toRadians(avglat));
         /*
          * Compute buffer zone extents and maximum bounding box size. Note that the maximum we

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -86 +86 @@
     private int hdoprange;
 
-    private static final double PHI = Math.toRadians(15);
+    private static final double PHI = Utils.toRadians(15);
 
     //// Variables used only to check cache validity

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -620 +620 @@
          */
         public static double degree_to_radians(double degree) { // NO_UCD (unused code)
-            return Math.toRadians(degree);
+            return Utils.toRadians(degree);
         }
 

trunk/src/org/openstreetmap/josm/gui/util/RotationAngle.java

@@ -153 +153 @@
             case "ne":
             case "northeast":
-                return Math.toRadians(45);
+                return Utils.toRadians(45);
             case "e":
             case "east":
-                return Math.toRadians(90);
+                return Utils.toRadians(90);
             case "se":
             case "southeast":
-                return Math.toRadians(135);
+                return Utils.toRadians(135);
             case "s":
             case "south":
@@ -165 +165 @@
             case "sw":
             case "southwest":
-                return Math.toRadians(225);
+                return Utils.toRadians(225);
             case "w":
             case "west":
-                return Math.toRadians(270);
+                return Utils.toRadians(270);
             case "nw":
             case "northwest":
-                return Math.toRadians(315);
+                return Utils.toRadians(315);
             default:
                 throw new IllegalArgumentException("Unexpected cardinal direction " + cardinal);

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -1317 +1317 @@
                 }
 
-                double radian = Math.toRadians(angle);
+                double radian = Utils.toRadians(angle);
 
                 new ImageIcon(img); // load completely
@@ -1346 +1346 @@
 
                 // rotate the graphics about the center point of the icon
-                g2d.rotate(Math.toRadians(originalAngle));
+                g2d.rotate(Utils.toRadians(originalAngle));
 
                 g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);