[Git][debian-gis-team/jmapviewer][master] 6 commits: New upstream version 2.5+dfsg

Sebastiaan Couwenberg gitlab at salsa.debian.org
Sat Jan 27 08:12:00 UTC 2018


Sebastiaan Couwenberg pushed to branch master at Debian GIS Project / jmapviewer


Commits:
acbf7561 by Bas Couwenberg at 2018-01-27T08:28:49+01:00
New upstream version 2.5+dfsg
- - - - -
f2a5652b by Bas Couwenberg at 2018-01-27T08:28:55+01:00
Merge tag 'upstream/2.5+dfsg'

Upstream version 2.5+dfsg

- - - - -
03c765b5 by Bas Couwenberg at 2018-01-27T08:31:45+01:00
New upstream release.

- - - - -
29858462 by Bas Couwenberg at 2018-01-27T08:42:46+01:00
Update copyright years for Dirk Stöcker & Vincent Privat.

- - - - -
629fc255 by Bas Couwenberg at 2018-01-27T08:43:18+01:00
Bump Standards-Version to 4.1.3, no changes.

- - - - -
6697e753 by Bas Couwenberg at 2018-01-27T08:44:46+01:00
Set distribution to unstable.

- - - - -


8 changed files:

- Readme.txt
- debian/changelog
- debian/control
- debian/copyright
- src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java
- src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java
- src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java
- src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java


Changes:

=====================================
Readme.txt
=====================================
--- 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


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jmapviewer (2.5+dfsg-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update copyright years for Dirk Stöcker & Vincent Privat.
+  * Bump Standards-Version to 4.1.3, no changes.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 27 Jan 2018 08:44:29 +0100
+
 jmapviewer (2.4+dfsg-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9~),
                docbook-xsl,
                docbook-xml,
                xsltproc
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/jmapviewer.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/jmapviewer.git
 Homepage: https://wiki.openstreetmap.org/wiki/JMapViewer


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,12 +17,12 @@ Copyright: 2007, Tim Haussmann
            2013, Matt Hoover
            2013, Alexei Kasatkin
            2013, Galo Higueras
-      2009-2016, Dirk Stöcker
       2011-2016, Gleb Smirnoff
       2012-2016, Simon Legner
       2015-2016, Wiktor Niesiobędzki
       2011-2017, Paul Hartmann
-      2011-2017, Vincent Privat
+      2009-2018, Dirk Stöcker
+      2011-2018, Vincent Privat
 License: GPL-2+
 
 Files: debian/*


=====================================
src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java
=====================================
--- 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;
+    }
 }


=====================================
src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java
=====================================
--- 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;
     }


=====================================
src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java
=====================================
--- 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


=====================================
src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java
=====================================
--- 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;
+    }
 }



View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/compare/7cde07a91ce9915f53c567392374947b5ff1c588...6697e75351bb39187f55ed3eeb53ee68eda3b599

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/compare/7cde07a91ce9915f53c567392374947b5ff1c588...6697e75351bb39187f55ed3eeb53ee68eda3b599
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180127/b55645cf/attachment-0001.html>


More information about the Pkg-grass-devel mailing list