Changeset 729 in josm for trunk/src

Timestamp:

2008-07-18T22:55:11+02:00 (16 years ago)

Author:

stoecker

Message:

added automatic tag correction system by Robin Rattay

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ReverseWayAction.java (modified) (2 diffs)
• corrector (added)
• corrector/ReverseWayTagCorrector.java (added)
• corrector/TagCorrection.java (added)
• corrector/TagCorrectionTable.java (added)
• corrector/TagCorrectionTableModel.java (added)
• corrector/TagCorrector.java (added)
• gui/JMultilineLabel.java (added)
• gui/MapFrame.java (modified) (3 diffs)

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

@@ -16 +16 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.corrector.ReverseWayTagCorrector;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Node;
@@ -47 +48 @@
                 return;
         }
-        Collection<Command> c = new LinkedList<Command>();
-        for (Way w : sel) {
-                Way wnew = new Way(w);
+
+        boolean propertiesUpdated = false;
+                ReverseWayTagCorrector reverseWayTagCorrector = new ReverseWayTagCorrector();
+                Collection<Command> c = new LinkedList<Command>();
+                for (Way w : sel) {
+                        Way wnew = new Way(w);
                         Collections.reverse(wnew.nodes);
-                c.add(new ChangeCommand(w, wnew));
-        }
-        Main.main.undoRedo.add(new SequenceCommand(tr("Reverse ways"), c));
-        Main.map.repaint();
+                        if (Main.pref.getBoolean("tag-correction.reverse-way", true))
+                                propertiesUpdated = reverseWayTagCorrector.execute(wnew) || propertiesUpdated;
+                        c.add(new ChangeCommand(w, wnew));
+                }
+                Main.main.undoRedo.add(new SequenceCommand(tr("Reverse ways"), c));
+                if (propertiesUpdated)
+                        Main.map.getPropertiesDialog().selectionChanged(Main.ds.getSelected());
+                Main.map.repaint();
     }
 }

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -67 +67 @@
         public final ButtonGroup toolGroup = new ButtonGroup();
 
+        private PropertiesDialog propertiesDialog;
 
         public MapFrame() {
@@ -95 +96 @@
 
                 addToggleDialog(new LayerListDialog(this));
-                addToggleDialog(new PropertiesDialog(this));
+                addToggleDialog(propertiesDialog = new PropertiesDialog(this));
                 addToggleDialog(new HistoryDialog());
                 addToggleDialog(new SelectionListDialog());
@@ -188 +189 @@
                         panel.add(statusLine, BorderLayout.SOUTH);
         }
+
+        public final PropertiesDialog getPropertiesDialog() {
+        return propertiesDialog;
+    }
 }