Changeset 17594 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java

Timestamp:

2021-03-20T11:50:08+01:00 (5 years ago)

Author:

simon04

Message:

fix #19857 - Select WMS layers: option to only show layers for current view

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java

@@ -4 +4 @@
 import java.awt.Component;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
@@ -16 +17 @@
 import javax.swing.tree.TreePath;
 
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.LayerDetails;
 import org.openstreetmap.josm.io.imagery.WMSImagery;
@@ -27 +29 @@
     private final JTree layerTree = new JTree(treeData);
     private final List<LayerDetails> selectedLayers = new LinkedList<>();
+    private LatLon checkBounds = null;
 
     /**
@@ -60 +63 @@
     }
 
+    /**
+     * Set coordinate to check {@linkplain LayerDetails#getBounds() layer bounds}
+     * when {@linkplain #updateTree updating the tree}.
+     * @param checkBounds the coordinate
+     */
+    public void setCheckBounds(LatLon checkBounds) {
+        this.checkBounds = checkBounds;
+    }
+
     void addLayersToTreeData(MutableTreeNode parent, Collection<LayerDetails> layers) {
         for (LayerDetails layerDetails : layers.stream()
-                .sorted((l1, l2) -> -1 * l1.toString().compareTo(l2.toString()))
+                .filter(l -> checkBounds == null || l.getBounds() == null || l.getBounds().contains(checkBounds))
+                .sorted(Comparator.comparing(LayerDetails::toString).reversed())
                 .toArray(LayerDetails[]::new)
                 ) {
@@ -89 +102 @@
     public void updateTreeList(Collection<LayerDetails> layers) {
         addLayersToTreeData(getTreeRootNode(), layers);
+        treeData.nodeStructureChanged(getTreeRootNode());
         getLayerTree().expandRow(0);
         getLayerTree().expandRow(1);