CONTRIBUTION

@@ -22,6 +22,7 @@ Upliner Mikhalych
 Vincent Privat
 Frederik Ramm
 Dirk Stöcker
+Stefan Volke
 Michael Zangl
 
 Many minor contributions and patches by others; see SVN history
@@ -103,6 +104,12 @@ ESRI projection definitions: Environmental Systems Research Institute
 Most icons have been nicked from GNOME and the GIMP, both under GPL. 
 Some are originally LGPL but redistributed here under GPL. 
 
+Simple OpenStreetMap logo has been created by ScubbX (CC-SA 2.0) based on official
+logo used by the OpenStreetMap Foundation:
+https://wiki.openstreetmap.org/wiki/File:Logo_simple.svg
+
+Social logos come from https://github.com/Automattic/social-logos (GPLv2 or later)
+
 The keyboard icon comes fom:
 - source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
 - licence: GPL

REVISION

@@ -3,7 +3,7 @@
 <entry
    kind="dir"
    path="trunk"
-   revision="13710">
+   revision="13860">
 <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="13710">
+   revision="13860">
 <author>Don-vip</author>
-<date>2018-05-06T21:56:40.881351Z</date>
+<date>2018-05-27T17:27:31.821043Z</date>
 </commit>
 </entry>
 </info>

build.xml

@@ -19,8 +19,13 @@
         <dirname property="base.dir" file="${ant.file.josm}"/>
         <property name="test.dir" location="${base.dir}/test"/>
         <property name="src.dir" location="${base.dir}/src"/>
-        <condition property="noJavaFX" value="${env.JOSM_NOJAVAFX}" else="0">
+        <condition property="noJavaFX">
+            <or>
                 <isset property="env.JOSM_NOJAVAFX"/>
+                <not>
+                    <available classname="javafx.scene.media.Media"/>
+                </not>
+            </or>
         </condition>
         <property name="build.dir" location="${base.dir}/build"/>
         <property name="dist.dir" location="${base.dir}/dist"/>
@@ -206,7 +211,7 @@ Build-Date: ${build.tstamp}
 
             <classpath file="${bundle.jar}"/>
 
-            <option value="-Xmx1024m"/>
+            <option value="-Xmx2048m"/>
 
             <option value="-Xdock:icon=Contents/Resources/JOSM.icns"/>
             <option value="-Xdock:name=JOSM"/>
@@ -369,7 +374,7 @@ Build-Date: ${build.tstamp}
             <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"/>
+            <exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>
         </javac>
 
         <copy todir="build" failonerror="no" includeemptydirs="no">
@@ -402,8 +407,9 @@ Build-Date: ${build.tstamp}
             <arg value="java.base/sun.security.util=ALL-UNNAMED" if:set="isJava9" />
             <arg value="--add-exports" if:set="isJava9" />
             <arg value="java.base/sun.security.x509=ALL-UNNAMED" if:set="isJava9" />
-            <arg value="--add-exports" if:set="isJava9" />
-            <arg value="javafx.graphics/com.sun.javafx.application=ALL-UNNAMED" if:set="isJava9" />
+            <arg value="--add-exports" if:set="isJava9" unless:set="noJavaFX" />
+            <arg value="javafx.graphics/com.sun.javafx.application=ALL-UNNAMED" if:set="isJava9" unless:set="noJavaFX" />
+            <excludepackage name="org/openstreetmap/josm/io/audio/fx" if:set="noJavaFX" />
         </javadoc>
     </target>
     <target name="clean" depends="init-properties">
@@ -496,10 +502,10 @@ Build-Date: ${build.tstamp}
                     <jvmarg value="java.base/sun.security.util=ALL-UNNAMED" if:set="isJava9" />
                     <jvmarg value="--add-exports" if:set="isJava9" />
                     <jvmarg value="java.base/sun.security.x509=ALL-UNNAMED" if:set="isJava9" />
