.classpath

@@ -148,12 +148,17 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="tools/groovy/groovy-cli-commons-2.5.0.jar">
+	<classpathentry kind="lib" path="tools/groovy/groovy-cli-commons-2.5.1.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="tools/groovy/groovy-xml-2.5.0.jar">
+	<classpathentry kind="lib" path="tools/groovy/groovy-xml-2.5.1.jar">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="test/lib/jmockit-1.40.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>

.travis.yml

-language: java
-os:
-  - linux
-  - osx
-matrix:
-  include:
-    - os: linux
-      dist: trusty
-      sudo: required
-      jdk:
-        - oraclejdk9
-        - oraclejdk8
-        - openjdk8
-    - os: osx
-      osx_image: xcode9.2
-before_install:
-  - >
-    case "${TRAVIS_OS_NAME:-linux}" in
-    linux)
-      ;;
-    osx)
-      brew update
-      brew install ant
-      ;;
-    esac;
+language: java
+script: (eval "$ANT_INVOCATION $(test $TRAVIS_JDK_VERSION = openjdk8 && echo -DnoJavaFX=true) test")
+os: linux
+dist: trusty
+env:
+  - ANT_INVOCATION="xvfb-run ant -Dtest.headless=false"
+  - ANT_INVOCATION="ant -Dtest.headless=true"
+jdk:
+  - oraclejdk9
+  - oraclejdk8
+  - openjdk8
+matrix:
+  include:
+  - os: osx
+    osx_image: xcode9.2
+    jdk: ~
+    env: ANT_INVOCATION="ant -Dtest.headless=true"
+before_install:
+  - >
+    case "${TRAVIS_OS_NAME:-linux}" in
+    linux)
+      ;;
+    osx)
+      brew update
+      brew install ant
+      ;;
+    esac;

REVISION

 <?xml version="1.0" encoding="UTF-8"?>
 <info>
 <entry
-   path="trunk"
-   revision="14026"
-   kind="dir">
+   revision="14066"
+   kind="dir"
+   path="trunk">
 <url>https://josm.openstreetmap.de/svn/trunk</url>
 <relative-url>^/trunk</relative-url>
 <repository>
@@ -11,9 +11,9 @@
 <uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
 </repository>
 <commit
-   revision="14026">
+   revision="14066">
 <author>Don-vip</author>
-<date>2018-07-08T23:47:59.959896Z</date>
+<date>2018-07-28T22:41:59.666644Z</date>
 </commit>
 </entry>
 </info>

build.xml

@@ -42,6 +42,7 @@
         <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
         <property name="dist-optimized.jar" location="${dist.dir}/josm-custom-optimized.jar"/>
         <property name="java.lang.version" value="1.8" />
+        <property name="test.headless" value="true" />
         <property name="jacoco.includes" value="org.openstreetmap.josm.*" />
         <property name="jacoco.inclbootstrapclasses" value="false" />
         <property name="jacoco.inclnolocationclasses" value="false" />
@@ -455,40 +456,39 @@ Build-Date: ${build.tstamp}
         <delete file="${test.dir}/config/functional-josm.home" failonerror="false"/>
         <delete file="${test.dir}/config/performance-josm.home" failonerror="false"/>
     </target>
-    <macrodef name="call-groovyc">
+    <macrodef name="call-javac">
         <attribute name="testfamily"/>
         <element name="cp-elements"/>
         <sequential>
-            <groovyc srcdir="${test.dir}/@{testfamily}" destdir="${test.dir}/build/@{testfamily}" encoding="UTF-8">
+            <javac srcdir="${test.dir}/@{testfamily}" destdir="${test.dir}/build/@{testfamily}"
+                target="${java.lang.version}" source="${java.lang.version}" debug="on"
+                includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
+                <compilerarg value="-Xlint:all"/>
+                <compilerarg value="-Xlint:-serial"/>
                 <classpath>
                     <cp-elements/>
                 </classpath>
-                <javac target="${java.lang.version}" source="${java.lang.version}" debug="on" encoding="UTF-8">
-                    <compilerarg value="-Xlint:all"/>
-                    <compilerarg value="-Xlint:-serial"/>
-                </javac>
-            </groovyc>
+            </javac>
         </sequential>
     </macrodef>
     <target name="test-compile" depends="test-init,dist">
-        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${toString:groovy.classpath}"/>
-        <call-groovyc testfamily="unit">
+        <call-javac testfamily="unit">
             <cp-elements>
                 <path refid="test.classpath"/>
             </cp-elements>
-        </call-groovyc>
-        <call-groovyc testfamily="functional">
+        </call-javac>
+        <call-javac testfamily="functional">
             <cp-elements>
                 <path refid="test.classpath"/>
                 <pathelement path="${test.dir}/build/unit"/>
             </cp-elements>
-        </call-groovyc>
-        <call-groovyc testfamily="performance">
+        </call-javac>
+        <call-javac testfamily="performance">
             <cp-elements>
                 <path refid="test.classpath"/>
                 <pathelement path="${test.dir}/build/unit"/>
             </cp-elements>
-        </call-groovyc>
+        </call-javac>
     </target>
     <macrodef name="call-junit">
         <attribute name="testfamily"/>
@@ -500,6 +500,7 @@ Build-Date: ${build.tstamp}
                 inclbootstrapclasses="${jacoco.inclbootstrapclasses}" inclnolocationclasses="${jacoco.inclnolocationclasses}">
                 <junit printsummary="yes" fork="true" forkmode="once">
                     <jvmarg value="-Dfile.encoding=UTF-8"/>
+                    <jvmarg value="-javaagent:${test.dir}/lib/jmockit-1.40.jar"/>
                     <jvmarg value="--add-modules" if:set="isJava9" unless:set="isJava11" />
                     <jvmarg value="java.activation,java.se.ee" if:set="isJava9" unless:set="isJava11" />
                     <jvmarg value="--add-exports" if:set="isJava9" />
@@ -524,7 +525,7 @@ Build-Date: ${build.tstamp}
                     <jvmarg value="java.desktop/java.awt=ALL-UNNAMED" if:set="isJava9" />
                     <sysproperty key="josm.home" value="${test.dir}/config/@{testfamily}-josm.home"/>
                     <sysproperty key="josm.test.data" value="${test.dir}/data"/>
-                    <sysproperty key="java.awt.headless" value="true"/>
+                    <sysproperty key="java.awt.headless" value="${test.headless}"/>
                     <sysproperty key="glass.platform" value="Monocle"/>
                     <sysproperty key="monocle.platform" value="Headless"/>
                     <sysproperty key="prism.order" value="sw"/>
@@ -804,7 +805,7 @@ Build-Date: ${build.tstamp}
     </macrodef>
 
     <target name="taginfo" depends="dist">
-        <!-- http://docs.groovy-lang.org/2.5.0/html/documentation/#_the_groovy_ant_task -->
+        <!-- http://docs.groovy-lang.org/2.5.1/html/documentation/#_the_groovy_ant_task -->
         <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="groovy.classpath"/>
         <property name="taginfoextract" value="scripts/TagInfoExtract.groovy"/>
         <property name="imgurlprefix" value="http://josm.openstreetmap.de/download/taginfo/taginfo-img"/>

data/defaultpresets.xml

@@ -512,6 +512,7 @@
                   fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:highway=motorway_link"
                   it.href="https://wiki.openstreetmap.org/wiki/IT:Tag:highway=motorway_link"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:highway=motorway_link"
