Changeset 1600 in josm for trunk/src/org

Timestamp:

2009-05-19T18:43:02+02:00 (15 years ago)

Author:

stoecker

Message:

fixed #2607 - patch by Teemu Koskinen - Don't add splitted ways in the end of relation

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SplitWayAction.java (modified) (2 diffs)
• gui/layer/GpxLayer.java (modified) (1 diff)

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

@@ -267 +267 @@
         for (Relation r : Main.ds.relations) {
             if (r.deleted || r.incomplete) continue;
+            Relation c = null;
+            int i = 0;
+
             for (RelationMember rm : r.members) {
                 if (rm.member instanceof Way) {
                     if (rm.member == selectedWay)
                     {
-                        Relation c = new Relation(r);
+                        if (c == null)
+                            c = new Relation(r);
+
                         for(Way wayToAdd : newWays)
                         {
@@ -279 +284 @@
                             if(em.role.length() > 0)
                                 warnme = true;
-                            c.members.add(em);
+
+                            i++;
+                            c.members.add(i, em);
                         }
-                        commandList.add(new ChangeCommand(r, c));
-                        break;
                     }
                 }
-            }
+                i++;
+            }
+
+            if (c != null)
+                commandList.add(new ChangeCommand(r, c));
         }
         if(warnme)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -306 +306 @@
 
         if (data.attr.containsKey("name"))
-            info.append(tr("Name: {0}", data.attr.get("name"))).append("<br>");
+            info.append(tr("Name: {0}", data.attr.get(data.META_NAME))).append("<br>");
 
         if (data.attr.containsKey("desc"))
-            info.append(tr("Description: {0}", data.attr.get("desc"))).append("<br>");
+            info.append(tr("Description: {0}", data.attr.get(data.META_DESC))).append("<br>");
 
         if(data.tracks.size() > 0){