[jmapviewer] 04/06: Merge tag 'upstream/1.05+dfsg'

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository jmapviewer.

commit 8c3ffe9baa24912664ed01614204f9079f516634
Merge: 113b137 e97508c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Dec 29 21:37:04 2014 +0100

    Merge tag 'upstream/1.05+dfsg'
    
    Upstream version 1.05+dfsg

 src/org/openstreetmap/gui/jmapviewer/Demo.java     |  16 +-
 .../gui/jmapviewer/FeatureAdapter.java             |  21 +++
 .../openstreetmap/gui/jmapviewer/JMapViewer.java   | 174 +++++++++++---------
 .../gui/jmapviewer/MemoryTileCache.java            |   7 +-
 .../gui/jmapviewer/OsmFileCacheTileLoader.java     | 178 +++++++++++----------
 .../gui/jmapviewer/OsmTileLoader.java              |   6 +-
 .../gui/jmapviewer/TMSFileCacheTileLoader.java     |  76 +++++++++
 src/org/openstreetmap/gui/jmapviewer/Tile.java     |  55 ++++---
 .../gui/jmapviewer/TileController.java             |   9 +-
 .../gui/jmapviewer/interfaces/TileCache.java       |   5 +
 .../jmapviewer/interfaces/TileLoaderListener.java  |  11 +-
 .../gui/jmapviewer/interfaces/TileSource.java      |  13 +-
 .../tilesources/AbstractMapQuestTileSource.java    |   4 +-
 .../tilesources/AbstractOsmTileSource.java         |   6 +-
 .../tilesources/AbstractTMSTileSource.java         |   9 +-
 .../tilesources/BingAerialTileSource.java          |   9 +-
 .../tilesources/MapQuestOpenAerialTileSource.java  |   2 +-
 .../tilesources/MapQuestOsmTileSource.java         |   2 +-
 .../gui/jmapviewer/tilesources/OsmTileSource.java  |   4 +-
 .../jmapviewer/tilesources/ScanexTileSource.java   |   4 +-
 .../gui/jmapviewer/tilesources/TMSTileSource.java  |   9 +-
 .../tilesources/TemplatedTMSTileSource.java        |   8 +-
 22 files changed, 390 insertions(+), 238 deletions(-)

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