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

Timestamp:

2019-06-02T21:35:31+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17779 - make sure imagery entries without shapes are displayed in imagery menu

File:

• trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java

@@ -152 +152 @@
     private static boolean isPosInOneShapeIfAny(ImageryInfo info, LatLon pos) {
         List<Shape> shapes = info.getBounds().getShapes();
-        return shapes == null || shapes.stream().anyMatch(s -> s.contains(pos));
+        return shapes == null || shapes.isEmpty() || shapes.stream().anyMatch(s -> s.contains(pos));
     }
 
@@ -185 +185 @@
                     .collect(Collectors.toList());
             if (!inViewLayers.isEmpty()) {
-                addDynamicSeparator();
+                if (inViewLayers.stream().anyMatch(i -> i.getImageryCategory() == ImageryCategory.PHOTO)) {
+                    addDynamicSeparator();
+                }
                 for (ImageryInfo i : inViewLayers) {
                     addDynamic(trackJosmAction(new AddImageryLayerAction(i)), i.getImageryCategory());