Changeset 19927 in osm for applications/editors/josm/plugins/tracer/src/org

Timestamp:

2010-02-07T23:24:41+01:00 (15 years ago)

Author:

petrdlouhy

Message:

Connecting was moved to it's own class
Fix to undo

Location:

applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer

Files:

• ConnectWays.java (added)
• TracerAction.java (modified) (5 diffs)

applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java

@@ -17 +17 @@
 import java.util.Collection;
 import java.util.LinkedList;
-import java.util.List;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.command.AddCommand;
-import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.command.DeleteCommand;
-import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -35 +31 @@
 import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.SAXException;
-import org.openstreetmap.josm.data.osm.BBox;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.tools.Pair;
 
 class TracerAction extends MapMode implements MouseListener {
@@ -47 +40 @@
     private boolean shift;
     protected TracerServer server = new TracerServer();
-
-    final double MIN_DISTANCE = 0.000015; //Minimal distance, when nodes are merged
-    final double MIN_DISTANCE_TW = 0.000015; //Minimal distance, when node is connected to other way
-    final double MIN_DISTANCE_SQ = 0.000015; //Minimal distance, when other node is connected this way
-    final double MAX_ANGLE = 30; //Minimal angle, when other node is connected this way
 
     public TracerAction(MapFrame mapFrame) {
@@ -108 +96 @@
     }
 
-    private boolean isBuilding(Way w) {
-        return (w.getKeys().get("building") == null ? false : w.getKeys().get("building").equals("yes"));
-    }
-
-    private boolean isInBuilding(Node n) {
-        for (OsmPrimitive op : n.getReferrers()) {
-            if (op instanceof Way) {
-                if (isBuilding((Way) op)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Try connect way to other buidings.
-     * @param way Way to connect.
-     * @return Commands.
-     */
-    private Command connectObjects(Way way) {
-
-        List<Command> cmds = new LinkedList<Command>();
-        Way newWay = new Way(way);
-        for (int i = 0; i < way.getNodesCount() - 1; i++) { 
-            Node n = way.getNode(i); 
-            //System.out.println("-------");
-            //System.out.println("Node: " + n);
-            LatLon ll = n.getCoor();
-            BBox bbox = new BBox(
-                    ll.getX() - MIN_DISTANCE,
-                    ll.getY() - MIN_DISTANCE,
-                    ll.getX() + MIN_DISTANCE,
-                    ll.getY() + MIN_DISTANCE);
-
-            // bude se node slucovat s jinym?
-            double minDistanceSq = MIN_DISTANCE;
-            List<Node> nodes = Main.main.getCurrentDataSet().searchNodes(bbox);
-            Node nearestNode = null;
-            for (Node nn : nodes) {
-                if (!nn.isUsable() || way.containsNode(nn) || newWay.containsNode(nn) || !isInBuilding(nn)) {
-                    continue;
-                }
-                double dist = nn.getCoor().distance(ll);
-                if (dist < minDistanceSq) {
-                    minDistanceSq = dist;
-                    nearestNode = nn;
-                }
-            }
-
-            //System.out.println("Nearest: " + nearestNode);
-            if (nearestNode == null) {
-                cmds.addAll(tryConnectNodeToAnyWay(n));
-            } else {
-                cmds.addAll(mergeNodes(n, nearestNode, newWay));
-            }
-        }
-
-        cmds.add(new ChangeCommand(way, trySplitWayByAnyNodes(newWay)));
-
-        Command cmd = new SequenceCommand(tr("Merge objects nodes"), cmds);
-        return cmd;
-    }
-
-    /**
-     * Merges two nodes
-     * @param n1 First node
-     * @param n2 Second node
-     * @param way Way containing first node
-     * @return List of Commands.
-     */
-    private List<Command> mergeNodes(Node n1, Node n2, Way way){
-        List<Command> cmds = new LinkedList<Command>();
-        cmds.add(new MoveCommand(n2, 
-                 (n1.getEastNorth().getX() - n2.getEastNorth().getX())/2, 
-                 (n1.getEastNorth().getY() - n2.getEastNorth().getY())/2
-                 ));
-
-        int j = way.getNodes().indexOf(n1);
-        way.addNode(j, n2);
-        if (j == 0) {
-            // first + last point
-            way.addNode(way.getNodesCount(), n2);
-        }
-        way.removeNode(n1);
-
-        cmds.add(new DeleteCommand(n1));
-        return cmds;
-    }
-
-    /**
-     * Try connect node "node" to way of other building.
-     *
-     * Zkusi zjistit, zda node neni tak blizko nejake usecky existujici budovy,
-     * ze by mel byt zacnenen do teto usecky. Pokud ano, provede to.
-     *
-     * @param node Node to connect.
-     * @throws IllegalStateException
-     * @throws IndexOutOfBoundsException
-     * @return List of Commands.
-     */
-    private List<Command> tryConnectNodeToAnyWay(Node node)
-            throws IllegalStateException, IndexOutOfBoundsException {
-        
-        List<Command> cmds = new LinkedList<Command>();
-
-        LatLon ll = node.getCoor();
-        BBox bbox = new BBox(
-                ll.getX() - MIN_DISTANCE_TW,
-                ll.getY() - MIN_DISTANCE_TW,
-                ll.getX() + MIN_DISTANCE_TW,
-                ll.getY() + MIN_DISTANCE_TW);
-
-        // node nebyl slouceny s jinym
-        // hledani pripadne blizke usecky, kam bod pridat
-        List<Way> ways = Main.main.getCurrentDataSet().searchWays(bbox);
-        double minDist = Double.MAX_VALUE;
-        Way nearestWay = null;
-        int nearestNodeIndex = 0;
-        for (Way ww : ways) {
-            if (!ww.isUsable() || ww.containsNode(node) || !isBuilding(ww)) {
-                continue;
-            }
-            for (Pair<Node, Node> np : ww.getNodePairs(false)) {
-                double dist = TracerGeometry.distanceFromSegment(ll, np.a.getCoor(), np.b.getCoor());
-                if (dist < minDist) {
-                    minDist = dist;
-                    nearestWay = ww;
-                    nearestNodeIndex = ww.getNodes().indexOf(np.a);
-                }
-            }
-        }
-        //System.out.println("Nearest way: " + nearestWay + " distance: " + minDist);
-        if (minDist < MIN_DISTANCE_TW) {
-            Way newNWay = new Way(nearestWay);
-            newNWay.addNode(nearestNodeIndex + 1, node);
-            //System.out.println("New way:" + newNWay);
-            Command c = new ChangeCommand(nearestWay, newNWay);
-            c.executeCommand();
-            cmds.add(c);
-        }
-        return cmds;
-    }
-
-    /**
-     * Try split way by any existing buiding nodes.
-     *
-     * Zkusi zjistit zda nejake usecka z way by nemela prochazet nejakym existujicim bodem,
-     * ktery je ji velmi blizko. Pokud ano, tak puvodni usecku rozdeli na dve tak, aby
-     * prochazela takovym bodem.
-     *
-     * @param way Way to split.
-     * @throws IndexOutOfBoundsException
-     * @throws IllegalStateException
-     * @return Modified way
-     */
-    private Way trySplitWayByAnyNodes(Way way)
-            throws IndexOutOfBoundsException, IllegalStateException {
-
-        // projdi kazdou novou usecku a zjisti, zda by nemela vest pres existujici body
-        int i = 0;
-        while (i < way.getNodesCount()) {
-            // usecka n1, n2
-            LatLon n1 = way.getNodes().get(i).getCoor();
-            LatLon n2 = way.getNodes().get((i + 1) % way.getNodesCount()).getCoor();
-            //System.out.println(way.getNodes().get(i) + "-----" + way.getNodes().get((i + 1) % way.getNodesCount()));
-            double minDistanceSq = MIN_DISTANCE_SQ;
-            double maxAngle = MAX_ANGLE;
-            List<Node> nodes = Main.main.getCurrentDataSet().searchNodes(new BBox(
-                Math.min(n1.getX(), n2.getX()) - minDistanceSq,
-                Math.min(n1.getY(), n2.getY()) - minDistanceSq,
-                Math.max(n1.getX(), n2.getX()) + minDistanceSq,
-                Math.max(n1.getY(), n2.getY()) + minDistanceSq
-            ));
-            Node nearestNode = null;
-            for (Node nod : nodes) {
-                if (!nod.isUsable() || way.containsNode(nod) || !isInBuilding(nod)) {
-                    continue;
-                }
-                LatLon nn = nod.getCoor();
-                double dist = TracerGeometry.distanceFromSegment(nn, n1, n2);
-                double angle = TracerGeometry.angleOfLines(n1, nn, nn, n2);
-                //System.out.println("Angle: " + angle + " distance: " + dist + " Node: " + nod);
-                if (!n1.equalsEpsilon(nn) && !n2.equalsEpsilon(nn) && dist < minDistanceSq && Math.abs(angle) < maxAngle) {
-                    maxAngle = angle;
-                    nearestNode = nod;
-                }
-            }
-            //System.out.println("Nearest_: " + nearestNode);
-            //System.out.println("");
-            if (nearestNode == null) {
-                // tato usecka se nerozdeli
-                i++;
-                continue;
-            } else {
-                // rozdeleni usecky
-                way.addNode(i + 1, nearestNode);
-                continue; // i nezvetsuji, treba bude treba rozdelit usecku znovu
-            }
-        }
-        return way;
-    }
-
     private void tagBuilding(Way way) {
         if(!alt) way.put("building", "yes");
@@ -345 +130 @@
             // connect to other buildings
             if (!ctrl) {
-                commands.add(connectObjects(way));
-            }
+                commands.add(ConnectWays.connect(way));
+                }
 
             if (!commands.isEmpty()) {
-                Main.main.undoRedo.add(new SequenceCommand(tr("Tracer building"), commands));
+                   Main.main.undoRedo.add(new SequenceCommand(tr("Tracer building"), commands));
 
                 if (shift) {