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

Timestamp:

2014-12-12T01:28:39+01:00 (10 years ago)

Author:

Don-vip

Message:

see #10825 - handle dataset properly in mapcss tagchecker verification of assertions

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/Relation.java (modified) (1 diff)
• osm/Way.java (modified) (1 diff)
• validation/tests/MapCSSTagChecker.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -475 +475 @@
 
     @Override
-    public void setDataset(DataSet dataSet) {
+    void setDataset(DataSet dataSet) {
         super.setDataset(dataSet);
         checkMembers();

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -619 +619 @@
 
     @Override
-    public void setDataset(DataSet dataSet) {
+    void setDataset(DataSet dataSet) {
         super.setDataset(dataSet);
         checkNodes();

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

@@ -30 +30 @@
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
@@ -533 +534 @@
      */
     public synchronized Collection<TestError> getErrorsForPrimitive(OsmPrimitive p, boolean includeOtherSeverity) {
-        final ArrayList<TestError> r = new ArrayList<>();
+        final List<TestError> r = new ArrayList<>();
         final Environment env = new Environment(p, new MultiCascade(), Environment.DEFAULT_LAYER, null);
         for (Set<TagCheck> schecks : checks.values()) {
@@ -628 +629 @@
     public Set<String> checkAsserts(final Collection<TagCheck> schecks) {
         Set<String> assertionErrors = new LinkedHashSet<>();
+        final DataSet ds = new DataSet();
         for (final TagCheck check : schecks) {
             if (Main.isDebugEnabled()) {
@@ -637 +639 @@
                 }
                 final OsmPrimitive p = OsmUtils.createPrimitive(i.getKey());
+                // Add primitive to dataset to avoid DataIntegrityProblemException when evaluating selectors
+                ds.addPrimitive(p);
                 final boolean isError = Utils.exists(getErrorsForPrimitive(p, true), new Predicate<TestError>() {
                     @Override
@@ -649 +653 @@
                     assertionErrors.add(error);
                 }
+                ds.removePrimitive(p);
             }
         }