.classpath

@@ -14,15 +14,15 @@
 	<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.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.4.4.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.13.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.0.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.15.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.1.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.2.jar"/>

REVISION

@@ -3,7 +3,7 @@
 <entry
    kind="dir"
    path="trunk"
-   revision="13500">
+   revision="13576">
 <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="13500">
-<author>Don-vip</author>
-<date>2018-03-04T15:20:37.045626Z</date>
+   revision="13576">
+<author>Klumbumbus</author>
+<date>2018-03-26T20:16:39.281292Z</date>
 </commit>
 </entry>
 </info>

build.xml

@@ -8,7 +8,7 @@
 **   https://josm.openstreetmap.de/wiki/DevelopersGuide/CreateBuild
 **
 -->
-<project xmlns:as="antlib:org.codehaus.mojo.animal_sniffer" name="josm" default="dist" xmlns:jacoco="antlib:org.jacoco.ant" xmlns:if="ant:if">
+<project xmlns:as="antlib:org.codehaus.mojo.animal_sniffer" name="josm" default="dist" xmlns:jacoco="antlib:org.jacoco.ant" xmlns:if="ant:if" xmlns:unless="ant:unless">
     <target name="init-properties">
         <!-- Load properties in a target and not at top level, so this build file can be
         imported from an IDE ant file (Netbeans) without messing up IDE properties.
@@ -18,6 +18,7 @@
         <dirname property="base.dir" file="${ant.file.josm}"/>
         <property name="test.dir" location="${base.dir}/test"/>
         <property name="src.dir" location="${base.dir}/src"/>
+        <property name="noJavaFX" value="0"/>
         <property name="build.dir" location="${base.dir}/build"/>
         <property name="dist.dir" location="${base.dir}/dist"/>
         <property name="tools.dir" location="${base.dir}/tools"/>
@@ -51,10 +52,20 @@
         <condition property="isJava10">
             <matches string="${ant.java.version}" pattern="1[0-9]" />
         </condition>
+        <!-- For Java11-specific stuff -->
+        <condition property="isJava11">
+            <matches string="${ant.java.version}" pattern="1[1-9]" />
+        </condition>
         <!-- Disable error_prone on Java 10+, see https://github.com/google/error-prone/issues/860 -->
         <condition property="javac.compiler" value="modern" else="com.google.errorprone.ErrorProneAntCompilerAdapter">
             <isset property="isJava10"/>
         </condition>
+        <!-- Disable jacoco on Java 11+, see https://github.com/jacoco/jacoco/issues/629 -->
+        <condition property="coverageByDefault">
+            <not>
+                <isset property="isJava11"/>
+            </not>
+        </condition>
         <path id="test.classpath">
             <fileset dir="${test.dir}/lib">
                 <include name="**/*.jar"/>
@@ -469,15 +480,15 @@ Build-Date: ${build.tstamp}
     <macrodef name="call-junit">
         <attribute name="testfamily"/>
         <attribute name="testITsuffix" default=""/>
-        <attribute name="coverage" default="true"/>
+        <attribute name="coverage" default="${coverageByDefault}"/>
         <sequential>
             <echo message="Running @{testfamily}@{testITsuffix} tests with JUnit"/>
             <jacoco:coverage destfile="${test.dir}/jacoco@{testITsuffix}.exec" enabled="@{coverage}" includes="${jacoco.includes}"
                 inclbootstrapclasses="${jacoco.inclbootstrapclasses}" inclnolocationclasses="${jacoco.inclnolocationclasses}">
                 <junit printsummary="yes" fork="true" forkmode="once">
                     <jvmarg value="-Dfile.encoding=UTF-8"/>
-                    <jvmarg value="--add-modules" if:set="isJava9" />
-                    <jvmarg value="java.activation,java.se.ee" if:set="isJava9" />
+                    <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" />
                     <jvmarg value="java.base/sun.security.util=ALL-UNNAMED" if:set="isJava9" />
                     <jvmarg value="--add-exports" if:set="isJava9" />
@@ -630,6 +641,7 @@ Build-Date: ${build.tstamp}
         <typedef uri="antlib:org.codehaus.mojo.animal_sniffer">
             <classpath path="${tools.dir}/animal-sniffer-ant-tasks.jar"/>
         </typedef>
+        <delete dir="${dir}" failonerror="false"/>
         <mkdir dir="${dir}"/>
         <!-- List of deprecated plugins -->
         <loadfile property="deprecated-plugins" srcFile="${src.dir}/org/openstreetmap/josm/plugins/PluginHandler.java">
