[jmapviewer] 02/03: Add patches from upstream SVN, r30933 is required for JOSM 8109.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository jmapviewer.

commit 6a67f71e1d54a9801dd8b640d94120fb4a7118c7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Mar 4 22:27:17 2015 +0100

    Add patches from upstream SVN, r30933 is required for JOSM 8109.
---
 debian/changelog                              |  1 +
 debian/patches/99-jmapviewer-svn-r30890.patch | 14 +++++++++++++
 debian/patches/99-jmapviewer-svn-r30933.patch | 30 +++++++++++++++++++++++++++
 debian/patches/99-jmapviewer-svn-r31032.patch | 14 +++++++++++++
 debian/patches/series                         |  3 +++
 5 files changed, 62 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b5006d4..66fbcd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jmapviewer (1.05+dfsg-1~exp2) UNRELEASED; urgency=medium
 
   * Update my email to @debian.org address.
+  * Add patches from upstream SVN, r30933 is required for JOSM 8109.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 04 Mar 2015 22:25:09 +0100
 
diff --git a/debian/patches/99-jmapviewer-svn-r30890.patch b/debian/patches/99-jmapviewer-svn-r30890.patch
new file mode 100644
index 0000000..8959dd7
--- /dev/null
+++ b/debian/patches/99-jmapviewer-svn-r30890.patch
@@ -0,0 +1,14 @@
+Description: create directory when writing tags file
+Origin: https://trac.openstreetmap.org/changeset/30890/subversion
+Bug: http://josm.openstreetmap.de/ticket/9813
+
+--- a/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java
++++ b/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java
+@@ -415,6 +415,7 @@ public class OsmFileCacheTileLoader exte
+ 
+         protected void saveTagsToFile() {
+             File tagsFile = getTagsFile();
++            tagsFile.getParentFile().mkdirs();
+             if (tile.getMetadata() == null) {
+                 tagsFile.delete();
+                 return;
diff --git a/debian/patches/99-jmapviewer-svn-r30933.patch b/debian/patches/99-jmapviewer-svn-r30933.patch
new file mode 100644
index 0000000..8627313
--- /dev/null
+++ b/debian/patches/99-jmapviewer-svn-r30933.patch
@@ -0,0 +1,30 @@
+Description: Remote API imagery cookies parameter is not handled properly
+ (patch by p.janaszek)
+Origin: https://trac.openstreetmap.org/changeset/30933/subversion
+Bug: http://josm.openstreetmap.de/ticket/11061
+
+--- a/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
++++ b/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
+@@ -13,6 +13,7 @@ public class TemplatedTMSTileSource exte
+     private String[] randomParts = null;
+     private Map<String, String> headers = new HashMap<>();
+ 
++    public static final String COOKIE_HEADER   = "Cookie";
+     public static final String PATTERN_ZOOM    = "\\{(?:(\\d+)-)?z(?:oom)?([+-]\\d+)?\\}";
+     public static final String PATTERN_X       = "\\{x\\}";
+     public static final String PATTERN_Y       = "\\{y\\}";
+@@ -36,6 +37,14 @@ public class TemplatedTMSTileSource exte
+         handleTemplate();
+     }
+ 
++    public TemplatedTMSTileSource(String name, String url, String id, int minZoom, int maxZoom, String cookies) {
++        super(name, url, id, minZoom, maxZoom);
++        if (cookies != null) {
++            headers.put(COOKIE_HEADER, cookies);
++        }
++        handleTemplate();
++    }
++
+     private void handleTemplate() {
+         // Capturing group pattern on switch values
+         Matcher m = Pattern.compile(".*"+PATTERN_SWITCH+".*").matcher(baseUrl);
diff --git a/debian/patches/99-jmapviewer-svn-r31032.patch b/debian/patches/99-jmapviewer-svn-r31032.patch
new file mode 100644
index 0000000..0f99b64
--- /dev/null
+++ b/debian/patches/99-jmapviewer-svn-r31032.patch
@@ -0,0 +1,14 @@
+Description: fix javadoc
+Origin: https://trac.openstreetmap.org/changeset/31032/subversion
+
+--- a/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
++++ b/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
+@@ -1064,7 +1064,7 @@ public class JMapViewer extends JPanel i
+ 
+     /**
+      * Return tile information caching class
+-     * @see TileLoaderListener#getTileCache()
++     * @see TileController#getTileCache()
+      */
+     public TileCache getTileCache() {
+         return tileController.getTileCache();
diff --git a/debian/patches/series b/debian/patches/series
index 32e8c24..0f79aff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,5 @@
 01-build_less.patch
 03-use-installed-library-in-demo.patch
+99-jmapviewer-svn-r30890.patch
+99-jmapviewer-svn-r30933.patch
+99-jmapviewer-svn-r31032.patch

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