Changeset 29037 in osm for applications/editors/josm/plugins/terracer

Timestamp:

2012-12-05T00:36:21+01:00 (12 years ago)

Author:

donvip

Message:

[josm_terracer] fix #josm6172 - Reuse associatedStreet relation when only a building is selected

File:

• applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java (modified) (2 diffs)

applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java

@@ -174 +174 @@
         }
 
+        Relation associatedStreet = null;
+
+        // Try to find an associatedStreet relation that could be reused from outline.
+        for (OsmPrimitive p : outline.getReferrers()) {
+            if (p instanceof Relation) {
+                Relation rel = (Relation) p;
+                if ("associatedStreet".equals(rel.get("type"))) {
+                    associatedStreet = rel;
+                    break;
+                }
+            }
+        }
+        
         // If we have a street, try to find an associatedStreet relation that could be reused.
-        Relation associatedStreet = null;
-        if (street != null) {
+        if (associatedStreet == null && street != null) {
             outer:for (OsmPrimitive osm : Main.main.getCurrentDataSet().allNonDeletedPrimitives()) {
                 if (!(osm instanceof Relation)) continue;
@@ -438 +450 @@
                     newAssociatedStreet.addMember(new RelationMember("house", w));
                 }
+                if (deleteOutline) {
+                    newAssociatedStreet.removeMembersFor(outline);
+                }
                 this.commands.add(new ChangeCommand(associatedStreet, newAssociatedStreet));
             }