Changeset 7599 in josm

Timestamp:

2014-10-05T01:24:20+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10582 - drop support of undocumented tag josm/ignore. New deprecation test in mapcss tagchecker, with new fix resolution that deletes the object. Please use upload prohibition flag at layer level.

Location:

trunk

Files:

• data/validator/deprecated.mapcss (modified) (1 diff)
• src/org/openstreetmap/josm/data/APIDataSet.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (modified) (7 diffs)

trunk/data/validator/deprecated.mapcss

@@ -281 +281 @@
   fixAdd: "bridge:structure=suspension";
 }
+
+/* See #10582 - JOSM supported this tag as "don't upload this" feature, before the introduction of upload flag at layer level */
+*[/josm\/ignore/] {
+  throwError: tr("{0} is deprecated. Please delete this object and use a private layer instead", "{0.key}");
+  fixDeleteObject: this;
+}

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -29 +29 @@
 
 /**
- * Represents a collection of {@link OsmPrimitive}s which should be uploaded to the
- * API.
+ * Represents a collection of {@link OsmPrimitive}s which should be uploaded to the API.
  * The collection is derived from the modified primitives of an {@link DataSet} and it provides methods
  * for sorting the objects in upload order.
- *
+ * @since 2025
  */
 public class APIDataSet {
@@ -65 +64 @@
 
         for (OsmPrimitive osm :primitives) {
-            if (osm.get("josm/ignore") != null) {
-                continue;
-            }
             if (osm.isNewOrUndeleted() && !osm.isDeleted()) {
                 toAdd.add(osm);

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

@@ -28 +28 @@
 import org.openstreetmap.josm.command.ChangePropertyKeyCommand;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -37 +38 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.mappaint.Environment;
+import org.openstreetmap.josm.gui.mappaint.Keyword;
 import org.openstreetmap.josm.gui.mappaint.MultiCascade;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition;
@@ -139 +141 @@
         protected final Map<Instruction.AssignmentInstruction, Severity> errors = new HashMap<>();
         protected final Map<String, Boolean> assertions = new HashMap<>();
+        protected boolean deletion = false;
 
         TagCheck(GroupedMapCSSRule rule) {
@@ -210 +213 @@
                             : ai.val instanceof String
                             ? (String) ai.val
+                            : ai.val instanceof Keyword
+                            ? ((Keyword) ai.val).val
                             : null;
                     if (ai.key.startsWith("throw")) {
@@ -238 +243 @@
                         final String[] x = val.split("=>", 2);
                         check.keyChange.put(Tag.removeWhiteSpaces(x[0]), Tag.removeWhiteSpaces(x[1]));
+                    } else if ("fixDeleteObject".equals(ai.key) && val != null) {
+                        CheckParameterUtil.ensureThat(val.equals("this"), "fixDeleteObject must be followed by 'this'");
+                        check.deletion = true;
                     } else if ("suggestAlternative".equals(ai.key) && val != null) {
                         check.alternatives.add(val);
@@ -388 +396 @@
          */
         Command fixPrimitive(OsmPrimitive p) {
-            if (change.isEmpty() && keyChange.isEmpty()) {
+            if (change.isEmpty() && keyChange.isEmpty() && !deletion) {
                 return null;
             }
@@ -403 +411 @@
                 final String newKey = insertArguments(matchingSelector, i.getValue());
                 cmds.add(new ChangePropertyKeyCommand(p, oldKey, newKey));
+            }
+            if (deletion) {
+                cmds.add(new DeleteCommand(p));
             }
             return new SequenceCommand(tr("Fix of {0}", getDescriptionForMatchingSelector(p, matchingSelector)), cmds);