diff -Nru trunk_6920/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java trunk/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java
--- trunk_6920/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java 2014-03-22 09:14:46.009450496 +0100
+++ trunk/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java 2014-03-22 10:42:13.571053188 +0100
@@ -11,7 +11,7 @@
public abstract class AbstractOsmTileSource extends AbstractTMSTileSource {
/**
- * The OSM attribution. Must be always in line with http://www.openstreetmap.org/copyright/en
+ * The OSM attribution. Must be always in line with https://www.openstreetmap.org/copyright/en
*/
public static final String DEFAULT_OSM_ATTRIBUTION = "\u00a9 OpenStreetMap contributors";
@@ -40,7 +40,7 @@
@Override
public String getAttributionLinkURL() {
- return "http://openstreetmap.org/";
+ return "https://openstreetmap.org/";
}
@Override
@@ -60,6 +60,6 @@
@Override
public String getTermsOfUseURL() {
- return "http://www.openstreetmap.org/copyright";
+ return "https://www.openstreetmap.org/copyright";
}
}
diff -Nru trunk_6920/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java trunk/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java
--- trunk_6920/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java 2014-03-22 09:14:46.009450496 +0100
+++ trunk/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java 2014-03-22 10:39:53.607052155 +0100
@@ -7,20 +7,33 @@
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() {