Changeset 13890 in josm for trunk/src

Timestamp:

2018-06-04T20:27:55+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16357 - use English imagery names in changeset source tag

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryInfo.java (modified) (5 diffs)
• data/imagery/ImageryLayerInfo.java (modified) (1 diff)
• gui/MapView.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -14 +14 @@
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
@@ -1551 +1552 @@
 
     /**
+     * Determines if this imagery should be transparent.
      * @return should this imagery be transparent
      */
@@ -1558 +1560 @@
 
     /**
-     *
+     * Sets whether imagery should be transparent.
      * @param transparent set to true if imagery should be transparent
      */
@@ -1566 +1568 @@
 
     /**
+     * Returns minimum tile expiration in seconds.
      * @return minimum tile expiration in seconds
      */
@@ -1573 +1576 @@
 
     /**
-     * Sets minimum tile expiration in seconds
+     * Sets minimum tile expiration in seconds.
      * @param minimumTileExpire minimum tile expiration in seconds
      */
     public void setMinimumTileExpire(int minimumTileExpire) {
         this.minimumTileExpire = minimumTileExpire;
-
+    }
+
+    /**
+     * Get a string representation of this imagery info suitable for the {@code source} changeset tag.
+     * @return English name, if known
+     * @since 13890
+     */
+    public String getSourceName() {
+        if (ImageryType.BING.equals(getImageryType())) {
+            return "Bing";
+        } else {
+            if (id != null) {
+                // Retrieve english name, unfortunately not saved in preferences
+                Optional<ImageryInfo> infoEn = ImageryLayerInfo.allDefaultLayers.stream().filter(x -> id.equals(x.getId())).findAny();
+                if (infoEn.isPresent()) {
+                    return infoEn.get().getOriginalName();
+                }
+            }
+            return getOriginalName();
+        }
     }
 }

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -43 +43 @@
     private final Map<String, ImageryInfo> layerIds = new HashMap<>();
     /** List of all available default layers */
-    private static final List<ImageryInfo> defaultLayers = new ArrayList<>();
+    static final List<ImageryInfo> defaultLayers = new ArrayList<>();
     /** List of all available default layers (including mirrors) */
-    private static final List<ImageryInfo> allDefaultLayers = new ArrayList<>();
+    static final List<ImageryInfo> allDefaultLayers = new ArrayList<>();
     /** List of all layer ids of available default layers (including mirrors) */
-    private static final Map<String, ImageryInfo> defaultLayerIds = new HashMap<>();
+    static final Map<String, ImageryInfo> defaultLayerIds = new HashMap<>();
 
     private static final String[] DEFAULT_LAYER_SITES = {

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

@@ -43 +43 @@
 import org.openstreetmap.josm.data.ViewportData;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
@@ -828 +827 @@
         for (final ImageryLayer i : layerManager.getLayersOfType(ImageryLayer.class)) {
             if (i.isVisible()) {
-                layerInfo.add(ImageryInfo.ImageryType.BING.equals(i.getInfo().getImageryType()) ? "Bing" : i.getName());
+                layerInfo.add(i.getInfo().getSourceName());
             }
         }