Changeset 33313 in osm

Timestamp:

2017-05-16T19:00:23+02:00 (7 years ago)

Author:

bastik

Message:

see #josm14796 - various improvements for JMapViewer (patch by Chris Tipper)

Location:

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

Files:

• JMapViewer.java (modified) (2 diffs)
• tilesources/OsmTileSource.java (modified) (2 diffs)
• tilesources/ScanexTileSource.java (modified) (1 diff)
• tilesources/TMSTileSource.java (modified) (1 diff)

applications/viewer/jmapviewer/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 */
@@ -503 +505 @@
         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

applications/viewer/jmapviewer/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;
 
 /**
@@ -63 +67 @@
         }
     }
+
+    /**
+     * The "Transport Map" OSM tile source.
+     *
+     * Template for thunderforest.com
+     */
+    public static class TransportMap extends AbstractOsmTileSource {
+
+        private static final String API_KEY = "API_KEY_HERE";
+
+        private static final String PATTERN = "https://%s.tile.thunderforest.com/transport";
+
+        private static final String[] SERVER = { "a", "b", "c" };
+
+        private int serverNum;
+
+        /**
+         * Constructs a new {@code TransportMap} tile source.
+         */
+        public TransportMap() {
+            super("OSM Transport Map", PATTERN, "osmtransportmap");
+        }
+
+        @Override
+        public String getBaseUrl() {
+            String url = String.format(this.baseUrl, new Object[] {SERVER[serverNum]});
+            serverNum = (serverNum + 1) % SERVER.length;
+            return url;
+        }
+
+        @Override
+        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/";
+        }
+    }
+
 }

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

@@ -110 +110 @@
 
     // Latitude to Y and back calculations.
-    private static double RADIUS_E = 6378137;   /* radius of Earth at equator, m */
-    private static double EQUATOR = 40075016.68557849; /* equator length, m */
-    private static double E = 0.0818191908426;  /* eccentricity of Earth's ellipsoid */
+    private static final double RADIUS_E = 6378137;   /* radius of Earth at equator, m */
+    private static final double EQUATOR = 40075016.68557849; /* equator length, m */
+    private static final double E = 0.0818191908426;  /* eccentricity of Earth's ellipsoid */
 
     @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))
                 );
     }

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

@@ -51 +51 @@
     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))
                 );
     }