Changeset 17684 in josm for trunk/src/org/openstreetmap

Timestamp:

2021-03-28T20:43:23+02:00 (4 years ago)

Author:

simon04

Message:

fix #20678 - History Browser: reset coordinates of a node to previous versions (via popup menu)

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• CoordinateInfoViewer.java (modified) (5 diffs)
• HistoryBrowserPanel.java (modified) (2 diffs)
• TagInfoViewer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java

@@ -7 +7 @@
 import java.awt.GridBagLayout;
 import java.awt.Insets;
+import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
+import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
 import javax.swing.UIManager;
 import javax.swing.event.ChangeEvent;
@@ -19 +22 @@
 import org.openstreetmap.gui.jmapviewer.JMapViewer;
 import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
+import org.openstreetmap.josm.command.MoveCommand;
+import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.history.HistoryNode;
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
@@ -30 +37 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Destroyable;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Pair;
 
@@ -114 +122 @@
         add(mapViewer, gc);
         mapViewer.setZoomControlsVisible(false);
+
+        JPopupMenu popupMenu = new JPopupMenu();
+        popupMenu.add(new RestoreCoordinateAction());
+        setComponentPopupMenu(popupMenu);
+        mapViewer.setComponentPopupMenu(popupMenu);
     }
 
@@ -424 +437 @@
         }
     }
+
+    private class RestoreCoordinateAction extends AbstractAction {
+
+        RestoreCoordinateAction() {
+            super(tr("Restore"));
+            new ImageProvider("undo").getResource().attachImageIcon(this, true);
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            OsmPrimitive primitive = getPrimitiveFromDataSet(PointInTimeType.REFERENCE_POINT_IN_TIME);
+            if (!(primitive instanceof Node)) {
+                return;
+            }
+            HistoryOsmPrimitive historyPrimitive = model.getPointInTime(PointInTimeType.REFERENCE_POINT_IN_TIME);
+            if (!(historyPrimitive instanceof HistoryNode) || ((HistoryNode) historyPrimitive).getCoords() == null) {
+                return;
+            }
+            MoveCommand command = new MoveCommand(((Node) primitive), ((HistoryNode) historyPrimitive).getCoords());
+            UndoRedoHandler.getInstance().add(command);
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserPanel.java

@@ -10 +10 @@
 
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.Destroyable;
 
@@ -64 +68 @@
     }
 
+    protected OsmPrimitive getPrimitiveFromDataSet(PointInTimeType pointInTime) {
+        DataSet dataSet = MainApplication.getLayerManager().getEditDataSet();
+        PrimitiveId primitiveId = model.getPointInTime(pointInTime);
+        if (dataSet == null || primitiveId == null) {
+            return null;
+        }
+        return dataSet.getPrimitiveById(primitiveId.getUniqueId(), primitiveId.getType());
+    }
+
     protected final <T extends AbstractAction> T trackJosmAction(T action) {
         if (action instanceof JosmAction) {

trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java

@@ -15 +15 @@
 
 import org.openstreetmap.josm.actions.RestorePropertyAction;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Tagged;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.properties.CopyAllKeyValueAction;
 import org.openstreetmap.josm.gui.dialogs.properties.CopyKeyValueAction;
@@ -83 +80 @@
         };
         Supplier<Collection<? extends Tagged>> objectSp = () -> Collections.singletonList(model.getPointInTime(pointInTime));
-        Supplier<OsmPrimitive> primitiveSupplier = () -> {
-            DataSet dataSet = MainApplication.getLayerManager().getEditDataSet();
-            PrimitiveId primitiveId = model.getPointInTime(pointInTime);
-            if (dataSet == null || primitiveId == null) {
-                return null;
-            }
-            return dataSet.getPrimitiveById(primitiveId.getUniqueId(), primitiveId.getType());
-        };
+        Supplier<OsmPrimitive> primitiveSupplier = () -> getPrimitiveFromDataSet(pointInTime);
 
         tagMenu.add(trackJosmAction(new CopyValueAction(table, tagKeyFn, objectSp)));