Changes between Initial Version and Version 1 of Ticket #22811, comment 1


Ignore:
Timestamp:
2023-03-14T21:28:53+01:00 (2 years ago)
Author:
taylor.smock

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #22811, comment 1

    initial v1  
    11OK. It looks like it is probably an interaction from loading the OSC into the layer directly. Merging the OSC from a different layer worked as expected.
     2
     3EDIT:
     4This has a really easy fix:
     5{{{#!diff
     6Index: src/org/openstreetmap/josm/io/OsmChangeReader.java
     7IDEA additional info:
     8Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
     9<+>UTF-8
     10===================================================================
     11diff --git a/src/org/openstreetmap/josm/io/OsmChangeReader.java b/src/org/openstreetmap/josm/io/OsmChangeReader.java
     12--- a/src/org/openstreetmap/josm/io/OsmChangeReader.java        (revision 18692)
     13+++ b/src/org/openstreetmap/josm/io/OsmChangeReader.java        (date 1678825659261)
     14@@ -92,7 +92,7 @@
     15                     parseUnknown();
     16                 }
     17                 if (p != null && action != null) {
     18-                    if ("modify".equals(action)) {
     19+                    if ("create".equals(action) || "modify".equals(action)) {
     20                         p.setModified(true);
     21                     } else if ("delete".equals(action)) {
     22                         p.setDeleted(true);
     23}}}
     24Now I just have to write a test for it.