[jmapviewer] 01/04: Imported Upstream version 1.14+dfsg
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Dec 31 14:49:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository jmapviewer.
commit a6a8413821b0917924eca48a86acc4cee5f421ec
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Dec 31 13:33:38 2015 +0100
Imported Upstream version 1.14+dfsg
---
build.xml | 2 +-
.../gui/jmapviewer/AttributionSupport.java | 6 ++--
.../openstreetmap/gui/jmapviewer/Coordinate.java | 2 +-
.../gui/jmapviewer/DefaultMapController.java | 2 +-
.../openstreetmap/gui/jmapviewer/JMapViewer.java | 38 +++++++++++-----------
.../gui/jmapviewer/JMapViewerTree.java | 6 ++--
src/org/openstreetmap/gui/jmapviewer/Layer.java | 2 +-
.../openstreetmap/gui/jmapviewer/LayerGroup.java | 2 +-
.../gui/jmapviewer/MapMarkerCircle.java | 10 +++---
.../gui/jmapviewer/MapPolygonImpl.java | 2 +-
.../gui/jmapviewer/MemoryTileCache.java | 2 +-
.../gui/jmapviewer/OsmTileLoader.java | 8 ++---
src/org/openstreetmap/gui/jmapviewer/Tile.java | 8 ++---
.../jmapviewer/checkBoxTree/CheckBoxNodeData.java | 8 ++---
.../checkBoxTree/CheckBoxNodeEditor.java | 2 +-
.../checkBoxTree/CheckBoxNodeRenderer.java | 2 +-
.../gui/jmapviewer/checkBoxTree/CheckBoxTree.java | 2 +-
.../gui/jmapviewer/interfaces/MapMarker.java | 2 +-
.../gui/jmapviewer/interfaces/MapPolygon.java | 2 +-
.../gui/jmapviewer/interfaces/MapRectangle.java | 2 +-
.../tilesources/AbstractMapQuestTileSource.java | 4 +--
.../tilesources/AbstractOsmTileSource.java | 6 ++--
.../tilesources/BingAerialTileSource.java | 7 ++--
.../gui/jmapviewer/tilesources/OsmTileSource.java | 4 +--
.../jmapviewer/tilesources/ScanexTileSource.java | 2 +-
.../gui/jmapviewer/tilesources/TMSTileSource.java | 3 +-
.../tilesources/TemplatedTMSTileSource.java | 4 +--
.../gui/jmapviewer/tilesources/TileSourceInfo.java | 6 ++--
28 files changed, 74 insertions(+), 72 deletions(-)
diff --git a/build.xml b/build.xml
index 75b70c8..a96296e 100644
--- a/build.xml
+++ b/build.xml
@@ -77,7 +77,7 @@
<target name="checkstyle">
<taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
- classpath="tools/checkstyle/checkstyle-6.11.2-all.jar"/>
+ classpath="tools/checkstyle/checkstyle-6.14-all.jar"/>
<checkstyle config="tools/checkstyle/jmapviewer_checks.xml">
<fileset dir="${basedir}/src" includes="**/*.java" />
<formatter type="xml" toFile="checkstyle-jmapviewer.xml"/>
diff --git a/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java b/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java
index c398aa0..15111b9 100644
--- a/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java
+++ b/src/org/openstreetmap/gui/jmapviewer/AttributionSupport.java
@@ -27,9 +27,9 @@ public class AttributionSupport {
public static final Font ATTR_FONT = new Font("Arial", Font.PLAIN, 10);
public static final Font ATTR_LINK_FONT;
- protected Rectangle attrTextBounds = null;
- protected Rectangle attrToUBounds = null;
- protected Rectangle attrImageBounds = null;
+ protected Rectangle attrTextBounds;
+ protected Rectangle attrToUBounds;
+ protected Rectangle attrImageBounds;
static {
HashMap<TextAttribute, Integer> aUnderline = new HashMap<>();
diff --git a/src/org/openstreetmap/gui/jmapviewer/Coordinate.java b/src/org/openstreetmap/gui/jmapviewer/Coordinate.java
index b564726..0acbf76 100644
--- a/src/org/openstreetmap/gui/jmapviewer/Coordinate.java
+++ b/src/org/openstreetmap/gui/jmapviewer/Coordinate.java
@@ -56,7 +56,7 @@ public class Coordinate implements ICoordinate {
@Override
public String toString() {
- return "Coordinate[" + data.y + ", " + data.x + "]";
+ return "Coordinate[" + data.y + ", " + data.x + ']';
}
@Override
diff --git a/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java b/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java
index 495184a..7721045 100644
--- a/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java
+++ b/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java
@@ -25,7 +25,7 @@ MouseWheelListener {
private Point lastDragPoint;
- private boolean isMoving = false;
+ private boolean isMoving;
private boolean movementEnabled = true;
diff --git a/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java b/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
index 8602f33..d537dad 100644
--- a/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
+++ b/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
@@ -43,7 +43,7 @@ import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource;
*/
public class JMapViewer extends JPanel implements TileLoaderListener {
- public static boolean debug = false;
+ public static boolean debug;
/**
* Vectors for clock-wise tile painting
@@ -537,39 +537,39 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
int tilesize = tileSource.getTileSize();
int tilex = center.x / tilesize;
int tiley = center.y / tilesize;
- int off_x = center.x % tilesize;
- int off_y = center.y % tilesize;
+ int offsx = center.x % tilesize;
+ int offsy = center.y % tilesize;
int w2 = getWidth() / 2;
int h2 = getHeight() / 2;
- int posx = w2 - off_x;
- int posy = h2 - off_y;
+ int posx = w2 - offsx;
+ int posy = h2 - offsy;
- int diff_left = off_x;
- int diff_right = tilesize - off_x;
- int diff_top = off_y;
- int diff_bottom = tilesize - off_y;
+ int diffLeft = offsx;
+ int diffRight = tilesize - offsx;
+ int diffTop = offsy;
+ int diffBottom = tilesize - offsy;
- boolean start_left = diff_left < diff_right;
- boolean start_top = diff_top < diff_bottom;
+ boolean startLeft = diffLeft < diffRight;
+ boolean startTop = diffTop < diffBottom;
- if (start_top) {
- if (start_left) {
+ if (startTop) {
+ if (startLeft) {
iMove = 2;
} else {
iMove = 3;
}
} else {
- if (start_left) {
+ if (startLeft) {
iMove = 1;
} else {
iMove = 0;
}
} // calculate the visibility borders
- int x_min = -tilesize;
- int y_min = -tilesize;
- int x_max = getWidth();
- int y_max = getHeight();
+ int xMin = -tilesize;
+ int yMin = -tilesize;
+ int xMax = getWidth();
+ int yMax = getHeight();
// calculate the length of the grid (number of squares per edge)
int gridLength = 1 << zoom;
@@ -584,7 +584,7 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
x++;
}
for (int j = 0; j < x; j++) {
- if (x_min <= posx && posx <= x_max && y_min <= posy && posy <= y_max) {
+ if (xMin <= posx && posx <= xMax && yMin <= posy && posy <= yMax) {
// tile is visible
Tile tile;
if (scrollWrapEnabled) {
diff --git a/src/org/openstreetmap/gui/jmapviewer/JMapViewerTree.java b/src/org/openstreetmap/gui/jmapviewer/JMapViewerTree.java
index 5979957..c7fb93f 100644
--- a/src/org/openstreetmap/gui/jmapviewer/JMapViewerTree.java
+++ b/src/org/openstreetmap/gui/jmapviewer/JMapViewerTree.java
@@ -25,7 +25,7 @@ import org.openstreetmap.gui.jmapviewer.interfaces.MapObject;
* Tree of layers for JMapViewer component
* @author galo
*/
-public class JMapViewerTree extends JPanel{
+public class JMapViewerTree extends JPanel {
/** Serial Version UID */
private static final long serialVersionUID = 3050203054402323972L;
@@ -94,7 +94,7 @@ public class JMapViewerTree extends JPanel{
} else if (layer.isVisibleTexts()) popup.add(menuItemHide);
else popup.add(menuItemShow);
- menuItemShow.addActionListener(new ActionListener(){
+ menuItemShow.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent arg0) {
setVisibleTexts(layer, true);
@@ -102,7 +102,7 @@ public class JMapViewerTree extends JPanel{
map.repaint();
}
});
- menuItemHide.addActionListener(new ActionListener(){
+ menuItemHide.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent arg0) {
setVisibleTexts(layer, false);
diff --git a/src/org/openstreetmap/gui/jmapviewer/Layer.java b/src/org/openstreetmap/gui/jmapviewer/Layer.java
index ede87cb..b31e73a 100644
--- a/src/org/openstreetmap/gui/jmapviewer/Layer.java
+++ b/src/org/openstreetmap/gui/jmapviewer/Layer.java
@@ -5,7 +5,7 @@ import java.util.List;
import org.openstreetmap.gui.jmapviewer.interfaces.MapObject;
-public class Layer extends AbstractLayer{
+public class Layer extends AbstractLayer {
private List<MapObject> elements;
public Layer(String name) {
diff --git a/src/org/openstreetmap/gui/jmapviewer/LayerGroup.java b/src/org/openstreetmap/gui/jmapviewer/LayerGroup.java
index 2fea5a3..170ab1b 100644
--- a/src/org/openstreetmap/gui/jmapviewer/LayerGroup.java
+++ b/src/org/openstreetmap/gui/jmapviewer/LayerGroup.java
@@ -3,7 +3,7 @@ package org.openstreetmap.gui.jmapviewer;
import java.util.List;
-public class LayerGroup extends AbstractLayer{
+public class LayerGroup extends AbstractLayer {
private List<AbstractLayer> layers;
public LayerGroup(String name) {
diff --git a/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java b/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java
index d3a0dbf..b92bdc4 100644
--- a/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java
+++ b/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java
@@ -128,19 +128,19 @@ public class MapMarkerCircle extends MapObjectImpl implements MapMarker {
@Override
public void paint(Graphics g, Point position, int radius) {
- int size_h = radius;
- int size = size_h * 2;
+ int sizeH = radius;
+ int size = sizeH * 2;
if (g instanceof Graphics2D && getBackColor() != null) {
Graphics2D g2 = (Graphics2D) g;
Composite oldComposite = g2.getComposite();
g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
g2.setPaint(getBackColor());
- g.fillOval(position.x - size_h, position.y - size_h, size, size);
+ g.fillOval(position.x - sizeH, position.y - sizeH, size, size);
g2.setComposite(oldComposite);
}
g.setColor(getColor());
- g.drawOval(position.x - size_h, position.y - size_h, size, size);
+ g.drawOval(position.x - sizeH, position.y - sizeH, size, size);
if (getLayer() == null || getLayer().isVisibleTexts()) paintText(g, position);
}
@@ -151,7 +151,7 @@ public class MapMarkerCircle extends MapObjectImpl implements MapMarker {
@Override
public String toString() {
- return "MapMarker at " + getLat() + " " + getLon();
+ return "MapMarker at " + getLat() + ' ' + getLon();
}
@Override
diff --git a/src/org/openstreetmap/gui/jmapviewer/MapPolygonImpl.java b/src/org/openstreetmap/gui/jmapviewer/MapPolygonImpl.java
index d993c2c..971625a 100644
--- a/src/org/openstreetmap/gui/jmapviewer/MapPolygonImpl.java
+++ b/src/org/openstreetmap/gui/jmapviewer/MapPolygonImpl.java
@@ -107,6 +107,6 @@ public class MapPolygonImpl extends MapObjectImpl implements MapPolygon {
@Override
public String toString() {
- return "MapPolygon [points=" + points + "]";
+ return "MapPolygon [points=" + points + ']';
}
}
diff --git a/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java b/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java
index 71b8aa5..bdb2e13 100644
--- a/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java
+++ b/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java
@@ -141,7 +141,7 @@ public class MemoryTileCache implements TileCache {
* @author Jan Peter Stotz
*/
protected static class CacheLinkedListElement {
- protected CacheEntry firstElement = null;
+ protected CacheEntry firstElement;
protected CacheEntry lastElement;
protected int elementCount;
diff --git a/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java b/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java
index 7064be3..3aac681 100644
--- a/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java
+++ b/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java
@@ -26,8 +26,8 @@ public class OsmTileLoader implements TileLoader {
private final class OsmTileJob implements TileJob {
private final Tile tile;
- private InputStream input = null;
- private boolean force = false;
+ private InputStream input;
+ private boolean force;
private OsmTileJob(Tile tile) {
this.tile = tile;
@@ -100,8 +100,8 @@ public class OsmTileLoader implements TileLoader {
*/
public Map<String, String> headers = new HashMap<>();
- public int timeoutConnect = 0;
- public int timeoutRead = 0;
+ public int timeoutConnect;
+ public int timeoutRead;
protected TileLoaderListener listener;
diff --git a/src/org/openstreetmap/gui/jmapviewer/Tile.java b/src/org/openstreetmap/gui/jmapviewer/Tile.java
index b24052d..7233bd7 100644
--- a/src/org/openstreetmap/gui/jmapviewer/Tile.java
+++ b/src/org/openstreetmap/gui/jmapviewer/Tile.java
@@ -40,9 +40,9 @@ public class Tile {
protected int zoom;
protected BufferedImage image;
protected String key;
- protected volatile boolean loaded = false; // field accessed by multiple threads without any monitors, needs to be volatile
- protected volatile boolean loading = false;
- protected volatile boolean error = false;
+ protected volatile boolean loaded; // field accessed by multiple threads without any monitors, needs to be volatile
+ protected volatile boolean loading;
+ protected volatile boolean error;
protected String error_message;
/** TileLoader-specific tile metadata */
@@ -88,7 +88,7 @@ public class Tile {
}
private static class CachedCallable<V> implements Callable<V> {
- private V result = null;
+ private V result;
private Callable<V> callable;
/**
diff --git a/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeData.java b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeData.java
index fac15f1..47e2114 100644
--- a/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeData.java
+++ b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeData.java
@@ -26,7 +26,7 @@ public class CheckBoxNodeData {
}
public Boolean isSelected() {
- return layer.isVisible();
+ return layer.isVisible();
}
public void setSelected(final Boolean newValue) {
@@ -34,7 +34,7 @@ public class CheckBoxNodeData {
}
public String getText() {
- return layer.getName();
+ return layer.getName();
}
public AbstractLayer getAbstractLayer() {
@@ -42,11 +42,11 @@ public class CheckBoxNodeData {
}
public void setAbstractLayer(final AbstractLayer layer) {
- this.layer = layer;
+ this.layer = layer;
}
@Override
public String toString() {
- return getClass().getSimpleName() + "[" + getText() + "/" + isSelected() + "]";
+ return getClass().getSimpleName() + '[' + getText() + '/' + isSelected() + ']';
}
}
diff --git a/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeEditor.java b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeEditor.java
index d1c7f16..3c57ca7 100644
--- a/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeEditor.java
+++ b/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{
+public class CheckBoxNodeEditor extends AbstractCellEditor implements TreeCellEditor {
/** SerialVersionUID */
private static final long serialVersionUID = -8921320784224636657L;
diff --git a/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeRenderer.java b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeRenderer.java
index b534788..dcb7de9 100644
--- a/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeRenderer.java
+++ b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxNodeRenderer.java
@@ -17,7 +17,7 @@ import javax.swing.tree.TreeCellRenderer;
*
* @author galo
*/
-public class CheckBoxNodeRenderer implements TreeCellRenderer{
+public class CheckBoxNodeRenderer implements TreeCellRenderer {
private final CheckBoxNodePanel panel = new CheckBoxNodePanel();
private final DefaultTreeCellRenderer defaultRenderer = new DefaultTreeCellRenderer();
diff --git a/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxTree.java b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxTree.java
index 1a2327d..4736863 100644
--- a/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxTree.java
+++ b/src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxTree.java
@@ -23,7 +23,7 @@ import org.openstreetmap.gui.jmapviewer.LayerGroup;
*
* @author galo
*/
-public class CheckBoxTree extends JTree{
+public class CheckBoxTree extends JTree {
/** Serial Version UID */
private static final long serialVersionUID = 6943401106938034256L;
diff --git a/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java b/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java
index a138b1c..763ecc6 100644
--- a/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java
+++ b/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java
@@ -14,7 +14,7 @@ import org.openstreetmap.gui.jmapviewer.JMapViewer;
* @see JMapViewer#addMapMarker(MapMarker)
* @see JMapViewer#getMapMarkerList()
*/
-public interface MapMarker extends MapObject, ICoordinate{
+public interface MapMarker extends MapObject, ICoordinate {
enum STYLE {
FIXED,
diff --git a/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java b/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java
index a212497..d170521 100644
--- a/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java
+++ b/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java
@@ -11,7 +11,7 @@ import java.util.List;
*
* @author Vincent Privat
*/
-public interface MapPolygon extends MapObject{
+public interface MapPolygon extends MapObject {
/**
* @return Latitude/Longitude of each point of polygon
diff --git a/src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java b/src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java
index e566767..c0a7a46 100644
--- a/src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java
+++ b/src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java
@@ -14,7 +14,7 @@ import org.openstreetmap.gui.jmapviewer.JMapViewer;
* @see JMapViewer#addMapRectangle(MapRectangle)
* @see JMapViewer#getMapRectangleList()
*/
-public interface MapRectangle extends MapObject{
+public interface MapRectangle extends MapObject {
/**
* @return Latitude/Longitude of top left of rectangle
diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractMapQuestTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractMapQuestTileSource.java
index cd2553c..8f45004 100644
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractMapQuestTileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractMapQuestTileSource.java
@@ -30,8 +30,8 @@ public class AbstractMapQuestTileSource extends AbstractOsmTileSource {
private int SERVER_NUM = 1;
- public AbstractMapQuestTileSource(String name, String base_url, String id) {
- super(name, base_url, id);
+ public AbstractMapQuestTileSource(String name, String baseUrl, String id) {
+ super(name, baseUrl, id);
}
@Override
diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java
index 201a3ff..0210515 100644
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java
@@ -19,12 +19,12 @@ public abstract class AbstractOsmTileSource extends AbstractTMSTileSource {
/**
* Constructs a new OSM tile source
* @param name Source name as displayed in GUI
- * @param base_url Source URL
+ * @param baseUrl Source URL
* @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 base_url, String id) {
- super(new TileSourceInfo(name, base_url, id));
+ public AbstractOsmTileSource(String name, String baseUrl, String id) {
+ super(new TileSourceInfo(name, baseUrl, id));
}
@Override
diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
index 83991da..bc704e4 100644
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java
@@ -47,7 +47,7 @@ public class BingAerialTileSource extends AbstractTMSTileSource {
private static final Pattern subdomainPattern = Pattern.compile("\\{subdomain\\}");
private static final Pattern quadkeyPattern = Pattern.compile("\\{quadkey\\}");
private static final Pattern culturePattern = Pattern.compile("\\{culture\\}");
- private String brandLogoUri = null;
+ private String brandLogoUri;
/**
* Constructs a new {@code BingAerialTileSource}.
@@ -89,7 +89,7 @@ public class BingAerialTileSource extends AbstractTMSTileSource {
}
protected URL getAttributionUrl() throws MalformedURLException {
- return new URL("http://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&output=xml&key="
+ return new URL("https://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial?include=ImageryProviders&output=xml&key="
+ API_KEY);
}
@@ -102,6 +102,9 @@ public class BingAerialTileSource extends AbstractTMSTileSource {
XPathFactory xPathFactory = XPathFactory.newInstance();
XPath xpath = xPathFactory.newXPath();
imageUrlTemplate = xpath.compile("//ImageryMetadata/ImageUrl/text()").evaluate(document);
+ imageUrlTemplate = imageUrlTemplate.replace(
+ "http://ecn.{subdomain}.tiles.virtualearth.net/",
+ "https://ecn.{subdomain}.tiles.virtualearth.net/");
imageUrlTemplate = culturePattern.matcher(imageUrlTemplate).replaceAll(Locale.getDefault().toString());
imageryZoomMax = Integer.valueOf(xpath.compile("//ImageryMetadata/ZoomMax/text()").evaluate(document));
diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java
index 0188bad..7c592a0 100644
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java
@@ -15,7 +15,7 @@ public class OsmTileSource {
private static final String[] SERVER = {"a", "b", "c"};
- private int serverNum = 0;
+ private int serverNum;
/**
* Constructs a new {@code "Mapnik"} tile source.
@@ -41,7 +41,7 @@ public class OsmTileSource {
private static final String[] SERVER = {"a", "b", "c"};
- private int serverNum = 0;
+ private int serverNum;
/**
* Constructs a new {@code CycleMap} tile source.
diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java
index e535231..e518dc4 100644
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/ScanexTileSource.java
@@ -55,7 +55,7 @@ public class ScanexTileSource extends TMSTileSource {
private ScanexLayer layer = ScanexLayer.IRS;
/** cached latitude used in {@link #tileYToLat(double, int)} */
- private double cachedLat = 0;
+ private double cachedLat;
/**
* Constructs a new {@code ScanexTileSource}.
diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/TMSTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/TMSTileSource.java
index d224240..590c06d 100644
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/TMSTileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/TMSTileSource.java
@@ -1,11 +1,10 @@
// License: GPL. For details, see Readme.txt file.
package org.openstreetmap.gui.jmapviewer.tilesources;
-
public class TMSTileSource extends AbstractTMSTileSource {
protected int maxZoom;
- protected int minZoom = 0;
+ protected int minZoom;
public TMSTileSource(TileSourceInfo info) {
super(info);
diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
index 6795a68..e85babb 100644
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
@@ -31,8 +31,8 @@ import org.openstreetmap.gui.jmapviewer.interfaces.TemplatedTileSource;
public class TemplatedTMSTileSource extends TMSTileSource implements TemplatedTileSource {
- private Random rand = null;
- private String[] randomParts = null;
+ private Random rand;
+ private String[] randomParts;
private final Map<String, String> headers = new HashMap<>();
private static final String COOKIE_HEADER = "Cookie";
diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java
index 56d70a5..7d2b2d1 100644
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java
+++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java
@@ -42,12 +42,12 @@ public class TileSourceInfo {
* Create a TileSourceInfo class
*
* @param name name
- * @param base_url base URL
+ * @param baseUrl base URL
* @param id unique id
*/
- public TileSourceInfo(String name, String base_url, String id) {
+ public TileSourceInfo(String name, String baseUrl, String id) {
this.name = name;
- this.url = base_url;
+ this.url = baseUrl;
this.id = id;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git
More information about the Pkg-grass-devel
mailing list