Changeset 12131 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode

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/actions/mapmode

Files:

• DrawAction.java (modified) (3 diffs)
• DrawSnapHelper.java (modified) (3 diffs)

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;