+                  ko.href="https://wiki.openstreetmap.org/wiki/Ko:Tag:highway=motorway_link"
                   pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:highway=motorway_link"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:highway=motorway_link"
                   uk.href="https://wiki.openstreetmap.org/wiki/Uk:Tag:highway=motorway_link" />
@@ -576,7 +577,8 @@
                   cs.href="https://wiki.openstreetmap.org/wiki/Cs:Highway_link"
                   es.href="https://wiki.openstreetmap.org/wiki/ES:Highway_link"
                   it.href="https://wiki.openstreetmap.org/wiki/IT:Highway_link"
-                  ja.href="https://wiki.openstreetmap.org/wiki/JA:Highway_link" />
+                  ja.href="https://wiki.openstreetmap.org/wiki/JA:Highway_link"
+                  ko.href="https://wiki.openstreetmap.org/wiki/Ko:Highway_link" />
             <space />
             <key key="highway" value="trunk_link" />
             <text key="ref" text="Reference" />
@@ -1415,6 +1417,7 @@
                   es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:highway=stop"
                   fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:highway=stop"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:highway=stop"
+                  ko.href="https://wiki.openstreetmap.org/wiki/Ko:Tag:highway=stop"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:highway=stop"
                   pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:highway=stop"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:highway=stop" />
@@ -1884,6 +1887,7 @@
             <link href="https://wiki.openstreetmap.org/wiki/Tag:barrier=guard_rail"
                   cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:barrier=guard_rail"
                   es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:barrier=guard_rail"
+                  fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:barrier=guard_rail"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:barrier=guard_rail"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=guard_rail"
                   pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:barrier=guard_rail" />
@@ -2353,6 +2357,17 @@
             <key key="waterway" value="dam" />
             <reference ref="name_wikipedia" />
         </item> <!-- Dam -->
+        <item name="Levee" icon="presets/misc/dyke.svg" type="way" preset_name_label="true">
+            <link href="https://wiki.openstreetmap.org/wiki/Tag:man_made=dyke"
+                  cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=dyke"
+                  de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:man_made=dyke"
+                  ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:man_made=dyke"
+                  pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:man_made=dyke"
+                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:man_made=dyke"
+                  ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:man_made=dyke" />
+            <space />
+            <key key="man_made" value="dyke" />
+        </item> <!-- Levee -->
         <item name="Groyne" icon="presets/nautical/groyne.svg" type="way,closedway" preset_name_label="true">
             <link href="https://wiki.openstreetmap.org/wiki/Tag:man_made=groyne"
                   cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=groyne"
@@ -4077,6 +4092,7 @@
             <link href="https://wiki.openstreetmap.org/wiki/Tag:tourism=guest_house"
                   cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=guest_house"
                   de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:tourism=guest_house"
+                  es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:tourism=guest_house"
                   fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:tourism=guest_house"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:tourism=guest_house"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=guest_house"
@@ -4143,6 +4159,7 @@
             <link href="https://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
                   cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=hostel"
                   de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:tourism=hostel"
+                  es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:tourism=hostel"
                   fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:tourism=hostel"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:tourism=hostel"
                   pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:tourism=hostel"
@@ -6231,6 +6248,7 @@
                   cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=watering_place"
                   de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:amenity=watering_place"
                   es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:amenity=watering_place"
+                  fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:amenity=watering_place"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:amenity=watering_place"
                   pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:amenity=watering_place"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:amenity=watering_place" />
@@ -6609,7 +6627,8 @@
         <item name="Equestrian" icon="presets/sport/equestrian.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="https://wiki.openstreetmap.org/wiki/Tag:sport=equestrian"
                   de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:sport=equestrian"
-                  es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:sport=equestrian" />
+                  es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:sport=equestrian"
+                  fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:sport=equestrian" />
             <space />
             <key key="sport" value="equestrian" />
             <text key="name" text="Name" />
@@ -6617,7 +6636,8 @@
         </item> <!-- Equestrian -->
         <item name="Horse Racing" icon="presets/sport/riding.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="https://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing"
-                  de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:sport=horse_racing" />
+                  de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:sport=horse_racing"
+                  fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:sport=horse_racing" />
             <space />
             <key key="sport" value="horse_racing" />
             <text key="name" text="Name" />
@@ -6918,7 +6938,8 @@
                   de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:sport=motocross"
                   es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:sport=motocross"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:sport=motocross"
-                  ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:sport=motocross" />
+                  ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:sport=motocross"
+                  sv.href="https://wiki.openstreetmap.org/wiki/Sv:Tag:sport=motocross" />
             <space />
             <key key="sport" value="motocross" />
             <text key="name" text="Name" />
@@ -7537,7 +7558,8 @@
             <link href="https://wiki.openstreetmap.org/wiki/Key:bridge:support"
                   cs.href="https://wiki.openstreetmap.org/wiki/Cs:Key:bridge:support"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Key:bridge:support"
-                  pl.href="https://wiki.openstreetmap.org/wiki/Pl:Key:bridge:support" />
+                  pl.href="https://wiki.openstreetmap.org/wiki/Pl:Key:bridge:support"
+                  ru.href="https://wiki.openstreetmap.org/wiki/RU:Key:bridge:support" />
             <space />
             <combo key="bridge:support" text="Type" values="pier,abutment,lift_pier,pivot_pier,pylon" match="key" />
         </item> <!-- Bridge Support -->
@@ -9728,6 +9750,7 @@
     <item name="It specialist" icon="presets/office/it.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="https://wiki.openstreetmap.org/wiki/Tag:office=it"
                   cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:office=it"
+                  es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:office=it"
                   ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:office=it"
                   pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:office=it"
                   ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:office=it"

data/validator/combinations.mapcss

@@ -212,13 +212,12 @@ way[incline                    ][!highway][!railway][aeroway!~/^(runway|taxiway)
   group: tr("missing tag");
 }
 
-/* {0.tag} together with {1.key}, see #10837, #14034, #9389, #11977, #13156 */
+/* {0.tag} together with {1.key}, see #16464, #10837, #14034, #9389, #11977, #13156 */
+*[internet_access=no][internet_access:fee],
 node[power=transformer][voltage],
 node[transformer=distribution][voltage][power=pole],
 *[amenity=vending_machine][shop],
 *[noname?][name],
-way[man_made=pipeline][tunnel=flooded],
-way[waterway=canal][tunnel=yes],
 way[oneway=yes][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath],
 way[oneway=yes][/:forward/][!traffic_sign:forward][bicycle:forward!=use_sidepath],
 way[oneway=-1 ][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath],
@@ -233,7 +232,9 @@ way[highway=footway][oneway=no] {
   group: tr("suspicious tag combination");
 }
 
