Changeset 32647 in osm for applications

Timestamp:

2016-07-13T02:49:03+02:00 (8 years ago)

Author:

darya

Message:

RE selection in blue

Location:

applications/editors/josm/plugins/pt_assistant

Files:

• src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/pt_assistant/validation/NodeChecker.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java (modified) (7 diffs)
• test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/DirecionTestTest.java (modified) (2 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantLayer.java

@@ -38 +38 @@
                 implements SelectionChangedListener, PropertyChangeListener, LayerChangeListener {
 
+        private static PTAssistantLayer layer;
         private List<OsmPrimitive> primitives = new ArrayList<>();
         private PTAssistantPaintVisitor paintVisitor;
-
-        public PTAssistantLayer() {
+        
+        private PTAssistantLayer() {
                 super("pt_assistant layer");
                 KeyboardFocusManager.getCurrentKeyboardFocusManager().addPropertyChangeListener(this);
                 Main.getLayerManager().addLayerChangeListener(this);
-
+                layer = this;
+
+        }
+        
+        public static PTAssistantLayer getLayer() {
+                if (layer == null) {
+                        new PTAssistantLayer();
+                }
+                return layer;
         }
 
@@ -159 +168 @@
 
                                 if (RouteUtils.isTwoDirectionRoute(relation)) {
-
-                                        this.primitives.clear();
-                                        this.primitives.add(relation);
-                                        if (!Main.getLayerManager().containsLayer(this)) {
-                                                Main.getLayerManager().addLayer(this);
-                                        }
-
-                                        if (paintVisitor == null) {
-                                                Graphics g = Main.map.mapView.getGraphics();
-                                                MapView mv = Main.map.mapView;
-                                                paintVisitor = new PTAssistantPaintVisitor(g, mv);
-                                        }
-
-                                        for (OsmPrimitive primitive : primitives) {
-                                                paintVisitor.visit(primitive);
-                                        }
-
-                                        Main.map.mapView.repaint();
+                                        
+                                        this.repaint(relation);
+
                                 }
 
@@ -182 +176 @@
                 }
         }
-
+        
+        
+        
+        /**
+         * Repaints the layer in cases when there was no selection change
+         * @param relation
+         */
+        public void repaint(Relation relation) {
+                this.primitives.clear();
+                this.primitives.add(relation);
+                if (!Main.getLayerManager().containsLayer(this)) {
+                        Main.getLayerManager().addLayer(this);
+                }
+
+                if (paintVisitor == null) {
+                        Graphics g = Main.map.mapView.getGraphics();
+                        MapView mv = Main.map.mapView;
+                        paintVisitor = new PTAssistantPaintVisitor(g, mv);
+                }
+
+                for (OsmPrimitive primitive : primitives) {
+                        paintVisitor.visit(primitive);
+                }
+
+                Main.map.mapView.repaint();
+        }
+        
+        
         @Override
         public void layerAdded(LayerAddEvent arg0) {

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/utils/RouteUtils.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.pt_assistant.utils;
+
+import java.util.Collection;
 
 import org.openstreetmap.josm.data.osm.Node;
@@ -30 +32 @@
          */
         public static boolean isTwoDirectionRoute(Relation r) {
-                
+
                 if (r == null) {
                         return false;
                 }
-                
+
                 if (!r.hasKey("route") || !r.hasTag("public_transport:version", "2")) {
                         return false;
@@ -156 +158 @@
         /**
          * Checks if the ways have a common node
+         * 
          * @param w1
          * @param w2
@@ -178 +181 @@
                 return false;
         }
-        
+
+        /**
+         * Checks if any way from the first collection touches any way from the
+         * second collection
+         * 
+         * @param c1 first collection
+         * @param c2 second collection
+         * @return true if ways touch, false otherwise
+         */
+        public static boolean waysTouch(Collection<Way> c1, Collection<Way> c2) {
+
+                if (c1 == null || c2 == null) {
+                        return false;
+                }
+
+                for (Way w1 : c1) {
+                        for (Way w2 : c2) {
+                                if (waysTouch(w1, w2)) {
+                                        return true;
+                                }
+                        }
+                }
+
+                return false;
+        }
+
         /**
          * Checks if the type of the way is suitable for buses to go on it. The
@@ -207 +235 @@
                 return false;
         }
-        
+
         public static boolean isWaySuitableForPublicTransport(Way way) {
-                
-                if (isWaySuitableForBuses(way) || way.hasTag("railway", "tram")
-                                || way.hasTag("railway", "subway") || way.hasTag("raiilway", "subway")
-                                || way.hasTag("railway", "light_rail")
+
+                if (isWaySuitableForBuses(way) || way.hasTag("railway", "tram") || way.hasTag("railway", "subway")
+                                || way.hasTag("raiilway", "subway") || way.hasTag("railway", "light_rail")
                                 || way.hasTag("railway", "train")) {
                         return true;
                 }
-                
-                return false;
-                
+
+                return false;
+
         }
 

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/NodeChecker.java

@@ -73 +73 @@
                 }
         }
+        
+        public static void fixError() {
+                
+        }
 
 }

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/PTAssistantValidatorTest.java

@@ -44 +44 @@
                                 tr("Check if route relations are compatible with public transport version 2"));
 
-                layer = new PTAssistantLayer();
+                layer = PTAssistantLayer.getLayer();
                 DataSet.addSelectionListener(layer);
 
@@ -333 +333 @@
                 if (testError.getCode() == ERROR_CODE_DIRECTION) {
                         commands.add(WayChecker.fixErrorByZooming(testError));
-
+                        
                 }
 

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/validation/WayChecker.java

@@ -16 +16 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SelectCommand;
-import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -29 +28 @@
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.plugins.pt_assistant.gui.PTAssistantLayer;
 import org.openstreetmap.josm.plugins.pt_assistant.utils.RouteUtils;
 
@@ -194 +194 @@
                 }
 
+                List<Relation> primitives = new ArrayList<>(1);
+                primitives.add(this.relation);
+
+                List<Set<Way>> listOfSets = new ArrayList<>();
                 for (Way problematicWay : problematicWays) {
-
-                        List<Relation> primitives = new ArrayList<>(1);
-                        primitives.add(relation);
-                        List<Way> highlighted = new ArrayList<>(1);
-                        // highlighted.add(problematicWay);
-                        Set<Way> adjacentWays = checkAdjacentWays(problematicWay, new HashSet<Way>());
-                        adjacentWays.removeAll(problematicWays);
-                        highlighted.add(problematicWay);
-                        highlighted.addAll(adjacentWays);
+                        Set<Way> primitivesToReport = new HashSet<>();
+                        primitivesToReport.add(problematicWay);
+                        primitivesToReport.addAll(checkAdjacentWays(problematicWay, new HashSet<Way>()));
+                        listOfSets.add(primitivesToReport);
+                }
+                
+                boolean changed = true;
+                while (changed) {
+                        changed = false;
+                        for (int i = 0; i < listOfSets.size(); i++) {
+                                for (int j = i; j < listOfSets.size(); j++) {
+                                        if (i != j && RouteUtils.waysTouch(listOfSets.get(i), listOfSets.get(j))) {
+                                                listOfSets.get(i).addAll(listOfSets.get(j));
+                                                listOfSets.remove(j);
+                                                j = listOfSets.size();
+                                                changed = true;
+                                        }
+                                }
+                        }
+                }
+
+                for (Set<Way> currentSet : listOfSets) {
                         TestError e = new TestError(this.test, Severity.WARNING,
                                         tr("PT: Route passes a oneway road in the wrong direction"),
-                                        PTAssistantValidatorTest.ERROR_CODE_DIRECTION, primitives, highlighted);
+                                        PTAssistantValidatorTest.ERROR_CODE_DIRECTION, primitives, currentSet);
                         this.errors.add(e);
                 }
 
-//              Set<Way> primitivesToReport = new HashSet<>();
-//              primitivesToReport.addAll(problematicWays);
-//              for (Way problematicWay : problematicWays) {
-//                      Set<Way> adjacentWays = checkAdjacentWays(problematicWay, new HashSet<Way>());
-//                      primitivesToReport.addAll(adjacentWays);
-//              }
-//
-//              List<Relation> primitives = new ArrayList<>(1);
-//              primitives.add(relation);
-//              TestError e = new TestError(this.test, Severity.WARNING,
-//                              tr("PT: Route passes a oneway road in the wrong direction"),
-//                              PTAssistantValidatorTest.ERROR_CODE_DIRECTION, primitives, primitivesToReport);
-//              this.errors.add(e);
-
         }
 
         /**
-         * Checks if the current way touches its neighbouring was correctly
+         * Checks if the current way touches its neighboring was correctly
          * 
          * @param prev
@@ -454 +457 @@
                 }
 
-                ArrayList<Command> commands = new ArrayList<>();
-
                 Collection<? extends OsmPrimitive> primitives = testError.getPrimitives();
                 Relation originalRelation = (Relation) primitives.iterator().next();
-                ArrayList<OsmPrimitive> primitivesToSelect = new ArrayList<>(1);
-                primitivesToSelect.add(originalRelation);
-                Collection<?> highlighted = testError.getHighlighted();
-                Way wayToHighlight = (Way) highlighted.iterator().next();
-                ArrayList<OsmPrimitive> primitivesToZoom = new ArrayList<>(1);
-                primitivesToZoom.add(wayToHighlight);
-
-                SelectCommand command1 = new SelectCommand(primitivesToSelect);
-                commands.add(command1);
-                SelectCommand command2 = new SelectCommand(primitivesToZoom);
-                commands.add(command2);
+                ArrayList<OsmPrimitive> primitivesToZoom = new ArrayList<>();
+                for (Object primitiveToZoom : testError.getHighlighted()) {
+                        primitivesToZoom.add((OsmPrimitive) primitiveToZoom);
+                }
+
+                SelectCommand command = new SelectCommand(primitivesToZoom);
 
                 List<OsmDataLayer> listOfLayers = Main.getLayerManager().getLayersOfType(OsmDataLayer.class);
@@ -495 +491 @@
                                 }
 
-                                return new SequenceCommand(null, commands);
+                                return command;
                         }
                 }
@@ -507 +503 @@
                 // zoom to problem:
                 AutoScaleAction.zoomTo(primitives);
-
-                // create editor:
-                GenericRelationEditor editor = (GenericRelationEditor) RelationEditor.getEditor(layer, r,
-                                r.getMembersFor(primitives));
 
                 // put stop-related members to the front and edit roles if necessary:
@@ -516 +508 @@
                 sortedRelationMembers.addAll(listNotStopMembers(r));
                 r.setMembers(sortedRelationMembers);
-                editor.reloadDataFromRelation();
+
+                // create editor:
+                GenericRelationEditor editor = (GenericRelationEditor) RelationEditor.getEditor(layer, r,
+                                r.getMembersFor(primitives));
 
                 // open editor:
                 editor.setVisible(true);
+                editor.setFocusable(true);
+                editor.requestFocusInWindow();
+
+                // make the current relation purple in the pt_assistant layer:
+                PTAssistantLayer.getLayer().repaint(r);
 
         }

applications/editors/josm/plugins/pt_assistant/test/unit/org/openstreetmap/josm/plugins/pt_assistant/validation/DirecionTestTest.java

@@ -6 +6 @@
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
@@ -44 +45 @@
                 assertEquals(onewayErrorCaught, 2);
 
-                // fix the direction errors:
-
                 boolean detectedErrorsAreCorrect = true;
                 for (TestError e : errors) {
                         if (e.getCode() == PTAssistantValidatorTest.ERROR_CODE_DIRECTION) {
                                 @SuppressWarnings("unchecked")
-                                List<OsmPrimitive> highlighted = (List<OsmPrimitive>) e.getHighlighted();
-                                if (highlighted.get(0).getId() != 225732678 && highlighted.get(0).getId() != 24215210) {
-                                        detectedErrorsAreCorrect = false;
+                                Collection<OsmPrimitive> highlighted = (Collection<OsmPrimitive>) e.getHighlighted();
+                                for (OsmPrimitive highlightedPrimitive: highlighted) {
+                                        if (highlightedPrimitive.getId() != 225732678 && highlightedPrimitive.getId() != 24215210) {
+                                                detectedErrorsAreCorrect = false;
+                                        }
                                 }
                         }