[jmapviewer] 01/04: Imported Upstream version 1.18+dfsg

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository jmapviewer.

commit eff9c9944884f8bceb5f7f9e8abc038f2d1892e3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jul 18 13:28:47 2016 +0200

    Imported Upstream version 1.18+dfsg
---
 src/org/openstreetmap/gui/jmapviewer/Demo.java     |  5 +----
 .../gui/jmapviewer/MemoryTileCache.java            |  5 +++++
 src/org/openstreetmap/gui/jmapviewer/Tile.java     |  7 +++++++
 src/org/openstreetmap/gui/jmapviewer/TileXY.java   | 10 +++++-----
 .../tilesources/MapQuestOpenAerialTileSource.java  | 23 ----------------------
 .../tilesources/MapQuestOsmTileSource.java         | 19 ------------------
 6 files changed, 18 insertions(+), 51 deletions(-)

diff --git a/src/org/openstreetmap/gui/jmapviewer/Demo.java b/src/org/openstreetmap/gui/jmapviewer/Demo.java
index 2f9d7b7..325e51e 100644
--- a/src/org/openstreetmap/gui/jmapviewer/Demo.java
+++ b/src/org/openstreetmap/gui/jmapviewer/Demo.java
@@ -24,8 +24,6 @@ import org.openstreetmap.gui.jmapviewer.interfaces.MapPolygon;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.BingAerialTileSource;
-import org.openstreetmap.gui.jmapviewer.tilesources.MapQuestOpenAerialTileSource;
-import org.openstreetmap.gui.jmapviewer.tilesources.MapQuestOsmTileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource;
 
 /**
@@ -91,8 +89,7 @@ public class Demo extends JFrame implements JMapViewerEventListener {
                 new OsmTileSource.Mapnik(),
                 new OsmTileSource.CycleMap(),
                 new BingAerialTileSource(),
-                new MapQuestOsmTileSource(),
-                new MapQuestOpenAerialTileSource() });
+        });
         tileSourceSelector.addItemListener(new ItemListener() {
             @Override
             public void itemStateChanged(ItemEvent e) {
diff --git a/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java b/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java
index e194a43..2f79953 100644
--- a/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java
+++ b/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java
@@ -131,6 +131,11 @@ public class MemoryTileCache implements TileCache {
         protected CacheEntry(Tile tile) {
             this.tile = tile;
         }
+
+        @Override
+        public String toString() {
+            return tile.toString();
+        }
     }
 
     /**
diff --git a/src/org/openstreetmap/gui/jmapviewer/Tile.java b/src/org/openstreetmap/gui/jmapviewer/Tile.java
index 58343ac..f0c73fc 100644
--- a/src/org/openstreetmap/gui/jmapviewer/Tile.java
+++ b/src/org/openstreetmap/gui/jmapviewer/Tile.java
@@ -227,6 +227,13 @@ public class Tile {
         return zoom;
     }
 
+    /**
+     * @return tile indexes as TileXY object
+     */
+    public TileXY getTileXY() {
+        return new TileXY(xtile, ytile);
+    }
+
     public BufferedImage getImage() {
         return image;
     }
diff --git a/src/org/openstreetmap/gui/jmapviewer/TileXY.java b/src/org/openstreetmap/gui/jmapviewer/TileXY.java
index 15f3a4f..f341999 100644
--- a/src/org/openstreetmap/gui/jmapviewer/TileXY.java
+++ b/src/org/openstreetmap/gui/jmapviewer/TileXY.java
@@ -19,12 +19,12 @@ public class TileXY {
     /**
      * Returns an instance of coordinates.
      *
-     * @param d number of the tile
-     * @param e number of the tile
+     * @param x number of the tile
+     * @param y number of the tile
      */
-    public TileXY(double d, double e) {
-        this.x = d;
-        this.y = e;
+    public TileXY(double x, double y) {
+        this.x = x;
+        this.y = y;
     }
 
     /**
diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOpenAerialTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOpenAerialTileSource.java
deleted file mode 100644
index 0a81665..0000000
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOpenAerialTileSource.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// License: GPL. For details, see Readme.txt file.
-package org.openstreetmap.gui.jmapviewer.tilesources;
-
-import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
-
-public class MapQuestOpenAerialTileSource extends AbstractMapQuestTileSource {
-
-    private static final String PATTERN = "http://oatile%d.mqcdn.com/tiles/1.0.0/sat";
-
-    public MapQuestOpenAerialTileSource() {
-        super("MapQuest Open Aerial", PATTERN, "mapquest-oa");
-    }
-
-    @Override
-    public String getAttributionText(int zoom, ICoordinate topLeft, ICoordinate botRight) {
-        return "Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency - "+MAPQUEST_ATTRIBUTION;
-    }
-
-    @Override
-    public String getAttributionLinkURL() {
-        return MAPQUEST_WEBSITE;
-    }
-}
diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOsmTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOsmTileSource.java
deleted file mode 100644
index 27b34f7..0000000
--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/MapQuestOsmTileSource.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// License: GPL. For details, see Readme.txt file.
-package org.openstreetmap.gui.jmapviewer.tilesources;
-
-import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
-
-public class MapQuestOsmTileSource extends AbstractMapQuestTileSource {
-
-    private static final String PATTERN = "http://otile%d.mqcdn.com/tiles/1.0.0/osm";
-
-    public MapQuestOsmTileSource() {
-        super("MapQuest-OSM", PATTERN, "mapquest-osm");
-    }
-
-    @Override
-    public String getAttributionText(int zoom, ICoordinate topLeft,
-            ICoordinate botRight) {
-        return super.getAttributionText(zoom, topLeft, botRight)+" - "+MAPQUEST_ATTRIBUTION;
-    }
-}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git