This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository jmapviewer.
commit acbf75613a07502bed781a30b035e3da1f7fdd4b Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Jan 27 08:28:49 2018 +0100 New upstream version 2.5+dfsg --- Readme.txt | 4 ++-- .../gui/jmapviewer/interfaces/TileSource.java | 7 +++++++ .../jmapviewer/tilesources/AbstractTMSTileSource.java | 7 +++++++ .../gui/jmapviewer/tilesources/OsmTileSource.java | 1 + .../gui/jmapviewer/tilesources/TileSourceInfo.java | 19 +++++++++++++++++++ 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/Readme.txt b/Readme.txt index bffb269..76d1c25 100644 --- a/Readme.txt +++ b/Readme.txt @@ -2,7 +2,7 @@ JMapViewer (c) 2007, Tim Haussmann (c) 2008-2012, Jan Peter Stotz -(c) 2009-2016, Dirk Stöcker +(c) 2009-2018, Dirk Stöcker (c) 2009, Stefan Zeller (c) 2009, Karl Guggisberg (c) 2009, Dave Hansen @@ -10,7 +10,7 @@ JMapViewer (c) 2010-2011, Michael Vigovsky (c) 2011-2017, Paul Hartmann (c) 2011-2016, Gleb Smirnoff -(c) 2011-2017, Vincent Privat +(c) 2011-2018, Vincent Privat (c) 2011, Jason Huntley (c) 2012-2016, Simon Legner (c) 2012, Teemu Koskinen diff --git a/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java b/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java index 9db81b5..bbb93bf 100644 --- a/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java +++ b/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java @@ -269,4 +269,11 @@ public interface TileSource extends Attributed { */ String getServerCRS(); + /** + * Determines if this imagery supports "/dirty" mode (tile re-rendering). + * @return <code>true</code> if it supports "/dirty" mode (tile re-rendering) + */ + default boolean isModTileFeatures() { + return false; + } } diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java index 98c7e82..b3ad7fe 100644 --- a/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java +++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java @@ -30,6 +30,7 @@ public abstract class AbstractTMSTileSource extends AbstractTileSource { private final Map<String, Set<String>> noTileHeaders; private final Map<String, Set<String>> noTileChecksums; private final Map<String, String> metadataHeaders; + protected boolean modTileFeatures; protected int tileSize; /** @@ -47,6 +48,7 @@ public abstract class AbstractTMSTileSource extends AbstractTileSource { this.noTileHeaders = info.getNoTileHeaders(); this.noTileChecksums = info.getNoTileChecksums(); this.metadataHeaders = info.getMetadataHeaders(); + this.modTileFeatures = info.isModTileFeatures(); this.tileSize = info.getTileSize(); } @@ -235,6 +237,11 @@ public abstract class AbstractTMSTileSource extends AbstractTileSource { return this.baseUrl + "/" + zoom + "/" + tilex + "/" + tiley; } + @Override + public boolean isModTileFeatures() { + return modTileFeatures; + } + private static int getTileMax(int zoom) { return (int) Math.pow(2.0, zoom) - 1; } diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java index e407e5b..fe58d94 100644 --- a/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java +++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java @@ -26,6 +26,7 @@ public class OsmTileSource { */ public Mapnik() { super("Mapnik", PATTERN, "MAPNIK"); + modTileFeatures = true; } @Override diff --git a/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java b/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java index edff7da..b34eeed 100644 --- a/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java +++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java @@ -40,6 +40,9 @@ public class TileSourceInfo { /** mapping <header key, metadata key> */ protected Map<String, String> metadataHeaders; + /** supports "/status" and "/dirty" mode (tile re-rendering) */ + protected boolean modTileFeatures; + /** * Create a TileSourceInfo class * @@ -187,4 +190,20 @@ public class TileSourceInfo { public final void setId(String id) { this.id = id; } + + /** + * Determines if this imagery supports "/status" and "/dirty" mode (tile re-rendering). + * @return <code>true</code> if it supports "/status" and "/dirty" mode (tile re-rendering) + */ + public final boolean isModTileFeatures() { + return modTileFeatures; + } + + /** + * Sets whether this imagery supports "/status" and "/dirty" mode (tile re-rendering). + * @param modTileFeatures <code>true</code> if it supports "/status" and "/dirty" mode (tile re-rendering) + */ + public final void setModTileFeatures(boolean modTileFeatures) { + this.modTileFeatures = modTileFeatures; + } } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/jmapviewer.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel