Changeset 10766 in josm for trunk/src/org/openstreetmap/josm/gui/datatransfer

Timestamp:

2016-08-07T22:52:29+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13290 - pasting from other layer changes objects position (modified patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/gui/datatransfer

Files:

• OsmTransferHandler.java (modified) (2 diffs)
• importers/PrimitiveDataPaster.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/datatransfer/OsmTransferHandler.java

@@ -83 +83 @@
      * Paste the current clipboard current at the given position
      * @param editLayer The layer to paste on.
-     * @param mPosition The position to paste at.
+     * @param mPosition The position to paste at. If it is <code>null</code>, the original position will be used.
      */
     public void pasteOn(OsmDataLayer editLayer, EastNorth mPosition) {
@@ -93 +93 @@
      * Paste the given clipboard current at the given position
      * @param editLayer The layer to paste on.
-     * @param mPosition The position to paste at.
+     * @param mPosition The position to paste at. If it is <code>null</code>, the original position will be used.
      * @param transferable The transferable to use.
      */

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/PrimitiveDataPaster.java

@@ -50 +50 @@
 
         EastNorth center = pasteBuffer.getCenter();
-        EastNorth offset = center == null ? null : pasteAt.subtract(center);
+        EastNorth offset = center == null || pasteAt == null ? new EastNorth(0, 0) : pasteAt.subtract(center);
 
         AddPrimitivesCommand command = createNewPrimitives(pasteBuffer, offset, layer);