-                    <jvmarg value="--add-exports" if:set="isJava9" />
-                    <jvmarg value="javafx.graphics/com.sun.javafx.application=ALL-UNNAMED" if:set="isJava9" />
-                    <jvmarg value="--add-exports" if:set="isJava9" />
-                    <jvmarg value="jdk.deploy/com.sun.deploy.config=ALL-UNNAMED" if:set="isJava9" />
+                    <jvmarg value="--add-exports" if:set="isJava9" unless:set="noJavaFX" />
+                    <jvmarg value="javafx.graphics/com.sun.javafx.application=ALL-UNNAMED" if:set="isJava9" unless:set="noJavaFX" />
+                    <jvmarg value="--add-exports" if:set="isJava9" unless:set="isJava11" />
+                    <jvmarg value="jdk.deploy/com.sun.deploy.config=ALL-UNNAMED" if:set="isJava9" unless:set="isJava11" />
                     <jvmarg value="--add-opens" if:set="isJava9" />
                     <jvmarg value="java.base/java.io=ALL-UNNAMED" if:set="isJava9" />
                     <jvmarg value="--add-opens" if:set="isJava9" />
@@ -713,6 +719,7 @@ Build-Date: ${build.tstamp}
             </path>
         </as:build-signatures>
         <as:check-signature signature="${dir}/api.sig" failonerror="false">
+            <ignore classname="afu.*"/>
             <ignore classname="au.*"/>
             <ignore classname="com.*"/>
             <ignore classname="de.*"/>
@@ -729,6 +736,7 @@ Build-Date: ${build.tstamp}
             <ignore classname="oracle.*"/>
             <ignore classname="org.apache.*"/>
             <ignore classname="org.bouncycastle.*"/>
+            <ignore classname="org.checkerframework.*"/>
             <ignore classname="org.codehaus.*"/>
             <ignore classname="org.dom4j.*"/>
             <ignore classname="org.eclipse.*"/>
@@ -912,7 +920,7 @@ Build-Date: ${build.tstamp}
     <target name="epsg-compile" depends="init-properties">
         <property name="proj-classpath" location="${build.dir}"/>
         <mkdir dir="${proj-build.dir}"/>
-        <javac sourcepath="" srcdir="${base.dir}/scripts" failonerror="true"
+        <javac sourcepath="" srcdir="${base.dir}/scripts" failonerror="true" includes="BuildProjectionDefinitions.java"
             destdir="${proj-build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on"
             includeantruntime="false" createMissingPackageInfoClass="false"
             encoding="UTF-8" classpath="${proj-classpath}">

data/maps.xsd

@@ -110,6 +110,18 @@
         </xs:sequence>
     </xs:complexType>
 
+    <xs:complexType name="defaultLayers">
+        <xs:sequence>
+            <xs:element name="layer" maxOccurs="unbounded">
+                <xs:complexType>
+                    <xs:attribute name="name" type="xs:string" use="optional" />
+                    <xs:attribute name="style" type="xs:string" use="optional" />
+                    <xs:attribute name="tile-matrix-set" type="xs:string" use="optional" />
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
     <!-- ISO3166-1, taken from http://www.iso.org/iso/country_codes/iso_3166_code_lists.htm + "EU" for Europe -->
     <xs:simpleType name="iso3166">
         <xs:restriction base="xs:string">
@@ -666,6 +678,9 @@
                             <xs:element name="terms-of-use-text" minOccurs="0" maxOccurs="1" type="xs:string" />
                             <!-- A link that is opened, when the user clicks on the terms-of-use text -->
                             <xs:element name="terms-of-use-url" minOccurs="0" maxOccurs="1" type="xs:string" />
+                            <!-- The image category, don't use enumeration, so future extension is possible -->
+                            <!-- Currently defined values are: "photo", "map", "historicmap", "osmbasedmap", "historicphoto" and "other" -->
+                            <xs:element name="category" minOccurs="0" maxOccurs="1" type="xs:string" />
                             <!-- The ISO 3166 country code -->
                             <xs:element name="country-code" minOccurs="0" maxOccurs="1" type="tns:iso3166" />
                             <!-- A base64-encoded image that is displayed as menu/toolbar icon -->
