Changeset 34238 in osm for applications/editors/josm/plugins

Timestamp:

2018-06-03T11:29:51+02:00 (7 years ago)

Author:

biswesh

Message:

Add checking of intersecting ways functionality

File:

• applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/DoubleSplitAction.java (modified) (7 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/actions/DoubleSplitAction.java

@@ -17 +17 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
@@ -35 +37 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
-//import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SplitWayCommand;
 import org.openstreetmap.josm.data.Bounds;
@@ -54 +55 @@
 import org.openstreetmap.josm.gui.layer.AbstractMapViewPaintable;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
-import org.openstreetmap.josm.plugins.utilsplugin2.selection.NodeWayUtils;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
 
@@ -599 +601 @@
         }
 
+        // to find if there is any highway, railway, waterway crossing the way
+        private void findIntersection(Set<Way> newWays) {
+                try {
+                        DataSet ds = getLayerManager().getEditDataSet();
+                        addWaysIntersectingWays(ds.getWays(), Arrays.asList(previousAffectedWay, affected), newWays);
+                        Node n1 = previousAffectedWay.firstNode();
+                        Node n2 = previousAffectedWay.lastNode();
+                        Node n3 = affected.firstNode();
+                        Node n4 = affected.lastNode();
+                        List<Way> waysToBeRemoved = new ArrayList<>();
+                        for (Way way : newWays) {
+                                int count = 0;
+                                if (way.containsNode(n1))
+                                        count++;
+                                if (way.containsNode(n2))
+                                        count++;
+                                if (!previousAffectedWay.equals(affected)) {
+                                        if (way.containsNode(n3))
+                                                count++;
+                                        if (way.containsNode(n4))
+                                                count++;
+                                }
+                                if (count == 1) {
+                                        waysToBeRemoved.add(way);
+                                } else {
+                                        if (!way.hasKey("highway") && !way.hasKey("waterway") && !way.hasKey("railway")) {
+                                                waysToBeRemoved.add(way);
+                                        }
+                                }
+                        }
+                        newWays.removeAll(waysToBeRemoved);
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+        }
+
+        int addWaysIntersectingWay(Collection<Way> ways, Way w, Set<Way> newWays) {
+        List<Pair<Node, Node>> nodePairs = w.getNodePairs(false);
+        int count = 0;
+        for (Way anyway: ways) {
+            if (Objects.equals(anyway, w)) continue;
+            if (newWays.contains(anyway)) continue;
+            List<Pair<Node, Node>> nodePairs2 = anyway.getNodePairs(false);
+            loop: for (Pair<Node, Node> p1 : nodePairs) {
+                for (Pair<Node, Node> p2 : nodePairs2) {
+                    if (null != Geometry.getSegmentSegmentIntersection(
+                            p1.a.getEastNorth(), p1.b.getEastNorth(),
+                            p2.a.getEastNorth(), p2.b.getEastNorth())) {
+                        newWays.add(anyway);
+                        count++;
+                        break loop;
+                    }
+                }
+            }
+        }
+        return count;
+    }
+
+        int addWaysIntersectingWays(Collection<Way> allWays, Collection<Way> initWays, Set<Way> newWays) {
+        int count = 0;
+        for (Way w : initWays) {
+            count += addWaysIntersectingWay(allWays, w, newWays);
+        }
+        return count;
+    }
+
         @Override
         public void mouseMoved(MouseEvent e) {
@@ -654 +722 @@
         // to be highlighted now
         private void updateHighlights() {
+                if (oldHighlights == null && newHighlights == null) {
+                        return;
+                }
+
                 if (oldHighlights.isEmpty() && newHighlights.isEmpty()) {
                         return;
@@ -741 +813 @@
                         if (previousAffectedWay.hasKey("waterway") || affected.hasKey("waterway")) {
                                 setOptionsWithTunnel();
-                        } else if (newWays.size() != 0) {
+                        } else if (newWays != null && newWays.size() != 0) {
                                 setOptionsWithBridge();
                         } else {
@@ -847 +919 @@
                 }
 
-                private void findIntersection(Set<Way> newWays) {
-                        DataSet ds = getLayerManager().getEditDataSet();
-                        NodeWayUtils.addWaysIntersectingWays(ds.getWays(), Arrays.asList(previousAffectedWay, affected), newWays);
-                        Node n1 = previousAffectedWay.firstNode();
-                        Node n2 = previousAffectedWay.lastNode();
-                        Node n3 = affected.firstNode();
-                        Node n4 = affected.lastNode();
-                        List<Way> waysToBeRemoved = new ArrayList<>();
-                        for (Way way : newWays) {
-                                int count = 0;
-                                if (way.containsNode(n1))
-                                        count++;
-                                if (way.containsNode(n2))
-                                        count++;
-                                if (!previousAffectedWay.equals(affected)) {
-                                        if (way.containsNode(n3))
-                                                count++;
-                                        if (way.containsNode(n4))
-                                                count++;
-                                }
-                                if (count == 1) {
-                                        waysToBeRemoved.add(way);
-                                } else {
-                                        if (!way.hasKey("highway") && !way.hasKey("waterway") && !way.hasKey("railway")) {
-                                                waysToBeRemoved.add(way);
-                                        }
-                                }
-                        }
-                        newWays.removeAll(waysToBeRemoved);
-                }
-
                 @Override
                 protected void buttonAction(int buttonIndex, ActionEvent evt) {