-/* {0.tag} together with {1.tag}, see #10186 */
+/* {0.tag} together with {1.tag}, see #16147, #10186 */
+way[man_made=pipeline][tunnel=flooded],
+way[waterway=canal][tunnel=yes],
 way[highway=footway][bicycle=designated] {
   throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
   group: tr("suspicious tag combination");

data/validator/geometry.mapcss

@@ -52,7 +52,10 @@ node[boundary=administrative] {
   throwWarning: tr("{0} on a node. Should be used on a way or relation.", "{0.tag}");
 }
 
-/* {0} on a node, should be an area; see ticket #10679 */
+/* {0} on a node, should be an area; #10679 #16528 */
+node[golf=green],
+node[golf=bunker],
+node[golf=fairway],
 node[area=yes],
 node[landuse],
 node[natural=scree],

data/validator/wikipedia.mapcss

@@ -48,21 +48,21 @@
 
 *[wikipedia =~ /(?i)^[-a-z]{2,12}:.*%[0-9A-F][0-9A-F]/] {
   throwError: tr("{0} tag should not have URL-encoded values like ''%27''", "{0.tag}");
-  fixAdd: concat("wikipedia=", get(regexp_match("^([-a-z]+:)(.*)$", tag("wikipedia")),1), trim(replace(URL_decode(get(regexp_match("^([-a-z]+:)(.+)$", tag("wikipedia")),2)), "_", " ")));
+  fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)(.*)$", tag("wikipedia")),1), trim(replace(URL_decode(get(regexp_match("(?i)^([-a-z]+:)(.+)$", tag("wikipedia")),2)), "_", " ")));
   assertMatch: "node wikipedia=en:Foo%27s";
   assertNoMatch: "node wikipedia=en:Foo";
 }
 
 *[wikipedia =~ /(?i)^[-a-z]{2,12}: /] {
   throwWarning: tr("wikipedia title should not start with a space after language code");
-  fixAdd: concat("wikipedia=", get(regexp_match("^([-a-z]+:)(.*)$", tag("wikipedia")),1), trim(get(regexp_match("^([-a-z]+:)(.*)$", tag("wikipedia")),2)));
+  fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)(.*)$", tag("wikipedia")),1), trim(get(regexp_match("(?i)^([-a-z]+:)(.*)$", tag("wikipedia")),2)));
   assertMatch: "node wikipedia=en: foo";
   assertNoMatch: "node wikipedia=en:foo";
 }
 
 *[wikipedia =~ /(?i)^[-a-z]{2,12}:wiki\//] { 
   throwWarning: tr("wikipedia title should not have ''{0}'' prefix", "wiki/");
-  fixAdd: concat("wikipedia=", get(regexp_match("^([-a-z]+:)wiki/(.*)$", tag("wikipedia")),1), trim(get(regexp_match("^([-a-z]+:)wiki/(.*)$", tag("wikipedia")),2)));
+  fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)wiki/(.*)$", tag("wikipedia")),1), trim(get(regexp_match("(?i)^([-a-z]+:)wiki/(.*)$", tag("wikipedia")),2)));
   assertMatch: "node wikipedia=en:wiki/foo";
   assertNoMatch: "node wikipedia=en:foo";
 }
@@ -72,7 +72,7 @@
    and look for 'wgCapitalLinks' setting. */
 *[wikipedia =~ /^[-a-zA-Z]{2,12}:\p{Ll}/][wikipedia !~ /^jbo:/][wikipedia !~ /(?i)^[-a-z]{2,12}:https?:/] {
   throwWarning: tr("wikipedia page title should have first letter capitalized");
-  fixAdd: concat("wikipedia=", get(regexp_match("^([-a-z]+:)(.)(.*)$", tag("wikipedia")),1), upper(get(regexp_match("^([-a-z]+:)(.)(.*)$", tag("wikipedia")),2)), get(regexp_match("^([-a-z]+:)(.)(.*)$", tag("wikipedia")),3));
+  fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)(.)(.*)$", tag("wikipedia")),1), upper(get(regexp_match("(?i)^([-a-z]+:)(.)(.*)$", tag("wikipedia")),2)), get(regexp_match("(?i)^([-a-z]+:)(.)(.*)$", tag("wikipedia")),3));
   assertMatch: "node wikipedia=en:foo";
   assertNoMatch: "node wikipedia=en:Foo";
   assertMatch: "node wikipedia=ru:абв";
@@ -81,7 +81,7 @@
 
 *[wikipedia =~ /(?i)^[-a-z]{2,12}:.*_/][wikipedia !~ /(?i)^[-a-z]{2,12}:https?:/] {
   throwWarning: tr("wikipedia page title should have spaces instead of underscores (''_''→'' '')");
-  fixAdd: concat("wikipedia=", get(regexp_match("^([-a-z]+:)(.+)$", tag("wikipedia")),1), trim(replace(get(regexp_match("^([-a-z]+:)(.+)$", tag("wikipedia")),2), "_", " ")));
+  fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)(.+)$", tag("wikipedia")),1), trim(replace(get(regexp_match("(?i)^([-a-z]+:)(.+)$", tag("wikipedia")),2), "_", " ")));
   assertMatch: "node wikipedia=en:foo_bar";
   assertNoMatch: "node wikipedia=en:foo bar";
 }
