[Git][debian-gis-team/jmapviewer][upstream] New upstream version 2.16+dfsg

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / jmapviewer


Commits:
2589e326 by Bas Couwenberg at 2022-02-10T05:48:38+01:00
New upstream version 2.16+dfsg
- - - - -


3 changed files:

- Readme.txt
- build.xml
- src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java


Changes:

=====================================
Readme.txt
=====================================
@@ -2,7 +2,7 @@ JMapViewer
 
 (c) 2007, Tim Haussmann
 (c) 2008-2012, Jan Peter Stotz
-(c) 2009-2018, Dirk Stöcker
+(c) 2009-2022, Dirk Stöcker
 (c) 2009, Stefan Zeller
 (c) 2009, Karl Guggisberg
 (c) 2009, Dave Hansen
@@ -10,15 +10,15 @@ JMapViewer
 (c) 2010-2011, Michael Vigovsky
 (c) 2011-2017, Paul Hartmann
 (c) 2011-2016, Gleb Smirnoff
-(c) 2011-2021, Vincent Privat
+(c) 2011-2022, Vincent Privat
 (c) 2011, Jason Huntley
-(c) 2012-2016, Simon Legner
+(c) 2012-2020, Simon Legner
 (c) 2012, Teemu Koskinen
 (c) 2012, Jiri Klement
 (c) 2013, Matt Hoover
 (c) 2013, Alexei Kasatkin
 (c) 2013, Galo Higueras
-(c) 2015-2016, Wiktor Niesiobędzki
+(c) 2015-2019, Wiktor Niesiobędzki
 (c) 2017, Robert Scott
 
 This work bases partly on the JOSM plugin "Slippy Map Chooser" by Tim Haussmann


=====================================
build.xml
=====================================
@@ -9,14 +9,20 @@
     <property name="jacoco.inclnolocationclasses" value="false" />
     <!-- For Java specific stuff by version -->
     <condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" /></condition>
-    <condition property="isJava10"><matches string="${ant.java.version}" pattern="1[0-9]" /></condition>
-    <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]" /></condition>
-    <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]" /></condition>
-    <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]" /></condition>
-    <!-- Disable jacoco on Java 13+, see https://github.com/jacoco/jacoco/pull/738 -->
+    <condition property="isJava10"><matches string="${ant.java.version}" pattern="(1|2)[0-9]" /></condition>
+    <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]|[2-9][0-9]" /></condition>
+    <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]|[2-9][0-9]" /></condition>
+    <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]|[2-9][0-9]" /></condition>
+    <condition property="isJava14"><matches string="${ant.java.version}" pattern="1[4-9]|[2-9][0-9]" /></condition>
+    <condition property="isJava16"><matches string="${ant.java.version}" pattern="1[6-9]|[2-9][0-9]" /></condition>
+    <condition property="isJava18"><matches string="${ant.java.version}" pattern="1[8-9]|[2-9][0-9]" /></condition>
+    <condition property="isJava19"><matches string="${ant.java.version}" pattern="19|[2-9][0-9]" /></condition>
+    <condition property="isJava20"><matches string="${ant.java.version}" pattern="[2-9][0-9]" /></condition>
+    <condition property="isJava21"><matches string="${ant.java.version}" pattern="2[1-9]|[3-9][0-9]" /></condition>
+    <!-- Disable jacoco on Java 18+, see https://github.com/jacoco/jacoco/pull/1132 -->
     <condition property="coverageByDefault">
         <not>
-            <isset property="isJava13"/>
+            <isset property="isJava18"/>
         </not>
     </condition>
     <path id="test.classpath">


=====================================
src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
=====================================
@@ -53,12 +53,6 @@ public class TemplatedTMSTileSource extends TMSTileSource implements TemplatedTi
     private static final Pattern PATTERN_API_KEY = Pattern.compile("\\{apikey\\}");
     private static final Pattern PATTERN_PARAM  = Pattern.compile("\\{((?:\\d+-)?z(?:oom)?(:?[+-]\\d+)?|x|y|!y|-y|switch:([^}]+))\\}");
 
-    /**
-     * Pattern used only for compatibility with older JOSM clients. To remove end of 2020, with an update of JOSM wiki
-     * @deprecated to remove end of 2020
-     */
-    @Deprecated
-    private static final Pattern PATTERN_API_KEY_COMPATIBILITY = Pattern.compile("_apiKey_");
     // CHECKSTYLE.ON: SingleSpaceSeparator
 
     private static final Pattern[] ALL_PATTERNS = {
@@ -107,10 +101,10 @@ public class TemplatedTMSTileSource extends TMSTileSource implements TemplatedTi
             replacePattern((matcher, output) -> {
                 try {
                     matcher.appendReplacement(output, FeatureAdapter.retrieveApiKey(imageryId));
-                } catch (IOException e) {
+                } catch (IOException | RuntimeException e) {
                     throw new IllegalArgumentException(e);
                 }
-            }, PATTERN_API_KEY, PATTERN_API_KEY_COMPATIBILITY);
+            }, PATTERN_API_KEY);
         }
         // Capturing group pattern on zoom values
         m = PATTERN_ZOOM.matcher(baseUrl);



View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/-/commit/2589e32637023477be144b23364c0231928570df

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/-/commit/2589e32637023477be144b23364c0231928570df
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20220210/07d52ee8/attachment-0001.htm>