Ticket #9841: https.patch

src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java

@@ -11 +11 @@
 public abstract class AbstractOsmTileSource extends AbstractTMSTileSource {
     
     /**
-     * The OSM attribution. Must be always in line with <a href="http://www.openstreetmap.org/copyright/en">http://www.openstreetmap.org/copyright/en</a>
+     * The OSM attribution. Must be always in line with <a href="https://www.openstreetmap.org/copyright/en">https://www.openstreetmap.org/copyright/en</a>
      */
     public static final String DEFAULT_OSM_ATTRIBUTION = "\u00a9 OpenStreetMap contributors";
     
@@ -40 +40 @@
 
     @Override
     public String getAttributionLinkURL() {
-        return "http://openstreetmap.org/";
+        return "https://openstreetmap.org/";
     }
 
     @Override
@@ -60 +60 @@
 
     @Override
     public String getTermsOfUseURL() {
-        return "http://www.openstreetmap.org/copyright";
+        return "https://www.openstreetmap.org/copyright";
     }
 }

src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java

@@ -7 +7 @@
 public class OsmTileSource {
 
     /**
-     * The default "Mapnik" OSM tile source URL
-     */
-    public static final String MAP_MAPNIK = "http://tile.openstreetmap.org";
-
-    /**
      * The default "Mapnik" OSM tile source.
      */
     public static class Mapnik extends AbstractOsmTileSource {
+
+        private static final String PATTERN = "https://%s.tile.openstreetmap.org";
+
+        private static final String[] SERVER = { "a", "b", "c" };
+
+        private int SERVER_NUM = 0;
         
         /**
          * Constructs a new {@code "Mapnik"} tile source.
          */
         public Mapnik() {
-            super("Mapnik", MAP_MAPNIK);
+            super("Mapnik", PATTERN);
+        }
+
+        @Override
+        public String getBaseUrl() {
+            String url = String.format(this.baseUrl, new Object[] { SERVER[SERVER_NUM] });
+            SERVER_NUM = (SERVER_NUM + 1) % SERVER.length;
+            return url;
+        }
+
+        @Override
+        public int getMaxZoom() {
+            return 19;
         }
 
         public TileUpdate getTileUpdate() {