@@ -712,8 +727,19 @@
                             <xs:element name="valid-georeference" minOccurs="0" maxOccurs="1" type="xs:boolean" />
                             <!-- old unused feature, ignored -->
                             <xs:element name="epsg4326to3857Supported" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+                            <xs:element name="default-layers" type="tns:defaultLayers" minOccurs="0" maxOccurs="1" />
+                            <xs:element name="custom-http-header" minOccurs="0" maxOccurs="unbounded">
+                                <xs:complexType>
+                                    <xs:attribute name="header-name" type="xs:string" />
+                                    <xs:attribute name="header-value" type="xs:string" />
+                                </xs:complexType>
+                            </xs:element>
+                            <xs:element name="transparent" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+                            <xs:element name="format" type="xs:string" minOccurs="0" maxOccurs="1"/>
                             <!-- 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" />
+                            <!--  minimum time in seconds for which tile will be considered valid -->
+                            <xs:element name="minimum-tile-expire" minOccurs="0" maxOccurs="1" type="xs:positiveInteger" />
                         </xs:choice>
                     </xs:sequence>
                     <xs:attribute name="last-check" type="xs:date" use="optional" />

data/validator/combinations.mapcss

@@ -136,7 +136,10 @@ relation[route=ski][!piste:type][type=route],
 /* {0.tag} without {1.key} (info level) */
 way[highway=track              ][!tracktype],
 way[power=cable                ][!location],
-node[power=transformer         ][!voltage],
+node[power=transformer         ][!voltage:primary],
+node[power=transformer         ][!voltage:secondary],
+node[transformer=distribution  ][!voltage:primary][power=pole],
+node[transformer=distribution  ][!voltage:secondary][power=pole],
 way[power=line                 ][!voltage],
 way[power=minor_line           ][!voltage],
 way[power=cable                ][!voltage],
@@ -203,6 +206,8 @@ way[incline                    ][!highway][!railway][aeroway!~/^(runway|taxiway)
 }
 
 /* {0.tag} together with {1.key}, see #10837, #14034, #9389, #11977, #13156 */
+node[power=transformer][voltage],
+node[transformer=distribution][voltage][power=pole],
 *[amenity=vending_machine][shop],
 *[noname?][name],
 way[oneway=yes][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath],
@@ -246,9 +251,17 @@ way[waterway=weir][bridge=yes][highway] {
   group: tr("suspicious tag combination");
 }
 
+/* #16214 */
+relation[type=multipolygon] >[role="inner"] way[area][eval(number_of_tags()) = 1] {
+  throwWarning: tr("{0} on an inner multipolygon ring without further tags", "{0.tag}");
+  fixRemove: "area";
+  set area_yes_autofix;
+  group: tr("suspicious tag combination");
+}
+
 /* only {0.key}, see #11104 #12422 #14950 */
 *[access][eval(number_of_tags()) = 1],
-*[area][eval(number_of_tags()) = 1],
+*[area][eval(number_of_tags()) = 1]!.area_yes_autofix,
 *[name][eval(number_of_tags()) = 1],
 *[ref][eval(number_of_tags()) = 1],
 *[lit][eval(number_of_tags()) = 1] {

data/validator/deprecated.mapcss

@@ -556,38 +556,97 @@ way[oneway=-1][!waterway] {
   group: tr("deprecated tagging");
 }
 
-/* see #10329 */
+/* see #10329, #15877 */
+  /* simple key change */
 *[color][!colour] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "colour";
   group: tr("deprecated tagging");
   fixChangeKey: "color => colour";
+  assertMatch: "way color=red";
+  assertNoMatch: "way color=red colour=red";
 }
