Changeset 13919 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2018-06-11T20:52:44+02:00 (6 years ago)

Author:

Don-vip

Message:

rendering of IPrimitives

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Files:

• OffsetIterator.java (modified) (2 diffs)
• StyledMapRenderer.java (modified) (16 diffs)

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

@@ -7 +7 @@
 import java.util.stream.Collectors;
 
-import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.INode;
 import org.openstreetmap.josm.gui.MapViewState;
 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
@@ -55 +55 @@
      * @param offset The offset of the line.
      */
-    public OffsetIterator(MapViewState mapState, List<Node> nodes, double offset) {
+    public OffsetIterator(MapViewState mapState, List<? extends INode> nodes, double offset) {
         this.mapState = mapState;
-        this.nodes = nodes.stream().filter(Node::isLatLonKnown).map(mapState::getPointFor).collect(Collectors.toList());
+        this.nodes = nodes.stream().filter(INode::isLatLonKnown).map(mapState::getPointFor).collect(Collectors.toList());
         this.offset = offset;
     }

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

@@ -49 +49 @@
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.IRelation;
+import org.openstreetmap.josm.data.osm.IRelationMember;
 import org.openstreetmap.josm.data.osm.IWay;
 import org.openstreetmap.josm.data.osm.Node;
@@ -55 +56 @@
 import org.openstreetmap.josm.data.osm.OsmUtils;
 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.osm.WaySegment;
@@ -526 +526 @@
      * @since 12285
      */
-    public void drawArea(Way w, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled) {
+    public void drawArea(IWay<?> w, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled) {
         Path2D.Double pfClip = null;
         if (extent != null) {
@@ -561 +561 @@
      * @param bs The text and it's alignment.
      */
-    public void drawBoxText(Node n, BoxTextElement bs) {
+    public void drawBoxText(INode n, BoxTextElement bs) {
         if (!isShowNames() || bs == null)
             return;
@@ -631 +631 @@
      * @param align alignment of the image. The top, center or bottom edge can be aligned with the way.
      */
-    public void drawRepeatImage(Way way, MapImage pattern, boolean disabled, double offset, double spacing, double phase,
+    public void drawRepeatImage(IWay<?> way, MapImage pattern, boolean disabled, double offset, double spacing, double phase,
             LineImageAlignment align) {
         final int imgWidth = pattern.getWidth();
@@ -730 +730 @@
      * @param theta the angle of rotation in radians
      */
-    public void drawNodeIcon(Node n, MapImage img, boolean disabled, boolean selected, boolean member, double theta) {
+    public void drawNodeIcon(INode n, MapImage img, boolean disabled, boolean selected, boolean member, double theta) {
         MapViewPoint p = mapState.getPointFor(n);
 
@@ -821 +821 @@
      * @param strokeColor The color to use for the outer corner of the symbol
      */
-    public void drawNodeSymbol(Node n, Symbol s, Color fillColor, Color strokeColor) {
+    public void drawNodeSymbol(INode n, Symbol s, Color fillColor, Color strokeColor) {
         MapViewPoint p = mapState.getPointFor(n);
 
@@ -853 +853 @@
      * @param clr The color to use for drawing the text.
      */
-    public void drawOrderNumber(Node n1, Node n2, int orderNumber, Color clr) {
+    public void drawOrderNumber(INode n1, INode n2, int orderNumber, Color clr) {
         MapViewPoint p1 = mapState.getPointFor(n1);
         MapViewPoint p2 = mapState.getPointFor(n2);
@@ -929 +929 @@
      * @param disabled draw using disabled style
      */
-    public void drawRestriction(Relation r, MapImage icon, boolean disabled) {
-        Way fromWay = null;
-        Way toWay = null;
-        OsmPrimitive via = null;
+    public void drawRestriction(IRelation<?> r, MapImage icon, boolean disabled) {
+        IWay<?> fromWay = null;
+        IWay<?> toWay = null;
+        IPrimitive via = null;
 
         /* find the "from", "via" and "to" elements */
-        for (RelationMember m : r.getMembers()) {
+        for (IRelationMember<?> m : r.getMembers()) {
             if (m.getMember().isIncomplete())
                 return;
             else {
                 if (m.isWay()) {
-                    Way w = m.getWay();
+                    IWay<?> w = (IWay<?>) m.getMember();
                     if (w.getNodesCount() < 2) {
                         continue;
@@ -964 +964 @@
                     }
                 } else if (m.isNode()) {
-                    Node n = m.getNode();
+                    INode n = (INode) m.getMember();
                     if (via == null && "via".equals(m.getRole())) {
                         via = n;
@@ -1007 +1007 @@
 
         /* find the "direct" nodes before the via node */
-        Node fromNode;
+        INode fromNode;
         if (fromWay.firstNode() == via) {
             fromNode = fromWay.getNode(1);
@@ -1227 +1227 @@
      * @param onewayReversed for oneway=-1 and similar
      */
-    public void drawWay(Way way, Color color, BasicStroke line, BasicStroke dashes, Color dashedColor, float offset,
+    public void drawWay(IWay<?> way, Color color, BasicStroke line, BasicStroke dashes, Color dashedColor, float offset,
             boolean showOrientation, boolean showHeadArrowOnly,
             boolean showOneway, boolean onewayReversed) {
@@ -1241 +1241 @@
         }
 
-        List<Node> wayNodes = way.getNodes();
+        List<? extends INode> wayNodes = way.getNodes();
         if (wayNodes.size() < 2) return;
 
@@ -1410 +1410 @@
     }
 
-    private MapViewPath getPath(Way w) {
+    private MapViewPath getPath(IWay<?> w) {
         MapViewPath path = new MapViewPath(mapState);
         if (w.isClosed()) {
@@ -1420 +1420 @@
     }
 
-    private static Path2D.Double getPFClip(Way w, double extent) {
+    private static Path2D.Double getPFClip(IWay<?> w, double extent) {
         Path2D.Double clip = new Path2D.Double();
         buildPFClip(clip, w.getNodes(), extent);
@@ -1451 +1451 @@
      * @param extent the extent
      */
-    private static void buildPFClip(Path2D.Double clip, List<Node> nodes, double extent) {
+    private static void buildPFClip(Path2D.Double clip, List<? extends INode> nodes, double extent) {
         boolean initial = true;
-        for (Node n : nodes) {
+        for (INode n : nodes) {
             EastNorth p = n.getEastNorth();
             if (p != null) {