Changeset 12505 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/OffsetIterator.java

Timestamp:

2017-07-24T19:24:44+02:00 (7 years ago)

Author:

michael2402

Message:

Add a method that allows traversing an offset version of a MapViewPath

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/OffsetIterator.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/OffsetIterator.java

@@ -23 +23 @@
 public class OffsetIterator implements Iterator<MapViewPoint> {
     private final MapViewState mapState;
-    private final List<Node> nodes;
+    private final List<MapViewPoint> nodes;
     private final double offset;
     private int idx;
@@ -37 +37 @@
     /**
      * Creates a new offset iterator
+     * @param nodes The nodes of the original line
+     * @param offset The offset of the line.
+     */
+    public OffsetIterator(List<MapViewPoint> nodes, double offset) {
+        if (nodes.size() < 2) {
+            throw new IllegalArgumentException("There must be at least 2 nodes.");
+        }
+        this.mapState = nodes.get(0).getMapViewState();
+        this.nodes = nodes;
+        this.offset = offset;
+    }
+
+    /**
+     * Creates a new offset iterator
      * @param mapState The map view state this iterator is for.
      * @param nodes The nodes of the original line
@@ -43 +57 @@
     public OffsetIterator(MapViewState mapState, List<Node> nodes, double offset) {
         this.mapState = mapState;
-        this.nodes = nodes.stream().filter(Node::isLatLonKnown).collect(Collectors.toList());
+        this.nodes = nodes.stream().filter(Node::isLatLonKnown).map(mapState::getPointFor).collect(Collectors.toList());
         this.offset = offset;
-        idx = 0;
     }
 
@@ -160 +173 @@
 
     private MapViewPoint getForIndex(int i) {
-        return mapState.getPointFor(nodes.get(i));
+        return nodes.get(i);
     }