-*[color][colour][tag(color)=tag(colour)] {
-  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+area[building:color][!building:colour] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "building:colour";
+  group: tr("deprecated tagging");
+  fixChangeKey: "building:color => building:colour";
+  assertMatch: "way building:color=red";
+  assertNoMatch: "way building:color=red building:colour=red";
+}
+area[roof:color][!roof:colour] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "roof:colour";
+  group: tr("deprecated tagging");
+  fixChangeKey: "roof:color => roof:colour";
+  assertMatch: "way roof:color=red";
+  assertNoMatch: "way roof:color=red roof:colour=red";
+}
+  /* both tags with same value, remove color */
+*[color][colour][color=*colour] {
+  throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}");
+  suggestAlternative: "colour";
   group: tr("deprecated tagging");
   set samecolor;
   fixRemove: "color";
   assertMatch: "way color=red colour=red";
   assertNoMatch: "way color=red colour=green";
 }
+area[building:color][building:colour]["building:color"=*"building:colour"] {
+  throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}");
+  suggestAlternative: "building:colour";
+  group: tr("deprecated tagging");
+  set samebuildingcolor;
+  fixRemove: "building:color";
+  assertMatch: "way building:color=red building:colour=red";
+  assertNoMatch: "way building:color=red building:colour=green";
+}
+area[roof:color][roof:colour]["roof:color"=*"roof:colour"] {
+  throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}");
+  suggestAlternative: "roof:colour";
+  group: tr("deprecated tagging");
+  set sameroofcolor;
+  fixRemove: "roof:color";
+  assertMatch: "way roof:color=red roof:colour=red";
+  assertNoMatch: "way roof:color=red roof:colour=green";
+}
+  /* both tags with different values, no autofix */
 *[color][colour]!.samecolor {
-  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
+  throwWarning: tr("{0} together with {1} and conflicting values", "{0.key}", "{1.key}");
+  suggestAlternative: "colour";
   group: tr("deprecated tagging");
   assertNoMatch: "way color=red colour=red";
   assertMatch: "way color=red colour=green";
 }
-*[/:color/]{
+*[building:color][building:colour]!.samebuildingcolor {
+  throwWarning: tr("{0} together with {1} and conflicting values", "{0.key}", "{1.key}");
+  suggestAlternative: "building:colour";
+  group: tr("deprecated tagging");
+  assertNoMatch: "way building:color=red building:colour=red";
+  assertMatch: "way building:color=red building:colour=green";
+}
+*[roof:color][roof:colour]!.sameroofcolor {
+  throwWarning: tr("{0} together with {1} and conflicting values", "{0.key}", "{1.key}");
+  suggestAlternative: "roof:colour";
+  group: tr("deprecated tagging");
+  assertNoMatch: "way roof:color=red roof:colour=red";
+  assertMatch: "way roof:color=red roof:colour=green";
+}
+  /* further more universal checks, no autofix */
+*[/:color/][!building:color][!roof:color] {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: ":colour";
   group: tr("deprecated tagging");
   assertNoMatch: "way color=red";
-  assertMatch: "way roof:color=grey";
+  assertNoMatch: "way roof:color=grey";
+  assertMatch: "way cycleway:surface:color=grey";
 }
 *[/color:/]  {
   throwWarning: tr("{0} is deprecated", "{0.key}");
   suggestAlternative: "colour:";
   group: tr("deprecated tagging");
+  assertNoMatch: "way color=red";
+  assertMatch: "way color:back=grey";
 }
 
 /* see #11234 */
@@ -653,6 +712,16 @@ relation[/^..$/][!to] {
   suggestAlternative: "...";
 }
 
+/* defunct payment cards */
+*[payment:ep_quick],
+*[payment:ep_cash],
+*[payment:ep_proton],
+*[payment:ep_chipknip] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  group: tr("deprecated tagging");
+  fixRemove: "{0.key}";
+}
+
 /* see #8717 */
 *[kp][highway=milestone],
 *[kp][railway=milestone],

data/validator/ignoretags.cfg

@@ -323,9 +323,10 @@ K:type=tmc
 K:type=TMC
 ;
 ; Tags not yet decided (to remove from this section when added or deprecated) 
-; see josm tickets 10759 and 15769
+; see josm tickets: 10759 15769 16315
 ;
 K:man_made=mast
 K:amenity=childcare
 K:landuse=logging
 K:power=catenary_mast
+K:indoor=room
\ No newline at end of file