.classpath

@@ -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.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.4.7.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.15.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.18.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"/>

REVISION

 <?xml version="1.0" encoding="UTF-8"?>
 <info>
 <entry
-   revision="13878"
    kind="dir"
-   path="trunk">
+   path="trunk"
+   revision="13996">
 <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="13878">
-<author>wiktorn</author>
-<date>2018-05-30T22:51:20.617314Z</date>
+   revision="13996">
+<author>Don-vip</author>
+<date>2018-07-01T21:07:04.227861Z</date>
 </commit>
 </entry>
 </info>

build.xml

@@ -720,11 +720,13 @@ Build-Date: ${build.tstamp}
         </as:build-signatures>
         <as:check-signature signature="${dir}/api.sig" failonerror="false">
             <ignore classname="afu.*"/>
+            <ignore classname="android.*"/>
             <ignore classname="au.*"/>
             <ignore classname="com.*"/>
             <ignore classname="de.*"/>
             <ignore classname="edu.*"/>
             <ignore classname="groovy.*"/>
+            <ignore classname="io.*"/>
             <ignore classname="it.*"/>
             <ignore classname="javax.*"/>
             <ignore classname="jogamp.*"/>
@@ -738,6 +740,7 @@ Build-Date: ${build.tstamp}
             <ignore classname="org.bouncycastle.*"/>
             <ignore classname="org.checkerframework.*"/>
             <ignore classname="org.codehaus.*"/>
+            <ignore classname="org.conscrypt.*"/>
             <ignore classname="org.dom4j.*"/>
             <ignore classname="org.eclipse.*"/>
             <ignore classname="org.ejml.*"/>

data/validator/combinations.mapcss

@@ -34,7 +34,6 @@ way[tilting_technology         ][!railway][route!=railway],
 way[track_class                ][!railway][route!=railway],
 way[tracks                     ][!railway][route!=railway],
 way[traffic_mode               ][!railway][route!=railway],
-way[usage                      ][!railway][route!=railway][man_made!=pipeline],
 way[workrules                  ][!railway][route!=railway],
 way[stream                     ][!waterway],
 way[length_unit                ][!waterway],
@@ -109,7 +108,8 @@ way[cutline                    ][man_made!=cutline],
 /* {0.key} without {1.tag} or {2.tag} */
 *[bridge:movable               ][bridge!=movable][man_made!=bridge],
 *[substation                   ][power!=substation][pipeline!=substation],
-*[reservoir_type               ][landuse!=reservoir][water!=reservoir] {
+*[reservoir_type               ][landuse!=reservoir][water!=reservoir],
+way[waterway=pressurised       ][tunnel!=flooded][man_made!=pipeline] {
   throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.tag}", "{2.tag}");
   group: tr("missing tag");
 }
@@ -178,6 +178,13 @@ way[highway=motorway_link][!oneway][junction!=roundabout] {
   group: tr("missing tag");
 }
 
+/* {0.tag} without {1.tag} */
+way[usage=penstock][man_made!=pipeline],
+way[usage=penstock][waterway!=pressurised] {
+  throwWarning: tr("{0} without {1}", "{0.tag}", "{1.tag}");
+  group: tr("missing tag");
+}
+
 /* {0.tag} without {1.tag} or {2.tag} */
 *[amenity=recycling][recycling_type!=container][recycling_type!=centre] {
   throwWarning: tr("{0} without {1} or {2}", "{0.tag}", "{1.tag}", "{2.tag}");
@@ -210,6 +217,8 @@ 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],
@@ -374,14 +383,15 @@ way[highway][natural][natural!=ridge],
     assertNoMatch: "node sport=10pin amenity=restaurant";
 }
 
-/* #10140 */
-*[building:levels][!building][!building:part] {
+/* {0.key} without {1.key} or {2.key} see #10140 */
+*[building:levels][!building][!building:part],
+way[usage][!railway][!waterway][route!=railway][man_made!=pipeline] {
   throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.key}");
   group: tr("missing tag");
 }
 
-/* any other *_name tag (with some exceptions) but not a name , see #10837 #11297 #11539 */
-*[/_name$/][!name][!old_name][!loc_name][!uic_name][!artist_name][!"osak:municipality_name"][!"osak:street_name"][noname!=yes] {
+/* any other *_name tag (with some exceptions) but not a name , see #10837 #11297 #11539 #16437 */
+*[/_name$/][!name][!old_name][!loc_name][!uic_name][!artist_name][!lock_name][!"osak:municipality_name"][!"osak:street_name"][noname!=yes] {
   throwWarning: tr("alternative name without {0}", "{1.key}");
   group: tr("missing tag");
 }
@@ -462,7 +472,7 @@ way[waterway][layer][layer=~/^(-1|-2|-3|-4|-5)$/][!tunnel][culvert!=yes][covered
   fixAdd: "unisex=yes";
 }
 
-/* #13138, 14468 */
+/* {1.key} without {2.tag} see #13138, 14468 */
 area:closed[water][natural!~/water|bay|strait/][water!=intermittent] { /* water=intermittent is deprecated and has an own warning */
   throwWarning: tr("{0} without {1}", "{1.key}", "{2.tag}");
   group: tr("missing tag");

data/validator/deprecated.mapcss

@@ -874,6 +874,15 @@ node[type][pipeline=marker] {
   fixRemove: "power";
 }
 
+/* #16430 */
+*[power][location=kiosk] {
+  throwWarning: tr("{0} is deprecated", "{1.tag}");
+  group: tr("deprecated tagging");
+  fixAdd: "man_made=street_cabinet";
+  fixAdd: "street_cabinet=power";
+  fixRemove: "location";
+}
+
 /* #12276 */
 *[man_made=well] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");

data/validator/highway.mapcss

@@ -126,11 +126,11 @@ way[footway][footway!=sidewalk][footway!=crossing]!.fixable_footway!.not_fixable
   assertMatch: "way footway=bar";
 }
 
-/* #11270, #9297, #15439 */
+/* #11270, #9297, #15439, #16424 */
 way[railway =~ /^(light_rail|miniature|narrow_gauge|preserved|rail)$/][!highway] > node { set .is_in_railway }
 way[highway =~ /^(bridleway|cycleway|footway|path|steps)$/] > node { set .is_in_minor_road }
 way[highway =~ /^(bus_guideway|living_street|motorway|motorway_link|pedestrian|primary|primary_link|raceway|residential|road|secondary|secondary_link|service|tertiary|tertiary_link|track|trunk|trunk_link|unclassified)$/] > node { set .is_in_major_road }
-node[railway!=crossing].is_in_railway.is_in_minor_road!.is_in_major_road {
+node[railway!=crossing][crossing!=no].is_in_railway.is_in_minor_road!.is_in_major_road {
   throwWarning: tr("pedestrian railway crossing without {0}", "{0.tag}");
   group: tr("missing tag");
   fixAdd: "railway=crossing";