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

Timestamp:

2010-02-14T15:01:00+01:00 (15 years ago)

Author:

jttt

Message:

Calculate bbox for relations, use it in mappaint.

File:

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

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

@@ -23 +23 @@
      */
     private final List<RelationMember> members = new ArrayList<RelationMember>();
+
+    private BBox bbox;
 
     /**
@@ -336 +338 @@
     @Override
     public BBox getBBox() {
-        return new BBox(0, 0, 0, 0);
+        if (bbox == null) {
+            calculateBBox(new HashSet<PrimitiveId>());
+            if (bbox == null) {
+                bbox = new BBox(0, 0, 0, 0); // No members
+            }
+        }
+        return  bbox;
+    }
+
+    private BBox calculateBBox(Set<PrimitiveId> visitedRelations) {
+        if (visitedRelations.contains(this))
+            return null;
+        visitedRelations.add(this);
+        if (members.isEmpty())
+            return null;
+        else {
+            BBox result = null;
+            for (RelationMember rm:members) {
+                BBox box = rm.isRelation()?rm.getRelation().calculateBBox(visitedRelations):rm.getMember().getBBox();
+                if (box != null) {
+                    if (result == null) {
+                        result = box;
+                    } else {
+                        result.add(box);
+                    }
+                }
+            }
+            return result;
+        }
     }
 
     @Override
     public void updatePosition() {
-        // Do nothing for now
+        bbox = calculateBBox(new HashSet<PrimitiveId>());
     }
 
@@ -355 +385 @@
             for (RelationMember rm: members) {
                 if (rm.getMember().getDataSet() != dataSet)
-                    throw new DataIntegrityProblemException("Relation member must be part of the same dataset as relation");
+                    throw new DataIntegrityProblemException(String.format("Relation member must be part of the same dataset as relation(%s, %s)", getPrimitiveId(), rm.getMember().getPrimitiveId()));
             }
         }