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

Timestamp:

2015-12-28T14:52:29+01:00 (8 years ago)

Author:

simon04

Message:

fix #11918 - Make obtain sources from current layers add only visible imagery sources

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapView.java (modified) (1 diff)
• io/BasicUploadSettingsPanel.java (modified) (2 diffs)

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

@@ -1151 +1151 @@
         }
         for (final GeoImageLayer i : getLayersOfType(GeoImageLayer.class)) {
-            layerInfo.add(i.getName());
+            if (i.isVisible()) {
+                layerInfo.add(i.getName());
+            }
         }
         for (final ImageryLayer i : getLayersOfType(ImageryLayer.class)) {
-            layerInfo.add(ImageryInfo.ImageryType.BING.equals(i.getInfo().getImageryType()) ? "Bing" : i.getName());
+            if (i.isVisible()) {
+                layerInfo.add(ImageryInfo.ImageryType.BING.equals(i.getInfo().getImageryType()) ? "Bing" : i.getName());
+            }
         }
         return Utils.join("; ", layerInfo);

trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java

@@ -32 +32 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -73 +74 @@
             public void hyperlinkUpdate(HyperlinkEvent e) {
                 if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())) {
-                    hcbUploadSource.setText(Main.map.mapView.getLayerInformationForSourceTag());
+                    final String source = Main.map.mapView.getLayerInformationForSourceTag();
+                    hcbUploadSource.setText(Utils.shortenString(source, Changeset.MAX_CHANGESET_TAG_LENGTH));
                     // Fix #9965
                     changesetSourceModel.setComment(hcbUploadSource.getText());