Changeset 33060 in osm for applications/editors/josm

Timestamp:

2016-11-14T01:25:09+01:00 (8 years ago)

Author:

frederik

Message:

Make "reconstruct relation" option available for polygons with inner rings. Any outer ring that has an inner ring will be placed in a relation of its own and not reconstructed. This allows the reconstruction of large multipolygon relations with multiple outer rings, only some of which have an inner ring - at least those without can be turned into a way.

Also, copy tags from the first way only if that way has area tags, fixing a bug where highway or waterway tags would be copied from the first way onto the relation.

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java (modified) (5 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

@@ -23 +23 @@
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.MultipolygonBuilder;
 import org.openstreetmap.josm.data.osm.MultipolygonBuilder.JoinedPolygon;
@@ -57 +58 @@
     public void actionPerformed(ActionEvent e) {
         Relation r = rel.get();
+        boolean relationReused = false;
         List<Way> ways = new ArrayList<>();
         boolean wont = false;
@@ -79 +81 @@
         }
 
-        if (!mpc.innerWays.isEmpty()) {
-            JOptionPane.showMessageDialog(Main.parent,
-                    tr("Reconstruction of polygons can be done only from outer ways"), tr("Reconstruct polygon"), JOptionPane.ERROR_MESSAGE);
+        rel.clear();
+        List<OsmPrimitive> newSelection = new ArrayList<>();
+        List<Command> commands = new ArrayList<>();
+        Command relationDeleteCommand = DeleteCommand.delete(Main.getLayerManager().getEditLayer(), Collections.singleton(r), true, true);
+        if (relationDeleteCommand == null)
             return;
-        }
-
-        rel.clear();
-        List<Way> newSelection = new ArrayList<>();
-        List<Command> commands = new ArrayList<>();
-        Command c = DeleteCommand.delete(Main.getLayerManager().getEditLayer(), Collections.singleton(r), true, true);
-        if (c == null)
-            return;
-        commands.add(c);
 
         for (JoinedPolygon p : mpc.outerWays) {
+
+            ArrayList<JoinedPolygon> myInnerWays = new ArrayList<JoinedPolygon>();
+            for (JoinedPolygon i : mpc.innerWays) {
+                // if the first point of any inner ring is contained in this
+                // outer ring, then this inner ring belongs to us. This 
+                // assumption only works if multipolygons have valid geometries
+                EastNorth en = i.ways.get(0).firstNode().getEastNorth();
+                if (p.area.contains(en.east(), en.north())) {
+                    myInnerWays.add(i);
+                }
+            }
+
+            if (!myInnerWays.isEmpty()) {
+                // this ring has inner rings, so we leave a multipolygon in 
+                // place and don't reconstruct the rings. 
+                Relation n = null;
+                if (relationReused) {
+                    n = new Relation();
+                    n.setKeys(r.getKeys());
+                } else {
+                    n = new Relation(r);
+                    n.setMembers(null);
+                }
+                for (Way w : p.ways) {
+                    n.addMember(new RelationMember("outer", w));
+                }
+                for (JoinedPolygon i : myInnerWays) {
+                    for (Way w : i.ways) {
+                        n.addMember(new RelationMember("inner", w));
+                    }
+                }
+                if (relationReused) {
+                    commands.add(new AddCommand(n));
+                } else {
+                    relationReused = true;
+                    commands.add(new ChangeCommand(r, n));
+                }
+                newSelection.add(n);
+                continue;
+            }
+
             // move all tags from relation and common tags from ways
+            // start with all tags from first way but only if area tags are 
+            // present
             Map<String, String> tags = p.ways.get(0).getKeys();
+            if (!p.ways.get(0).hasAreaTags()) {
+                tags.clear();
+            }
             List<OsmPrimitive> relations = p.ways.get(0).getReferrers();
             Set<String> noTags = new HashSet<>(r.keySet());
@@ -150 +191 @@
         }
 
+        // only delete the relation if it hasn't been re-used
+        if (!relationReused) {
+            commands.add(relationDeleteCommand);
+        }
+
         Main.main.undoRedo.add(new SequenceCommand(tr("Reconstruct polygons from relation {0}",
                 r.getDisplayName(DefaultNameFormatter.getInstance())), commands));
@@ -164 +210 @@
             return false;
         else {
-            for (RelationMember m : newRelation.getMembers()) {
-                if ("inner".equals(m.getRole()))
-                    return false;
-            }
             return true;
         }