REVISION

 <?xml version="1.0" encoding="UTF-8"?>
 <info>
 <entry
+   revision="15915"
    kind="dir"
-   path="trunk"
-   revision="15806">
+   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="15806">
+   revision="15915">
 <author>Don-vip</author>
-<date>2020-02-01T00:10:57.430951Z</date>
+<date>2020-02-23T18:11:30.189915Z</date>
 </commit>
 </entry>
 </info>

build.xml

@@ -942,7 +942,7 @@ Build-Date: ${build.tstamp}
     <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:'"/>
+            <arg value="(git ls-files src test --modified 2>/dev/null || 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"/>

data/boundaries.osm

@@ -47864,6 +47864,7 @@
     <nd ref='-7512' />
     <nd ref='-25542' />
     <tag k='ISO3166-2' v='US-NY' />
+    <tag k='name:en' v='New York' />
   </way>
   <way id='-29556'>
     <nd ref='-25570' />

data/defaultpresets.xml

@@ -737,7 +737,14 @@
                 <check key="noname" text="Street has no name" disable_off="true" />
                 <text key="ref" text="Reference" />
                 <reference ref="highway_base" />
-                <reference ref="highway_yesno_incline_oneway_lit_width_sidewalk" />
+                <checkgroup columns="2">
+                    <check key="oneway" text="Oneway" />
+                    <check key="oneway:bicycle" text="Oneway for bicycle" />
+                </checkgroup>
+                <reference ref="highway_yesno_incline" />
+                <check key="lit" text="Lit" />
+                <text key="width" text="Width (meters)" />
+                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
                 <check key="narrow" text="Narrow" disable_off="true" />
                 <check key="trolley_wire" text="Overhead trolley wires" />
             </optional>
@@ -948,6 +955,7 @@
                 <reference ref="highway_yesno_incline_oneway_lit_width" />
                 <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
                 <reference ref="general_access" />
+                <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" />
                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
                 <combo key="motorcycle" text="Motorcycle" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
                 <combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" />
@@ -996,8 +1004,8 @@
             <link wiki="Bicycle" />
             <space />
             <combo key="cycleway" text="Cycleway" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
-            <combo key="cycleway:left" text="Cycleway left" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
-            <combo key="cycleway:right" text="Cycleway right" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
+            <combo key="cycleway:left" text="Cycleway left" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
+            <combo key="cycleway:right" text="Cycleway right" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
             <check key="oneway:bicycle" text="Oneway (bicycle)" />
             <space />
             <optional text="Edit Highway Attributes:">
@@ -1843,8 +1851,16 @@
             <link wiki="Tag:route=ferry" />
             <key key="route" value="ferry" />
             <optional>
-                <text key="name" text="Name" />
+                <reference ref="name_ref_operator" />
+                <reference ref="oh_wheelchair" />
+                <space />
+                <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
+                <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
+                <reference ref="fee" />
+                <combo key="ferry" text="Highway type the ferry connects" values="trunk,primary,secondary,tertiary,unclassified" values_context="Highway" />
+                <check key="ferry:cable" text="Reaction ferry" />
             </optional>
+            <preset_link preset_name="Road Restrictions" />
         </item> <!-- Ferry Route -->
         <separator/>
         <item name="Marina" icon="presets/nautical/marina.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -2290,7 +2306,8 @@
             <checkgroup columns="4">
                 <check key="bicycle" text="Bicycle" />
                 <check key="scooter" text="Scooter" />
-                <check key="car" text="Car" />
+                <check key="motorcycle" text="Motorcycle" />
+                <check key="motorcar" text="Car" />
                 <check key="truck" text="Truck" />
             </checkgroup>
             <space />
@@ -3362,6 +3379,12 @@
             <space />
             <reference ref="link_contact_address" />
         </item> <!-- Hackerspace -->
+        <item name="Outdoor seating" icon="presets/leisure/outdoor_seating.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:leisure=outdoor_seating" />
+            <space />
+            <key key="leisure" value="outdoor_seating" />
+            <reference ref="name_operator_oh_wheelchair" />
+        </item> <!-- Outdoor seating -->
         <separator/>
         <item name="Playground" icon="presets/leisure/playground.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:leisure=playground" />
@@ -6502,6 +6525,8 @@
             <check key="payment:visa" text="Visa" match="keyvalue" />
         </checkgroup>
         <space />
+        <check key="payment:contactless" text="Contactless payment" match="keyvalue" />
+        <space />
         <combo key="payment:electronic_purses" text="Electronic purses and Charge cards" values="no" match="keyvalue" />
         <checkgroup columns="4">
             <check key="payment:ep_avant" text="Avant (fi)" match="keyvalue" />

data/validator/deprecated.mapcss

@@ -689,15 +689,17 @@ area[roof:color][roof:colour]["roof:color"=*"roof:colour"] {
   group: tr("key with uncommon character");
 }
 
-/* see #11330 */
+/* see #11330, #18642 */
 *[/^.$/],
 node[/^..$/],
-way[/^..$/],
+way[/^..$/][route=ferry][!to],
+way[/^..$/][route!=ferry],
 relation[/^..$/][!to] {
   throwWarning: tr("uncommon short key");
   assertNoMatch: "relation to=Berlin";
   assertMatch: "relation fo=bar";
   assertMatch: "way to=bar";
+  assertNoMatch: "way to=Zuidschermer;Akersloot route=ferry";
   assertMatch: "node fo=bar";
   assertMatch: "node f=b";
 }
@@ -1917,3 +1919,19 @@ way[bicycle:oneway] {
   fixChangeKey: "building:min_height => min_height";
   group: tr("deprecated tagging");
 }
+
+/* #11232 */
+way[highway][construction=yes][highway!=construction] {
+  throwWarning: tr("{0} is deprecated", "{1.tag}");
+  suggestAlternative: "construction=minor";
+  suggestAlternative: concat("highway=construction + construction=", "{0.value}");
+  group: tr("deprecated tagging");
+}
+
+/* #18659 */
+*[car][amenity=charging_station] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "motorcar";
+  group: tr("deprecated tagging");
+  fixChangeKey: "car => motorcar";
+}

data/validator/geometry.mapcss

@@ -393,3 +393,18 @@ area:closed2[aeroway] ⊉ way[building=hangar][!aeroway] {
   suggestAlternative: "building=industrial";
   suggestAlternative: "building=warehouse";
 }
+
+/* #17533 - Check waterway flow direction */
+*[waterway][waterway!=drain] > node:connection {
+  set notDrain;
+}
+way[waterway=drain] >[index!=1] node:connection {
+  set notDrainFirstNode;
+}
+way[waterway=drain] >[index!=-1] node:connection {
+  set notDrainLastNode;
+}
+way[waterway=drain] > node:connection!.notDrainFirstNode!.notDrain,
+way[waterway=drain] > node:connection!.notDrainLastNode!.notDrain {
+  throwWarning: tr("incorrect drain flow direction");
+}

data/validator/ignoretags.cfg

@@ -410,6 +410,7 @@ K:crossing=zebra
 K:healthcare=dentist
 K:healthcare=doctor
 K:healthcare=hospital
+K:healthcare=pharmacy
 K:golf=cartpath
 K:historic=fort
 K:man_made=water_tap