.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="org/apache/commons/compress/compressors/CompressorException.java|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/CompressorStreamProvider.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/brotli/|org/apache/commons/compress/compressors/bzip2/BZip2Utils.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzip/|org/apache/commons/compress/compressors/lz4/|org/apache/commons/compress/compressors/lz77support/|org/apache/commons/compress/compressors/lzma/|org/apache/commons/compress/compressors/pack200/|org/apache/commons/compress/compressors/snappy/|org/apache/commons/compress/compressors/xz/|org/apache/commons/compress/compressors/z/|org/apache/commons/compress/utils/ArchiveUtils.java|org/apache/commons/jcs/JCS.java|org/apache/commons/jcs/access/GroupCacheAccess.java|org/apache/commons/jcs/access/PartitionedCacheAccess.java|org/apache/commons/jcs/access/behavior/IGroupCacheAccess.java|org/apache/commons/jcs/access/exception/InvalidGroupException.java|org/apache/commons/jcs/admin/servlet/|org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheMonitor.java|org/apache/commons/jcs/auxiliary/disk/jdbc/|org/apache/commons/jcs/auxiliary/lateral/|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java|org/apache/commons/jcs/auxiliary/remote/RemoteCache.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheRestore.java|org/apache/commons/jcs/auxiliary/remote/http/|org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java|org/apache/commons/jcs/auxiliary/remote/server/TimeoutConfigurableRMISocketFactory.java|org/apache/commons/jcs/engine/CacheAdaptor.java|org/apache/commons/jcs/engine/CacheGroup.java|org/apache/commons/jcs/engine/CacheWatchRepairable.java|org/apache/commons/jcs/engine/ZombieCacheService.java|org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java|org/apache/commons/jcs/engine/ZombieCacheWatch.java|org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java|org/apache/commons/jcs/utils/access/|org/apache/commons/jcs/utils/discovery/|org/apache/commons/jcs/utils/net/|org/apache/commons/jcs/utils/props/|org/apache/commons/jcs/utils/servlet/|org/apache/commons/logging/impl/AvalonLogger.java|org/apache/commons/logging/impl/Jdk13LumberjackLogger.java|org/apache/commons/logging/impl/Log4JLogger.java|org/apache/commons/logging/impl/LogKitLogger.java|org/apache/commons/logging/impl/ServletContextCleaner.java|org/openstreetmap/gui/jmapviewer/Demo.java|org/openstreetmap/gui/jmapviewer/JMapViewerTree.java|org/openstreetmap/gui/jmapviewer/checkBoxTree/|org/apache/commons/compress/archivers/|org/apache/commons/compress/changes/|org/apache/commons/compress/parallel/|org/apache/commons/compress/PasswordRequiredException.java|org/apache/commons/compress/compressors/zstandard/" kind="src" path="src"/>
+	<classpathentry excluding="org/apache/commons/compress/PasswordRequiredException.java|org/apache/commons/compress/archivers/|org/apache/commons/compress/changes/|org/apache/commons/compress/compressors/CompressorException.java|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/CompressorStreamProvider.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/brotli/|org/apache/commons/compress/compressors/bzip2/BZip2Utils.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzip/|org/apache/commons/compress/compressors/lz4/|org/apache/commons/compress/compressors/lz77support/|org/apache/commons/compress/compressors/lzma/|org/apache/commons/compress/compressors/pack200/|org/apache/commons/compress/compressors/snappy/|org/apache/commons/compress/compressors/xz/XZUtils.java|org/apache/commons/compress/compressors/z/|org/apache/commons/compress/compressors/zstandard/|org/apache/commons/compress/parallel/|org/apache/commons/compress/utils/ArchiveUtils.java|org/apache/commons/jcs/JCS.java|org/apache/commons/jcs/access/GroupCacheAccess.java|org/apache/commons/jcs/access/PartitionedCacheAccess.java|org/apache/commons/jcs/access/behavior/IGroupCacheAccess.java|org/apache/commons/jcs/access/exception/InvalidGroupException.java|org/apache/commons/jcs/admin/servlet/|org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheMonitor.java|org/apache/commons/jcs/auxiliary/disk/jdbc/|org/apache/commons/jcs/auxiliary/lateral/|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java|org/apache/commons/jcs/auxiliary/remote/RemoteCache.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheRestore.java|org/apache/commons/jcs/auxiliary/remote/http/|org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java|org/apache/commons/jcs/auxiliary/remote/server/TimeoutConfigurableRMISocketFactory.java|org/apache/commons/jcs/engine/CacheAdaptor.java|org/apache/commons/jcs/engine/CacheGroup.java|org/apache/commons/jcs/engine/CacheWatchRepairable.java|org/apache/commons/jcs/engine/ZombieCacheService.java|org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java|org/apache/commons/jcs/engine/ZombieCacheWatch.java|org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java|org/apache/commons/jcs/utils/access/|org/apache/commons/jcs/utils/discovery/|org/apache/commons/jcs/utils/net/|org/apache/commons/jcs/utils/props/|org/apache/commons/jcs/utils/servlet/|org/apache/commons/logging/impl/AvalonLogger.java|org/apache/commons/logging/impl/Jdk13LumberjackLogger.java|org/apache/commons/logging/impl/Log4JLogger.java|org/apache/commons/logging/impl/LogKitLogger.java|org/apache/commons/logging/impl/ServletContextCleaner.java|org/openstreetmap/gui/jmapviewer/Demo.java|org/openstreetmap/gui/jmapviewer/JMapViewerTree.java|org/openstreetmap/gui/jmapviewer/checkBoxTree/" kind="src" path="src"/>
 	<classpathentry including="data/|images/|resources/|styles/" kind="src" path=""/>
 	<classpathentry kind="src" path="test/unit"/>
 	<classpathentry kind="src" path="test/functional"/>
@@ -14,14 +14,14 @@
 	<classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/jfcunit.jar"/>
-	<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.4.2.jar"/>
 	<classpathentry kind="lib" path="test/lib/reflections/reflections-0.9.10.jar"/>
 	<classpathentry kind="lib" path="test/lib/reflections/guava-21.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/reflections/javassist-3.21.0-GA.jar"/>
 	<classpathentry kind="lib" path="test/lib/system-rules-1.16.1.jar"/>
 	<classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.4.6.jar"/>
 	<classpathentry kind="lib" path="test/lib/commons-testing/commons-testing-2.1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.10.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.13.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.0.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>

.settings/org.eclipse.core.resources.prefs

 eclipse.preferences.version=1
+encoding//windows/locale=ISO-8859-1
 encoding/<project>=UTF-8

CONTRIBUTION

