Filter and MapCSS "modified" not updating after uploading changes

[anonymous]

What steps will reproduce the problem?

1. Add, enable and reverse filter "modified"
2. Modify some data
3. Send changes to server (or upload selected changes)

What is the expected result?

Uploaded data should be inactive.

What happens instead?

Uploaded data is still active. I must disable and enable again filter.

Please provide any additional information below. Attach a screenshot if possible.

URL:http://josm.openstreetmap.de/svn/trunk
Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b
Last:Changed Date: 2016-01-30 01:43:42 +0100 (Sat, 30 Jan 2016)
Build-Date:2016-01-30 02:34:22
Revision:9685
Relative:URL: ^/trunk

Identification: JOSM/1.5 (9685 pl) Linux Ubuntu Xenial Xerus (development branch)
Memory Usage: 819 MB / 869 MB (374 MB allocated, but free)
Java version: 1.8.0_72-internal-b15, Oracle Corporation, OpenJDK 64-Bit Server VM
Dataset consistency test: No problems found

Plugins:
- Mapillary (31976)
- OpeningHoursEditor (31772)
- PicLayer (31895)
- apache-commons (31895)
- apache-http (31895)
- ejml (31895)
- geotools (31895)
- jts (31772)
- measurement (31895)
- opendata (31937)
- reverter (32005)
- tag2link (31910)
- tageditor (31772)
- utilsplugin2 (32018)

[Klumbumbus]

same problem for the mapcss pseudoclass :modified (e.g. Styles/Modified)

[simon04]

In 9695/josm:

see #12457 - MapCSS "modified" not updating after uploading changes

[simon04]

For the filter it seems more complicated. The following should fix it, however, it's a hack. Unfortunately, we do not have a DatasetChangedEvent for the flags, and extending the often used interface DataSetListener does not seem a good idea neither.

src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -567 +567 @@
         boolean locked = writeLock();
         try {
             super.setModified(modified);
+            dataSet.fireTagsChanged(this, getKeys());
             clearCachedStyle();
         } finally {
             writeUnlock(locked);

src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

@@ -328 +328 @@
 
     @Override
     public void nodeMoved(NodeMovedEvent event) {
-        // Do nothing
+        filterModel.executeFilters(event.getPrimitives());
     }
 
     @Override

src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -520 +520 @@
 
         // if uploaded, clean the modified flags as well
         data.cleanupDeletedPrimitives();
-        for (OsmPrimitive p: data.allPrimitives()) {
-            if (processed.contains(p)) {
-                p.setModified(false);
+        data.beginUpdate();
+        try {
+            for (OsmPrimitive p : data.allPrimitives()) {
+                if (processed.contains(p)) {
+                    p.setModified(false);
+                }
             }
+        } finally {
+            data.endUpdate();
         }
     }

[bastiK]

Replying to simon04:

For the filter it seems more complicated. The following should fix it, however, it's a hack. Unfortunately, we do not have a DatasetChangedEvent for the flags, and extending the often used interface DataSetListener does not seem a good idea neither.

Troublesome, but extending DataSetListener seems to be the correct way.

An alternative would be to bend the definition of otherDatasetChange. It could serve as an umbrella event for all kinds of changes to primitives that are not covered by other event types. You can extend the enum DatasetEventType ​without breaking the plugins.

[simon04]

In 9941/josm:

fix #12457 - Filter "modified" not updating after uploading changes

[Don-vip]

Milestone renamed