Changeset 32457 in osm

Timestamp:

2016-06-30T00:22:24+02:00 (8 years ago)

Author:

darya

Message:

styling: oneway, stop numbers

File:

• applications/editors/josm/plugins/pt_assistant/src/org/openstreetmap/josm/plugins/pt_assistant/gui/PTAssistantPaintVisitor.java (modified) (10 diffs)

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.util.HashMap;
 import java.util.List;
 
@@ -11 +12 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.validation.PaintVisitor;
 import org.openstreetmap.josm.gui.MapView;
@@ -31 +33 @@
         public void visit(Relation r) {
 
+                HashMap<Long, String> stopOrderMap = new HashMap<>();
+
                 int stopCount = 1;
+
                 for (RelationMember rm : r.getMembers()) {
+
                         if (RouteUtils.isPTStop(rm)) {
+
                                 String label = "";
-                                if (r.hasKey("ref")) {
-                                        label = label + r.get("ref");
-                                } else if (r.hasKey("name")) {
-                                        label = label + r.get("name");
-                                }
-                                label = label + "." + stopCount;
+
+                                if (stopOrderMap.containsKey(rm.getMember().getId())) {
+                                        label = stopOrderMap.get(rm.getMember().getId());
+                                        label = label + ";" + stopCount;
+                                } else {
+                                        if (r.hasKey("ref")) {
+                                                label = label + r.get("ref");
+                                        } else if (r.hasKey("name")) {
+                                                label = label + r.get("name");
+                                        }
+                                        label = label + ":" + stopCount;
+                                }
+
+                                stopOrderMap.put(rm.getMember().getId(), label);
                                 drawStop(rm.getMember(), label);
                                 stopCount++;
+
                         } else if (RouteUtils.isPTWay(rm)) {
                                 if (rm.isWay()) {
@@ -61 +77 @@
 
         @Override
-        public void visit(List<Node> nodes) {
+        public void visit(Way w) {
+
+                if (w == null) {
+                        return;
+                }
+
+                /*-
+                 * oneway values:
+                 * 0 two-way street
+                 * 1 oneway street in the way's direction
+                 * 2 oneway street in ways's direction but public transport allowed
+                 * -1 oneway street in reverse direction
+                 * -2 oneway street in reverse direction but public transport allowed
+                 */
+                int oneway = 0;
+
+                if (w.hasTag("junction", "roundabout") || w.hasTag("highway", "motorway")) {
+                        oneway = 1;
+                } else if (w.hasTag("oneway", "1") || w.hasTag("oneway", "yes") || w.hasTag("oneway", "true")) {
+                        if (w.hasTag("busway", "lane") || w.hasTag("busway:left", "lane") || w.hasTag("busway:right", "lane")
+                                        || w.hasTag("oneway:bus", "no") || w.hasTag("busway", "opposite_lane")
+                                        || w.hasTag("oneway:psv", "no") || w.hasTag("trolley_wire", "backward")) {
+                                oneway = 2;
+                        } else {
+                                oneway = 1;
+                        }
+                } else if (w.hasTag("oneway", "-1") || w.hasTag("oneway", "reverse")) {
+                        if (w.hasTag("busway", "lane") || w.hasTag("busway:left", "lane") || w.hasTag("busway:right", "lane")
+                                        || w.hasTag("oneway:bus", "no") || w.hasTag("busway", "opposite_lane")
+                                        || w.hasTag("oneway:psv", "no") || w.hasTag("trolley_wire", "backward")) {
+                                oneway = -2;
+                        } else {
+                                oneway = -1;
+                        }
+                }
+
+                visit(w.getNodes(), oneway);
+
+        }
+
+        public void visit(List<Node> nodes, int oneway) {
                 Node lastN = null;
                 for (Node n : nodes) {
@@ -68 +124 @@
                                 continue;
                         }
-                        drawSegment(lastN, n, new Color(208, 80, 208, 179));
+                        this.drawSegment(lastN, n, new Color(208, 80, 208, 179), oneway);
                         lastN = n;
                 }
@@ -83 +139 @@
                 if (n.isDrawable() && isNodeVisible(n)) {
                         drawNode(n, Color.BLUE);
+                }
+        }
+
+        /**
+         * Draws a line around the segment
+         *
+         * @param n1
+         *            The first node of segment
+         * @param n2
+         *            The second node of segment
+         * @param color
+         *            The color
+         */
+        protected void drawSegment(Node n1, Node n2, Color color, int oneway) {
+                if (n1.isDrawable() && n2.isDrawable() && isSegmentVisible(n1, n2)) {
+                        drawSegment(mv.getPoint(n1), mv.getPoint(n2), color, oneway);
                 }
         }
@@ -96 +168 @@
          *            The color
          */
-        protected void drawSegment(Point p1, Point p2, Color color) {
+        protected void drawSegment(Point p1, Point p2, Color color, int oneway) {
 
                 double t = Math.atan2((double) p2.x - p1.x, (double) p2.y - p1.y);
@@ -109 +181 @@
                 g.fillOval((int) (p2.x - 8), (int) (p2.y - 8), 16, 16);
 
+                if (oneway != 0) {
+                        double middleX = (double) (p1.x + p2.x) / 2.0;
+                        double middleY = (double) (p1.y + p2.y) / 2.0;
+                        double cosTriangle = 6 * Math.cos(t);
+                        double sinTriangle = 6 * Math.sin(t);
+                        g.setColor(new Color(50, 50, 50));
+
+                        if (oneway > 0) {
+                                int[] xFillTriangle = { (int) (middleX + cosTriangle), (int) (middleX - cosTriangle),
+                                                (int) (middleX + 2 * sinTriangle) };
+                                int[] yFillTriangle = { (int) (middleY - sinTriangle), (int) (middleY + sinTriangle),
+                                                (int) (middleY + 2 * cosTriangle) };
+                                g.fillPolygon(xFillTriangle, yFillTriangle, 3);
+
+                                if (oneway == 2) {
+                                        int[] xDrawTriangle = { (int) (middleX + cosTriangle), (int) (middleX - cosTriangle),
+                                                        (int) (middleX - 2 * sinTriangle) };
+                                        int[] yDrawTriangle = { (int) (middleY - sinTriangle), (int) (middleY + sinTriangle),
+                                                        (int) (middleY - 2 * cosTriangle) };
+                                        g.fillPolygon(xDrawTriangle, yDrawTriangle, 3);
+                                }
+                        }
+
+                        if (oneway < 0) {
+                                int[] xFillTriangle = { (int) (middleX + cosTriangle), (int) (middleX - cosTriangle),
+                                                (int) (middleX - 2 * sinTriangle) };
+                                int[] yFillTriangle = { (int) (middleY - sinTriangle), (int) (middleY + sinTriangle),
+                                                (int) (middleY - 2 * cosTriangle) };
+                                g.fillPolygon(xFillTriangle, yFillTriangle, 3);
+
+                                if (oneway == -2) {
+                                        int[] xDrawTriangle = { (int) (middleX + cosTriangle), (int) (middleX - cosTriangle),
+                                                        (int) (middleX + 2 * sinTriangle) };
+                                        int[] yDrawTriangle = { (int) (middleY - sinTriangle), (int) (middleY + sinTriangle),
+                                                        (int) (middleY + 2 * cosTriangle) };
+                                        g.fillPolygon(xDrawTriangle, yDrawTriangle, 3);
+                                }
+                        }
+
+                }
+
                 // g.drawLine((int) (p1.x - cosT), (int) (p1.y - sinT), (int) (p2.x +
                 // cosT), (int) (p2.y - sinT));
@@ -139 +252 @@
 
                 Point p = mv.getPoint(n);
-                
+
                 g.setColor(Color.WHITE);
                 Font stringFont = new Font("SansSerif", Font.PLAIN, 24);
@@ -160 +273 @@
                 }
 
-
         }