@@ -110,7 +110,7 @@
 *[wikipedia ^= "ru:ru:"],
 *[wikipedia ^= "zh:zh:"] {
   throwWarning: tr("wikipedia language seems to be duplicated, e.g. en:en:Foo");
-  fixAdd: concat("wikipedia=", get(regexp_match("^([-a-z]+:)([-a-z]+:)(.*)$", tag("wikipedia")),2), trim(get(regexp_match("^([-a-z]+:)([-a-z]+:)(.*)$", tag("wikipedia")),3)));
+  fixAdd: concat("wikipedia=", get(regexp_match("(?i)^([-a-z]+:)([-a-z]+:)(.*)$", tag("wikipedia")),2), trim(get(regexp_match("(?i)^([-a-z]+:)([-a-z]+:)(.*)$", tag("wikipedia")),3)));
   assertMatch: "node wikipedia=en:en:Foo";
   assertMatch: "node wikipedia=en:fr:Foo";
   assertNoMatch: "node wikipedia=en:Bar";

data_nodist/projection/josm-epsg

@@ -136,6 +136,24 @@
 <27564> +proj=lcc +lat_0=42.165 +lat_1=41d33'37.396" +lat_2=42d46'3.588" +lon_0=2d20'14.025" +x_0=234.358 +y_0=185861.369 +a=6378249.2 +b=6356515 +nadgrids=ntf_r93.gsb +units=m +bounds=-4.416666666666665,41.49,9.18,44.267667  <>
 # Rijksdriehoekscoördinaten (Netherlands)
 <28992> +proj=sterea +lat_0=52d9'22.178" +lon_0=5d23'15.5" +k_0=0.9999079 +x_0=155000 +y_0=463000 +ellps=bessel +towgs84=565.4171,50.3319,465.5524,-0.398957,0.343988,-1.877402,4.0725 +units=m +bounds=3.1,50.56,7.6,53.63  <>
+# MGI / Austria GK West
+<31254> +proj=tmerc +lat_0=0 +lon_0=10.33333333333333 +k=1 +x_0=0 +y_0=-5000000 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+# MGI / Austria GK Central
+<31255> +proj=tmerc +lat_0=0 +lon_0=13.33333333333333 +k=1 +x_0=0 +y_0=-5000000 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+# MGI / Austria GK East
+<31256> +proj=tmerc +lat_0=0 +lon_0=16.33333333333333 +k=1 +x_0=0 +y_0=-5000000 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+# MGI / Austria GK M28
+<31257> +proj=tmerc +lat_0=0 +lon_0=10.33333333333333 +k=1 +x_0=150000 +y_0=-5000000 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+# MGI / Austria GK M31
+<31258> +proj=tmerc +lat_0=0 +lon_0=13.33333333333333 +k=1 +x_0=450000 +y_0=-5000000 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+# MGI / Austria GK M34
+<31259> +proj=tmerc +lat_0=0 +lon_0=16.33333333333333 +k=1 +x_0=750000 +y_0=-5000000 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+# MGI / Austria M28
+<31284> +proj=tmerc +lat_0=0 +lon_0=10.33333333333333 +k=1 +x_0=150000 +y_0=0 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+# MGI / Austria M31
+<31285> +proj=tmerc +lat_0=0 +lon_0=13.33333333333333 +k=1 +x_0=450000 +y_0=0 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+# MGI / Austria M34
+<31286> +proj=tmerc +lat_0=0 +lon_0=16.33333333333333 +k=1 +x_0=750000 +y_0=0 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
 # Belgian Lambert 1972
 <31370> +proj=lcc +lat_0=90 +lat_1=49d50'0.00204" +lat_2=51d10'0.00204" +lon_0=4d22'2.952" +x_0=150000.013 +y_0=5400088.438 +ellps=intl +towgs84=-99.06,53.32,-112.49,0.419,-0.83,1.885,-1.0 +units=m +bounds=2.54,49.51,6.4,51.5  <>
 # Gauß-Krüger Zone 2

data_nodist/projection/projection-reference-data

@@ -40705,60 +40705,60 @@
     12.094626217386507,-70.8993130752017,-154866.794837554,-1.287454449718851E7
     15.524765489720075,33.410063680681546,-75183.516480737,-1301974.097651883
     17.714969153272243,41.95626382892638,114613.50402083,-352794.234822817
-<EPSG:31254> +proj=tmerc +lat_0=0 +lon_0=10.33333333333333 +k=1 +x_0=0 +y_0=-5000000 +datum=hermannskogel +units=m +no_defs  <>
-    16.704350576440667,-39.41588558839312,548608.348782722,-9384308.839667352
-    5.087633521900576,17.108808074044234,-559010.047996347,-3100567.64755282
-    15.666677969458915,-34.40922213777655,490350.226643089,-8822241.271279193
-    9.690320367835717,88.37461558751613,-1862.992877556,4819928.196660712
-    7.468172431868942,66.89859119880882,-125360.372816732,2425469.643286673
-    3.8717794473707015,53.175498424234775,-431744.174344061,913226.670631299
-    8.32007239439972,2.47050145901828,-224091.519560919,-4727102.845311792
-    4.9165084473155645,-47.401477376232286,-409010.197850572,-1.0266254746832352E7
-<EPSG:31255> +proj=tmerc +lat_0=0 +lon_0=13.33333333333333 +k=1 +x_0=0 +y_0=-5000000 +datum=hermannskogel +units=m +no_defs  <>
-    8.67313664070818,-55.412876309633965,-295188.014062428,-1.115311950843294E7
-    12.030991255614705,-52.73854306270829,-88135.772732602,-1.084639088447732E7
-    19.326290038178904,66.28556690059324,268859.569666519,2367081.482130386
-    13.330323931528447,-57.326465794171476,-362.78387282,-1.1356280997460961E7
-    16.005180972083455,-12.180518806582526,290711.323819052,-6348903.630341711
-    10.064833975691988,33.48095820363737,-303850.448807786,-1289600.574302534
-    16.49004061332503,-13.74756906010434,341386.981515982,-6523066.148107393
-    8.370596747358844,84.34174020389617,-54388.756031201,4371846.481533451
-<EPSG:31256> +proj=tmerc +lat_0=0 +lon_0=16.33333333333333 +k=1 +x_0=0 +y_0=-5000000 +datum=hermannskogel +units=m +no_defs  <>
-    19.26116920574693,-49.50209926295006,211880.512772576,-1.0489705368865669E7
-    17.772997176758544,-14.019952020147699,155403.853970618,-6551440.343802076
-    14.185625190161282,55.15498470379126,-136782.491779541,1116108.823951378
-    17.833041069886967,80.16816405523562,28806.884251539,3903781.509803871
-    19.56075144806445,52.470561654383204,219398.535322658,820109.024656454
-    21.84831732125914,-23.449898010564297,563943.426222092,-7605554.40989493
-    17.303341081831697,47.71596300261794,72870.775349523,286809.988571543
-    20.057760643586608,-63.57795601561598,184738.706368463,-1.2058118092505034E7
-<EPSG:31257> +proj=tmerc +lat_0=0 +lon_0=10.33333333333333 +k=1 +x_0=150000 +y_0=-5000000 +datum=hermannskogel +units=m +no_defs  <>
-    13.448401593631255,64.52484983699696,299605.652907127,2161565.934544209
-    14.203275259722618,50.410043030402306,425090.197643468,593143.596089071
-    17.173358610730297,-16.684866947714355,880806.893453153,-6858399.951952142
-    11.682714560747462,-63.57136643046246,216819.722608131,-1.205269461225022E7
-    10.93122287780162,-44.78903212353934,197092.995464648,-9961828.937782118
-    8.740138044782562,69.44608283644465,87666.715800917,2707534.602843526
-    13.620797019690203,-55.220102124110596,358947.497544642,-1.1126694546275374E7
-    7.680823951376442,-67.18636947547739,35028.990681827,-1.2457450903145585E7
-<EPSG:31258> +proj=tmerc +lat_0=0 +lon_0=13.33333333333333 +k=1 +x_0=450000 +y_0=-5000000 +datum=hermannskogel +units=m +no_defs  <>
-    12.590198107995802,16.442517510416565,370569.802350324,-3181723.246549226
-    11.8665072853921,86.7052452813036,440785.567445377,4633577.501248924
-    18.275787064857063,-40.37286951931421,869611.12864879,-9482887.638135448
-    20.259069228531445,19.80823472202232,1176948.884550049,-2794434.064953919
-    8.423245401277198,16.85965100161053,-73839.953326467,-3129173.047191193
-    17.500035696816255,-75.54465549376074,565887.935558478,-1.3391550897149337E7
-    16.19979701807265,-77.72235653229082,517886.090622711,-1.3632193777176695E7
-    7.659180887080413,-59.96081885103282,133127.372874345,-1.1663278175061641E7
-<EPSG:31259> +proj=tmerc +lat_0=0 +lon_0=16.33333333333333 +k=1 +x_0=750000 +y_0=-5000000 +datum=hermannskogel +units=m +no_defs  <>
-    20.918742613188435,-26.948692039343058,1205443.81485499,-7990556.772326373
-    17.2661800367815,-53.8551414264235,811222.705431764,-1.09702582889706E7
-    22.331879647606314,-46.549431111290275,1209797.528876063,-1.0174820729489682E7
-    20.4610660157538,1.8513360182217582,1209565.083762779,-4795236.796061303
-    10.667080624892535,-6.560159968111705,122249.024440974,-5729402.618996352
-    11.891705658188755,-54.86009920939572,464750.024453696,-1.1090752217170356E7
-    22.93794995592335,-24.79750250198299,1418606.570728261,-7760195.77688208
-    16.535143842283208,9.032484500188119,772128.276377434,-4001636.07943975
+<EPSG:31254> +proj=tmerc +lat_0=0 +lon_0=10.33333333333333 +k=1 +x_0=0 +y_0=-5000000 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+    6.730314873219369,-69.69840143924209,-1.273927358168633E7,-139679.060102705
+    12.738757917616734,18.783969274272167,-2921014.330947396,253567.657402286
+    6.688306432545563,68.32972402524805,2586640.003561706,-150087.576615822
+    11.265434695904169,-57.797613267052796,-1.1409120070204725E7,55209.561872397
+    14.72786534899139,36.397066285744444,-961903.46344969,394328.664099535
+    11.987427313839381,23.64659533183864,-2383359.511940803,168709.549712422
+    7.810948110658461,12.551848660310938,-3611018.489869419,-274310.530291306
+    14.408808358964423,56.171758003812016,1234695.364493803,253130.583536554
+<EPSG:31255> +proj=tmerc +lat_0=0 +lon_0=13.33333333333333 +k=1 +x_0=0 +y_0=-5000000 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+    6.659177402263931,27.328282812171608,-1958722.762968794,-661403.901141615
+    13.021673875683433,43.39888653159559,-193397.970156568,-25209.059760873
+    8.301024091305832,53.4205188386365,932763.718452002,-334359.864970386
+    7.224678887098913,-11.979717873405193,-6332637.794125505,-666583.274605781
+    13.358013234734702,8.356928776262905,-4076347.551431638,2625.546138356
+    14.240188761677107,-65.22529406402168,-1.223666089292557E7,42241.210472981
+    15.775484075375518,44.66313847158665,-50075.334803669,193726.898691697
+    6.561347984166816,60.316247933022225,1708072.888632488,-373711.696724133
+<EPSG:31256> +proj=tmerc +lat_0=0 +lon_0=16.33333333333333 +k=1 +x_0=0 +y_0=-5000000 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+    16.759668681213324,-30.901122394186174,-8420390.948030356,40606.846856753
+    16.4016878456974,82.07818442935445,4116696.159370877,1268.483484066
+    12.271493231978237,66.46256539601606,2379824.069573296,-180814.678380738
+    19.644133611113915,29.890566033609545,-1687917.319396146,319903.177880804
+    19.767948807320735,-27.88938867397534,-8091259.118252624,338125.244787625
+    21.43578881884023,-34.1633667584683,-8793848.864002436,470526.48397385
+    12.645800027631017,-25.598612923210105,-7837861.478322087,-370714.159632664
+    15.872859135658661,86.89985942211337,4655192.307714144,-2549.950056397
+<EPSG:31257> +proj=tmerc +lat_0=0 +lon_0=10.33333333333333 +k=1 +x_0=150000 +y_0=-5000000 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+    10.560875957791676,55.662992682618324,1170599.039042499,164377.815368743
+    11.22848497717215,24.82145632815846,-2253907.981058999,240432.898975241
+    17.00644973938342,-60.07077812272408,-1.168068238101615E7,520885.642843092
+    16.15262736782673,-11.08462854847842,-6232484.356807952,786612.102000498
+    6.11197244804813,29.88404250069371,-1685707.801666059,-258009.800535642
+    3.8590043339475364,-59.96318798605575,-1.1667640702586405E7,-211447.915001738
+    15.434264682770774,62.538630463845465,1946860.32097498,412434.430111524
+    8.175095198139655,-22.250204177357006,-7463438.739869332,-72695.09436691
+<EPSG:31258> +proj=tmerc +lat_0=0 +lon_0=13.33333333333333 +k=1 +x_0=450000 +y_0=-5000000 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+    10.07321416205033,-62.48835165992507,-1.193553946244595E7,281813.58450063
+    18.276131610431783,52.940337854309604,878939.921825171,782269.479020944
+    15.17665557743833,-73.42328012290898,-1.3151631796618886E7,508547.218424846
+    12.825139506665362,71.1596173066396,2897957.323115613,431824.451326199
+    12.427736934400773,-87.9970476404854,-1.4777781124639673E7,446340.797723736
+    11.06471863774162,85.71640336375393,4523391.225284217,431276.411780573
+    14.03406003365375,-38.59231217558362,-9273705.148820184,510858.179039465
+    9.974516057419613,-81.46191539600729,-1.4049626701430367E7,394203.399571382
+<EPSG:31259> +proj=tmerc +lat_0=0 +lon_0=16.33333333333333 +k=1 +x_0=750000 +y_0=-5000000 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+    14.78204158224276,49.00231374502894,430560.162869235,636588.25465315
+    16.521628122360983,-15.556994975404379,-6721033.941452511,770070.909327875
+    18.530674086263957,72.7193273810658,3073239.659277619,823052.80516032
+    22.37086877638862,-18.458556077723713,-7052818.465702474,1388517.80731598
+    17.07821970006808,15.262813153548748,-3312288.395651119,829976.513712813
+    18.71285251414203,-68.86375782592633,-1.2643929321156632E7,845623.245426774
+    14.811289238777649,-59.31129211341745,-1.1578327081662858E7,663177.168855002
+    17.514334016743835,-31.52905673537753,-8490534.240089234,862008.634557255
 <EPSG:31281> +proj=tmerc +lat_0=0 +lon_0=28 +k=1 +x_0=0 +y_0=0 +ellps=bessel +towgs84=682,-203,480,0,0,0,0 +pm=ferro +units=m +no_defs  <>
     4.0882722642889,-46.54825307485722,-478542.846294492,-5176212.230585787
     4.694577368568881,-29.432888658515367,-547232.216948703,-3270873.018165629
@@ -40786,33 +40786,33 @@
     20.761759376048737,86.24017340066288,32788.232244315,9582770.773277214
     17.640003060351916,-10.404490633362187,143474.662352777,-1151335.783062453
     9.943094981839526,-67.88328161251748,-267771.354348882,-7546622.386831757
-<EPSG:31284> +proj=tmerc +lat_0=0 +lon_0=10.33333333333333 +k=1 +x_0=150000 +y_0=0 +datum=hermannskogel +units=m +no_defs  <>
-    15.286621803280568,2.1340511332023766,701552.836199112,236392.474376777
-    3.6653709584901786,35.621817921204965,-454531.538381915,3963668.839454047
-    15.435359546747966,-41.27531610301946,577287.006379613,-4583917.735622705
-    8.578447025193597,-35.97607280316944,-8483.668881716,-3984553.887893575
-    10.755553352800247,55.86839250745504,176491.213320361,6193524.524652229
-    14.509259002702011,-56.90708709871884,404078.856177584,-6317344.241347691
-    4.52744229054763,-44.18957603682991,-314378.580613598,-4911471.327579508
-    14.73284907499732,-66.09179973252475,348680.561083564,-7339936.6295874
-<EPSG:31285> +proj=tmerc +lat_0=0 +lon_0=13.33333333333333 +k=1 +x_0=450000 +y_0=0 +datum=hermannskogel +units=m +no_defs  <>
-    14.059516102940531,-1.0443168059733523,530703.711648107,-115939.378417757
-    16.64566225572161,-84.0299415674132,488315.760898431,-9335855.429067118
-    9.714602388019875,-40.21458519391454,141758.935692836,-4459851.572334943
-    11.012615344098226,-61.490610689697846,326229.931352217,-6822318.464054843
-    14.225791498807995,-41.00422679230941,524889.908812501,-4541629.03306314
-    20.293336801249392,20.659662903670622,1176560.855931565,2300508.182125558
-    13.878260767198341,-43.25744703671536,494057.253125972,-4791644.5507617
-    18.027042894248538,-61.90311929727129,696360.339459566,-6874994.767531895
-<EPSG:31286> +proj=tmerc +lat_0=0 +lon_0=16.33333333333333 +k=1 +x_0=750000 +y_0=0 +datum=hermannskogel +units=m +no_defs  <>
-    19.004271543822085,36.24001080695001,990158.013678415,4014980.491648905
-    13.663072714199915,21.0072130547143,472292.86516495,2325708.874633281
-    15.142885726742211,5.789846874139172,618074.00384702,639893.053575442
-    20.193234694075922,10.263926142768668,1173091.147446598,1137089.753825814
-    15.185467931822355,-0.5319751419024783,622130.903477759,-59294.814428547
-    10.953808022298784,2.025605807153127,150571.503653903,224521.447258264
-    17.111697176755214,-54.122796185491254,800731.534442119,-5999922.748970442
-    13.967892100411978,-55.060619654382386,598733.251562021,-6106584.447802988
+<EPSG:31284> +proj=tmerc +lat_0=0 +lon_0=10.33333333333333 +k=1 +x_0=150000 +y_0=0 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+    12.614421442382513,-74.03171894970914,-8219954.949429885,219860.408315334
+    7.0508734938691795,-48.077234917251914,-5332349.996298105,-94766.085853663
+    5.644411229963503,-81.5607948072056,-9062155.19327514,73067.237620325
+    6.4179598691503985,73.40931858531869,8153021.387357713,25371.981856439
+    7.501712732445383,88.46379309324405,9830086.546793057,141699.140212748
+    10.635045476070244,-36.399050597364194,-4030103.765558198,176849.465288824
+    10.127792324995042,35.85216978622914,3968684.486449129,131410.806539786
+    6.514611478962749,36.83330737924497,4084361.984777927,-190742.616343133
+<EPSG:31285> +proj=tmerc +lat_0=0 +lon_0=13.33333333333333 +k=1 +x_0=450000 +y_0=0 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+    13.511714633181665,46.20031141468425,5117886.888807316,463818.558844569
+    19.03189224305742,-29.89276660859322,-3322216.522077793,1000664.509880753
+    10.844074363908756,53.93561202273264,5981151.131061024,286610.09285676
+    10.060888074442454,22.46655061605452,2488666.81235159,113023.622754924
+    6.8222132351809215,-48.67739661691417,-5414369.290230017,-29503.498432913
+    8.829171591659012,17.37160593811808,1926593.705211206,-29141.615609154
+    13.46861326906186,15.83044807140324,1750401.568629719,464424.218978021
+    20.248456356585137,-28.724186880067208,-3198700.241049194,1126246.671089831
+<EPSG:31286> +proj=tmerc +lat_0=0 +lon_0=16.33333333333333 +k=1 +x_0=750000 +y_0=0 +datum=hermannskogel +units=m +axis=neu +no_defs  <>
+    16.243660537612545,7.319482118666315,808910.070263495,740032.951689704
+    21.130888504118502,75.92944808691954,8435472.734712053,880309.846776067
+    19.594289575040854,-84.65626618572723,-9405653.930594724,783792.787172848
+    19.5189401115055,9.229895821081826,1021744.121268782,1100166.582299268
+    20.5344135831888,-75.58144719389215,-8395720.67736465,866582.760523444
+    19.85511497160883,88.95357630574316,9884779.305095969,757416.567306758
+    15.496599804584175,56.91997046114929,6310829.640370189,699165.547006866
+    22.51680055304349,21.746526207058096,2418054.763704245,1390537.337003009
 <EPSG:31287> +proj=lcc +lat_1=49 +lat_2=46 +lat_0=47.5 +lon_0=13.33333333333333 +x_0=400000 +y_0=400000 +datum=hermannskogel +units=m +no_defs  <>
     67.44461981554436,3.643671039991613,7563591.252528059,-2315218.850381509
     75.71151812909277,87.60507285143646,888899.534886339,5781154.942329449

debian/changelog

+josm (0.0.svn14066+dfsg-2~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 09 Aug 2018 18:20:43 +0200
+
+josm (0.0.svn14066+dfsg-2) unstable; urgency=medium
+
+  * Drop autopkgtest to test installability.
+    (closes: #905118)
+  * Add lintian override for testsuite-autopkgtest-missing.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 31 Jul 2018 19:27:00 +0200
+
+josm (0.0.svn14066+dfsg-1) unstable; urgency=medium
+
+  * New tested snapshot.
+  * Refresh patches.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Mon, 30 Jul 2018 18:39:05 +0200
+
 josm (0.0.svn14026+dfsg-1~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.

debian/patches/00-build.patch

@@ -17,7 +17,7 @@ Forwarded: not-needed
          <property name="error_prone_ant.jar" location="${tools.dir}/error_prone_ant.jar"/>
          <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
          <property name="dist-optimized.jar" location="${dist.dir}/josm-custom-optimized.jar"/>
-@@ -74,10 +75,23 @@
+@@ -75,10 +76,23 @@
              </not>
          </condition>
          <path id="groovy.classpath">
@@ -43,7 +43,7 @@ Forwarded: not-needed
          <path id="test.classpath">
              <fileset dir="${test.dir}/lib">
                  <include name="**/*.jar"/>
-@@ -140,10 +154,9 @@
+@@ -141,10 +155,9 @@
      <!--
        ** Creates the REVISION file to be included in the distribution
      -->
@@ -56,7 +56,7 @@ Forwarded: not-needed
          <tstamp>
              <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
          </tstamp>
-@@ -154,8 +167,10 @@
+@@ -155,8 +168,10 @@
          <echo file="${revision.dir}/REVISION">
  # automatically generated by JOSM build.xml - do not edit
  Revision: ${version.entry.commit.revision}
@@ -68,7 +68,7 @@ Forwarded: not-needed
  </echo>
      </target>
      <!--
-@@ -175,7 +190,7 @@ Build-Date: ${build.tstamp}
+@@ -176,7 +191,7 @@ Build-Date: ${build.tstamp}
          <copy file="README" todir="${build.dir}"/>
          <copy file="LICENSE" todir="${build.dir}"/>
          <!-- create josm-custom.jar -->
@@ -77,7 +77,7 @@ Forwarded: not-needed
          <jar destfile="${dist.jar}" basedir="${build.dir}" level="${clevel}">
              <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
              <manifest>
-@@ -185,6 +200,8 @@ Build-Date: ${build.tstamp}
+@@ -186,6 +201,8 @@ Build-Date: ${build.tstamp}
                  <attribute name="Permissions" value="all-permissions"/>
                  <attribute name="Codebase" value="josm.openstreetmap.de"/>
                  <attribute name="Application-Name" value="JOSM - Java OpenStreetMap Editor"/>
@@ -86,7 +86,7 @@ Forwarded: not-needed
                  <!-- Java 9 stuff. Entries are safely ignored by Java 8 -->
                  <attribute name="Add-Exports" value="java.base/sun.security.util java.base/sun.security.x509 java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi javafx.graphics/com.sun.javafx.application jdk.deploy/com.sun.deploy.config" />
                  <attribute name="Add-Opens" value="java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
-@@ -259,43 +276,21 @@ Build-Date: ${build.tstamp}
+@@ -260,43 +277,21 @@ Build-Date: ${build.tstamp}
      </target>
      <target name="javacc" depends="init" unless="javacc.notRequired">
          <mkdir dir="${mapcss.dir}/parsergen"/>
@@ -133,7 +133,7 @@ Forwarded: not-needed
              <exclude name="org/apache/commons/jcs/JCS.java"/>
              <exclude name="org/apache/commons/jcs/access/GroupCacheAccess.java"/>
              <exclude name="org/apache/commons/jcs/access/PartitionedCacheAccess.java"/>
-@@ -316,21 +311,15 @@ Build-Date: ${build.tstamp}
+@@ -317,21 +312,15 @@ Build-Date: ${build.tstamp}
              <exclude name="org/apache/commons/jcs/utils/net/**"/>
              <exclude name="org/apache/commons/jcs/utils/props/**"/>
              <exclude name="org/apache/commons/jcs/utils/servlet/**"/>
@@ -158,7 +158,7 @@ Forwarded: not-needed
              <compilerarg value="-Xlint:cast"/>
              <compilerarg value="-Xlint:deprecation"/>
              <compilerarg value="-Xlint:dep-ann"/>
-@@ -344,19 +333,14 @@ Build-Date: ${build.tstamp}
+@@ -345,19 +334,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"/>
@@ -179,7 +179,7 @@ Forwarded: not-needed
              <compilerarg value="-Xlint:cast"/>
              <compilerarg value="-Xlint:deprecation"/>
              <compilerarg value="-Xlint:dep-ann"/>
-@@ -370,13 +354,6 @@ Build-Date: ${build.tstamp}
+@@ -371,13 +355,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"/>
@@ -193,7 +193,7 @@ Forwarded: not-needed
              <compilerarg line="-Xmaxwarns 1000"/>
              <exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>
          </javac>
-@@ -391,6 +368,7 @@ Build-Date: ${build.tstamp}
+@@ -392,6 +369,7 @@ Build-Date: ${build.tstamp}
          </uptodate>
          <mkdir dir="${build.dir}"/>
          <mkdir dir="${dist.dir}"/>
@@ -201,7 +201,7 @@ Forwarded: not-needed
      </target>
      <target name="javadoc" depends="init-properties">
          <javadoc destdir="javadoc"
-@@ -426,6 +404,7 @@ Build-Date: ${build.tstamp}
+@@ -427,6 +405,7 @@ Build-Date: ${build.tstamp}
          <delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
          <delete file="${epsg.output}"/>
          <delete file="${pmd.dir}/cache"/>
@@ -209,7 +209,7 @@ Forwarded: not-needed
      </target>
      <macrodef name="init-test-preferences">
          <attribute name="testfamily"/>
-@@ -945,6 +924,7 @@ Build-Date: ${build.tstamp}
+@@ -946,6 +925,7 @@ Build-Date: ${build.tstamp}
                  <pathelement path="${base.dir}"/>
                  <pathelement path="${proj-classpath}"/>
                  <pathelement path="${proj-build.dir}"/>

debian/source/lintian-overrides

+# Not worth the effort
+testsuite-autopkgtest-missing
+

debian/tests/control

-# Test installability
-Depends: @
-Test-Command: /bin/true

i18n/po/af.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-08 03:41+0200\n"
+"POT-Creation-Date: 2018-07-29 03:41+0200\n"
 "PO-Revision-Date: 2018-05-18 08:09+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2018-07-08 04:30+0000\n"
-"X-Generator: Launchpad (build 18704)\n"
+"X-Launchpad-Export-Date: 2018-07-30 04:30+0000\n"
+"X-Generator: Launchpad (build 18737)\n"
 "Language: af\n"
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -17673,6 +17673,9 @@ msgstr ""
 msgid "Dam"
 msgstr ""
+msgid "Levee"
+msgstr ""
+
 msgid "Groyne"
 msgstr ""
@@ -20899,6 +20902,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
+msgid "pylon"
+msgstr ""
+
 msgid "Bridge outline"
 msgstr ""
@@ -25013,7 +25019,7 @@ msgstr ""
 msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
 msgstr ""
-msgid "Loire-Atlantique - Orthophotos 2016"
+msgid "Loire-Atlantique - Orthophotos 2016 - 10 cm"
 msgstr ""
 msgid "Route 500"
@@ -26112,6 +26118,14 @@ msgstr ""
 msgid "Supplementing incomplete coverage in other sources (true color)"
 msgstr ""
+msgid "Lantmäteriet Orthophotos"
+msgstr ""
+
+msgid ""
+"Most recent orthophotos for Sweden. Permission only for mapping forest fire "
+"regions."
+msgstr ""
+
 msgid "Lantmäteriet Topographic Map"
 msgstr ""
@@ -28457,9 +28471,6 @@ msgstr ""
 msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
 msgstr ""
-msgid "{0} imported images"
-msgstr ""
-
 msgid "{0} downloaded images"
 msgstr ""
@@ -28481,12 +28492,6 @@ msgstr ""
 msgid "Export Streetside images"
 msgstr ""
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
 msgid "Walk mode"
 msgstr ""
@@ -28505,9 +28510,6 @@ msgstr ""
 msgid "Export selected images"
 msgstr ""
-msgid "Rewrite imported images"
-msgstr ""
-
 msgid "Select a directory"
 msgstr ""
@@ -28647,16 +28649,13 @@ msgid ""
 "has disappeared from screen."
 msgstr ""
-msgid "Streetside Image info"
+msgid "Streetside 360° image info"
 msgstr ""
 msgid ""
 "Displays detail information on the currently selected Streetside image"
 msgstr ""
-msgid "Show detections on top of image"
-msgstr ""
-
 msgid "View in browser"
 msgstr ""
@@ -28666,9 +28665,6 @@ msgstr ""
 msgid "Add Streetside tag"
 msgstr ""
-msgid "Image detections"
-msgstr ""
-
 msgid "Image actions"
 msgstr ""
@@ -28678,28 +28674,12 @@ msgstr ""
 msgid "Sequence key"
 msgstr ""
-msgid "{0} detections"
-msgstr ""
-
 msgid "image has no key"
 msgstr ""
-msgid "unknown user"
-msgstr ""
-
 msgid "sequence has no id"
 msgstr ""
-msgid ""
-"Welcome to the Microsoft Streetside JOSM Plugin. To view the vector bubbles "
-"for the 360 degree imagery, select Imagery->Streetside from the JOSM menu."
-msgstr ""
-
-msgid ""
-"Once the blue bubbles appear on the map, click on a vector bubble and "
-"undock/maximize the 360 viewer to view the imagery."
-msgstr ""
-
 msgid ""
 "Select Microsoft Streetside from the Imagery menu, then click on a blue "
 "vector bubble.."
@@ -28744,10 +28724,6 @@ msgid ""
 "Streetside images for a smaller portion of the map."
 msgstr ""
-msgid ""
-"Streetside download interrupted (probably because of closing the layer)."
-msgstr ""
-
 msgid "Downloading"
 msgstr ""
@@ -34882,9 +34858,6 @@ msgstr ""
 msgid "Querying"
 msgstr ""
-msgid "No change to upload!"
-msgstr ""
-
 msgid "The bounding box of the edited layer is too big."
 msgstr ""

i18n/po/ak.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-07-08 03:41+0200\n"
+"POT-Creation-Date: 2018-07-29 03:41+0200\n"
 "PO-Revision-Date: 2018-06-07 19:03+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Akan <ak@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2018-07-08 04:31+0000\n"
-"X-Generator: Launchpad (build 18704)\n"
+"X-Launchpad-Export-Date: 2018-07-30 04:31+0000\n"
+"X-Generator: Launchpad (build 18737)\n"
 msgid "{0}: option ''{1}'' is ambiguous"
 msgstr ""
@@ -17669,6 +17669,9 @@ msgstr ""
 msgid "Dam"
 msgstr ""
+msgid "Levee"
+msgstr ""
+
 msgid "Groyne"
 msgstr ""
@@ -20895,6 +20898,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
+msgid "pylon"
+msgstr ""
+
 msgid "Bridge outline"
 msgstr ""
@@ -25009,7 +25015,7 @@ msgstr ""
 msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
 msgstr ""
-msgid "Loire-Atlantique - Orthophotos 2016"
+msgid "Loire-Atlantique - Orthophotos 2016 - 10 cm"
 msgstr ""
 msgid "Route 500"
@@ -26108,6 +26114,14 @@ msgstr ""
 msgid "Supplementing incomplete coverage in other sources (true color)"
 msgstr ""
+msgid "Lantmäteriet Orthophotos"
+msgstr ""
+
+msgid ""
+"Most recent orthophotos for Sweden. Permission only for mapping forest fire "
+"regions."
+msgstr ""
+
 msgid "Lantmäteriet Topographic Map"
 msgstr ""
@@ -28453,9 +28467,6 @@ msgstr ""
 msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
 msgstr ""
-msgid "{0} imported images"
-msgstr ""
-
 msgid "{0} downloaded images"
 msgstr ""
@@ -28477,12 +28488,6 @@ msgstr ""
 msgid "Export Streetside images"
 msgstr ""
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
 msgid "Walk mode"
 msgstr ""
@@ -28501,9 +28506,6 @@ msgstr ""
 msgid "Export selected images"
 msgstr ""
-msgid "Rewrite imported images"
-msgstr ""
-
 msgid "Select a directory"
 msgstr ""
@@ -28643,16 +28645,13 @@ msgid ""
 "has disappeared from screen."
 msgstr ""
-msgid "Streetside Image info"
+msgid "Streetside 360° image info"
 msgstr ""
 msgid ""
 "Displays detail information on the currently selected Streetside image"
 msgstr ""
-msgid "Show detections on top of image"
-msgstr ""
-
 msgid "View in browser"
 msgstr ""
@@ -28662,9 +28661,6 @@ msgstr ""
 msgid "Add Streetside tag"
 msgstr ""
-msgid "Image detections"
-msgstr ""
-
 msgid "Image actions"
 msgstr ""
@@ -28674,28 +28670,12 @@ msgstr ""
 msgid "Sequence key"
 msgstr ""
-msgid "{0} detections"
-msgstr ""
-
 msgid "image has no key"
 msgstr ""
-msgid "unknown user"
-msgstr ""
-
 msgid "sequence has no id"
 msgstr ""
-msgid ""
-"Welcome to the Microsoft Streetside JOSM Plugin. To view the vector bubbles "
-"for the 360 degree imagery, select Imagery->Streetside from the JOSM menu."
-msgstr ""
-
-msgid ""
-"Once the blue bubbles appear on the map, click on a vector bubble and "
-"undock/maximize the 360 viewer to view the imagery."
-msgstr ""
-
 msgid ""
 "Select Microsoft Streetside from the Imagery menu, then click on a blue "
 "vector bubble.."
@@ -28740,10 +28720,6 @@ msgid ""
 "Streetside images for a smaller portion of the map."
 msgstr ""
-msgid ""
-"Streetside download interrupted (probably because of closing the layer)."
-msgstr ""
-
 msgid "Downloading"
 msgstr ""
@@ -34878,9 +34854,6 @@ msgstr ""
 msgid "Querying"
 msgstr ""
-msgid "No change to upload!"
-msgstr ""
-
 msgid "The bounding box of the edited layer is too big."
 msgstr ""

i18n/po/am.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-08 03:41+0200\n"
+"POT-Creation-Date: 2018-07-29 03:41+0200\n"
 "PO-Revision-Date: 2018-05-18 08:09+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Amharic <am@li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2018-07-08 04:32+0000\n"
-"X-Generator: Launchpad (build 18704)\n"
+"X-Launchpad-Export-Date: 2018-07-30 04:32+0000\n"
+"X-Generator: Launchpad (build 18737)\n"
 "Language: am\n"
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -17670,6 +17670,9 @@ msgstr ""
 msgid "Dam"
 msgstr ""
+msgid "Levee"
+msgstr ""
+
 msgid "Groyne"
 msgstr ""
@@ -20896,6 +20899,9 @@ msgstr ""
 msgid "pivot_pier"
 msgstr ""
+msgid "pylon"
+msgstr ""
+
 msgid "Bridge outline"
 msgstr ""
@@ -25010,7 +25016,7 @@ msgstr ""
 msgid "Loire-Atlantique - Orthophotos 2012 - 20 cm"
 msgstr ""
-msgid "Loire-Atlantique - Orthophotos 2016"
+msgid "Loire-Atlantique - Orthophotos 2016 - 10 cm"
 msgstr ""
 msgid "Route 500"
@@ -26109,6 +26115,14 @@ msgstr ""
 msgid "Supplementing incomplete coverage in other sources (true color)"
 msgstr ""
+msgid "Lantmäteriet Orthophotos"
+msgstr ""
+
+msgid ""
+"Most recent orthophotos for Sweden. Permission only for mapping forest fire "
+"regions."
+msgstr ""
+
 msgid "Lantmäteriet Topographic Map"
 msgstr ""
@@ -28454,9 +28468,6 @@ msgstr ""
 msgid "{0} sequences, each containing between {1} and {2} images (ø {3})"
 msgstr ""
-msgid "{0} imported images"
-msgstr ""
-
 msgid "{0} downloaded images"
 msgstr ""
@@ -28478,12 +28489,6 @@ msgstr ""
 msgid "Export Streetside images"
 msgstr ""
-msgid "Join mode"
-msgstr ""
-
-msgid "Join/unjoin pictures"
-msgstr ""
-
 msgid "Walk mode"
 msgstr ""
@@ -28502,9 +28507,6 @@ msgstr ""
 msgid "Export selected images"
 msgstr ""
-msgid "Rewrite imported images"
-msgstr ""
-
 msgid "Select a directory"
 msgstr ""
@@ -28644,16 +28646,13 @@ msgid ""
 "has disappeared from screen."
 msgstr ""
-msgid "Streetside Image info"
+msgid "Streetside 360° image info"
 msgstr ""
 msgid ""
 "Displays detail information on the currently selected Streetside image"
 msgstr ""
-msgid "Show detections on top of image"
-msgstr ""
-
 msgid "View in browser"
 msgstr ""
@@ -28663,9 +28662,6 @@ msgstr ""
 msgid "Add Streetside tag"
 msgstr ""
-msgid "Image detections"
-msgstr ""
-
 msgid "Image actions"
 msgstr ""
@@ -28675,28 +28671,12 @@ msgstr ""
 msgid "Sequence key"
 msgstr ""
-msgid "{0} detections"
-msgstr ""
-
 msgid "image has no key"
 msgstr ""
-msgid "unknown user"
-msgstr ""
-
 msgid "sequence has no id"
 msgstr ""
-msgid ""
-"Welcome to the Microsoft Streetside JOSM Plugin. To view the vector bubbles "
-"for the 360 degree imagery, select Imagery->Streetside from the JOSM menu."
-msgstr ""
-
-msgid ""
-"Once the blue bubbles appear on the map, click on a vector bubble and "
-"undock/maximize the 360 viewer to view the imagery."
-msgstr ""
-
 msgid ""
 "Select Microsoft Streetside from the Imagery menu, then click on a blue "
 "vector bubble.."
@@ -28741,10 +28721,6 @@ msgid ""
 "Streetside images for a smaller portion of the map."
 msgstr ""
-msgid ""
-"Streetside download interrupted (probably because of closing the layer)."
-msgstr ""
-
 msgid "Downloading"
 msgstr ""
@@ -34879,9 +34855,6 @@ msgstr ""
 msgid "Querying"
 msgstr ""
-msgid "No change to upload!"
-msgstr ""
-
 msgid "The bounding box of the edited layer is too big."
 msgstr ""