Changeset 32793 in osm for applications

Timestamp:

2016-08-10T13:15:27+02:00 (8 years ago)

Author:

darya

Message:

fix the RE for oneway error

Location:

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

Files:

• gui/PTAssistantLayer.java (modified) (11 diffs)
• gui/PTAssistantPaintVisitor.java (modified) (7 diffs)
• utils/StopToWayAssigner.java (modified) (1 diff)
• validation/Checker.java (modified) (4 diffs)
• validation/PTAssistantValidatorTest.java (modified) (5 diffs)

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

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MapView;
@@ -44 +45 @@
         private PTAssistantPaintVisitor paintVisitor;
         private HashMap<Character, List<PTWay>> fixVariants = new HashMap<>();
-        
+        private HashMap<Way, List<Character>> wayColoring = new HashMap<>();
+
         private PTAssistantLayer() {
                 super("pt_assistant layer");
@@ -51 +53 @@
                 layer = this;
         }
-        
+
         public static PTAssistantLayer getLayer() {
                 if (layer == null) {
@@ -66 +68 @@
                 this.primitives.clear();
         }
-        
+
         public void clearFixVariants() {
                 fixVariants.clear();
                 Main.map.mapView.repaint();
         }
-        
+
         /**
          * Adds the first 5 fix variants to be displayed in the pt_assistant layer
+         * 
          * @param fixVariants
          */
         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++) {
@@ -82 +87 @@
                                 List<PTWay> fixVariant = fixVariants.get(i);
                                 this.fixVariants.put(alphabet, fixVariant);
+                                fixVariantLetterMap.put(fixVariant, alphabet);
                                 alphabet++;
                         }
                 }
-        }
-        
-        /**
-         * Returns fix variant (represented by a list of PTWays) that corresponds to the given character. 
+
+                for (List<PTWay> fixVariant : fixVariants) {
+                        Character currentFixVariantLetter = fixVariantLetterMap.get(fixVariant);
+                        for (PTWay ptway : fixVariant) {
+                                for (Way way : ptway.getWays()) {
+                                        if (wayColoring.containsKey(way)) {
+                                                wayColoring.get(way).add(currentFixVariantLetter);
+                                        } else {
+                                                List<Character> letterList = new ArrayList<>();
+                                                letterList.add(currentFixVariantLetter);
+                                                wayColoring.put(way, letterList);
+                                        }
+                                }
+                        }
+                }
+        }
+
+        /**
+         * Returns fix variant (represented by a list of PTWays) that corresponds to
+         * the given character.
+         * 
          * @param c
          * @return
@@ -95 +118 @@
                 return this.fixVariants.get(Character.toUpperCase(c));
         }
-        
 
         @Override
@@ -105 +127 @@
                         paintVisitor.visit(primitive);
                 }
-                
-                paintVisitor.visitFixVariants(this.fixVariants);
+
+                paintVisitor.visitFixVariants(this.fixVariants, this.wayColoring);
 
         }
@@ -201 +223 @@
 
                                 if (RouteUtils.isTwoDirectionRoute(relation)) {
-                                        
+
                                         this.repaint(relation);
 
@@ -209 +231 @@
                 }
         }
-        
-        
-        
+
         /**
          * Repaints the layer in cases when there was no selection change
+         * 
          * @param relation
          */
@@ -232 +253 @@
                         paintVisitor.visit(primitive);
                 }
-                
-                paintVisitor.visitFixVariants(this.fixVariants);
+
+                paintVisitor.visitFixVariants(this.fixVariants, this.wayColoring);
 
                 Main.map.mapView.repaint();
         }
-        
-        
+
         @Override
         public void layerAdded(LayerAddEvent arg0) {
@@ -249 +269 @@
 
         }
-
 
         @Override

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

@@ -5 +5 @@
 import java.awt.Graphics;
 import java.awt.Point;
+import java.awt.Polygon;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -10 +11 @@
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.openstreetmap.josm.Main;
@@ -24 +26 @@
 import org.openstreetmap.josm.tools.Pair;
 
