[jmapviewer] 02/05: Merge tag 'upstream/2.1+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 f3d10f9eaec92752b5220a7fe522d08da57f2f8a
Merge: 7dae7c9 01ffece
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon May 1 18:53:50 2017 +0200

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

 build.xml                                          |  2 +-
 .../openstreetmap/gui/jmapviewer/Coordinate.java   |  5 +-
 .../gui/jmapviewer/MapPolygonImpl.java             |  6 +-
 .../gui/jmapviewer/OsmTileLoader.java              |  5 --
 .../jmapviewer/{Coordinate.java => Projected.java} | 45 ++++-------
 src/org/openstreetmap/gui/jmapviewer/Tile.java     | 23 ++++--
 .../openstreetmap/gui/jmapviewer/TileRange.java    | 57 ++++++++++++++
 src/org/openstreetmap/gui/jmapviewer/TileXY.java   |  5 ++
 .../gui/jmapviewer/interfaces/IProjected.java      | 22 ++++++
 .../gui/jmapviewer/interfaces/TileJob.java         |  9 ---
 .../gui/jmapviewer/interfaces/TileSource.java      | 90 ++++++++++++++++++----
 .../tilesources/BingAerialTileSource.java          |  6 +-
 .../jmapviewer/tilesources/ScanexTileSource.java   |  8 +-
 .../gui/jmapviewer/tilesources/TMSTileSource.java  | 45 +++++++++++
 14 files changed, 248 insertions(+), 80 deletions(-)

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