Changeset 2202 in josm for trunk

Timestamp:

2009-09-27T18:01:21+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3553: Error on join overlapped areas

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CombineWayAction.java (modified) (7 diffs)
• MergeNodesAction.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.osm.TagCollection;
+import org.openstreetmap.josm.data.osm.TigerUtils;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -46 +47 @@
         super(tr("Combine Way"), "combineway", tr("Combine several ways into one."),
                 Shortcut.registerShortcut("tools:combineway", tr("Tool: {0}", tr("Combine Way")), KeyEvent.VK_C, Shortcut.GROUP_EDIT), true);
-    }
-
-    protected Set<OsmPrimitive> intersect(Set<? extends OsmPrimitive> s1, Set<? extends OsmPrimitive> s2) {
-        HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>(s1);
-        ret.retainAll(s2);
-        return ret;
-    }
-
-    protected boolean confirmCombiningWithConflictsInRelationMemberships() {
-        ExtendedDialog ed = new ExtendedDialog(Main.parent,
-                tr("Combine ways with different memberships?"),
-                new String[] {tr("Combine Anyway"), tr("Cancel")});
-        ed.setButtonIcons(new String[] {"combineway.png", "cancel.png"});
-        ed.setContent(tr("The selected ways have differing relation memberships.  "
-                + "Do you still want to combine them?"));
-        ed.showDialog();
-
-        return ed.getValue() == 1;
     }
 
@@ -82 +65 @@
         JOptionPane.showMessageDialog(
                 Main.parent,
-                msg,  //FIXME: not sure whether this fits in a dialog
+                msg,
                 tr("Information"),
                 JOptionPane.INFORMATION_MESSAGE
@@ -120 +103 @@
     }
 
+    /**
+     * Combines tags from TIGER data
+     * 
+     * @param tc the tag collection
+     */
+    protected static void combineTigerTags(TagCollection tc) {
+        for (String key: tc.getKeys()) {
+            if (TigerUtils.isTigerTag(key)) {
+                tc.setUniqueForKey(key, TigerUtils.combineTags(key, tc.getValues(key)));
+            }
+        }
+    }
+
     protected static void completeTagCollectionForEditing(TagCollection tc) {
         for (String key: tc.getKeys()) {
@@ -148 +144 @@
 
 
-        // try to build a new way out of the combination of ways
-        // which are combined
+        // try to build a new way which includes all the combined
+        // ways
         //
         NodeGraph graph = NodeGraph.createDirectedGraphFromWays(ways);
@@ -172 +168 @@
 
         TagCollection completeWayTags = new TagCollection(wayTags);
+        combineTigerTags(completeWayTags);
         completeTagCollectionWithMissingTags(completeWayTags, ways);
         TagCollection tagsToEdit = new TagCollection(completeWayTags);
@@ -216 +213 @@
         }
     }
-
 
     public void actionPerformed(ActionEvent event) {

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.osm.TagCollection;
+import org.openstreetmap.josm.data.osm.TigerUtils;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.BackreferencedDataSet.RelationToChildReference;
@@ -93 +94 @@
 
     /**
+     * Combines tags from TIGER data
+     * 
+     * @param tc the tag collection
+     */
+    protected static void combineTigerTags(TagCollection tc) {
+        for (String key: tc.getKeys()) {
+            if (TigerUtils.isTigerTag(key)) {
+                tc.setUniqueForKey(key, TigerUtils.combineTags(key, tc.getValues(key)));
+            }
+        }
+    }
+
+    /**
      * Selects a node out of a collection of candidate nodes. The selected
      * node will become the target node the remaining nodes are merged to.
@@ -153 +167 @@
      * Fixes the parent ways referring to one of the nodes.
      * 
-     * Replies null, if the ways could not be fixed, i.e. because a way would have to be delted
+     * Replies null, if the ways could not be fixed, i.e. because a way would have to be deleted
      * which is referred to by a relation.
      * 
@@ -159 +173 @@
      * @param nodesToDelete the collection of nodes to be deleted
      * @param targetNode the target node the other nodes are merged to
-     * @return a list of command; null, the ways could not be fixed
+     * @return a list of commands; null, if the ways could not be fixed
      */
     protected static List<Command> fixParentWays(BackreferencedDataSet backreferences, Collection<OsmPrimitive> nodesToDelete, Node targetNode) {
@@ -207 +221 @@
     /**
      * Merges the nodes in <code>node</code> onto one of the nodes. Uses the dataset
-     * managed by <code>layer</code> as reference. <code>backreferences</code> is precomputed
+     * managed by <code>layer</code> as reference. <code>backreferences</code> is a precomputed
      * collection of all parent/child references in the dataset.
      *
      * @param layer layer the reference data layer. Must not be null.
-     * @param backreferences if null, backreferneces are first computed from layer.data; otherwise
-     *    backreferences.getSource() == layer.data must hold
+     * @param backreferences if null, backreferences are first computed from layer.data; otherwise
+     *    backreferences.getSource() == layer.data must be true
      * @param nodes the collection of nodes. Ignored if null.
      * @param targetNode the target node the collection of nodes is merged to. Must not be null.
@@ -235 +249 @@
         //
         TagCollection nodeTags = TagCollection.unionOfAllPrimitives(nodes);
+        combineTigerTags(nodeTags);
         completeTagCollectionWithMissingTags(nodeTags, nodes);
         TagCollection nodeTagsToEdit = new TagCollection(nodeTags);
@@ -258 +273 @@
         nodesToDelete.remove(targetNode);
 
-        // change the ways referring to at least one of the merge nodes
+        // fix the ways referring to at least one of the merged nodes
         //
         Collection<Way> waysToDelete= new HashSet<Way>();
@@ -287 +302 @@
 
     /**
-     * Enable the "Merge Nodes" menu option if more then one node is selected
+     * Enable the "Merge Nodes" menu option if more than one node is selected
      */
     @Override