Changeset 17497 in josm for trunk

Timestamp:

2021-02-20T20:52:51+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20498 - make sure fixChangeKey does not overwrite existing tag

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -106 +106 @@
          * @param p OSM primitive
          * @param matchingSelector  matching selector
-         * @return fix command
+         * @return fix command, or {@code null} if if cannot be created
          */
         Command createCommand(OsmPrimitive p, Selector matchingSelector);
@@ -182 +182 @@
 
         /**
-         * Creates a fixing command which executes a {@link ChangePropertyKeyCommand} on the specified keys.
+         * Creates a fixing command which executes a {@link ChangePropertyKeyCommand} on the specified keys
+         * if {@code p} does not already have {@code newKey}
          * @param oldKey old key
          * @param newKey new key
-         * @return created fix command
+         * @return created fix command, or {@code null}
          */
         static FixCommand fixChangeKey(final String oldKey, final String newKey) {
@@ -191 +192 @@
                 @Override
                 public Command createCommand(OsmPrimitive p, Selector matchingSelector) {
-                    return new ChangePropertyKeyCommand(p,
+                    return p.hasKey(newKey) ? null : new ChangePropertyKeyCommand(p,
                             TagCheck.insertArguments(matchingSelector, oldKey, p),
                             TagCheck.insertArguments(matchingSelector, newKey, p));
@@ -465 +466 @@
                 Collection<Command> cmds = fixCommands.stream()
                         .map(fixCommand -> fixCommand.createCommand(p, matchingSelector))
+                        .filter(Objects::nonNull)
                         .collect(Collectors.toList());
                 if (deletion && !p.isDeleted()) {
                     cmds.add(new DeleteCommand(p));
                 }
-                return new SequenceCommand(tr("Fix of {0}", getDescriptionForMatchingSelector(p, matchingSelector)), cmds);
+                return cmds.isEmpty() ? null
+                        : new SequenceCommand(tr("Fix of {0}", getDescriptionForMatchingSelector(p, matchingSelector)), cmds);
             } catch (IllegalArgumentException e) {
                 Logging.error(e);