+import com.sun.org.apache.bcel.internal.generic.CPInstruction;
+
 public class PTAssistantPaintVisitor extends PaintVisitor {
 
@@ -400 +404 @@
          * @param fixVariants
          */
-        protected void visitFixVariants(HashMap<Character, List<PTWay>> fixVariants) {
+        protected void visitFixVariants(HashMap<Character, List<PTWay>> fixVariants,
+                        HashMap<Way, List<Character>> wayColoring) {
+
+                drawFixVariantsWithParallelLines(wayColoring);
+
                 Color[] colors = { new Color(255, 0, 0, 150), new Color(0, 255, 0, 150), new Color(0, 0, 255, 150),
                                 new Color(255, 255, 0, 150), new Color(0, 255, 255, 150) };
@@ -411 +419 @@
                 for (Character c : fixVariants.keySet()) {
                         if (fixVariants.get(c) != null) {
-                                drawFixVariant(fixVariants.get(c), colors[colorIndex % 5]);
+                                // drawFixVariant(fixVariants.get(c), colors[colorIndex % 5]);
                                 drawFixVariantLetter(c.toString(), colors[colorIndex % 5], letterX, letterY);
                                 colorIndex++;
@@ -438 +446 @@
                 }
         }
-        
+
+        /**
+         * 
+         * @param wayColoring
+         */
+        protected void drawFixVariantsWithParallelLines(Map<Way, List<Character>> wayColoring) {
+
+                HashMap<Character, Color> colors = new HashMap<>();
+                colors.put('A', new Color(255, 0, 0, 150));
+                colors.put('B', new Color(0, 255, 0, 150));
+                colors.put('C', new Color(0, 0, 255, 150));
+                colors.put('D', new Color(255, 255, 0, 150));
+                colors.put('E', new Color(0, 255, 255, 150));
+
+                for (Way way : wayColoring.keySet()) {
+                        List<Character> letterList = wayColoring.get(way);
+                        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);
+                        }
+                }
+        }
+
         /**
          * 
@@ -445 +478 @@
          * @param color
          */
-        protected void drawSegmentWithParallelLines(Node n1, Node n2, Color color) {
+        protected void drawSegmentWithParallelLines(Node n1, Node n2, List<Color> colors) {
                 if (!n1.isDrawable() || !n2.isDrawable() || !isSegmentVisible(n1, n2)) {
-                                return;
-                }
-                
+                        return;
+                }
+
                 Point p1 = mv.getPoint(n1);
                 Point p2 = mv.getPoint(n2);
-
                 double t = Math.atan2((double) p2.x - p1.x, (double) p2.y - p1.y);
-                double cosT = 9 * Math.cos(t);
-                double sinT = 9 * Math.sin(t);
-
-                int[] xPoints = { (int) (p1.x + cosT), (int) (p2.x + cosT), (int) (p2.x - cosT), (int) (p1.x - cosT) };
-                int[] yPoints = { (int) (p1.y - sinT), (int) (p2.y - sinT), (int) (p2.y + sinT), (int) (p1.y + sinT) };
-                g.setColor(color);
-                g.fillPolygon(xPoints, yPoints, 4);
-                g.fillOval((int) (p1.x - 9), (int) (p1.y - 9), 18, 18);
-                g.fillOval((int) (p2.x - 9), (int) (p2.y - 9), 18, 18);
+                // double cosT = 9 * Math.cos(t);
+                // double sinT = 9 * Math.sin(t);
+                //
+                // int[] xPoints = { (int) (p1.x + cosT), (int) (p2.x + cosT), (int)
+                // (p2.x - cosT), (int) (p1.x - cosT) };
+                // int[] yPoints = { (int) (p1.y - sinT), (int) (p2.y - sinT), (int)
+                
+                double cosT = 9*Math.cos(t);
+                double sinT = 9*Math.sin(t);
+                
+                 int[] xPointsBasic = { (int) (p1.x + cosT/colors.size()), (int) (p2.x + cosT/colors.size()),
+                 (int) (p2.x - cosT/colors.size()), (int) (p1.x - cosT/colors.size()) };
+                 int[] yPointsBasic = { (int) (p1.y - sinT/colors.size()), (int) (p2.y - sinT/colors.size()),
+                 (int) (p2.y + sinT/colors.size()), (int) (p1.y + sinT/colors.size()) };
+                
+                for (int i = 0; i < colors.size(); i++) {
+                        Polygon polygon = new Polygon(xPointsBasic, yPointsBasic, 4);
+                        int halfStripeWidthCos = (int) cosT/colors.size();
+                        int halfStripeWidthSin = (int) sinT / colors.size();
+                        polygon.translate((int)(-cosT + halfStripeWidthCos*(i)*2), (int)(- sinT + halfStripeWidthSin*(i)*2));
+                        g.setColor(colors.get(i));
+                        g.fillPolygon(polygon);
+                }
+                
+                
+//              double cosT = 18 * Math.cos(t);
+//              double sinT = 18 * Math.sin(t);
+//              // int[] xPointsBasic = { (int) (p1.x + cosT), (int) (p2.x + cosT),
+//              // (int) (p2.x - cosT), (int) (p1.x - cosT) };
+//              // int[] yPointsBasic = { (int) (p1.y - sinT), (int) (p2.y - sinT),
+//              // (int) (p2.y + sinT), (int) (p1.y + sinT) };
+//
+//              for (int i = 0; i < colors.size(); i++) {
+//                      int[] xPoints = { (int) (p1.x - cosT / 2 + cosT / colors.size() *(i+0.5)),
+//                                      (int) (p2.x - cosT / 2 + cosT / colors.size() * (i+0.5)),
+//                                      (int) (p2.x - cosT / 2 + cosT / colors.size() * (i)),//
+//                                      (int) (p1.x - cosT / 2 + cosT / colors.size() * (i)) };//
+//                      int[] yPoints = { (int) (p1.y - sinT / 2 + sinT / colors.size() * (i)),//
+//                                      (int) (p2.y - sinT / 2 + sinT / colors.size() * (i)),//
+//                                      (int) (p2.y - sinT / 2 + sinT / colors.size() * (i+0.5)),
+//                                      (int) (p1.y - sinT / 2 + sinT / colors.size() * (i+0.5)) };
+//                      g.setColor(colors.get(i));
+//                      g.fillPolygon(xPoints, yPoints, 4);
+//              }
+                
+                
+
+                // int[] xPoints1 = { (int) (p1.x + cosT), (int) (p2.x + cosT), (int)
+                // (p2.x - cosT), (int) (p1.x - cosT) };
+                // int[] yPoints1 = { (int) (p1.y - sinT), (int) (p2.y - sinT), (int)
+                // (p2.y + sinT), (int) (p1.y + sinT) };
+                // Polygon polygon1 = new Polygon(xPointsBasic, yPointsBasic, 4);
+                // polygon1.translate((int)(4.5 * Math.cos(t)), (int)(4.5 *
+                // Math.sin(t)));
+                // g.setColor(colors.get(0));
+                // g.fillPolygon(polygon1);
+                //
+                // if (colors.size() > 1) {
+                // Polygon polygon2 = new Polygon(xPointsBasic, yPointsBasic, 4);
+                // polygon2.translate((int)(-4.5 * Math.cos(t)),
+                // (int)(-4.5*Math.sin(t)));
+                // g.setColor(colors.get(1));
+                // g.fillPolygon(polygon2);
+                // }
+
+                // double cosT = 9 * Math.cos(t);
+                // double sinT = 9 * Math.sin(t);
+                //
+                // int[] xPoints = { (int) (p1.x + cosT), (int) (p2.x + cosT), (int)
+                // (p2.x - cosT), (int) (p1.x - cosT) };
+                // int[] yPoints = { (int) (p1.y - sinT), (int) (p2.y - sinT), (int)
+                // (p2.y + sinT), (int) (p1.y + sinT) };
+                // g.setColor(color);
+                // g.fillPolygon(xPoints, yPoints, 4);
+                // g.fillOval((int) (p1.x - 9), (int) (p1.y - 9), 18, 18);
+                // g.fillOval((int) (p2.x - 9), (int) (p2.y - 9), 18, 18);
         }
 

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

@@ -314 +314 @@
                 double lengthC = segment.a.getCoor().distance(segment.b.getCoor());
 
-                // calculate triangle area using Feron's formula:
+                // calculate triangle area using Heron's formula:
                 double p = (lengthA + lengthB + lengthC) / 2.0;
                 double triangleArea = Math.sqrt(p * (p - lengthA) * (p - lengthB) * (p - lengthC));

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

@@ -33 +33 @@
         // test which created this WayChecker:
         protected final Test test;
-        
+
         // node that is checked:
         protected Node node;
@@ -42 +42 @@
         // stores all found errors:
         protected ArrayList<TestError> errors = new ArrayList<>();
-        
+
         protected Checker(Node node, Test test) {
                 this.node = node;
@@ -126 +126 @@
                 return resultList;
         }
-        
+
         /**
          * 
@@ -134 +134 @@
         protected static Command fixErrorByZooming(TestError testError) {
 
-                if (testError.getCode() != PTAssistantValidatorTest.ERROR_CODE_STOP_BY_STOP) {
+                if (testError.getCode() != PTAssistantValidatorTest.ERROR_CODE_STOP_BY_STOP
+                                && testError.getCode() != PTAssistantValidatorTest.ERROR_CODE_DIRECTION) {
                         return null;
                 }

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

@@ -106 +106 @@
         @Override
         public void visit(Relation r) {
-                
-                System.out.println("starting: visit relation id=" + r.getId() + ", ref: " + r.get("ref") + ", " + r.getMembersCount() + " members");
-                
+                                
                 // Do some testing on stop area relations
                 if (StopUtils.isStopArea(r)) {
@@ -131 +129 @@
 
                 if (!RouteUtils.isTwoDirectionRoute(r)) {
-                        System.out.println("return: not two-direction route");
                         return;
                 }
@@ -141 +138 @@
                         boolean downloadSuccessful = this.downloadIncompleteMembers();
                         if (!downloadSuccessful) {
-                                System.out.println("return: download not successful");
                                 return;
                         }
@@ -147 +143 @@
 
                 if (r.hasIncompleteMembers()) {
-                        System.out.println("return: has incomplete members");
                         return;
                 }
@@ -165 +160 @@
                         this.proceedAfterWayCheckerErrors(r);
                 }
-
-                System.out.println("ending: visit relation id=" + r.getId() + ", ref: " + r.get("ref") + ", " + r.getMembersCount() + " members");
 
         }