Changeset 5351 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-07-19T10:55:57+02:00 (12 years ago)

Author:

bastiK

Message:

see #7847 - avoid rendering artefacts for ways with missing nodes in wireframe view

File:

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

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

@@ -138 +138 @@
            require changing the colour while painting... */
         for (final OsmPrimitive osm: data.searchRelations(bbox)) {
-            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isDisabledAndHidden()) {
+            if (osm.isDrawable() && !ds.isSelected(osm) && !osm.isDisabledAndHidden()) {
                 osm.visit(this);
             }
@@ -144 +144 @@
 
         for (final OsmPrimitive osm:data.searchWays(bbox)){
-            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isDisabledAndHidden() && osm.isTagged()) {
+            if (osm.isDrawable() && !ds.isSelected(osm) && !osm.isDisabledAndHidden() && osm.isTagged()) {
                 osm.visit(this);
             }
@@ -151 +151 @@
 
         for (final OsmPrimitive osm:data.searchWays(bbox)){
-            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isDisabledAndHidden() && !osm.isTagged()) {
+            if (osm.isDrawable() && !ds.isSelected(osm) && !osm.isDisabledAndHidden() && !osm.isTagged()) {
                 osm.visit(this);
             }
@@ -157 +157 @@
         displaySegments();
         for (final OsmPrimitive osm : data.getSelected()) {
-            if (!osm.isDeleted()) {
+            if (osm.isDrawable()) {
                 osm.visit(this);
             }
@@ -164 +164 @@
 
         for (final OsmPrimitive osm: data.searchNodes(bbox)) {
-            if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isDisabledAndHidden())
+            if (osm.isDrawable() && !ds.isSelected(osm) && !osm.isDisabledAndHidden())
             {
                 osm.visit(this);
@@ -344 +344 @@
 
         for (RelationMember m : r.getMembers()) {
-            if (m.getMember().isIncomplete() || m.getMember().isDeleted()) {
+            if (m.getMember().isIncomplete() || !m.getMember().isDrawable()) {
                 continue;
             }
@@ -361 +361 @@
                 boolean first = true;
                 for (Node n : m.getWay().getNodes()) {
-                    if (n.isIncomplete() || n.isDeleted()) {
+                    if (!n.isDrawable()) {
                         continue;
                     }