Changeset 2603 in josm for trunk/src/org

Timestamp:

2009-12-10T18:32:05+01:00 (14 years ago)

Author:

stoecker

Message:

fixed #4126 - turn restrictions not drawn

Location:

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

Files:

• OsmPrimitive.java (modified) (1 diff)
• visitor/MapPaintVisitor.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -360 +360 @@
     }
 
+    public boolean isDrawable()
+    {
+        return !isDeleted() && !isIncomplete() && !isFiltered();
+    }
+
     /**
      * Replies true if this primitive is either unknown to the server (i.e. its id

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -518 +518 @@
             for (RelationMember m : r.getMembers())
             {
-                if (m.isWay() && drawable(m.getMember()))
+                if (m.isWay() && m.getMember().isDrawable())
                 {
                     drawSelectedMember(m.getMember(), styles != null ? getPrimitiveStyle(m.getMember())
@@ -1312 +1312 @@
     }
 
-    boolean drawable(OsmPrimitive osm)
-    {
-        return !osm.isDeleted() && !osm.isIncomplete() && !osm.isFiltered();
-    }
-
     @Override
     public void getColors()
@@ -1384 +1379 @@
             /*** RELATIONS ***/
             for (final Relation osm: data.getRelations()) {
-                if (drawable(osm)) {
+                if (osm.isDrawable()) {
                     paintUnselectedRelation(osm);
                 }
@@ -1391 +1386 @@
             /*** AREAS ***/
             for (final Way osm : selectedLast(data, data.searchWays(bbox))) {
-                if (drawable(osm) && osm.mappaintDrawnCode != paintid) {
+                if (osm.isDrawable() && osm.mappaintDrawnCode != paintid) {
                     if (isPrimitiveArea(osm) && osm.mappaintDrawnAreaCode != paintid) {
                         drawWay(osm, fillAreas);
@@ -1405 +1400 @@
             }
         } else {
+            drawMultipolygon = false;
+
+            /*** RELATIONS ***/
+            for (final Relation osm: data.getRelations()) {
+                if (osm.isDrawable()) {
+                    paintUnselectedRelation(osm);
+                }
+            }
+
             /*** WAYS (filling disabled)  ***/
             for (final Way way: data.getWays()) {
-                if (drawable(way) && !data.isSelected(way)) {
+                if (way.isDrawable() && !data.isSelected(way)) {
                     drawWay(way, 0);
                 }
@@ -1429 +1433 @@
                         /* TODO: is it possible to do this like the nodes/ways code? */
                         for (RelationMember m : r.getMembers()) {
-                            if (m.isNode() && drawable(m.getMember())) {
+                            if (m.isNode() && m.getMember().isDrawable()) {
                                 drawSelectedMember(m.getMember(), styles != null ? getPrimitiveStyle(m.getMember()) : null, true, true);
                             }