Ticket #14796: JMapViewer-2.patch

src/org/openstreetmap/gui/jmapviewer/JMapViewer.java

@@ -44 +44 @@
  */
 public class JMapViewer extends JPanel implements TileLoaderListener {
 
+    private static final long serialVersionUID = 1L;
+
     /** whether debug mode is enabled or not */
     public static boolean debug;
 
@@ -502 +504 @@
             return (int) marker.getRadius();
         else if (p != null) {
             Integer radius = getLatOffset(marker.getLat(), marker.getLon(), marker.getRadius(), false);
-            radius = radius == null ? null : p.y - radius.intValue();
+            radius = radius == null ? null : p.y - radius;
             return radius;
         } else
             return null;

src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java

@@ -9 +9 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
@@ -22 +23 @@
  * @author Jan Peter Stotz
  */
 public class OsmTileLoader implements TileLoader {
-    private static final ThreadPoolExecutor jobDispatcher = (ThreadPoolExecutor) Executors.newFixedThreadPool(3);
+    
+    private static final ThreadPoolExecutor jobDispatcher = new ThreadPoolExecutor(8, 24, 30, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(2_000));
 
     private final class OsmTileJob implements TileJob {
         private final Tile tile;
@@ -178 +180 @@
 
     @Override
     public void cancelOutstandingTasks() {
-        jobDispatcher.getQueue().clear();
+        for (Runnable item : jobDispatcher.getQueue()) {
+            jobDispatcher.remove(item);
+        }
     }
 
     /**

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

@@ -263 +263 @@
             }
         }
         try {
-            return attributions.get(0, TimeUnit.MILLISECONDS);
+            return attributions.get(1500, TimeUnit.MILLISECONDS);
         } catch (TimeoutException ex) {
             System.err.println("Bing: attribution data is not yet loaded.");
         } catch (ExecutionException ex) {

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

@@ -1 +1 @@
 // License: GPL. For details, see Readme.txt file.
 package org.openstreetmap.gui.jmapviewer.tilesources;
 
+import java.io.IOException;
+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
+
 /**
  * OSM Tile source.
  */
@@ -37 +40 @@
      */
     public static class CycleMap extends AbstractOsmTileSource {
 
-        private static final String PATTERN = "http://%s.tile.opencyclemap.org/cycle";
+        private static final String API_KEY = "API_KEY";
 
-        private static final String[] SERVER = {"a", "b", "c"};
+        private static final String PATTERN = "https://%s.tile.thunderforest.com/cycle";
 
+        private static final String[] SERVER = { "a", "b", "c" };
+
         private int serverNum;
 
         /**
@@ -47 +52 @@
          * Constructs a new {@code CycleMap} tile source.
          */
         public CycleMap() {
-            super("Cyclemap", PATTERN, "opencyclemap");
+            super("OSM Cycle Map", PATTERN, "opencyclemap");
         }
 
         @Override
@@ -61 +66 @@
         public int getMaxZoom() {
             return 18;
         }
+
+        @Override
+        public String getTileUrl(int zoom, int tilex, int tiley) throws IOException {
+            return this.getBaseUrl() + getTilePath(zoom, tilex, tiley); // + "?apikey=" + API_KEY;
+        }
+
+        @Override
+        public String getAttributionText(int zoom, ICoordinate topLeft, ICoordinate botRight) {
+            return "Maps © Thunderforest, Data © OpenStreetMap contributors";
+        }
+
+        @Override
+        public String getAttributionLinkURL() {
+            return "http://www.thunderforest.com/";
+        }
     }
+
 }

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

@@ -116 +116 @@
     @Override
     public Point latLonToXY(double lat, double lon, int zoom) {
         return new Point(
-                (int) osmMercator.lonToX(lon, zoom),
-                (int) latToTileY(lat, zoom)
+                (int) Math.round(osmMercator.lonToX(lon, zoom)),
+                (int) Math.round(latToTileY(lat, zoom))
                 );
     }
 

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

@@ -50 +50 @@
     @Override
     public Point latLonToXY(double lat, double lon, int zoom) {
         return new Point(
-                (int) osmMercator.lonToX(lon, zoom),
-                (int) osmMercator.latToY(lat, zoom)
+                (int) Math.round(osmMercator.lonToX(lon, zoom)),
+                (int) Math.round(osmMercator.latToY(lat, zoom))
                 );
     }