Changeset 30336 in osm for applications/viewer/jmapviewer/src/org

Timestamp:

2014-03-22T12:26:52+01:00 (11 years ago)

Author:

donvip

Message:

fix #josm9841 - HTTPS access to OSM tiles

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources

Files:

• AbstractOsmTileSource.java (modified) (3 diffs)
• OsmTileSource.java (modified) (2 diffs)

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

@@ -12 +12 @@
     
     /**
-     * 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";
@@ -41 +41 @@
     @Override
     public String getAttributionLinkURL() {
-        return "http://openstreetmap.org/";
+        return "https://openstreetmap.org/";
     }
 
@@ -61 +61 @@
     @Override
     public String getTermsOfUseURL() {
-        return "http://www.openstreetmap.org/copyright";
+        return "https://www.openstreetmap.org/copyright";
     }
 }

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

@@ -8 +8 @@
 
     /**
-     * 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;
         
         /**
@@ -21 +22 @@
          */
         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;
         }