@@ -70,6 +70,10 @@ The opening hour validation uses code from opening_hour.js
 (https://github.com/ypid/opening_hours.js) which is licensed
 with the New (2-clause) BSD license.
 
+The XZ code (https://tukaani.org/xz/java.html)
+is from Lasse Collin and Igor Pavlov
+and license free Public Domain.
+
 ------------------------------- PROJECTION DATA -------------------------------
 
 French NTF_R93 NTV2 grid: Source: IGN - Institut national de l'information

README

@@ -59,15 +59,25 @@ This is an overview of the files and directories in the JOSM code repository:
 - CONTRIBUTION              list of major code contributors
 - data/                     data files that will be included in the JOSM jar file
     - fonts/                font files used for map rendering
+    - gpx/                  different color gradients for gpx drawing
     - projection/           projection files
-      - epsg                list of projection definitions
-    - *.lang                translation data
-    - *.xsd                 xml schema files for validation of configuration files
+      - custom-epsg         list of projection definitions, auto-generated file created by ant task 'epsg'
+    - security/*.pem        certificates that we like to accept for TLS connections, but are missing in the
+                            default Java certificate store
+    - validator/            data files used by the JOSM validator
+      - *.cfg               files designed for the old tagchecker, still in use
+      - *.mapcss            default validation rules for the MapCSS-based tagchecker
+      - opening_hours.js    Javascript code to validate opening hours tag
+                            (external library, see https://github.com/opening-hours/opening_hours.js)
+    - boundaries.osm        OSM file containing boundary data for the states of the earth, including
+                            data for right and left-hand traffic
+    - defaultpresets.xml    data file for the core tagging presets
     - help-browser.css      CSS file for the help sites (HTML content is downloaded from the website
                             on demand, but displayed inside the programm in a Java web browser component.)
-    - validator/            data files used by the JOSM validator feature
-      - *.cfg               files designed for the old tagchecker, still used
-      - *.mapcss            default validation rules for the new mapcss-based tagchecker
+    - overpass-wizard.js    Javascript code to provide a wizard-GUI for creating Overpass requests
+                            (external library, see https://github.com/tyrasd/overpass-wizard)
+    - *.lang                translation data
+    - *.xsd                 xml schema files for validation of configuration files
 - data_nodist/              data files that are useful for development, but not distributed
     - exif-direction-example.jpg
                             sample image, that contains direction information in the EXIF header
@@ -75,17 +85,27 @@ This is an overview of the files and directories in the JOSM code repository:
     - filterTests.osm       used for unit testing of the filter feature
                             (see test/unit/org/openstreetmap/josm/data/osm/FilterTest.java)
     - Join_Areas_Tests.osm  some examples to test the 'join areas' feature
-    - mapcss/               sample map styles and corresponding data files for regression testing
+    - *.*                   various other data files used for unit testing and as reference file
     - projection/           projection files
-      - *.gsb               NTv2 grid files for projection support (see CONTRIBUTION)
+      - *.gsb               NTv2 grid files for projection support, downloaded by the
+                            client on demand (see CONTRIBUTION)
+      - CHENyx06-Distribution.pdf
+                            archive of terms of use for the CHENyx06.gsb file
+      - epsg                EPSG data file, taken from the proj.4 project
+                            (see https://github.com/OSGeo/proj.4/blob/master/nad/epsg)
+      - josm-epsg           customizations to the epsg file, used together with the epsg file
+                            to generate data/projection/custom-epsg
+                            
       - projection-reference-data.csv
                             reference data for projection tests
                             (see test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java)
       - projection-regression-test-data.csv
                             regression data for projection tests
                             (see test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java)
-- geticons.pl               tool to find all used icons and allows deleting unused icons
-                            searches also for images with incompatible svg code
+    - trans/*.lang          translation data for files that are not distributed, but used
+                            by the server for localization of the services;
+                            currently contains plugin descriptions in order to include translations
+                            in the downloaded plugin list
 - gpl-2.0.txt, gpl-3.0.txt  full text of the GNU General Public License
 - images/                   images distributed with the JOSM binary
     - icons                 images for the Potlatch 2 style
@@ -99,12 +119,23 @@ This is an overview of the files and directories in the JOSM code repository:
                             files, Debian/Ubuntu scripts, man pages, icons, etc.
 - macosx/                   files needed to create the MacOS X package
 - netbeans/                 preconfigured Netbeans project
-- optimize-images           short script to decrease size of PNG images
 - patches/                  patches for external libraries used in JOSM (see below)
 - README                    this file
 - resources/                resource files that will be included in the JOSM jar file
 - scripts/                  various scripts used by JOSM developers
-- src/                      the source code of the program
+  - BuildProjectionDefinitions.java
+                            called from the ant build file to combine the files epsg and josm-epsg
+                            to create the custom-epsg file for distribution
+  - geticons.pl             tool to find all used icons and allows deleting unused icons
+                            searches also for images with incompatible svg code
+  - optimize-images         short script to decrease size of PNG images
+  - presets_lang.pl         helper script to update language links in presets file
+  - since_xxx.py            developer tool to replace "@since xxx" in Javadoc by the upcoming revision number
+  - SyncEditorLayerIndex.groovy
+                            script to compare and analyse the differences of the editor layer index and the
+                            JOSM imagery list (see https://josm.openstreetmap.de/wiki/ImageryCompare)
+  - TagInfoExtract.groovy   extracts tag information for the taginfo project
+- src/                      the source code of the application
 - start.html                HTML page to run the applet version of JOSM
 - styles/                   map styles included in JOSM
 - sytles_nodist/            files needed for map style maintenance
@@ -180,3 +211,6 @@ There are some third party libraries which are directly included in the source c
 * swinghelper: Class CheckThreadViolationRepaintManager to find classpath violations
     src/org/jdesktop/swinghelper/debug/CheckThreadViolationRepaintManager.java
     -> https://github.com/floscher/swinghelper
+* xz extractor
+    src/org/tukaani
+    -> https://tukaani.org/xz/java.html

REVISION

@@ -2,7 +2,7 @@
 <info>
 <entry
    path="trunk"
-   revision="13265"
+   revision="13367"
    kind="dir">
 <url>https://josm.openstreetmap.de/svn/trunk</url>
 <relative-url>^/trunk</relative-url>
@@ -11,9 +11,9 @@
 <uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
 </repository>
 <commit
-   revision="13265">
+   revision="13367">
 <author>Don-vip</author>
-<date>2017-12-31T02:09:43.768156Z</date>
+<date>2018-01-28T22:08:56.144724Z</date>
 </commit>
 </entry>
 </info>

appveyor.yml

@@ -22,8 +22,6 @@ artifacts:
   - path: checkstyle-josm.xml
   - path: pmd-josm.xml
   - path: spotbugs-josm.xml
-  - path: javadoc
-    type: zip
   - path: test\report
     type: zip
   - path: hs_err_pid*.log

build.xml

@@ -241,7 +241,7 @@ Build-Date: ${build.tstamp}
     </target>
     <target name="compile-cots" depends="init">
         <!-- COTS -->
-        <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,gnu/**" nowarn="on" encoding="iso-8859-1"
+        <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**,gnu/**" nowarn="on" encoding="iso-8859-1"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
             <!-- get rid of "internal proprietary API" warning -->
             <compilerarg value="-XDignore.symbol.file"/>
@@ -250,8 +250,6 @@ Build-Date: ${build.tstamp}
             <exclude name="org/apache/commons/compress/changes/**"/>
             <exclude name="org/apache/commons/compress/compressors/bzip2/BZip2Utils.java"/>
             <exclude name="org/apache/commons/compress/compressors/brotli/**"/>
-            <exclude name="org/apache/commons/compress/compressors/lzma/**"/>
-            <exclude name="org/apache/commons/compress/compressors/xz/**"/>
             <exclude name="org/apache/commons/compress/compressors/CompressorStreamFactory.java"/>
             <exclude name="org/apache/commons/compress/compressors/CompressorStreamProvider.java"/>
             <exclude name="org/apache/commons/compress/compressors/CompressorException.java"/>
@@ -259,9 +257,11 @@ Build-Date: ${build.tstamp}
             <exclude name="org/apache/commons/compress/compressors/deflate/**"/>
             <exclude name="org/apache/commons/compress/compressors/gzip/**"/>
             <exclude name="org/apache/commons/compress/compressors/lz4/**"/>
+            <exclude name="org/apache/commons/compress/compressors/lzma/**"/>
             <exclude name="org/apache/commons/compress/compressors/lz77support/**"/>
             <exclude name="org/apache/commons/compress/compressors/pack200/**"/>
             <exclude name="org/apache/commons/compress/compressors/snappy/**"/>
+            <exclude name="org/apache/commons/compress/compressors/xz/XZUtils.java"/>
             <exclude name="org/apache/commons/compress/compressors/z/**"/>
             <exclude name="org/apache/commons/compress/compressors/zstandard/**"/>
             <exclude name="org/apache/commons/compress/parallel/**"/>
@@ -296,7 +296,7 @@ Build-Date: ${build.tstamp}
     <target name="compile-jmapviewer" depends="init">
         <!-- JMapViewer -->
         <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}" 
-            excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,gnu/**"
+            excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,org/tukaani/**,gnu/**"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
             <compilerclasspath>
                 <pathelement location="${error_prone_ant.jar}"/>
@@ -315,13 +315,14 @@ Build-Date: ${build.tstamp}
             <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
             <compilerarg value="-XDignore.symbol.file"/>
             <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+            <compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg line="-Xmaxwarns 1000"/>
         </javac>
     </target>
     <target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer">
         <!-- JOSM -->
         <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
-            excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**"
+            excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
             <compilerclasspath>
                 <pathelement location="${error_prone_ant.jar}"/>
@@ -344,6 +345,7 @@ Build-Date: ${build.tstamp}
             <compilerarg value="-Xep:FutureReturnValueIgnored:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:FloatingPointLiteralPrecision:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:ShortCircuitBoolean:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+            <compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg line="-Xmaxwarns 1000"/>
             <exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/>
@@ -813,6 +815,16 @@ Build-Date: ${build.tstamp}
             encoding="UTF-8" classpath="${checkstyle.dir}/checkstyle-all.jar">
         </javac>
     </target>
+    <target name="checkstyle-changed" depends="checkstyle-compile">
+        <exec append="false" osfamily="unix" executable="bash" failifexecutionfails="true">
+            <arg value="-c"/>
+            <arg value="svn status -q --ignore-externals src test | grep -o '\(src\|test\)/.*' | xargs java -cp '${checkstyle.dir}/checkstyle-all.jar:${checkstyle-build.dir}' com.puppycrawl.tools.checkstyle.Main -c ${checkstyle.dir}/josm_checks.xml | sed -e 's:\([^ ]*\) [^:]*/\([^:/]*.java\:[^:]*\):(\2)\1:'"/>
+        </exec>
+        <exec append="false" osfamily="windows" executable="powershell" failifexecutionfails="true">
+            <arg value="/c"/>
+            <arg value="svn status -q --ignore-externals src test | ForEach-Object {java -cp '${checkstyle.dir}/checkstyle-all.jar;${checkstyle-build.dir}' com.puppycrawl.tools.checkstyle.Main -c ${checkstyle.dir}/josm_checks.xml $_.split(' ')[7]}"/>
+        </exec>
+    </target>
     <target name="checkstyle" depends="checkstyle-compile">
         <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
              classpath="${checkstyle.dir}/checkstyle-all.jar:${checkstyle-build.dir}"/>

data/defaultpresets.xml

@@ -299,7 +299,7 @@
         <combo key="circuits" text="Amount of circuits" values="1,2,3,4" />
     </chunk>
     <chunk id="power_loc">
-        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,rooftop,kiosk" values_context="power" />
+        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,rooftop" values_context="power" />
     </chunk>
     <chunk id="power_extra">
         <reference ref="power_loc" />
@@ -1406,6 +1406,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:crossing"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:crossing"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:crossing"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Key:crossing"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:crossing"
                   nl.href="http://wiki.openstreetmap.org/wiki/NL:Key:crossing"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:crossing"
@@ -2340,6 +2341,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=basin"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=basin"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=basin"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:landuse=basin"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:landuse=basin"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:landuse=basin"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:landuse=basin"
@@ -2504,6 +2506,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=ferry_terminal"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=ferry_terminal"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=ferry_terminal"
                   fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=ferry_terminal"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=ferry_terminal"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=ferry_terminal"
@@ -2561,6 +2564,7 @@
                     <check key="fuel:diesel" text="Diesel" />
                     <check key="fuel:biodiesel" text="Bio Diesel" />
                     <check key="fuel:octane_80" text="Octane 80" />
+                    <check key="fuel:octane_87" text="Octane 87" />
                     <check key="fuel:octane_91" text="Octane 91" />
                     <check key="fuel:octane_92" text="Octane 92" />
                     <check key="fuel:octane_95" text="Octane 95" />
@@ -2568,6 +2572,7 @@
                     <check key="fuel:octane_100" text="Octane 100" />
                     <check key="fuel:e10" text="E10 (10% Ethanol mix)" />
                     <check key="fuel:e85" text="E85 (85% Ethanol mix)" />
+                    <check key="fuel:ethanol" text="Ethanol (alcohol)" />
                     <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" />
                     <check key="fuel:cng" text="CNG (Compressed Natural Gas)" />
                 </checkgroup>
@@ -2725,6 +2730,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:railway=subway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=subway"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:railway=subway"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=subway"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:railway=subway"
@@ -3130,6 +3136,7 @@
                     <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" />
                     <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" />
                     <check key="fuel:octane_80" text="Octane 80" />
+                    <check key="fuel:octane_87" text="Octane 87" />
                     <check key="fuel:octane_91" text="Octane 91" />
                     <check key="fuel:octane_92" text="Octane 92" />
                     <check key="fuel:octane_95" text="Octane 95" />
@@ -3137,6 +3144,7 @@
                     <check key="fuel:octane_100" text="Octane 100" />
                     <check key="fuel:e10" text="E10 (10% Ethanol mix)" />
                     <check key="fuel:e85" text="E85 (85% Ethanol mix)" />
+                    <check key="fuel:ethanol" text="Ethanol (alcohol)" />
                     <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" />
                     <check key="fuel:cng" text="CNG (Compressed Natural Gas)" />
                     <check key="fuel:1_25" text="1/25 mix (mofa/moped)" />
@@ -3269,6 +3277,7 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=car_parts"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=car_parts"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=car_parts"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=car_parts"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=car_parts" />
             <space />
             <key key="shop" value="car_parts" />
@@ -3601,6 +3610,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:railway=subway_entrance"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=subway_entrance"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:railway=subway_entrance"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=subway_entrance"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:railway=subway_entrance"
@@ -6383,7 +6393,8 @@
         <item name="Nine-pin Bowling" icon="presets/sport/9pin.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=9pin"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:sport=9pin"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=9pin" />
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=9pin"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:sport=9pin" />
             <space />
             <key key="sport" value="9pin" />
             <text key="name" text="Name" />
@@ -6393,7 +6404,8 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:sport=10pin"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=10pin"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:sport=10pin" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:sport=10pin"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:sport=10pin" />
             <space />
             <key key="sport" value="10pin" />
             <text key="name" text="Name" />
@@ -6675,6 +6687,7 @@
         <item name="Boule" icon="presets/sport/boule.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=boules"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:sport=boules"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:sport=boules"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=boules" />
             <space />
             <key key="sport" value="boules" />
@@ -6857,6 +6870,7 @@
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:building:part"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:building:part"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Key:building:part"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Key:building:part"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Key:building:part"
                   zh_CN.href="http://wiki.openstreetmap.org/wiki/Zh-hans:Key:building:part" />
             <space />
@@ -6917,6 +6931,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=flagpole"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=flagpole"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=flagpole"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:man_made=flagpole"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=flagpole"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=flagpole"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:man_made=flagpole" />
@@ -7061,6 +7076,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=adit"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=adit"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=adit"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:man_made=adit"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=adit"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=adit"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:man_made=adit"
@@ -7209,7 +7225,10 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=water_well" />
             <space />
             <key key="man_made" value="water_well" />
+            <optional>
                 <text key="name" text="Name" />
+                <combo key="pump" text="Pump" values="yes,no,manual,powered"  values_sort="false"/>
+            </optional>
         </item> <!-- Water Well -->
         <separator/>
         <item name="Lighthouse" icon="presets/landmark/lighthouse.svg" type="node,closedway" preset_name_label="true">
@@ -7292,6 +7311,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=survey_point"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=survey_point"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:man_made=survey_point"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:man_made=survey_point"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=survey_point"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:man_made=survey_point"
@@ -8184,7 +8204,8 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=cheese"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=cheese"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=cheese"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=cheese" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=cheese"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=cheese" />
             <space />
             <key key="shop" value="cheese" />
             <reference ref="name_operator_oh_wheelchair" />
@@ -8242,7 +8263,8 @@
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=tea"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=tea"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=tea"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=tea" />
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=tea"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=tea" />
             <space />
             <key key="shop" value="tea" />
             <reference ref="name_oh_wheelchair" />
@@ -8254,6 +8276,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=coffee"
                   it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=coffee"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=coffee"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=coffee"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=coffee" />
             <space />
             <key key="shop" value="coffee" />
@@ -8877,6 +8900,7 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=cosmetics"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=cosmetics"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=cosmetics"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=cosmetics"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=cosmetics" />
             <space />
             <key key="shop" value="cosmetics" />
@@ -9138,6 +9162,7 @@
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=travel_agency"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=travel_agency"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=travel_agency"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=travel_agency"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=travel_agency" />
             <space />
             <key key="shop" value="travel_agency" />
@@ -9220,7 +9245,8 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=bookmaker"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bookmaker"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=bookmaker"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=bookmaker" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=bookmaker"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=bookmaker" />
             <space />
             <key key="shop" value="bookmaker" />
             <reference ref="name_operator_oh_wheelchair" />
@@ -9268,7 +9294,8 @@
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=photo"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=photo"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=photo"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=photo" />
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=photo"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=photo" />
             <space />
             <key key="shop" value="photo" />
             <reference ref="name_oh_wheelchair" />
@@ -10078,6 +10105,7 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=city"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:place=city"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=city"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:place=city"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=city"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=city"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=city"
@@ -10170,6 +10198,7 @@
         <item name="Quarter" icon="presets/place/quarter.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=quarter"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:place=quarter"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=quarter"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=quarter" />
             <space />
             <key key="place" value="quarter" />
@@ -10377,7 +10406,8 @@
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=reef"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=reef"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=reef"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=reef" />
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:natural=reef"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=reef" />
             <space />
             <key key="natural" value="reef" />
             <text key="name" text="Name" />

data/maps.xsd

@@ -698,8 +698,10 @@
                             </xs:element>
                             <!--  is imagery properly georeferenced (i.e. no need to check offsets). Defaults to false. Affects showing warnings. -->
                             <xs:element name="valid-georeference" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-                            <!-- does imagery server supports JOSM 4326 to 3857 reprojection and non-square queries. Affects showing warnings. -->
+                            <!-- old unused feature, ignored -->
                             <xs:element name="epsg4326to3857Supported" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+                            <!-- does imagery server supports "/status" and tile re-rendering using "/dirty". Defaults to false. -->
+                            <xs:element name="mod-tile-features" minOccurs="0" maxOccurs="1" type="xs:boolean" />
                         </xs:choice>
                     </xs:sequence>
                     <xs:attribute name="last-check" type="xs:date" use="optional" />

data/validator/combinations.mapcss

@@ -348,7 +348,7 @@ way[highway][natural][natural!=ridge],
 }
 
 /* #9593, #11183, #12418, #12761 */
-*[sport][sport!=skiing][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground|ice_rink|horse_riding|fitness_centre|fitness_station|bowling_alley)$/][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
+*[sport][sport!=skiing][!building][!club][tourism != hotel][highway != raceway][!leisure][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
     throwWarning: tr("sport without physical feature");
     group: tr("missing tag");
     assertMatch: "node sport=tennis";

data/validator/deprecated.mapcss

@@ -1171,3 +1171,47 @@ way[building=1] {
   group: tr("misspelled value");
   fixAdd: "building=yes";
 }
+
+/* #15675 */
+node[power=transformer][location=pole][transformer] {
+  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  group: tr("deprecated tagging");
+  fixChangeKey: "location => power";
+}
+node[power=transformer][location=pole][!transformer] {
+  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  group: tr("deprecated tagging");
+  fixChangeKey: "location => power";
+  fixAdd: "transformer=yes";
+}
+
+node[tourism=picnic_table],
+node[amenity=picnic_table],
+node[leisure=picnic],
+node[leisure=picnic_site] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "tourism=picnic_site";
+  suggestAlternative: "leisure=picnic_table";
+  group: tr("deprecated tagging");
+}
+
+/* #15804 */
+relation[water=salt],
+way[water=salt],
+way[water=salt_pool],
+way[water=salt_panne],
+way[water=salt_pond] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "salt=yes";
+  suggestAlternative: "landuse=salt_pond";
+  group: tr("deprecated tagging");
+}
+
+/* #15805 */
+way[water=tidal] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "tidal=yes";
+  fixAdd: "tidal=yes";
+  fixRemove: "water";
+  group: tr("deprecated tagging");
+}
\ No newline at end of file

