Ticket #14796: JMapViewer.patch

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

@@ -26 +26 @@
 
     private Point lastDragPoint;
 
-    private boolean isMoving;
+    private boolean isMoving = false;
 
     private boolean movementEnabled = true;
 
-    private int movementMouseButton = MouseEvent.BUTTON3;
-    private int movementMouseButtonMask = MouseEvent.BUTTON3_DOWN_MASK;
+    private int movementMouseButton = MouseEvent.BUTTON1;
+    private int movementMouseButtonMask = MouseEvent.BUTTON1_DOWN_MASK;
 
     private boolean wheelZoomEnabled = true;
     private boolean doubleClickZoomEnabled = true;
@@ -49 +49 @@
         if (!movementEnabled || !isMoving)
             return;
         // Is only the selected mouse button pressed?
-        if ((e.getModifiersEx() & MOUSE_BUTTONS_MASK) == movementMouseButtonMask
+        if ((e.getModifiersEx() & MOUSE_BUTTONS_MASK) == movementMouseButtonMask 
                 || (isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK)) {
             Point p = e.getPoint();
             if (lastDragPoint != null) {

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

@@ -75 +75 @@
         add(helpPanel, BorderLayout.SOUTH);
         panel.add(panelTop, BorderLayout.NORTH);
         panel.add(panelBottom, BorderLayout.SOUTH);
-        JLabel helpLabel = new JLabel("Use right mouse button to move,\n "
+        JLabel helpLabel = new JLabel("Use left mouse button to move,\n "
                 + "left double click or mouse wheel to zoom.");
         helpPanel.add(helpLabel);
         JButton button = new JButton("setDisplayToFitMapMarkers");
@@ -88 +88 @@
         JComboBox<TileSource> tileSourceSelector = new JComboBox<>(new TileSource[] {
                 new OsmTileSource.Mapnik(),
                 new OsmTileSource.CycleMap(),
-                new BingAerialTileSource(),
+                new BingAerialTileSource()
         });
         tileSourceSelector.addItemListener(new ItemListener() {
             @Override

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.ThreadPoolExecutor;
+import java.util.concurrent.*;
 
 import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
@@ -22 +21 @@
  * @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 +178 @@
 
     @Override
     public void cancelOutstandingTasks() {
-        jobDispatcher.getQueue().clear();
+        for (Runnable item : jobDispatcher.getQueue()) {
+            jobDispatcher.remove(item);
+        }
     }
 
     /**

src/org/openstreetmap/gui/jmapviewer/interfaces/TileLoaderListener.java

@@ -6 +6 @@
 /**
  * This listener listens to successful tile loads.
  */
-@FunctionalInterface
+//@FunctionalInterface
 public interface TileLoaderListener {
 
     /**

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

@@ -14 +14 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.regex.Pattern;
 
 import javax.imageio.ImageIO;
@@ -57 +56 @@
      * Constructs a new {@code BingAerialTileSource}.
      */
     public BingAerialTileSource() {
-        super(new TileSourceInfo("Bing", null, null));
+        super(new TileSourceInfo("Bing Aerial Maps", null, null));
     }
 
     /**
@@ -192 +191 @@
     @Override
     public Image getAttributionImage() {
         try {
-            final InputStream imageResource = JMapViewer.class.getResourceAsStream("images/bing_maps.png");
+            final InputStream imageResource = JMapViewer.class.getResourceAsStream("images/bing_maps_logo_white_small.png");
             if (imageResource != null) {
                 return ImageIO.read(imageResource);
             } else {
@@ -239 +238 @@
                     try {
                         InputSource xml = new InputSource(getAttributionUrl().openStream());
                         List<Attribution> r = parseAttributionText(xml);
-                        System.out.println("Successfully loaded Bing attribution data.");
                         return r;
                     } catch (IOException ex) {
                         System.err.println("Could not connect to Bing API. Will retry in " + waitTimeSec + " seconds.");
@@ -263 +261 @@
             }
         }
         try {
-            return attributions.get(0, TimeUnit.MILLISECONDS);
-        } catch (TimeoutException ex) {
-            System.err.println("Bing: attribution data is not yet loaded.");
+            return attributions.get();
         } catch (ExecutionException ex) {
             throw new RuntimeException(ex.getCause());
         } catch (InterruptedException ign) {

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.
  */
@@ -11 +14 @@
      */
     public static class Mapnik extends AbstractOsmTileSource {
 
-        private static final String PATTERN = "https://%s.tile.openstreetmap.org";
+        private static final String PATTERN = "http://%s.tile.openstreetmap.org";
 
         private static final String[] SERVER = {"a", "b", "c"};
 
@@ -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 = "http://%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)));
     }
 
     @Override
     public ICoordinate xyToLatLon(int x, int y, int zoom) {
         return new Coordinate(
-                osmMercator.yToLat(y, zoom),
-                osmMercator.xToLon(x, zoom)
-                );
+            osmMercator.yToLat(y, zoom),
+            osmMercator.xToLon(x, zoom)
+        );
     }
 
     @Override
     public TileXY latLonToTileXY(double lat, double lon, int zoom) {
         return new TileXY(
-                osmMercator.lonToX(lon, zoom) / getTileSize(),
-                osmMercator.latToY(lat, zoom) / getTileSize()
-                );
+            osmMercator.lonToX(lon, zoom) / getTileSize(),
+            osmMercator.latToY(lat, zoom) / getTileSize()
+        );
     }
 
     @Override
     public ICoordinate tileXYToLatLon(int x, int y, int zoom) {
         return new Coordinate(
-                osmMercator.yToLat(y * getTileSize(), zoom),
-                osmMercator.xToLon(x * getTileSize(), zoom)
-                );
+            osmMercator.yToLat(y * getTileSize(), zoom),
+            osmMercator.xToLon(x * getTileSize(), zoom)
+        );
     }
 
     @Override