Changeset 4134 in josm

Timestamp:

2011-06-11T00:23:38+02:00 (13 years ago)

Author:

bastiK

Message:

see #67 - new parallel way drawing mode (patch by Ole Jørgen Brønner)

Location:

trunk

Files:

• images/cursor/modifier/parallel.png (added)
• images/mapmode/parallel.png (added)
• images_nodist/mapmode (added)
• images_nodist/mapmode/parallel.svg (added)
• src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java (added)
• src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (added)
• src/org/openstreetmap/josm/actions/mapmode/ParallelWays.java (added)
• src/org/openstreetmap/josm/data/coor/EastNorth.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MapFrame.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/Geometry.java (modified) (1 diff)

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

@@ -25 +25 @@
     public EastNorth add(double dx, double dy) {
         return new EastNorth(x+dx, y+dy);
+    }
+
+    public EastNorth add(EastNorth other) {
+        return new EastNorth(x+other.x, y+other.y);
+    }
+
+    public EastNorth scale(double s) {
+        return new EastNorth(s * x, s * y);
     }
 

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

@@ -41 +41 @@
 import org.openstreetmap.josm.actions.mapmode.ExtrudeAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
+import org.openstreetmap.josm.actions.mapmode.ParallelWayAction;
 import org.openstreetmap.josm.actions.mapmode.SelectAction;
 import org.openstreetmap.josm.actions.mapmode.ZoomAction;
@@ -129 +130 @@
         addMapMode(new IconToggleButton(new SelectAction(this)));
         addMapMode(new IconToggleButton(new DrawAction(this)));
-        addMapMode(new IconToggleButton(new ExtrudeAction(this)));
         addMapMode(new IconToggleButton(new ZoomAction(this)));
         addMapMode(new IconToggleButton(new DeleteAction(this)));
+        addMapMode(new IconToggleButton(new ExtrudeAction(this)));
+        addMapMode(new IconToggleButton(new ParallelWayAction(this)));
 
         toolGroup.setSelected(((AbstractButton)toolBarActions.getComponent(0)).getModel(), true);

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

@@ -334 +334 @@
     }
 
+    public static EastNorth closestPointToLine(EastNorth lineP1, EastNorth lineP2, EastNorth point) {
+        double ldx = lineP2.getX() - lineP1.getX();
+        double ldy = lineP2.getY() - lineP1.getY();
+
+        if (ldx == 0 && ldy == 0) //segment zero length
+            return lineP1;
+
+        double pdx = point.getX() - lineP1.getX();
+        double pdy = point.getY() - lineP1.getY();
+
+        double offset = (pdx * ldx + pdy * ldy) / (ldx * ldx + ldy * ldy);
+        return new EastNorth(lineP1.getX() + ldx * offset, lineP1.getY() + ldy * offset);
+    }
+
     /**
      * This method tests if secondNode is clockwise to first node.