Changeset 32801 in osm

Timestamp:

2016-08-12T02:33:42+02:00 (8 years ago)

Author:

darya

Message:

multiple fixes displayed correctly

Location:

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

Files:

• data/PTRouteSegment.java (modified) (3 diffs)
• gui/PTAssistantLayer.java (modified) (1 diff)
• gui/PTAssistantPaintVisitor.java (modified) (5 diffs)
• validation/SegmentChecker.java (modified) (5 diffs)

applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/data/PTRouteSegment.java

@@ -61 +61 @@
                 return ptways.get(ptways.size() - 1);
         }
+        
+        public Way getFirstWay() {
+                if (ptways.isEmpty()) {
+                        return null;
+                }
+                return ptways.get(0).getWays().get(0);
+        }
+        
+        public Way getLastWay() {
+                if (ptways.isEmpty()) {
+                        return null;
+                }
+                List<Way> waysOfLast = ptways.get(ptways.size() - 1).getWays();
+                return waysOfLast.get(waysOfLast.size() - 1);
+        }
 
-        public void addFixVariant(List<PTWay> list) {
+        /**
+         * Adds the new fix variant if an identical fix variant (i.e. same ways) is
+         * not already contained in the list of the fix variants of this.
+         * 
+         * @param list the PTWays of the new fix variant
+         */
+        public synchronized void addFixVariant(List<PTWay> list) {
+                List<Way> otherWays = new ArrayList<>();
+                for (PTWay ptway : list) {
+                        otherWays.addAll(ptway.getWays());
+                }
+
+                for (List<PTWay> fixVariant : this.fixVariants) {
+                        List<Way> thisWays = new ArrayList<>();
+                        for (PTWay ptway : fixVariant) {
+                                thisWays.addAll(ptway.getWays());
+                        }
+                        boolean listsEqual = (thisWays.size() == otherWays.size());
+                        if (listsEqual) {
+                                for (int i = 0; i < thisWays.size(); i++) {
+                                        if (thisWays.get(i).getId() != otherWays.get(i).getId()) {
+                                                listsEqual = false;
+                                                break;
+                                        }
+                                }
+                        }
+                        if (listsEqual) {
+                                return;
+                        }
+                }
+
                 this.fixVariants.add(list);
         }
@@ -77 +122 @@
          */
         public boolean equalsRouteSegment(PTRouteSegment other) {
+
                 List<Way> thisWays = new ArrayList<>();
                 for (PTWay ptway : this.ptways) {
@@ -85 +131 @@
                         otherWays.addAll(ptway.getWays());
                 }
+
                 if (thisWays.size() != otherWays.size()) {
                         return false;
                 }
-                
+
                 for (int i = 0; i < thisWays.size(); i++) {
-                        if (thisWays.get(i) != otherWays.get(i)) {
+                        if (thisWays.get(i).getId() != otherWays.get(i).getId()) {
                                 return false;
                         }
                 }
-                
+
                 return true;
         }

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

@@ -82 +82 @@
         public void addFixVariants(List<List<PTWay>> fixVariants) {
                 HashMap<List<PTWay>, Character> fixVariantLetterMap = new HashMap<>();
-
+                
                 char alphabet = 'A';
-                for (int i = 0; i < fixVariants.size(); i++) {
-                        if (i < 5) {
-                                List<PTWay> fixVariant = fixVariants.get(i);
-                                this.fixVariants.put(alphabet, fixVariant);
-                                fixVariantLetterMap.put(fixVariant, alphabet);
-                                alphabet++;
-                        }
-                }
-
-                for (List<PTWay> fixVariant : fixVariants) {
-                        Character currentFixVariantLetter = fixVariantLetterMap.get(fixVariant);
+                for (int i = 0; i < 5 && i < fixVariants.size(); i++) {
+                        List<PTWay> fixVariant = fixVariants.get(i);
+                        this.fixVariants.put(alphabet, fixVariant);
+                        fixVariantLetterMap.put(fixVariant, alphabet);
+                        alphabet++;
+                }
+
+                for (Character currentFixVariantLetter: this.fixVariants.keySet()) {
+                        List<PTWay> fixVariant = this.fixVariants.get(currentFixVariantLetter);
                         for (PTWay ptway : fixVariant) {
                                 for (Way way : ptway.getWays()) {
                                         if (wayColoring.containsKey(way)) {
-                                                wayColoring.get(way).add(currentFixVariantLetter);
+                                                if (!wayColoring.get(way).contains(currentFixVariantLetter)) {
+                                                        wayColoring.get(way).add(currentFixVariantLetter);
+                                                }
                                         } else {
                                                 List<Character> letterList = new ArrayList<>();

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

@@ -434 +434 @@
          * @param color
          */
+        @SuppressWarnings("unused")
         private void drawFixVariant(List<PTWay> fixVariant, Color color) {
                 for (PTWay ptway : fixVariant) {
@@ -459 +460 @@
                 for (Way way : wayColoring.keySet()) {
                         List<Character> letterList = wayColoring.get(way);
-//                      if (letterList.size() != numberOfFixVariants) {
-                                List<Color> wayColors = new ArrayList<>();
-                                for (Character letter : letterList) {
-                                        wayColors.add(colors.get(letter));
-                                }
-                                for (Pair<Node, Node> nodePair : way.getNodePairs(false)) {
-                                        drawSegmentWithParallelLines(nodePair.a, nodePair.b, wayColors);
-                                }
-//                      }
+                        List<Color> wayColors = new ArrayList<>();
+                        for (Character letter : letterList) {
+                                wayColors.add(colors.get(letter));
+                        }
+                        for (Pair<Node, Node> nodePair : way.getNodePairs(false)) {
+                                drawSegmentWithParallelLines(nodePair.a, nodePair.b, wayColors);
+                        }
                 }
         }
@@ -507 +506 @@
                 } else {
                         boolean iterate = true;
-//                      while (Math.abs(p2.x - p1.x) > Math.abs(nextPointX - p1.x) && Math.abs(p2.y - p1.y) > Math.abs(nextPointY - p1.y)) {
-//                      while((p1.x < p2.x && nextPointX < p2.x) || (p1.x >= p2.x && nextPointX >= p2.x)) {
                         while (iterate) {
-                                // for (int i = 0; i < colors.size(); i++) {
                                 currentColor = colors.get(i % colors.size());
-                                // if (Math.abs(p2.x - p1.x) > Math.abs(nextPointX - p1.x)) {
 
                                 int[] xPoints = { (int) (prevPointX + cosT), (int) (nextPointX + cosT), (int) (nextPointX - cosT),
@@ -529 +524 @@
                                         iterate = false;
                                 }
-                                
-                                // }
-                                // }
                         }
 
@@ -544 +536 @@
                 g.setColor(currentColor);
                 g.fillOval((int) (p2.x - 9), (int) (p2.y - 9), 18, 18);
-
-                // double cosT = 20*Math.cos(t);
-                // double sinT = 20*Math.sin(t);
-                // int[] xPointsBasic = { (int) (p1.x + cosT/colors.size()/2), (int)
-                // (p2.x + cosT/colors.size()/2),
-                // (int) (p2.x - cosT/colors.size()/2), (int) (p1.x -
-                // cosT/colors.size()/2) };
-                // int[] yPointsBasic = { (int) (p1.y - sinT/colors.size()/2), (int)
-                // (p2.y - sinT/colors.size()/2),
-                // (int) (p2.y + sinT/colors.size()/2), (int) (p1.y +
-                // sinT/colors.size()/2) };
-                //
-                // for (int i = 0; i < colors.size(); i++) {
-                // Polygon polygon = new Polygon(xPointsBasic, yPointsBasic, 4);
-                // double halfStripeWidthCos = cosT/colors.size();
-                // double halfStripeWidthSin = sinT/colors.size();
-                //// polygon.translate((int)(-cosT + halfStripeWidthCos*(2*i+1)),
-                // (int)(- sinT + halfStripeWidthSin*(2*i+1)));
-                // int deltaX, deltaY;
-                // if (cosT > 0) {
-                // deltaX = (int)(-cosT + halfStripeWidthCos * (2*i+1));
-                // } else {
-                // deltaX = (int)(cosT - halfStripeWidthCos * (2*i+1));
-                // }
-                // if (sinT > 0) {
-                // deltaY = (int)(- sinT + halfStripeWidthSin*(2*i+1));
-                // } else {
-                // deltaY = (int)(sinT - halfStripeWidthSin*(2*i+1));
-                // }
-                // polygon.translate(deltaX, deltaY);
-                // g.setColor(colors.get(i));
-                // g.fillPolygon(polygon);
-                // }
         }
 

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

@@ -99 +99 @@
          *            to add to the list of correct segments
          */
-        public static void addCorrectSegment(PTRouteSegment segment) {
+        public synchronized static void addCorrectSegment(PTRouteSegment segment) {
                 for (PTRouteSegment correctSegment : correctSegments) {
                         if (correctSegment.equalsRouteSegment(segment)) {
@@ -366 +366 @@
         }
 
+        /**
+         * 
+         * @param node
+         * @return
+         */
         private boolean isDeadendNode(Node node) {
                 int count = 0;
@@ -692 +697 @@
                 // layer, clear them:
                 ((PTAssistantValidatorTest) testError.getTester()).clearFixVariants();
-
+                
                 PTRouteSegment wrongSegment = wrongSegments.get(testError);
 
@@ -698 +703 @@
                 List<PTRouteSegment> correctSegmentsForThisError = new ArrayList<>();
                 for (PTRouteSegment segment : correctSegments) {
-                        if (wrongSegment.getFirstStop().equalsStop(segment.getFirstStop())
-                                        && wrongSegment.getLastStop().equalsStop(segment.getLastStop())) {
+                        if (wrongSegment.getFirstWay().getId() == segment.getFirstWay().getId()
+                                        && wrongSegment.getLastWay().getId() == segment.getLastWay().getId()) {
                                 correctSegmentsForThisError.add(segment);
+                        }
+                }
+
+                // if no correct segment found, apply less strict criteria to look for one:
+                if (correctSegmentsForThisError.isEmpty() && wrongSegment.getFixVariants().isEmpty()) {
+                        for (PTRouteSegment segment : correctSegments) {
+                                if (wrongSegment.getFirstStop().equalsStop(segment.getFirstStop())
+                                                && wrongSegment.getLastStop().equalsStop(segment.getLastStop())) {
+                                        correctSegmentsForThisError.add(segment);
+                                }
+                        }
+                        if (!correctSegmentsForThisError.isEmpty()) {
+                                // display the notification:
+                                if (SwingUtilities.isEventDispatchThread()) {
+                                        Notification notification = new Notification(
+                                                        tr("Warning: the diplayed fix variants are based on less strict criteria"));
+                                        notification.show();
+                                } else {
+                                        SwingUtilities.invokeLater(new Runnable() {
+                                                @Override
+                                                public void run() {
+                                                        Notification notification = new Notification(
+                                                                        tr("Warning: the diplayed fix variants are based on less strict criteria"));
+                                                        notification.show();
+                                                }
+                                        });
+                                }
                         }
                 }
@@ -835 +867 @@
                 PTRouteSegment wrongSegment = wrongSegments.get(testError);
                 wrongSegments.remove(testError);
-                wrongSegment.setPTWays(wrongSegment.getFixVariants().get(0));
+                wrongSegment.setPTWays(fix);
                 addCorrectSegment(wrongSegment);
         }