BufferedImage containing the decoded contents of the input, or null.
* @throws java.net.MalformedURLException if the URI could not be converted to a URL
* @throws IOException if an error occurs during reading.
*/
- public static BufferedImage readImage(URI url) throws IOException {
- return imageAdapter.read(url.toURL(), false, false);
+ public static BufferedImage readImage(URI uri) throws IOException {
+ return imageAdapter.read(uri.toURL(), false, false);
}
/**
@@ -270,11 +270,12 @@ public final class FeatureAdapter {
}
/**
- * Get settings value for a certain key and provide a default value.
+ * Get the integer settings value for a certain key and provide a default value.
* @param key the identifier for the setting
* @param def the default value. For each call of get() with a given key, the
- * default value must be the same. {@code def} may be null.
+ * default value must be the same.
* @return the corresponding value if the property has been set before, {@code def} otherwise
+ * @throws NumberFormatException if the value that has been set is not an integer
*/
public static int getIntSetting(String key, int def) {
return Integer.parseInt(settingsAdapter.get(key, Integer.toString(def)));
@@ -294,6 +295,13 @@ public final class FeatureAdapter {
* Default API key support that relies on system property named {@code null if it is not visible and checkOutside is set to true
*/
public Integer getLatOffset(double lat, double lon, double offset, boolean checkOutside) {
Point p = tileSource.latLonToXY(lat + offset, lon, zoom);
@@ -491,19 +475,18 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
}
/**
- * Calculates the position on the map of a given coordinate
+ * Calculates the radius of a map marker on the map.
*
* @param marker MapMarker object that define the x,y coordinate
- * @param p coordinate
- * @return Integer the radius in pixels
+ * @param p position of the marker on the map
+ * @return the radius in pixels, or null if it cannot be determined
*/
public Integer getRadius(MapMarker marker, Point p) {
if (marker.getMarkerStyle() == MapMarker.STYLE.FIXED)
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);
- return radius;
+ Integer offset = getLatOffset(marker.getLat(), marker.getLon(), marker.getRadius(), false);
+ return offset == null ? null : (p.y - offset);
} else
return null;
}
@@ -593,7 +576,8 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
} else {
iMove = 0;
}
- } // calculate the visibility borders
+ }
+ // calculate the visibility borders
int xMin = -tilesize;
int yMin = -tilesize;
int xMax = getWidth();
@@ -617,7 +601,7 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
Tile tile;
if (scrollWrapEnabled) {
// in case tilex is out of bounds, grab the tile to use for wrapping
- int tilexWrap = ((tilex % gridLength) + gridLength) % gridLength;
+ int tilexWrap = Math.floorMod(tilex, gridLength);
tile = tileController.getTile(tilexWrap, tiley, zoom);
} else {
tile = tileController.getTile(tilex, tiley, zoom);
@@ -630,13 +614,13 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
}
painted = true;
}
- Point p = move[iMove];
+ Point p = MOVE[iMove];
posx += p.x * tilesize;
posy += p.y * tilesize;
tilex += p.x;
tiley += p.y;
}
- iMove = (iMove + 1) % move.length;
+ iMove = (iMove + 1) % MOVE.length;
}
}
// outer border of the map
@@ -648,8 +632,6 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
g.drawRect(w2 - center.x, h2 - center.y, mapSize, mapSize);
}
- // g.drawString("Tiles in cache: " + tileCache.getTileCount(), 50, 20);
-
// keep x-coordinates from growing without bound if scroll-wrap is enabled
if (scrollWrapEnabled) {
center.x = center.x % mapSize;
@@ -657,7 +639,7 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
if (mapPolygonsVisible && mapPolygonList != null) {
synchronized (this) {
- for (MapPolygon polygon : mapPolygonList) {
+ for (MapPolygon polygon : snapshot(mapPolygonList)) {
if (polygon.isVisible())
paintPolygon(g, polygon);
}
@@ -666,7 +648,7 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
if (mapRectanglesVisible && mapRectangleList != null) {
synchronized (this) {
- for (MapRectangle rectangle : mapRectangleList) {
+ for (MapRectangle rectangle : snapshot(mapRectangleList)) {
if (rectangle.isVisible())
paintRectangle(g, rectangle);
}
@@ -675,7 +657,7 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
if (mapMarkersVisible && mapMarkerList != null) {
synchronized (this) {
- for (MapMarker marker : mapMarkerList) {
+ for (MapMarker marker : snapshot(mapMarkerList)) {
if (marker.isVisible())
paintMarker(g, marker);
}
@@ -685,6 +667,17 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
attribution.paintAttribution(g, getWidth(), getHeight(), getPosition(0, 0), getPosition(getWidth(), getHeight()), zoom, this);
}
+ /**
+ * Copies a list of map objects, so that it can be iterated while other threads change it.
+ * Copying a {@link Collections#synchronizedList} is atomic, unlike iterating over it.
+ * @param
* Mathematical optimization
*
- * log(u) := log((1.0 + sin(toRadians(aLat))) / (1.0 - sin(toRadians(aLat))
*
- *
- * y = -1 * (radius(aZoomlevel) / 2 * log(u)))) - falseNorthing(aZoomlevel))
- * y = -1 * (getMaxPixel(aZoomlevel) / 2 * PI / 2 * log(u)) - -1 * getMaxPixel(aZoomLevel) / 2
- * y = getMaxPixel(aZoomlevel) / (-4 * PI) * log(u)) + getMaxPixel(aZoomLevel) / 2
- * y = getMaxPixel(aZoomlevel) * ((log(u) / (-4 * PI)) + 1/2)
+ * log(u) := log((1.0 + sin(toRadians(aLat))) / (1.0 - sin(toRadians(aLat))))
+ * y = -1 * (radius(aZoomlevel) / 2 * log(u)) - falseNorthing(aZoomlevel)
+ * y = -1 * (getMaxPixels(aZoomlevel) / (2 * PI) / 2 * log(u)) - -1 * getMaxPixels(aZoomLevel) / 2
+ * y = getMaxPixels(aZoomlevel) / (-4 * PI) * log(u) + getMaxPixels(aZoomLevel) / 2
+ * y = getMaxPixels(aZoomlevel) * ((log(u) / (-4 * PI)) + 1/2)
*
obj based on
- * the fields {@link #xtile}, {@link #ytile} and
- * {@link #zoom}.
- * The {@link #source} field is ignored.
+ * the fields {@link #xtile}, {@link #ytile}, {@link #zoom}
+ * and {@link #source}.
*/
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
- if (obj == null || !this.getClass().equals(obj.getClass()))
+ if (obj == null || !getClass().equals(obj.getClass()))
return false;
final Tile other = (Tile) obj;
return xtile == other.xtile
@@ -344,11 +331,11 @@ public class Tile {
}
public String getStatus() {
- if (this.error)
+ if (error)
return "error";
- if (this.loaded)
+ if (loaded)
return "loaded";
- if (this.loading)
+ if (loading)
return "loading";
return "new";
}
@@ -393,7 +380,7 @@ public class Tile {
}
/**
- * returns the metadata of the Tile
+ * Returns the metadata of the Tile
*
* @param key metadata key that should be returned
* @return null if no such metadata exists, or the value of the metadata
@@ -404,7 +391,6 @@ public class Tile {
}
/**
- *
* @return metadata of the tile
*/
public Mapnull if the tile
- * was not found in the cache.
+ * @return the specified tile, or null if the position is outside of the map
*/
public Tile getTile(int tilex, int tiley, int zoom) {
int max = 1 << zoom;
@@ -37,7 +45,7 @@ public class TileController {
tileCache.addTile(tile);
tile.loadPlaceholderFromCache(tileCache);
}
- if (tile.error) {
+ if (tile.hasError()) {
tile.loadPlaceholderFromCache(tileCache);
}
if (!tile.isLoaded()) {
@@ -76,7 +84,6 @@ public class TileController {
/**
* Removes all jobs from the queue that are currently not being processed.
- *
*/
public void cancelOutstandingJobs() {
tileLoader.cancelOutstandingTasks();
diff --git src/org/openstreetmap/gui/jmapviewer/TileRange.java src/org/openstreetmap/gui/jmapviewer/TileRange.java
index 61c5f29..25b2eca 100644
--- src/org/openstreetmap/gui/jmapviewer/TileRange.java
+++ src/org/openstreetmap/gui/jmapviewer/TileRange.java
@@ -41,18 +41,17 @@ public class TileRange {
}
protected double tilesSpanned() {
- return Math.sqrt(1.0 * this.size());
+ return Math.sqrt(size());
}
/**
- * Returns size
- * @return size
- * @throws ArithmeticException – if the result overflows an int (see {@link Math#multiplyExact(int, int)})
+ * Returns the number of tiles in this range.
+ * @return the number of tiles
+ * @throws ArithmeticException if the result overflows an int (see {@link Math#multiplyExact(int, int)})
*/
- public int size() throws ArithmeticException {
+ public int size() {
int xSpan = maxX - minX + 1;
int ySpan = maxY - minY + 1;
return Math.multiplyExact(xSpan, ySpan);
}
}
-
diff --git src/org/openstreetmap/gui/jmapviewer/TileXY.java src/org/openstreetmap/gui/jmapviewer/TileXY.java
index ca671cc..733d125 100644
--- src/org/openstreetmap/gui/jmapviewer/TileXY.java
+++ src/org/openstreetmap/gui/jmapviewer/TileXY.java
@@ -2,8 +2,9 @@
package org.openstreetmap.gui.jmapviewer;
/**
- * @author w
+ * Tile coordinates at a zoom level. They are fractional for points inside a tile.
*
+ * @author w
*/
public class TileXY {
/**
@@ -17,7 +18,7 @@ public class TileXY {
private final double y;
/**
- * Returns an instance of coordinates.
+ * Constructs a new {@code TileXY}.
*
* @param x number of the tile
* @param y number of the tile
@@ -28,17 +29,17 @@ public class TileXY {
}
/**
- * @return x index of the tile as integer
+ * @return x index of the tile as integer, rounded towards zero
*/
public int getXIndex() {
- return x < 0 ? (int) Math.ceil(x) : (int) Math.floor(x);
+ return (int) x;
}
/**
- * @return y index of the tile as integer
+ * @return y index of the tile as integer, rounded towards zero
*/
public int getYIndex() {
- return y < 0 ? (int) Math.ceil(y) : (int) Math.floor(y);
+ return (int) y;
}
/**
diff --git src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeEditor.java src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeEditor.java
index c12645a..f2d908f 100644
--- src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeEditor.java
+++ src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeEditor.java
@@ -19,7 +19,7 @@ import javax.swing.tree.TreePath;
* @author galo
*/
public class CheckBoxNodeEditor extends AbstractCellEditor implements TreeCellEditor {
- /** SerialVersionUID */
+ // Java 14: annotate with @Serial
private static final long serialVersionUID = -8921320784224636657L;
private final CheckBoxNodeRenderer renderer = new CheckBoxNodeRenderer();
@@ -32,25 +32,8 @@ public class CheckBoxNodeEditor extends AbstractCellEditor implements TreeCellEd
@Override
public Object getCellEditorValue() {
- final CheckBoxNodePanel panel = renderer.getPanel();
- /*final CheckBoxNodeData checkBoxNode =
- new CheckBoxNodeData(panel.label.getText(), panel.check.isSelected());
- return checkBoxNode;
- CheckBoxNodeData data = search(theTree.rootNode(), panel.label.getText());
- data.setSelected(panel.check.isSelected());*/
- return panel.getData();
+ return renderer.getPanel().getData();
}
- /*public CheckBoxNodeData search(DefaultMutableTreeNode node, String name){
- CheckBoxNodeData data = CheckBoxTree.data(node);
- if(data.getText().equals(name)) return data;
- else{
- data = null;
- for(int i=0; ig
*
* @param g graphics structure for painting
- * @param topLeft lop left edge of painting region
+ * @param topLeft top left edge of painting region
* @param bottomRight bottom right edge of painting region
*/
void paint(Graphics g, Point topLeft, Point bottomRight);
diff --git src/org/openstreetmap/gui/jmapviewer/interfaces/TemplatedTileSource.java src/org/openstreetmap/gui/jmapviewer/interfaces/TemplatedTileSource.java
index 1037c9f..b405972 100644
--- src/org/openstreetmap/gui/jmapviewer/interfaces/TemplatedTileSource.java
+++ src/org/openstreetmap/gui/jmapviewer/interfaces/TemplatedTileSource.java
@@ -4,14 +4,13 @@ package org.openstreetmap.gui.jmapviewer.interfaces;
import java.util.Map;
/**
- * Interface for template tile sources, @see TemplatedTMSTileSource
+ * Interface for template tile sources, see {@link org.openstreetmap.gui.jmapviewer.tilesources.TemplatedTMSTileSource}.
*
* @author Wiktor Niesiobędzki
* @since 1.10
*/
public interface TemplatedTileSource extends TileSource {
/**
- *
* @return headers to be sent with http requests
*/
MapThis package and all sub-packages are belonging to the Java -component JMapViewer +
This package and all its sub-packages belong to the Java +component JMapViewer.
-JMapViewer is designed to run as stand-alone component without +
JMapViewer is designed to run as a stand-alone component without any further requirements. Therefore please do not add any code that -depends on other libraries or applications. Only functions and methods -provided by the runtime library of Java 8 should be used.
+depends on other libraries or applications. Only the Java 11 modules +java.desktop and java.logging should be used.
diff --git src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java
index 49976f3..9230046 100644
--- src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java
+++ src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java
@@ -23,7 +23,7 @@ public abstract class AbstractOsmTileSource extends TMSTileSource {
* @param id unique id for the tile source; contains only characters that
* are safe for file names; can be null
*/
- public AbstractOsmTileSource(String name, String baseUrl, String id) {
+ protected AbstractOsmTileSource(String name, String baseUrl, String id) {
super(new TileSourceInfo(name, baseUrl, id));
}
diff --git src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java
index 89dd0d8..5626e68 100644
--- src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java
+++ src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java
@@ -19,7 +19,6 @@ import org.openstreetmap.gui.jmapviewer.OsmMercator;
* Class generalizing all tile based tile sources
*
* @author Wiktor Niesiobędzki
- *
*/
public abstract class AbstractTMSTileSource extends AbstractTileSource {
@@ -56,7 +55,7 @@ public abstract class AbstractTMSTileSource extends AbstractTileSource {
*/
@Override
public int getDefaultTileSize() {
- return OsmMercator.DEFAUL_TILE_SIZE;
+ return OsmMercator.DEFAULT_TILE_SIZE;
}
@Override
@@ -92,9 +91,8 @@ public abstract class AbstractTMSTileSource extends AbstractTileSource {
* @param tilex tile number in x axis
* @param tiley tile number in y axis
* @return String containing path part of URL of the tile
- * @throws IOException when subclass cannot return the tile URL
*/
- public String getTilePath(int zoom, int tilex, int tiley) throws IOException {
+ public String getTilePath(int zoom, int tilex, int tiley) {
return "/" + zoom + "/" + tilex + "/" + tiley + "." + getExtension();
}
@@ -107,7 +105,7 @@ public abstract class AbstractTMSTileSource extends AbstractTileSource {
@Override
public String getTileUrl(int zoom, int tilex, int tiley) throws IOException {
- return this.getBaseUrl() + getTilePath(zoom, tilex, tiley);
+ return getBaseUrl() + getTilePath(zoom, tilex, tiley);
}
@Override
@@ -115,9 +113,6 @@ public abstract class AbstractTMSTileSource extends AbstractTileSource {
return getName();
}
- /*
- * Most tilesources use OsmMercator projection.
- */
@Override
public int getTileSize() {
if (tileSize <= 0) {
@@ -168,22 +163,13 @@ public abstract class AbstractTMSTileSource extends AbstractTileSource {
try {
md = MessageDigest.getInstance(searchEntry.getKey());
} catch (NoSuchAlgorithmException e) {
- FeatureAdapter.getLogger(this.getClass()).log(Level.FINER, searchEntry.getKey() + " algorithm was not found", e);
- break;
- }
- byte[] byteDigest = md.digest(content);
- final int len = byteDigest.length;
-
- char[] hexChars = new char[len * 2];
- int j = 0;
- for (final int v : byteDigest) {
- int vn = (v & 0xf0) >> 4;
- hexChars[j++] = (char) (vn + (vn >= 10 ? ('a' - 10) : '0'));
- vn = (v & 0xf);
- hexChars[j++] = (char) (vn + (vn >= 10 ? ('a' - 10) : '0'));
+ FeatureAdapter.getLogger(getClass()).log(Level.FINER, searchEntry.getKey() + " algorithm was not found", e);
+ // the checksums of the other algorithms can still match
+ continue;
}
+ String digest = toHex(md.digest(content));
for (String val: searchEntry.getValue()) {
- if (new String(hexChars).equalsIgnoreCase(val)) {
+ if (digest.equalsIgnoreCase(val)) {
return true;
}
}
@@ -210,7 +196,7 @@ public abstract class AbstractTMSTileSource extends AbstractTileSource {
@Override
public String getTileId(int zoom, int tilex, int tiley) {
- return this.baseUrl + "/" + zoom + "/" + tilex + "/" + tiley;
+ return baseUrl + "/" + zoom + "/" + tilex + "/" + tiley;
}
@Override
@@ -218,6 +204,22 @@ public abstract class AbstractTMSTileSource extends AbstractTileSource {
return modTileFeatures;
}
+ /**
+ * Encodes bytes as lower case hexadecimal digits.
+ * @param bytes the bytes to encode
+ * @return two hexadecimal digits per byte
+ */
+ // Java 17: replace with java.util.HexFormat.of().formatHex(bytes)
+ private static String toHex(byte[] bytes) {
+ char[] hexChars = new char[bytes.length * 2];
+ int j = 0;
+ for (byte b : bytes) {
+ hexChars[j++] = Character.forDigit((b >> 4) & 0xf, 16);
+ hexChars[j++] = Character.forDigit(b & 0xf, 16);
+ }
+ return new String(hexChars);
+ }
+
private static int getTileMax(int zoom) {
return (int) Math.pow(2.0, zoom) - 1;
}
diff --git src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTileSource.java src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTileSource.java
index 6a93554..d9502c2 100644
--- src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTileSource.java
+++ src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTileSource.java
@@ -8,6 +8,9 @@ import java.util.Map;
import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
+/**
+ * Base class for tile sources, which holds the attribution.
+ */
public abstract class AbstractTileSource implements TileSource {
protected String attributionText;
@@ -17,6 +20,13 @@ public abstract class AbstractTileSource implements TileSource {
protected String termsOfUseText;
protected String termsOfUseURL;
+ /**
+ * Constructs a new {@code AbstractTileSource}.
+ */
+ protected AbstractTileSource() {
+ // Nothing to do
+ }
+
@Override
public boolean requiresAttribution() {
return attributionText != null || attributionLinkURL != null || attributionImage != null
diff --git src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
index 21ba10f..a89eb79 100644
--- src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
+++ src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
@@ -3,6 +3,7 @@ package org.openstreetmap.gui.jmapviewer.tilesources;
import java.awt.Image;
import java.io.IOException;
+import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -17,7 +18,6 @@ import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.xml.XMLConstants;
@@ -65,10 +65,6 @@ public class BingAerialTileSource extends TMSTileSource {
/** Original Bing API key created by Potlatch2 developers in 2010 */
private static final String API_KEY = "Arzdiw4nlOJzRwOz__qailc8NiR31Tt51dN2D7cm57NrnceZnCpgOkmJhNpGoppU";
- private static final Pattern PATTERN_SUBDOMAIN = Pattern.compile("\\{subdomain}");
- private static final Pattern PATTERN_QUADKEY = Pattern.compile("\\{quadkey}");
- private static final Pattern PATTERN_CULTURE = Pattern.compile("\\{culture}");
-
private volatile Future* The longitude calculation is the same as in OsmMercator, - * we inherit it from AbstractTMSTileSource. - * - * TODO: correct getDistance() method. + * we inherit it from TMSTileSource. + *
+ * Note that {@link #getDistance(double, double, double, double)} is inherited as well, so it still
+ * assumes a sphere.
*/
public class ScanexTileSource extends TMSTileSource {
private static final String DEFAULT_URL = "https://maps.kosmosnimki.ru";
@@ -28,9 +29,12 @@ public class ScanexTileSource extends TMSTileSource {
private static final String API_KEY = "4018C5A9AECAD8868ED5DEB2E41D09F7";
// Latitude to Y and back calculations.
- private static final double RADIUS_E = 6_378_137; /* 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 */
+ /** radius of Earth at equator, m */
+ private static final double RADIUS_E = 6_378_137;
+ /** equator length, m */
+ private static final double EQUATOR = 40075016.68557849;
+ /** eccentricity of Earth's ellipsoid */
+ private static final double E = 0.0818191908426;
private enum ScanexLayer {
IRS("irs", "/TileSender.ashx?ModeKey=tile&MapName=F7B8CF651682420FA1749D894C8AD0F6&LayerName=BAC78D764F0443BD9AF93E7A998C9F5B");
@@ -74,21 +78,21 @@ public class ScanexTileSource extends TMSTileSource {
* thus is extraneous. But let it be there just in case if
* OsmMercator changes.
*/
- this.tileSize = 256;
+ tileSize = 256;
for (ScanexLayer slayer : ScanexLayer.values()) {
if (url.equalsIgnoreCase(slayer.getName())) {
- this.layer = slayer;
+ layer = slayer;
// Override baseUrl and maxZoom in base class.
- this.baseUrl = DEFAULT_URL;
+ baseUrl = DEFAULT_URL;
if (maxZoom == 0)
- this.maxZoom = DEFAULT_MAXZOOM;
+ maxZoom = DEFAULT_MAXZOOM;
return;
}
}
- /* If not "irs" or "spot" keyword, then a custom URL. */
- TemplatedTMSTileSource.checkUrl(info.getUrl());
- this.templateSource = new TemplatedTMSTileSource(info);
+ // If not the "irs" keyword, then a custom URL.
+ TemplatedTMSTileSource.checkUrl(url);
+ templateSource = new TemplatedTMSTileSource(info);
}
@Override
@@ -96,12 +100,12 @@ public class ScanexTileSource extends TMSTileSource {
return "jpeg";
}
- @Override
+ @Override
public String getTileUrl(int zoom, int tilex, int tiley) {
- if (this.templateSource != null)
- return this.templateSource.getTileUrl(zoom, tilex, tiley);
+ if (templateSource != null)
+ return templateSource.getTileUrl(zoom, tilex, tiley);
else
- return this.getBaseUrl() + getTilePath(zoom, tilex, tiley);
+ return getBaseUrl() + getTilePath(zoom, tilex, tiley);
}
@Override
@@ -111,7 +115,7 @@ public class ScanexTileSource extends TMSTileSource {
tilex = tilex - tmp;
tiley = tmp - tiley - 1;
- return this.layer.getUri() + "&apikey=" + API_KEY + "&x=" + tilex + "&y=" + tiley + "&z=" + zoom;
+ return layer.getUri() + "&apikey=" + API_KEY + "&x=" + tilex + "&y=" + tiley + "&z=" + zoom;
}
@Override
@@ -153,7 +157,7 @@ public class ScanexTileSource extends TMSTileSource {
return (EQUATOR/2 - (RADIUS_E * Math.log(tmp/pow))) * Math.pow(2.0, zoom) / EQUATOR;
}
- /*
+ /**
* To solve inverse formula latitude = f(y) we use
* Newton's method. We cache previous calculated latitude,
* because new one is usually close to the old one. In case
@@ -166,9 +170,8 @@ public class ScanexTileSource extends TMSTileSource {
lat0 = lat;
lat = lat - Math.toDegrees(nextTerm(Math.toRadians(lat), y, zoom));
if (lat > OsmMercator.MAX_LAT || lat < OsmMercator.MIN_LAT) {
- Random r = new Random();
lat = OsmMercator.MIN_LAT +
- r.nextInt((int) (OsmMercator.MAX_LAT - OsmMercator.MIN_LAT));
+ ThreadLocalRandom.current().nextInt((int) (OsmMercator.MAX_LAT - OsmMercator.MIN_LAT));
}
} while (Math.abs(lat0 - lat) > 0.000001);
@@ -177,13 +180,13 @@ public class ScanexTileSource extends TMSTileSource {
return lat;
}
- /* Next term in Newton's polynomial */
+ /** Next term in Newton's polynomial */
private static double nextTerm(double lat, double y, int zoom) {
double sinl = Math.sin(lat);
double cosl = Math.cos(lat);
- zoom = (int) Math.pow(2.0, zoom - 1d);
- double ec = Math.exp((1 - y/zoom)*Math.PI);
+ int halfTiles = (int) Math.pow(2.0, zoom - 1d);
+ double ec = Math.exp((1 - y/halfTiles)*Math.PI);
double f = Math.tan(Math.PI/4+lat/2) -
ec * Math.pow(Math.tan(Math.PI/4 + Math.asin(E * sinl)/2), E);
diff --git src/org/openstreetmap/gui/jmapviewer/tilesources/TMSTileSource.java src/org/openstreetmap/gui/jmapviewer/tilesources/TMSTileSource.java
index 09645d7..eb7fa99 100644
--- src/org/openstreetmap/gui/jmapviewer/tilesources/TMSTileSource.java
+++ src/org/openstreetmap/gui/jmapviewer/tilesources/TMSTileSource.java
@@ -17,6 +17,9 @@ import org.openstreetmap.gui.jmapviewer.interfaces.IProjected;
*/
public class TMSTileSource extends AbstractTMSTileSource {
+ /** Length of the equator in the projected coordinates, in meters */
+ private static final double MERCATOR_WIDTH = 2 * Math.PI * OsmMercator.EARTH_RADIUS;
+
protected int maxZoom;
protected int minZoom;
protected OsmMercator osmMercator;
@@ -25,11 +28,12 @@ public class TMSTileSource extends AbstractTMSTileSource {
* Constructs a new {@code TMSTileSource}.
* @param info tile source information
*/
+ @SuppressWarnings("this-escape")
public TMSTileSource(TileSourceInfo info) {
super(info);
minZoom = info.getMinZoom();
maxZoom = info.getMaxZoom();
- this.osmMercator = new OsmMercator(this.getTileSize());
+ osmMercator = new OsmMercator(getTileSize());
}
@Override
@@ -81,16 +85,14 @@ public class TMSTileSource extends AbstractTMSTileSource {
@Override
public IProjected tileXYtoProjected(int x, int y, int zoom) {
- double mercatorWidth = 2 * Math.PI * OsmMercator.EARTH_RADIUS;
- double f = mercatorWidth * getTileSize() / osmMercator.getMaxPixels(zoom);
- return new Projected(f * x - mercatorWidth / 2, -(f * y - mercatorWidth / 2));
+ double f = MERCATOR_WIDTH * getTileSize() / osmMercator.getMaxPixels(zoom);
+ return new Projected(f * x - MERCATOR_WIDTH / 2, -(f * y - MERCATOR_WIDTH / 2));
}
@Override
public TileXY projectedToTileXY(IProjected p, int zoom) {
- double mercatorWidth = 2 * Math.PI * OsmMercator.EARTH_RADIUS;
- double f = mercatorWidth * getTileSize() / osmMercator.getMaxPixels(zoom);
- return new TileXY((p.getEast() + mercatorWidth / 2) / f, (-p.getNorth() + mercatorWidth / 2) / f);
+ double f = MERCATOR_WIDTH * getTileSize() / osmMercator.getMaxPixels(zoom);
+ return new TileXY((p.getEast() + MERCATOR_WIDTH / 2) / f, (-p.getNorth() + MERCATOR_WIDTH / 2) / f);
}
@Override
diff --git src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
index b64f131..b8337c4 100644
--- src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
+++ src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
@@ -2,10 +2,10 @@
package org.openstreetmap.gui.jmapviewer.tilesources;
import java.io.IOException;
-import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
-import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
import java.util.function.BiConsumer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -49,20 +49,18 @@ public class TemplatedTMSTileSource extends TMSTileSource implements TemplatedTi
private static final Pattern PATTERN_SWITCH = Pattern.compile("\\{switch:([^}]+)}");
private static final Pattern PATTERN_HEADER = Pattern.compile("\\{header\\(([^,]+),([^}]+)\\)}");
private static final Pattern PATTERN_API_KEY = Pattern.compile("\\{apikey}");
- private static final Pattern PATTERN_PARAM = Pattern.compile("\\{((?:\\d+-)?z(?:oom)?(:?[+-]\\d+)?|x|y|!y|-y|quad|switch:([^}]+))}");
-
+ private static final Pattern PATTERN_PARAM = Pattern.compile("\\{((?:\\d+-)?z(?:oom)?(?:[+-]\\d+)?|x|y|!y|-y|quad|switch:([^}]+))}");
+ private static final Pattern PATTERN_ANY = Pattern.compile("\\{[^}]*}");
// CHECKSTYLE.ON: SingleSpaceSeparator
- private static final Pattern[] ALL_PATTERNS = {
+ private static final List