Changeset 4846 in josm for trunk

Timestamp:

2012-01-22T11:50:28+01:00 (12 years ago)

Author:

simon04

Message:

see #7184 - Added ImproveWayAccuracy plugin to josm core. This plugin was initially written by Alexander Kachkaev (kachkaev).

Location:

trunk

Files:

• images/cursor/hand.png (added)
• images/cursor/modifier/add_node.png (added)
• images/cursor/modifier/add_node_lock.png (added)
• images/cursor/modifier/lock.png (added)
• images/cursor/modifier/mode.png (added)
• images/mapmode/button.png (added)
• src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (added)
• src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java (added)
• src/org/openstreetmap/josm/gui/MapFrame.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/Geometry.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -42 +42 @@
 import org.openstreetmap.josm.actions.mapmode.DrawAction;
 import org.openstreetmap.josm.actions.mapmode.ExtrudeAction;
+import org.openstreetmap.josm.actions.mapmode.ImproveWayAccuracyAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.actions.mapmode.ParallelWayAction;
@@ -145 +146 @@
         addMapMode(new IconToggleButton(new ExtrudeAction(this), true));
         addMapMode(new IconToggleButton(new ParallelWayAction(this), true));
+        addMapMode(new IconToggleButton(new ImproveWayAccuracyAction(Main.map), true));
 
         toolGroup.setSelected(((AbstractButton)toolBarActions.getComponent(0)).getModel(), true);

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -106 +106 @@
             new DeprecatedPlugin("ParallelWay", IN_CORE),
             new DeprecatedPlugin("dumbutils", tr("replaced by new {0} plugin","utilsplugin2")),
+            new DeprecatedPlugin("ImproveWayAccuracy", IN_CORE),
         });
     }

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

@@ -551 +551 @@
         return area2 < 0;
     }
+
+    /**
+     * Returns angle of a segment defined with 2 point coordinates.
+     *
+     * @param p1
+     * @param p2
+     * @return Angle in radians (-pi, pi]
+     */
+    public static double getSegmentAngle(EastNorth p1, EastNorth p2) {
+        return Math.atan2(p2.north() - p1.north(), p2.east() - p1.east());
+    }
+
+    /**
+     * Returns angle of a corner defined with 3 point coordinates.
+     *
+     * @param p1
+     * @param p2 Common endpoint
+     * @param p3
+     * @return Angle in radians (-pi, pi]
+     */
+    public static double getCornerAngle(EastNorth p1, EastNorth p2, EastNorth p3) {
+        Double result = getSegmentAngle(p2, p1) - getSegmentAngle(p2, p3);
+        if (result <= -Math.PI) {
+            result += 2 * Math.PI;
+        }
+
+        if (result > Math.PI) {
+            result -= 2 * Math.PI;
+        }
+
+        return result;
+    }
+
+    /**
+     * Returns the coordinate of intersection of segment sp1-sp2 and an altitude
+     * to it starting at point ap. If the line defined with sp1-sp2 intersects
+     * its altitude out of sp1-sp2, null is returned.
+     *
+     * @param sp1
+     * @param sp2
+     * @param ap
+     * @return Intersection coordinate or null
+     */
+    public static EastNorth getSegmentAltituteIntersection(EastNorth sp1,
+            EastNorth sp2, EastNorth ap) {
+        Double segmentLenght = sp1.distance(sp2);
+        Double altitudeAngle = getSegmentAngle(sp1, sp2) + Math.PI / 2;
+
+        // Taking a random point on the altitude line (angle is known).
+        EastNorth ap2 = new EastNorth(ap.east() + 1000
+                * Math.cos(altitudeAngle), ap.north() + 1000
+                * Math.sin(altitudeAngle));
+
+        // Finding the intersection of two lines
+        EastNorth resultCandidate = Geometry.getLineLineIntersection(sp1, sp2,
+                ap, ap2);
+
+        // Filtering result
+        if (resultCandidate != null
+                && resultCandidate.distance(sp1) * .999 < segmentLenght
+                && resultCandidate.distance(sp2) * .999 < segmentLenght) {
+            return resultCandidate;
+        } else {
+            return null;
+        }
+    }
 }