Changeset 2070 in josm for trunk/src/org/openstreetmap/josm/data/osm/Relation.java

Timestamp:

2009-09-06T23:07:33+02:00 (15 years ago)

Author:

Gubaer

Message:

new: rewrite of CombineWay action
new: conflict resolution dialog for CombineWay, including conflicts for different relation memberships
cleanup: cleanup in OsmReader, reduces memory footprint and reduces parsing time
cleanup: made most of the public fields in OsmPrimitive @deprecated, added accessors and changed the code
cleanup: replaced usages of @deprecated constructors for ExtendedDialog
fixed #3208: Combine ways brokes relation order

WARNING: this changeset touches a lot of code all over the code base. "latest" might become slightly unstable in the next days. Also experience incompatibility issues with plugins in the next few days.

File:

• trunk/src/org/openstreetmap/josm/data/osm/Relation.java (modified) (8 diffs)

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
@@ -17 +19 @@
      * All members of this relation. Note that after changing this,
      * makeBackReferences and/or removeBackReferences should be called.
-     */
+     * 
+     * @deprecated use the improved API instead of accessing this list directly
+     */
+    @Deprecated
     public final List<RelationMember> members = new ArrayList<RelationMember>();
 
@@ -104 +109 @@
 
     /**
+     * Create a new relation with id 0
+     */
+    public Relation() {
+
+    }
+
+    /**
      * Create an identical clone of the argument (including the id)
      */
     public Relation(Relation clone) {
+        super(clone.getId());
         cloneFrom(clone);
     }
 
     /**
-     * Create an incomplete Relation.
-     */
-    public Relation(long id) {
-        this.id = id;
-        incomplete = true;
-    }
-
-    /**
-     * Create an empty Relation. Use this only if you set meaningful values
-     * afterwards.
-     */
-    public Relation() {
-    }
+     * Creates a new relation for the given id. If the id > 0, the way is marked
+     * as incomplete.
+     * 
+     * @param id the id. > 0 required
+     * @throws IllegalArgumentException thrown if id < 0
+     */
+    public Relation(long id) throws IllegalArgumentException {
+        super(id);
+    }
+
 
     @Override public void cloneFrom(OsmPrimitive osm) {
@@ -138 +148 @@
         // return "{Relation id="+id+" version="+version+" members="+Arrays.toString(members.toArray())+"}";
         // adding members in string increases memory usage a lot and overflows for looped relations
-        return "{Relation id="+id+" version="+version+"}";
+        return "{Relation id="+getId()+" version="+getVersion()+"}";
     }
 
@@ -152 +162 @@
 
     public int compareTo(OsmPrimitive o) {
-        return o instanceof Relation ? Long.valueOf(id).compareTo(o.id) : -1;
+        return o instanceof Relation ? Long.valueOf(getId()).compareTo(o.getId()) : -1;
     }
 
@@ -158 +168 @@
     public boolean isIncomplete() {
         for (RelationMember m : members)
-            if (m.member == null)
+            if (m.getMember() == null)
                 return true;
         return false;
@@ -183 +193 @@
         ArrayList<RelationMember> todelete = new ArrayList<RelationMember>();
         for (RelationMember member: members) {
-            if (member.member == primitive) {
+            if (member.getMember() == primitive) {
                 todelete.add(member);
             }
@@ -194 +204 @@
         return formatter.format(this);
     }
+
+    /**
+     * Replies the set of  {@see OsmPrimitive}s referred to by at least one
+     * member of this relation
+     * 
+     * @return the set of  {@see OsmPrimitive}s referred to by at least one
+     * member of this relation
+     */
+    public Set<OsmPrimitive> getMemberPrimitives() {
+        HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
+        for (RelationMember m: members) {
+            if (m.getMember() != null) {
+                ret.add(m.getMember());
+            }
+        }
+        return ret;
+    }
 }