Changeset 14495 in josm for trunk/src/org

Timestamp:

2018-12-02T17:37:47+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #17054 - prefer JOSM imagery entry "OpenStreetMap Carto (Standard)" over jmapviewer tile source "Mapnik"

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• bbox/SlippyMapBBoxChooser.java (modified) (4 diffs)
• history/CoordinateInfoViewer.java (modified) (3 diffs)
• preferences/imagery/ImageryPreference.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -13 +13 @@
 import java.awt.geom.Path2D;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -90 +89 @@
         public List<TileSource> getTileSources() {
             if (!TMSLayer.PROP_ADD_TO_SLIPPYMAP_CHOOSER.get()) return Collections.<TileSource>emptyList();
-            List<TileSource> sources = new ArrayList<>();
-            for (ImageryInfo info : this.getImageryInfos()) {
-                try {
-                    TileSource source = TMSLayer.getTileSourceStatic(info);
-                    if (source != null) {
-                        sources.add(source);
-                    }
-                } catch (IllegalArgumentException ex) {
-                    Logging.warn(ex);
-                    if (ex.getMessage() != null && !ex.getMessage().isEmpty()) {
-                        JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
-                                ex.getMessage(), tr("Warning"),
-                                JOptionPane.WARNING_MESSAGE);
-                    }
-                }
+            return imageryInfosToTileSources(getImageryInfos());
+        }
+    }
+
+    /**
+     * TileSource provider for the slippymap chooser - providing default OSM tile source
+     * @since 14495
+     */
+    public static class DefaultOsmTileSourceProvider implements TileSourceProvider {
+
+        protected static final StringProperty DEFAULT_OSM_TILE_URL = new StringProperty(
+                "default.osm.tile.source.url", "https://{switch:a,b,c}.tile.openstreetmap.org/{zoom}/{x}/{y}.png");
+
+        @Override
+        public List<TileSource> getTileSources() {
+            List<TileSource> result = imageryInfosToTileSources(ImageryLayerInfo.instance.getLayers().stream()
+                   .filter(l -> l.getUrl().equals(DEFAULT_OSM_TILE_URL.get())).collect(Collectors.toList()));
+            if (result.isEmpty()) {
+                result.add(new OsmTileSource.Mapnik());
             }
-            return sources;
+            return result;
+        }
+
+        /**
+         * Returns the default OSM tile source.
+         * @return the default OSM tile source
+         */
+        public static TileSource get() {
+            return new DefaultOsmTileSourceProvider().getTileSources().get(0);
         }
     }
@@ -136 +147 @@
     }
 
+    static List<TileSource> imageryInfosToTileSources(List<ImageryInfo> imageryInfos) {
+        List<TileSource> sources = new ArrayList<>();
+        for (ImageryInfo info : imageryInfos) {
+            try {
+                TileSource source = TMSLayer.getTileSourceStatic(info);
+                if (source != null) {
+                    sources.add(source);
+                }
+            } catch (IllegalArgumentException ex) {
+                Logging.warn(ex);
+                if (ex.getMessage() != null && !ex.getMessage().isEmpty()) {
+                    JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
+                            ex.getMessage(), tr("Warning"),
+                            JOptionPane.WARNING_MESSAGE);
+                }
+            }
+        }
+        return sources;
+    }
+
     /**
      * Plugins that wish to add custom tile sources to slippy map choose should call this method
@@ -146 +177 @@
     private static CopyOnWriteArrayList<TileSourceProvider> providers = new CopyOnWriteArrayList<>();
     static {
-        addTileSourceProvider(() -> Arrays.<TileSource>asList(new OsmTileSource.Mapnik()));
+        addTileSourceProvider(new DefaultOsmTileSourceProvider());
         addTileSourceProvider(new TMSTileSourceProvider());
         addTileSourceProvider(new CurrentLayersTileSourceProvider());

trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java

@@ -19 +19 @@
 import org.openstreetmap.gui.jmapviewer.JMapViewer;
 import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
-import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.conversion.DecimalDegreesCoordinateFormat;
@@ -25 +24 @@
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
 import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
@@ -323 +323 @@
         MapViewer(HistoryBrowserModel model) {
             this.updater = new Updater(model, PointInTimeType.REFERENCE_POINT_IN_TIME);
-            setTileSource(new OsmTileSource.Mapnik()); // for attribution
+            setTileSource(SlippyMapBBoxChooser.DefaultOsmTileSourceProvider.get()); // for attribution
             setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY));
             addMouseListener(new MouseAdapter() {

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

@@ -53 +53 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.MapPolygon;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapRectangle;
-import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
@@ -63 +62 @@
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -356 +356 @@
             // Add default item map
             defaultMap = new JMapViewer();
-            defaultMap.setTileSource(new OsmTileSource.Mapnik()); // for attribution
+            defaultMap.setTileSource(SlippyMapBBoxChooser.DefaultOsmTileSourceProvider.get()); // for attribution
             defaultMap.addMouseListener(new MouseAdapter() {
                 @Override