@@ -726,6 +738,7 @@ Build-Date: ${build.tstamp}
             <ignore classname="org.jaitools.*"/>
             <ignore classname="org.jaxen.*"/>
             <ignore classname="org.jboss.*"/>
+            <ignore classname="org.jdom.*"/>
             <ignore classname="org.jdom2.*"/>
             <ignore classname="org.jfree.*"/>
             <ignore classname="org.jgraph.*"/>

data/help-browser.css

@@ -58,6 +58,10 @@ code, tt {
  TRAC CSS
  ********/
 
+dl.wiki { margin-top: 5px; margin-bottom: 5px }
+dl.wiki dt { font-weight: bold }
+dl.wiki dd { margin-left: 40px }
+
 div.code pre .hll { background-color: #ffffcc }
 div.code pre  { background: #ffffff; }
 div.code pre .c { color: #999988; font-style: italic } /* Comment */

data/maps.xsd

@@ -19,10 +19,19 @@
     <xs:simpleType name="id">
         <!-- exclude white space characters and characters that are not valid for file names in Windows -->
         <xs:restriction base="xs:string">
-            <xs:pattern value='[^\s/\\:*?"&lt;>|]+' />
+            <xs:pattern value='[^\s/\\:*?"&lt;>|,;]+' />
         </xs:restriction>
     </xs:simpleType>
 
+    <xs:complexType name="oldid">
+        <xs:simpleContent>
+            <xs:extension base="tns:id">
+                <!-- date of the retirement of this ID -->
+                <xs:attribute name="date" type="xs:date" use="required" />
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+
     <xs:simpleType name="type">
         <xs:restriction base="xs:string">
             <xs:enumeration value="wms" />
@@ -622,6 +631,8 @@
                             <xs:element name="description" minOccurs="0" type="tns:description" />
                             <!-- A unique id for the imagery source -->
                             <xs:element name="id" minOccurs="0" maxOccurs="1" type="tns:id" />
+                            <!-- Historic id for the imagery source -->
+                            <xs:element name="oldid" minOccurs="0" maxOccurs="unbounded" type="tns:oldid" />
                             <!-- The type. Can be tms, wms and html. In addition, there are the special types bing and scanex 
                                 with hardcoded behaviour. -->
                             <xs:element name="type" minOccurs="1" maxOccurs="1" type="tns:type" />
@@ -665,6 +676,7 @@
                                 <xs:complexType>
                                     <xs:all>
                                         <xs:element name="type" minOccurs="1" maxOccurs="1" type="tns:type" />
+                                        <xs:element name="id" minOccurs="0" maxOccurs="1" type="tns:id" />
                                         <xs:element name="url" minOccurs="1" maxOccurs="1" type="xs:string" />
                                         <xs:element name="projections" minOccurs="0" maxOccurs="1" type="tns:projections" />
                                         <xs:element name="min-zoom" minOccurs="0" maxOccurs="1" type="tns:zoom" />
@@ -706,6 +718,7 @@
                     </xs:sequence>
                     <xs:attribute name="last-check" type="xs:date" use="optional" />
                     <xs:attribute name="eli-best" type="xs:boolean" use="optional" />
+                    <xs:attribute name="overlay" type="xs:boolean" use="optional" />
                 </xs:complexType>
             </xs:element>
         </xs:sequence>

data/validator/combinations.mapcss

@@ -12,7 +12,7 @@ way[motorroad                  ][!highway],
 node[ntd_id                    ][!highway],
 way[sac_scale                  ][!highway],
 way[sidewalk                   ][!highway],
-way[step_count                 ][!highway],
+way[step_count                 ][!highway][man_made!=tower],
 way[tracktype                  ][!highway],
 way[trail_visibility           ][!highway], /* #15029 */
 way[trolley_wire               ][!highway],
@@ -97,7 +97,7 @@ node[board_type                ][information!=board],
 node[lamp_type                 ][highway!=street_lamp],
 node[map_type                  ][information!=map],
 *[site_type                    ][historic!=archaeological_site],
-*[artwork_type                 ][tourism!=artwork],
+*[artwork_type                 ][tourism!=artwork][exhibit!=artwork],
 *[castle_type                  ][historic!=castle],
 *[parking                      ][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/],
 way[cutline                    ][man_made!=cutline],

data/validator/deprecated.mapcss

@@ -1222,3 +1222,11 @@ way[water=tidal] {
   group: tr("misspelled value");
   fixAdd: "amenity=toilets";
 }
+
+way[power=busbar] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "power=line + line=busbar";
+  group: tr("deprecated tagging");
+  fixAdd: "power=line";
+  fixAdd: "line=busbar";
+}
\ No newline at end of file