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

Timestamp:

2016-01-02T18:04:19+01:00 (9 years ago)

Author:

simon04

Message:

see #7089 - Relation list: re-filter after zooming

This allows to use filters such as parent inview to only display relations w/ members in the current view.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -60 +60 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
+import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.PopupMenuHandler;
@@ -85 +86 @@
  * objects are visible on the map and can be selected there. Relations are not.
  */
-public class RelationListDialog extends ToggleDialog implements DataSetListener {
+public class RelationListDialog extends ToggleDialog implements DataSetListener, NavigatableComponent.ZoomChangeListener {
     /** The display list. */
     private final JList<Relation> displaylist;
@@ -206 +207 @@
     public void showNotify() {
         MapView.addLayerChangeListener(newAction);
+        MapView.addZoomChangeListener(this);
         newAction.updateEnabledState();
         DatasetEventManager.getInstance().addDatasetListener(this, FireMode.IN_EDT);
@@ -215 +217 @@
     public void hideNotify() {
         MapView.removeLayerChangeListener(newAction);
+        MapView.removeZoomChangeListener(this);
         DatasetEventManager.getInstance().removeDatasetListener(this);
         DataSet.removeSelectionListener(addSelectionToRelations);
@@ -671 +674 @@
         /* ignore */
     }
+
+    @Override
+    public void zoomChanged() {
+        // re-filter relations
+        if (model.filter != null) {
+            model.setFilter(model.filter);
+        }
+    }
 }