Changeset 4844 in osm for applications/editors/josm/plugins

Timestamp:

2007-10-07T13:38:17+02:00 (17 years ago)

Author:

gabriel

Message:

validator: Make changes to support relations.

Location:

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator

Files:

• GridLayer.java (modified) (1 diff)
• Test.java (modified) (1 diff)
• TestError.java (modified) (1 diff)
• util/AgregatePrimitivesVisitor.java (modified) (1 diff)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java

@@ -180 +180 @@
                         }
                 }
+
+                public void visit(Relation r) {}
                 
                 /** 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java

@@ -131 +131 @@
 
         public void visit(Way w) {}
+
+        public void visit(Relation r) {}
 
         /**

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java

@@ -307 +307 @@
                         }
         }
+
+                public void visit(Relation r)
+                {
+                        /* No idea how to draw a relation. */
+                }
         
         /**

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java

@@ -55 +55 @@
         }
 
+        public void visit(Relation r) {
+                // Relations can be cyclic so don't visit them twice.
+                if (!aggregatedData.contains(r)) {
+                        aggregatedData.add(r);
+                        for (RelationMember m : r.members) {
+                                m.member.visit(this);
+                        }
+                }
+        }
+
         /**
          * A comparator that orders nodes first, ways last.