data/validator/ignoretags.cfg

@@ -174,6 +174,7 @@ K:glacier:type=mountain
 K:glacier:type=ice_tongue
 K:glacier:type=icecap
 K:waterway=drystream
+K:allotments=plot
 ;
 ; Highway Key/Value Pairs
 ;
@@ -319,8 +320,10 @@ K:type=tmc
 K:type=TMC
 ;
 ; Tags not yet decided (to remove from this section when added or deprecated) 
-; see https://josm.openstreetmap.de/ticket/10759
+; see josm tickets 10759 and 15769
 ;
 K:man_made=mast
 K:amenity=childcare
 K:landuse=logging
+K:power=catenary_mast
+K:man_made=kiln
\ No newline at end of file

data/validator/numeric.mapcss

-/* measurement values and units warnings (ticket #8687) */
+/* measurement values and units warnings (tickets #8687, #15719) */
 
 *[/^[0-9]+$/] {
   throwWarning: tr("numerical key");
@@ -54,8 +54,20 @@
   assertNoMatch: "node building:levels=0"; /* valid because there can be building:levels:underground > 0 or roof:levels > 0 */
 }
 
-*[height][height !~ /^(([0-9]+\.?[0-9]*( (m|ft))?)|([1-9][0-9]*\'((10|11|[0-9])((\.[0-9]+)?)\")?))$/] {
-  throwWarning: tr("{0}: meters is default; period is separator; if units, put space then unit", "height");
+*[height][height =~ /^[0-9]+,[0-9][0-9]?( (m|ft))?$/] {
+  throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}");
+  fixAdd: concat("height=", replace(tag("height"), ",", "."));
+  set height_separator_autofix;
+  assertMatch: "node height=5,5";
+  assertMatch: "node height=12,00";
+  assertMatch: "node height=12,5 ft";
+  assertNoMatch: "node height=12,000";
+  assertNoMatch: "node height=3,50,5";
+  assertNoMatch: "node height=3.5";
+  assertNoMatch: "node height=4";
+}
+*[height][height !~ /^(([0-9]+\.?[0-9]*( (m|ft))?)|([1-9][0-9]*\'((10|11|[0-9])((\.[0-9]+)?)\")?))$/]!.height_separator_autofix {
+  throwWarning: tr("unusual value of {0}: meters is default; point is decimal separator; if units, put space then unit", "{0.key}");
   assertMatch: "node height=medium";
   assertMatch: "node height=-5";
   assertNoMatch: "node height=2 m";
@@ -65,8 +77,20 @@
   assertNoMatch: "node height=22'";
 }
 
-*[maxheight][maxheight !~ /^(([1-9][0-9]*(\.[0-9]+)?( (m|ft))?)|([0-9]+\'(([0-9]|10|11)(\.[0-9]*)?\")?)|none|default)$/] {
-  throwWarning: tr("{0}: meters is default; period is separator; if units, put space then unit", "maxheight");
+*[maxheight][maxheight =~ /^[0-9]+,[0-9][0-9]?( (m|ft))?$/] {
+  throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}");
+  fixAdd: concat("maxheight=", replace(tag("maxheight"), ",", "."));
+  set maxheight_separator_autofix;
+  assertMatch: "node maxheight=5,5";
+  assertMatch: "node maxheight=12,00";
+  assertMatch: "node maxheight=12,5 ft";
+  assertNoMatch: "node maxheight=12,000";
+  assertNoMatch: "node maxheight=3,50,5";
+  assertNoMatch: "node maxheight=3.5";
+  assertNoMatch: "node maxheight=4";
+}
+*[maxheight][maxheight !~ /^(([1-9][0-9]*(\.[0-9]+)?( (m|ft))?)|([0-9]+\'(([0-9]|10|11)(\.[0-9]*)?\")?)|none|default)$/]!.maxheight_separator_autofix {
+  throwWarning: tr("unusual value of {0}: meters is default; point is decimal separator; if units, put space then unit", "{0.key}");
   assertMatch: "node maxheight=something";
   assertMatch: "node maxheight=-5";
   assertMatch: "node maxheight=0";
@@ -78,8 +102,19 @@
   assertNoMatch: "node maxheight=16'3\"";
 }
 
-way[width][width !~ /^(([0-9]+\.?[0-9]*( [a-z]+)?)|([0-9]+\'([0-9]+\.?[0-9]*\")?))$/] {
-  throwWarning: tr("{0}: meters is default; period is separator; if units, put space then unit", "width");
+*[width][width =~ /^[0-9]+,[0-9][0-9]?( (m|ft))?$/] {
+  throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}");
+  fixAdd: concat("width=", replace(tag("width"), ",", "."));
+  set width_separator_autofix;
+  assertMatch: "node width=5,5";
+  assertMatch: "node width=12,00";
+  assertNoMatch: "node width=12,000";
+  assertNoMatch: "node width=3,50,5";
+  assertNoMatch: "node width=3.5";
+  assertNoMatch: "node width=4";
+}
+*[width][width !~ /^(([0-9]+\.?[0-9]*( [a-z]+)?)|([0-9]+\'([0-9]+\.?[0-9]*\")?))$/]!.width_separator_autofix {
+  throwWarning: tr("unusual value of {0}: meters is default; point is decimal separator; if units, put space then unit", "{0.key}");
   assertMatch: "way width=something";
   assertMatch: "way width=-5";
   assertNoMatch: "way width=3";
@@ -90,8 +125,19 @@ way[width][width !~ /^(([0-9]+\.?[0-9]*( [a-z]+)?)|([0-9]+\'([0-9]+\.?[0-9]*\")?
   assertNoMatch: "way width=10'5\"";
 }
 
-*[maxwidth][maxwidth !~ /^(([0-9]+\.?[0-9]*( (m|ft))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/] {
-  throwWarning: tr("{0}: meters is default; period is separator; if units, put space then unit", "maxwidth");
+*[maxwidth][maxwidth =~ /^[0-9]+,[0-9][0-9]?( (m|ft))?$/] {
+  throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}");
+  fixAdd: concat("maxwidth=", replace(tag("maxwidth"), ",", "."));
+  set maxwidth_separator_autofix;
+  assertMatch: "node maxwidth=5,5";
+  assertMatch: "node maxwidth=12,00";
+  assertNoMatch: "node maxwidth=12,000";
+  assertNoMatch: "node maxwidth=3,50,5";
+  assertNoMatch: "node maxwidth=3.5";
+  assertNoMatch: "node maxwidth=4";
+}
+*[maxwidth][maxwidth !~ /^(([0-9]+\.?[0-9]*( (m|ft))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/]!.maxwidth_separator_autofix {
+  throwWarning: tr("unusual value of {0}: meters is default; point is decimal separator; if units, put space then unit", "{0.key}");
   assertMatch: "way maxwidth=something";
   assertMatch: "way maxwidth=-5";
   assertNoMatch: "way maxwidth=2";
@@ -99,8 +145,20 @@ way[width][width !~ /^(([0-9]+\.?[0-9]*( [a-z]+)?)|([0-9]+\'([0-9]+\.?[0-9]*\")?
   assertNoMatch: "way maxwidth=2.5";
   assertNoMatch: "way maxwidth=7 ft";
 }
-*[maxweight][maxweight !~ /^(([0-9]+\.?[0-9]*( (t|kg|lbs))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/] {
-  throwWarning: tr("{0}: tonne is default; period is separator; if units, put space then unit", "maxweight");
+
+*[maxweight][maxweight =~ /^[0-9]+,[0-9][0-9]?( (t|kg|lbs))?$/] {
+  throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}");
+  fixAdd: concat("maxweight=", replace(tag("maxweight"), ",", "."));
+  set maxweight_separator_autofix;
+  assertMatch: "node maxweight=5,5";
+  assertMatch: "node maxweight=12,00";
+  assertNoMatch: "node maxweight=12,000";
+  assertNoMatch: "node maxweight=3,50,5";
+  assertNoMatch: "node maxweight=3.5";
+  assertNoMatch: "node maxweight=4";
+}
+*[maxweight][maxweight !~ /^(([0-9]+\.?[0-9]*( (t|kg|lbs))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/]!.maxweight_separator_autofix {
+  throwWarning: tr("unusual value of {0}: tonne is default; point is decimal separator; if units, put space then unit", "{0.key}");
   assertMatch: "way maxweight=something";
   assertMatch: "way maxweight=-5";
   assertNoMatch: "way maxweight=2";
@@ -108,10 +166,11 @@ way[width][width !~ /^(([0-9]+\.?[0-9]*( [a-z]+)?)|([0-9]+\'([0-9]+\.?[0-9]*\")?
   assertNoMatch: "way maxweight=2.5";
   assertNoMatch: "way maxweight=7 kg";
 }
+
 way[maxspeed][maxspeed !~ /^(signals|none|unposted|variable|walk|[1-9][0-9]*( [a-z]+)?|[A-Z][A-Z]:(urban|rural|living_street|motorway))$/],
 way[maxspeed:forward][maxspeed:forward !~ /^(signals|none|unposted|variable|walk|[1-9][0-9]*( [a-z]+)?|[A-Z][A-Z]:(urban|rural|living_street|motorway))$/],
 way[maxspeed:backward][maxspeed:backward !~ /^(signals|none|unposted|variable|walk|[1-9][0-9]*( [a-z]+)?|[A-Z][A-Z]:(urban|rural|living_street|motorway))$/] {
-  throwWarning: tr("unusual {0} format", "maxspeed");
+  throwWarning: tr("unusual value of {0}", "{0.key}");
   assertMatch: "way maxspeed=something";
   assertMatch: "way maxspeed=-50";
   assertMatch: "way maxspeed=0";
@@ -126,8 +185,19 @@ way[maxspeed:backward][maxspeed:backward !~ /^(signals|none|unposted|variable|wa
   assertNoMatch: "way maxspeed=variable";
 }
 
-*[distance][distance !~ /^(([0-9]+\.?[0-9]*( (m|km|mi|nmi))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/] {
-  throwWarning: tr("{0}: kilometers is default; period is separator; if units, put space then unit", "distance");
+*[distance][distance =~ /^[0-9]+,[0-9][0-9]?( (m|km|mi|nmi))?$/] {
+  throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}");
+  fixAdd: concat("distance=", replace(tag("distance"), ",", "."));
+  set distance_separator_autofix;
+  assertMatch: "node distance=5,5";
+  assertMatch: "node distance=12,00";
+  assertNoMatch: "node distance=12,000";
+  assertNoMatch: "node distance=3,50,5";
+  assertNoMatch: "node distance=3.5";
+  assertNoMatch: "node distance=4";
+}
+*[distance][distance !~ /^(([0-9]+\.?[0-9]*( (m|km|mi|nmi))?)|([0-9]+\'[0-9]+\.?[0-9]*\"))$/]!.distance_separator_autofix {
+  throwWarning: tr("unusual value of {0}: kilometers is default; point is decimal separator; if units, put space then unit", "{0.key}");
   assertMatch: "way distance=something";
   assertMatch: "way distance=-5";
   assertNoMatch: "way distance=2";
@@ -144,7 +214,7 @@ way[voltage][voltage =~ /(.*[A-Za-z].*)|.*,.*|.*( ).*/] {
 /* some users are using frequency for other purposes (not electromagnetic) 
    with the values 'perennial' and 'intermittent'; the vast majority are 0, 16.7, 50 and 60 */
 way[frequency][frequency !~ /^(0|[1-9][0-9]*(\.[0-9]+)?)( (kHz|MHz|GHz|THz))?$/] {
-  throwWarning: tr("unusual {0} specification", "frequency");
+  throwWarning: tr("unusual value of {0}", "{0.key}");
   assertMatch: "way frequency=something";
   assertNoMatch: "way frequency=0"; /* DC */
   assertNoMatch: "way frequency=16.7";
@@ -154,7 +224,7 @@ way[frequency][frequency !~ /^(0|[1-9][0-9]*(\.[0-9]+)?)( (kHz|MHz|GHz|THz))?$/]
 }
 
 way[gauge][gauge !~ /^([1-9][0-9]{1,3}(;[1-9][0-9]{1,3})*|broad|standard|narrow)$/] {
-  throwWarning: tr("unusual train track gauge; use mm with no separator");
+  throwWarning: tr("unusual value of {0}", "{0.key}");
   assertMatch: "way gauge=something";
   assertNoMatch: "way gauge=1435";
   assertNoMatch: "way gauge=1000;1435";
@@ -164,7 +234,11 @@ way[gauge][gauge !~ /^([1-9][0-9]{1,3}(;[1-9][0-9]{1,3})*|broad|standard|narrow)
 
 /* the numbers for percentage and degrees include could probably be bracketed a bit more precisely */
 way[incline][incline !~ /^(up|down|-?([0-9]+?(\.[1-9]%)?|100)[%°]?)$/] {
-  throwWarning: tr("unusual incline; use percentages/degrees or up/down");
+  throwWarning: tr("unusual value of {0}", "{0.key}");
+  suggestAlternative: "x%";
+  suggestAlternative: "x°";
+  suggestAlternative: "up";
+  suggestAlternative: "down";
   assertMatch: "way incline=extreme";
   assertNoMatch: "way incline=up";
   assertNoMatch: "way incline=down";
@@ -194,7 +268,7 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
   assertNoMatch: "node amenity=cinema screen=8";
 }
 *[admin_level][admin_level !~ /^(1|2|3|4|5|6|7|8|9|10|11|12)$/] {
-  throwWarning: tr("unusual value of {0}", "{1.key}");
+  throwWarning: tr("unusual value of {0}", "{0.key}");
   assertMatch: "node admin_level=0";
   assertMatch: "node admin_level=-1";
   assertMatch: "node admin_level=13";
@@ -204,13 +278,13 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
 /* #14989 */
 *[direction][direction<0],
 *[direction][direction>=360] {
-  throwWarning: tr("unusual value of {0}", "{1.key}");
+  throwWarning: tr("unusual value of {0}", "{0.key}");
   assertMatch: "node direction=-10";
   assertMatch: "node direction=360";
   assertNoMatch: "node direction=0";
 }
 *[direction][direction !~ /^([0-9][0-9]?[0-9]?|north|east|south|west|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW|forward|backward|both|clockwise|anti-clockwise|anticlockwise|up|down)(-([0-9][0-9]?[0-9]?|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW))?(;([0-9][0-9]?[0-9]?|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW)-([0-9][0-9]?[0-9]?|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW))*$/] {
-  throwWarning: tr("unusual value of {0}", "{1.key}");
+  throwWarning: tr("unusual value of {0}", "{0.key}");
   assertMatch: "node direction=north-down";
   assertMatch: "node direction=rome";
   assertMatch: "node direction=C";
@@ -239,7 +313,7 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
 *[ele][ele =~ /^-?[0-9]+(\.[0-9]+)? ?m$/] {
   throwWarning: tr("{0} must be a numeric value, in meters and without units", "{0.key}");
   fixAdd: concat("ele=", trim(replace(tag("ele"), "m", "")));
-  set .ele_is_fixable;
+  set ele_meter_remove_autofix;
   assertMatch: "node ele=12m";
   assertMatch: "node ele=12 m";
   assertNoMatch: "node ele=12km";
@@ -248,7 +322,18 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
   assertNoMatch: "node ele=12";
   assertNoMatch: "node ele=high";
 }
-*[ele][ele !~ /^-?[0-9]+(\.[0-9]+)?$/]!.ele_is_fixable{
+*[ele][ele =~ /^[0-9]+,[0-9][0-9]?$/] {
+  throwWarning: tr("unusual value of {0}: use . instead of , as decimal separator", "{0.key}");
+  fixAdd: concat("ele=", replace(tag("ele"), ",", "."));
+  set ele_separator_autofix;
+  assertMatch: "node ele=5,5";
+  assertMatch: "node ele=12,00";
+  assertNoMatch: "node ele=8,848"; /* wrongly used thousands separator */
+  assertNoMatch: "node ele=3,50,5";
+  assertNoMatch: "node ele=3.5";
+  assertNoMatch: "node ele=4";
+}
+*[ele][ele !~ /^-?[0-9]+(\.[0-9]+)?$/]!.ele_meter_remove_autofix!.ele_separator_autofix{
   throwWarning: tr("{0} must be a numeric value, in meters and without units", "{0.key}");
   assertNoMatch: "node ele=12m";
   assertNoMatch: "node ele=12 m";

data/validator/unnecessary.mapcss

@@ -16,7 +16,7 @@
 area:closed[amenity ][area?][!highway],
 area:closed[building][area?],
 area:closed[landuse ][area?][!highway],
-area:closed[leisure ][area?][!highway],
+area:closed[leisure ][area?][!highway][leisure!=track][leisure!=slipway],
 area:closed[natural ][area?],
 area:closed[shop    ][area?] {
   throwWarning: tr("{0} is unnecessary for {1}", "{2.key}", "{1.key}");

data_nodist/csv.style

-FIELD_DELIMITER		WHITESPACE
-RECORD_DELIMITER	NEWLINE
-BADCHARS		COMMA
-
-IFIELD LAT_DECIMAL, "", "%f"
-IFIELD LON_DECIMAL, "", "%f"
-IFIELD ALT_METERS, "", "%f"
-IFIELD IGNORE, "", ""

debian/changelog

+josm (0.0.svn13367+dfsg-1~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 03 Feb 2018 07:43:32 +0100
+
+josm (0.0.svn13367+dfsg-1) unstable; urgency=medium
+
+  * New tested snapshot.
+  * Update license for translations from BSD-3-Clause to GPL-2+ (same as JOSM).
+  * Bump Standards-Version to 4.1.3, no changes.
+  * Update copyright-format URL to use HTTPS.
+  * Add license & copyright for XZ Java sources.
+  * Refresh patches.
+  * Bump minimum required jmapviewer version to 2.5.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Mon, 29 Jan 2018 07:55:09 +0100
+
 josm (0.0.svn13265+dfsg-1~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.

debian/control

@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9~),
                gettext,
                groovy,
                javacc,
-               jmapviewer (>= 2.4),
+               jmapviewer (>= 2.5),
                libcommons-compress-java,
                libcommons-logging-java,
                libgettext-ant-tasks-java,
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 9~),
                libsvgsalamander-java,
                libterm-readkey-perl,
                openjfx
-Standards-Version: 4.1.2
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/josm.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/josm.git -b stretch-backports
 Homepage: https://josm.openstreetmap.de
@@ -30,7 +30,7 @@ Package: josm
 Architecture: all
 Depends: default-jre (>= 2:1.8) | java8-runtime,
          fonts-noto,
-         jmapviewer (>= 2.4),
+         jmapviewer (>= 2.5),
          libcommons-compress-java,
          libcommons-logging-java,
          libgettext-commons-java (>= 0.9.6),

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: JOSM
 Upstream-Contact: JOSM Developers <josm-dev@openstreetmap.org>
 Source: https://josm.openstreetmap.de/svn/trunk
@@ -122,8 +122,17 @@ Files: src/org/jdesktop/*
 Copyright: 2004, Sun Microsystems, Inc.
 License: LGPL-2.1+
 
+Files: src/org/tukaani/*
+Copyright: disclaimed
+License: public-domain
+ This Java implementation of XZ has been put into the public domain,
+ thus you can do whatever you want with it. All the files in the package
+ have been written by Lasse Collin, but some files are heavily based on
+ public domain code written by Igor Pavlov.
+
 Files: src/javax/json/*
  src/org/glassfish/json/*
+ resources/org/glassfish/json/*
 Copyright: 2011-2017, Oracle and/or its affiliates
 Comment: The contents of this file are subject to the terms of either the GNU
  General Public License Version 2 only ("GPL") or the Common Development
@@ -166,17 +175,11 @@ Copyright: 2011-2017, Andrey Ponomarenko's ABI Laboratory
 License: GPL-2+ or LGPL-2.1+
 
 Files: i18n/po/*.po
-Copyright: 2006-2013, 2015-2016, Rosetta Contributors
-           2006-2013, 2015-2016, Canonical Ltd
-License: BSD-3-Clause
-
-Files: i18n/po/en_GB.po
-Copyright: 2006, Immanuel Scholz
-License: BSD-3-Clause
-
-Files: i18n/po/tr.po
-Copyright: 2009, ikinokta
-License: BSD-3-Clause
+Copyright: 2006-2013, 2015-2017, Rosetta Contributors
+           2006-2013, 2015-2017, Canonical Ltd
+                           2009, ikinokta
+                           2006, Immanuel Scholz
+License: GPL-2+
 
 Files: i18n/convcss.pl
  i18n/convmaps.pl
@@ -235,35 +238,6 @@ License: BSD-2-Clause
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-3-Clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
- .
-   * Redistributions in binary form must reproduce the above
-     copyright notice, this list of conditions and the following
-     disclaimer in the documentation and/or other materials provided
-     with the distribution.
- .
-   * Neither the name of the <ORGANIZATION> nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the "Software"),

debian/patches/00-build.patch

@@ -100,8 +100,8 @@ Forwarded: not-needed
      </target>
      <target name="compile-cots" depends="init">
          <!-- COTS -->
--        <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,gnu/**" nowarn="on" encoding="iso-8859-1"
-+        <javac srcdir="${src.dir}" classpathref="classpath" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,gnu/**" nowarn="on" encoding="iso-8859-1"
+-        <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**,gnu/**" nowarn="on" encoding="iso-8859-1"
++        <javac srcdir="${src.dir}" classpathref="classpath" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**,gnu/**" nowarn="on" encoding="iso-8859-1"
              destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
              <!-- get rid of "internal proprietary API" warning -->
              <compilerarg value="-XDignore.symbol.file"/>
@@ -110,8 +110,6 @@ Forwarded: not-needed
 -            <exclude name="org/apache/commons/compress/changes/**"/>
 -            <exclude name="org/apache/commons/compress/compressors/bzip2/BZip2Utils.java"/>
 -            <exclude name="org/apache/commons/compress/compressors/brotli/**"/>
--            <exclude name="org/apache/commons/compress/compressors/lzma/**"/>
--            <exclude name="org/apache/commons/compress/compressors/xz/**"/>
 -            <exclude name="org/apache/commons/compress/compressors/CompressorStreamFactory.java"/>
 -            <exclude name="org/apache/commons/compress/compressors/CompressorStreamProvider.java"/>
 -            <exclude name="org/apache/commons/compress/compressors/CompressorException.java"/>
@@ -119,9 +117,11 @@ Forwarded: not-needed
 -            <exclude name="org/apache/commons/compress/compressors/deflate/**"/>
 -            <exclude name="org/apache/commons/compress/compressors/gzip/**"/>
 -            <exclude name="org/apache/commons/compress/compressors/lz4/**"/>
+-            <exclude name="org/apache/commons/compress/compressors/lzma/**"/>
 -            <exclude name="org/apache/commons/compress/compressors/lz77support/**"/>
 -            <exclude name="org/apache/commons/compress/compressors/pack200/**"/>
 -            <exclude name="org/apache/commons/compress/compressors/snappy/**"/>
+-            <exclude name="org/apache/commons/compress/compressors/xz/XZUtils.java"/>
 -            <exclude name="org/apache/commons/compress/compressors/z/**"/>
 -            <exclude name="org/apache/commons/compress/compressors/zstandard/**"/>
 -            <exclude name="org/apache/commons/compress/parallel/**"/>
@@ -146,7 +146,7 @@ Forwarded: not-needed
          <!-- JMapViewer -->
 -        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}" 
 +        <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath"
-             excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,gnu/**"
+             excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,org/tukaani/**,gnu/**"
              destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
 -            <compilerclasspath>
 -                <pathelement location="${error_prone_ant.jar}"/>
@@ -154,11 +154,12 @@ Forwarded: not-needed
              <compilerarg value="-Xlint:cast"/>
              <compilerarg value="-Xlint:deprecation"/>
              <compilerarg value="-Xlint:dep-ann"/>
-@@ -314,18 +303,14 @@ Build-Date: ${build.tstamp}
+@@ -314,19 +303,14 @@ Build-Date: ${build.tstamp}
              <compilerarg value="-Xlint:unchecked"/>
              <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
              <compilerarg value="-XDignore.symbol.file"/>
 -            <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+-            <compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
              <compilerarg line="-Xmaxwarns 1000"/>
          </javac>
      </target>
@@ -166,7 +167,7 @@ Forwarded: not-needed
          <!-- JOSM -->
 -        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
 +        <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath"
-             excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**"
+             excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
              destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
 -            <compilerclasspath>
 -                <pathelement location="${error_prone_ant.jar}"/>
@@ -174,7 +175,7 @@ Forwarded: not-needed
              <compilerarg value="-Xlint:cast"/>
              <compilerarg value="-Xlint:deprecation"/>
              <compilerarg value="-Xlint:dep-ann"/>
-@@ -339,12 +324,6 @@ Build-Date: ${build.tstamp}
+@@ -340,13 +324,6 @@ Build-Date: ${build.tstamp}
              <compilerarg value="-Xlint:unchecked"/>
              <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
              <compilerarg value="-XDignore.symbol.file"/>
@@ -183,11 +184,12 @@ Forwarded: not-needed
 -            <compilerarg value="-Xep:FutureReturnValueIgnored:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
 -            <compilerarg value="-Xep:FloatingPointLiteralPrecision:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
 -            <compilerarg value="-Xep:ShortCircuitBoolean:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+-            <compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
 -            <compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
              <compilerarg line="-Xmaxwarns 1000"/>
              <exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/>
          </javac>
-@@ -359,6 +338,7 @@ Build-Date: ${build.tstamp}
+@@ -361,6 +338,7 @@ Build-Date: ${build.tstamp}
          </uptodate>
          <mkdir dir="${build.dir}"/>
          <mkdir dir="${dist.dir}"/>
@@ -195,7 +197,7 @@ Forwarded: not-needed
      </target>
      <target name="javadoc" depends="init-properties">
          <javadoc destdir="javadoc"
-@@ -392,6 +372,7 @@ Build-Date: ${build.tstamp}
+@@ -394,6 +372,7 @@ Build-Date: ${build.tstamp}
          <delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
          <delete file="${epsg.output}"/>
          <delete file="${pmd.dir}/cache"/>
@@ -203,7 +205,7 @@ Forwarded: not-needed
      </target>
      <macrodef name="init-test-preferences">
          <attribute name="testfamily"/>
-@@ -893,6 +874,7 @@ Build-Date: ${build.tstamp}
+@@ -905,6 +884,7 @@ Build-Date: ${build.tstamp}
                  <pathelement path="${base.dir}"/>
                  <pathelement path="${proj-classpath}"/>
                  <pathelement path="${proj-build.dir}"/>
@@ -233,7 +235,7 @@ Forwarded: not-needed
      <target name="init" description="Loads the Ant gettext and contrib tasks">
          <taskdef name="gettext-extract" classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask" classpath="${gettexttasks.jar}"/>
          <!-- for the <foreach> possibility -->
-@@ -66,7 +66,7 @@
+@@ -87,7 +87,7 @@
          </exec>
          <delete file="po/josm.raw.pot"/>
      </target>
@@ -242,7 +244,7 @@ Forwarded: not-needed
          <gettext-extract keysFile="core.pot" poDirectory="po" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
              <fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
              <fileset dir="${i18n.build.dir}" includes="specialmessages.java"/>
-@@ -108,9 +108,14 @@
+@@ -129,9 +129,14 @@
          <delete file="${po.build.dir}/data.pot"/>
          <delete file="${po.build.dir}/plugins.raw.pot"/>
      </target>
@@ -260,7 +262,7 @@ Forwarded: not-needed
      </target>
      <target name="buildplugins" depends="init">
          <foreach param="path" target="plugintrans" parallel="true" maxThreads="8">
-@@ -159,15 +164,14 @@
+@@ -184,15 +189,14 @@
          </if>
          <delete dir="${po.build.dir}/plugin_${dir}"/>
      </target>