Skip to content

Commits on Source 13

Show whitespace changes
Inline Side-by-side
.classpath
View file @ f5647df0
......@@ -22,37 +22,12 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/fest/fest-assert-1.0.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/fest/fest-reflect-1.1.jar">
<classpathentry kind="lib" path="test/lib/jmockit-1.41.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/fest/fest-swing-1.1.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/fest/fest-util-1.0.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar">
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
<attributes>
<attribute name="test" value="true"/>
</attributes>
......@@ -62,12 +37,12 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.4.8.jar">
<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.5.1.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/reflections/reflections-0.9.10.jar">
<classpathentry kind="lib" path="test/lib/reflections/reflections-0.9.11.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
......@@ -87,11 +62,6 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.4.6.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/commons-testing/commons-testing-2.1.0.jar">
<attributes>
<attribute name="test" value="true"/>
......@@ -102,7 +72,7 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.1.0.jar">
<classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.1.2.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
......@@ -113,27 +83,7 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.2.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/unitils-core/commons-lang-2.6.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/unitils-core/commons-logging-1.1.3.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/unitils-core/ognl-2.6.9.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/fest/debug-1.0.jar">
<classpathentry kind="lib" path="tools/pmd/commons-lang3-3.7.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
......@@ -158,10 +108,5 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/jmockit-1.40.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
.travis.yml
View file @ f5647df0
language: java
script: (eval "$ANT_INVOCATION $(test $TRAVIS_JDK_VERSION = openjdk8 && echo -DnoJavaFX=true) test")
script: (eval "$ANT_INVOCATION $(test $TRAVIS_JDK_VERSION = openjdk8 && echo -DnoJavaFX=true) test-unit-hardfail")
os: linux
dist: trusty
env:
......
REVISION
View file @ f5647df0
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
revision="14066"
revision="14178"
kind="dir"
path="trunk">
<url>https://josm.openstreetmap.de/svn/trunk</url>
......@@ -11,9 +11,9 @@
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<commit
revision="14066">
revision="14178">
<author>Don-vip</author>
<date>2018-07-28T22:41:59.666644Z</date>
<date>2018-08-22T17:44:25.261472Z</date>
</commit>
</entry>
</info>
appveyor.yml
View file @ f5647df0
version: '{build}'
branches:
only:
- mirror
image: Visual Studio 2017
install:
- cinst ant
- refreshenv
build_script:
- ant compile javadoc dist distmac checkstyle pmd spotbugs
- ant compile dist distmac checkstyle pmd spotbugs
test_script:
- ant test
after_test:
- ant test-unit-hardfail
on_finish:
- ps: |
$wc = New-Object 'System.Net.WebClient'
Get-ChildItem . -Name -Recurse 'TEST-*.xml' |
......
build.xml
View file @ f5647df0
......@@ -29,6 +29,7 @@
</condition>
<property name="build.dir" location="${base.dir}/build"/>
<property name="dist.dir" location="${base.dir}/dist"/>
<property name="modules.dir" location="${dist.dir}/modules"/>
<property name="tools.dir" location="${base.dir}/tools"/>
<property name="pmd.dir" location="${tools.dir}/pmd"/>
<property name="checkstyle.dir" location="${tools.dir}/checkstyle"/>
......@@ -52,26 +53,20 @@
<condition property="clevel" value="${clevel}" else="9">
<isset property="clevel"/>
</condition>
<!-- For Java9-specific stuff -->
<condition property="isJava9">
<matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" />
</condition>
<!-- For Java10-specific stuff -->
<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 -->
<!-- For Java specific stuff by version -->
<condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" /></condition>
<condition property="isJava10"><matches string="${ant.java.version}" pattern="1[0-9]" /></condition>
<condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]" /></condition>
<condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]" /></condition>
<condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]" /></condition>
<!-- error_prone works differently 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 -->
<!-- Disable jacoco on Java 13+, see https://github.com/jacoco/jacoco/pull/738 -->
<condition property="coverageByDefault">
<not>
<isset property="isJava11"/>
<isset property="isJava13"/>
</not>
</condition>
<path id="groovy.classpath">
......@@ -84,7 +79,7 @@
<include name="**/*.jar"/>
</fileset>
<pathelement path="${dist.jar}"/>
<pathelement path="${toString:groovy.classpath}"/>
<pathelement path="${pmd.dir}/commons-lang3-3.7.jar"/>
<pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
</path>
<path id="pmd.classpath">
......@@ -332,6 +327,8 @@ Build-Date: ${build.tstamp}
<compilerclasspath>
<pathelement location="${error_prone_ant.jar}"/>
</compilerclasspath>
<compilerarg line="-XDcompilePolicy=simple" compiler="modern"/>
<compilerarg line="-processorpath ${error_prone_ant.jar}" compiler="modern"/>
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
......@@ -345,8 +342,10 @@ 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"/>
<compilerarg value="-Xep:CatchAndPrintStackTrace:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
<compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
<compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
<compilerarg value="-Xplugin:ErrorProne -Xep:CatchAndPrintStackTrace:OFF -Xep:ReferenceEquality:OFF -Xep:StringSplitter:OFF" compiler="modern"/>
<compilerarg line="-Xmaxwarns 1000"/>
</javac>
</target>
......@@ -358,6 +357,8 @@ Build-Date: ${build.tstamp}
<compilerclasspath>
<pathelement location="${error_prone_ant.jar}"/>
</compilerclasspath>
<compilerarg line="-XDcompilePolicy=simple" compiler="modern"/>
<compilerarg line="-processorpath ${error_prone_ant.jar}" compiler="modern"/>
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
......@@ -378,6 +379,7 @@ Build-Date: ${build.tstamp}
<compilerarg value="-Xep:ShortCircuitBoolean:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
<compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
<compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
<compilerarg value="-Xplugin:ErrorProne -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF" compiler="modern"/>
<compilerarg line="-Xmaxwarns 1000"/>
<exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>
</javac>
......@@ -498,9 +500,9 @@ Build-Date: ${build.tstamp}
<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">
<junit printsummary="yes" fork="true" forkmode="once" failureproperty="test.@{testfamily}@{testITsuffix}.failed">
<jvmarg value="-Dfile.encoding=UTF-8"/>
<jvmarg value="-javaagent:${test.dir}/lib/jmockit-1.40.jar"/>
<jvmarg value="-javaagent:${test.dir}/lib/jmockit-1.41.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" />
......@@ -550,15 +552,45 @@ Build-Date: ${build.tstamp}
<call-junit testfamily="unit"/>
<call-junit testfamily="functional"/>
</target>
<target name="test-hardfail" depends="test" description="Run 'test' target but abort if tests failed">
<fail message="'test' failed">
<condition>
<or>
<isset property="test.unit.failed"/>
<isset property="test.functional.failed"/>
</or>
</condition>
</fail>
</target>
<target name="test-unit" depends="test-compile" unless="test-unit.notRequired"
description="Run unit tests. OSM API (TEST) account shall be set with -Dosm.username and -Dosm.password">
<call-junit testfamily="unit"/>
</target>
<target name="test-unit-hardfail" depends="test-unit" description="Run 'test-unit' target but abort if tests failed">
<fail message="'test-unit' failed" if="test.unit.failed"/>
</target>
<target name="test-it" depends="test-compile" unless="test-it.notRequired"
description="Run integration tests. OSM API (TEST) account shall be set with -Dosm.username and -Dosm.password">
<call-junit testfamily="unit" testITsuffix="IT"/>
<call-junit testfamily="functional" testITsuffix="IT"/>
</target>
<target name="test-it-hardfail" depends="test-it" description="Run 'test-it' target but abort if tests failed">
<fail message="'test-it' failed">
<condition>
<or>
<isset property="test.unitIT.failed"/>
<isset property="test.functionalIT.failed"/>
</or>
</condition>
</fail>
</target>
<target name="test-perf" depends="test-compile" unless="test-perf.notRequired"
description="Run performance tests. OSM API (TEST) account shall be set with -Dosm.username and -Dosm.password">
<call-junit testfamily="performance" coverage="false"/>
</target>
<target name="test-perf-hardfail" depends="test-perf" description="Run 'test-perf' target but abort if tests failed">
<fail message="'test-perf' failed" if="test.performance.failed"/>
</target>
<target name="test-html" depends="test, test-it, test-perf" description="Generate HTML test reports">
<!-- May require additional ant dependencies like ant-trax package -->
<junitreport todir="${test.dir}/report">
......@@ -733,6 +765,7 @@ Build-Date: ${build.tstamp}
<ignore classname="groovy.*"/>
<ignore classname="io.*"/>
<ignore classname="it.*"/>
<ignore classname="java.lang.invoke.MethodHandle"/>
<ignore classname="javax.*"/>
<ignore classname="jogamp.*"/>
<ignore classname="junit.*"/>
......@@ -749,6 +782,7 @@ Build-Date: ${build.tstamp}
<ignore classname="org.dom4j.*"/>
<ignore classname="org.eclipse.*"/>
<ignore classname="org.ejml.*"/>
<ignore classname="org.fusesource.*"/>
<ignore classname="org.gdal.*"/>
<ignore classname="org.hibernate.*"/>
<ignore classname="org.hsqldb.*"/>
......@@ -757,11 +791,13 @@ Build-Date: ${build.tstamp}
<ignore classname="org.jaitools.*"/>
<ignore classname="org.jaxen.*"/>
<ignore classname="org.jboss.*"/>
<ignore classname="org.jctools.*"/>
<ignore classname="org.jdom.*"/>
<ignore classname="org.jdom2.*"/>
<ignore classname="org.jfree.*"/>
<ignore classname="org.jgraph.*"/>
<ignore classname="org.joda.*"/>
<ignore classname="org.json.*"/>
<ignore classname="org.junit.*"/>
<ignore classname="org.jvnet.*"/>
<ignore classname="org.kxml2.*"/>
......@@ -950,4 +986,61 @@ Build-Date: ${build.tstamp}
<arg value="${base.dir}"/>
</java>
</target>
<!--
** generate jdeps dependency graph
-->
<target name="jdeps" depends="compile">
<delete dir="${modules.dir}"/>
<mkdir dir="${modules.dir}"/>
<!-- JOSM only -->
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-main.jar" includes="org/openstreetmap/josm/Main.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-actions.jar" includes="org/openstreetmap/josm/actions/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-cli.jar" includes="org/openstreetmap/josm/cli/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-command.jar" includes="org/openstreetmap/josm/command/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-corrector.jar" includes="org/openstreetmap/josm/corrector/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-data.jar" includes="org/openstreetmap/josm/data/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-gui.jar" includes="org/openstreetmap/josm/gui/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-io.jar" includes="org/openstreetmap/josm/io/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-plugins.jar" includes="org/openstreetmap/josm/plugins/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-spi.jar" includes="org/openstreetmap/josm/spi/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-tools.jar" includes="org/openstreetmap/josm/tools/**/*.class"/>
<exec executable="jdeps" dir="${modules.dir}">
<arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.*|gnu.*|oauth.*|org.apache.*|org.glassfish.*|org.jdesktop.*|org.openstreetmap.gui.*'"/>
<arg line="-dotoutput dots *.jar"/>
</exec>
<exec executable="dot" dir="${modules.dir}/dots">
<arg line="-O -Tpng summary.dot"/>
</exec>
<move file="${modules.dir}/dots/summary.dot.png" tofile="${modules.dir}/josm-without-dependencies.png"/>
<!-- Direct dependencies -->
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/metadata-extractor.jar" includes="com/drew/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/svgSalamander.jar" includes="com/kitfox/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/gnu-getopt.jar" includes="gnu/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/javax-json.jar" includes="javax/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/oauth-signpost.jar" includes="oauth/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/commons-compress.jar" includes="org/apache/commons/compress/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/commons-jcs.jar" includes="org/apache/commons/jcs/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/glassfish-json.jar" includes="org/glassfish/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/jdesktop.jar" includes="org/jdesktop/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/jmapviewer.jar" includes="org/openstreetmap/gui/**/*.class"/>
<exec executable="jdeps" dir="${modules.dir}">
<arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.sun.*|com.google.*|org.tukaani.*|org.apache.commons.logging.*'"/>
<arg line="-dotoutput dots *.jar"/>
</exec>
<exec executable="dot" dir="${modules.dir}/dots">
<arg line="-O -Tpng summary.dot"/>
</exec>
<move file="${modules.dir}/dots/summary.dot.png" tofile="${modules.dir}/josm-with-direct-dependencies.png"/>
<!-- All dependencies -->
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/commons-logging.jar" includes="org/apache/commons/logging/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/google-gdata.jar" includes="com/google/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/tukaani-xz.jar" includes="org/tukaani/**/*.class"/>
<exec executable="jdeps" dir="${modules.dir}">
<arg line="-dotoutput dots *.jar"/>
</exec>
<exec executable="dot" dir="${modules.dir}/dots">
<arg line="-O -Tpng summary.dot"/>
</exec>
<move file="${modules.dir}/dots/summary.dot.png" tofile="${modules.dir}/josm-with-all-dependencies.png"/>
</target>
</project>
data/defaultpresets.xml
View file @ f5647df0
......@@ -1871,6 +1871,7 @@
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:barrier=fence"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:barrier=fence"
es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:barrier=fence"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:barrier=fence"
it.href="https://wiki.openstreetmap.org/wiki/IT:Tag:barrier=fence"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:barrier=fence"
nl.href="https://wiki.openstreetmap.org/wiki/NL:Tag:barrier=fence"
......@@ -1979,6 +1980,7 @@
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:barrier=entrance"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:barrier=entrance"
es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:barrier=entrance"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:barrier=entrance"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:barrier=entrance"
pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=entrance"
ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:barrier=entrance" />
......@@ -2453,6 +2455,7 @@
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=reservoir_covered"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:man_made=reservoir_covered"
es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:man_made=reservoir_covered"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:man_made=reservoir_covered"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:man_made=reservoir_covered"
pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:man_made=reservoir_covered"
pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:man_made=reservoir_covered"
......@@ -2479,7 +2482,7 @@
<text key="name" text="Name" />
<combo key="water" text="Water Body" values="canal,lake,lagoon,oxbow,pond,reservoir,river,lock,wastewater" match="key" values_searchable="true" />
<check key="salt" text="Salt Water" disable_off="true" />
<check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
<check key="intermittent" text="Intermittent (contains not permanently water)" disable_off="true" />
<check key="tidal" text="In the tidal range" disable_off="true" />
<text key="wikipedia" text="Wikipedia" />
<reference ref="water_access" />
......@@ -2512,7 +2515,7 @@
<space />
<key key="waterway" value="riverbank" />
<text key="name" text="Name" />
<check key="intermittent" text="Is the water body intermittent (disappears seasonally)?" disable_off="true" />
<check key="intermittent" text="Intermittent (contains not permanently water)" disable_off="true" />
<check key="tidal" text="In the tidal range" disable_off="true" />
</item> <!-- Riverbank -->
<separator/>
......@@ -2554,6 +2557,7 @@
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:natural=beach"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:natural=beach"
es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:natural=beach"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:natural=beach"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:natural=beach"
pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:natural=beach"
pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:natural=beach"
......@@ -3192,6 +3196,7 @@
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=parking_entrance"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking_entrance"
es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:amenity=parking_entrance"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:amenity=parking_entrance"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:amenity=parking_entrance"
pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:amenity=parking_entrance"
pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:amenity=parking_entrance"
......@@ -4772,6 +4777,7 @@
ca.href="https://wiki.openstreetmap.org/wiki/Ca:Tag:leisure=swimming_pool"
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:leisure=swimming_pool"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:leisure=swimming_pool"
es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:leisure=swimming_pool"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:leisure=swimming_pool"
it.href="https://wiki.openstreetmap.org/wiki/IT:Tag:leisure=swimming_pool"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:leisure=swimming_pool"
......@@ -4818,7 +4824,8 @@
es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:leisure=horse_riding"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:leisure=horse_riding"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:leisure=horse_riding"
pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=horse_riding" />
pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=horse_riding"
ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:leisure=horse_riding" />
<space />
<key key="leisure" value="horse_riding" />
<reference ref="name_operator_oh_wheelchair" />
......@@ -5077,6 +5084,8 @@
<combo key="artwork_type" text="Type" values="mural,sculpture,statue" />
<text key="name" text="Name" />
<text key="artist_name" text="Artist Name" />
<combo key="material" text="Material" values="metal,plastic,steel,stone,wood,concrete" />
<text key="start_date" text="Start date" />
</item> <!-- Artwork -->
<item name="Studio" icon="presets/service/studio.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="https://wiki.openstreetmap.org/wiki/Tag:amenity=studio"
......@@ -5776,6 +5785,7 @@
fr.href="https://wiki.openstreetmap.org/wiki/FR:Key:social_facility"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Key:social_facility"
pl.href="https://wiki.openstreetmap.org/wiki/Pl:Key:social_facility"
pt.href="https://wiki.openstreetmap.org/wiki/Pt:Key:social_facility"
ru.href="https://wiki.openstreetmap.org/wiki/RU:Key:social_facility" />
<space />
<key key="amenity" value="social_facility" />
......@@ -6637,7 +6647,8 @@
<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"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:sport=horse_racing" />
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:sport=horse_racing"
ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:sport=horse_racing" />
<space />
<key key="sport" value="horse_racing" />
<text key="name" text="Name" />
......@@ -6919,6 +6930,7 @@
<item name="Motorsport" icon="presets/sport/motor.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="https://wiki.openstreetmap.org/wiki/Tag:sport=motor"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:sport=motor"
es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:sport=motor"
ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:sport=motor" />
<space />
<key key="sport" value="motor" />
......@@ -7073,7 +7085,7 @@
<space />
<key key="man_made" value="tower" />
<text key="name" text="Name" />
<combo key="tower:type" text="Tower type" values="bell_tower,communication,cooling,defensive,observation,radar,watchtower" />
<combo key="tower:type" text="Tower type" values="bell_tower,communication,cooling,defensive,observation,radar,watchtower" values_searchable="true" />
<optional>
<text key="height" text="Height (meters)" />
<text key="operator" text="Operator" />
......@@ -7939,6 +7951,17 @@
<reference ref="ref_operator_branch" />
<preset_link preset_name="Power Substation" />
</item> <!-- Transformer Tower -->
<item name="Terminal" icon="presets/power/terminal.svg" type="node" preset_name_label="true">
<link href="https://wiki.openstreetmap.org/wiki/Tag:power=terminal"
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:power=terminal"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:power=terminal" />
<space />
<key key="power" value="terminal" />
<optional>
<text key="ref" text="Reference" />
<text key="operator" text="Operator" />
</optional>
</item> <!-- Terminal -->
<item name="Power Portal" icon="presets/power/portal.svg" type="node,way" preset_name_label="true">
<link href="https://wiki.openstreetmap.org/wiki/Tag:power=portal"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:power=portal"
......@@ -8034,6 +8057,17 @@
<reference ref="transformer_voltage_frequency" />
<reference ref="optional_transformer_rating_phases_devices_windings" />
</item> <!-- Pole with Transformer -->
<item name="Catenary mast" icon="presets/power/catenary_mast.svg" type="node" preset_name_label="true">
<link href="https://wiki.openstreetmap.org/wiki/Tag:power=catenary_mast"
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:power=catenary_mast"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:power=catenary_mast" />
<space />
<key key="power" value="catenary_mast" />
<optional>
<text key="ref" text="Reference" />
<text key="operator" text="Operator" />
</optional>
</item> <!-- Catenary mast -->
<item name="Insulator" icon="presets/power/insulator.svg" type="node,way" preset_name_label="true">
<link href="https://wiki.openstreetmap.org/wiki/Tag:power=insulator"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:power=insulator" />
......@@ -8638,6 +8672,7 @@
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:shop=outdoor"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:shop=outdoor"
es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:shop=outdoor"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:shop=outdoor"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:shop=outdoor"
pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:shop=outdoor"
ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:shop=outdoor" />
......@@ -8665,6 +8700,7 @@
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:shop=dry_cleaning"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:shop=dry_cleaning"
fi.href="https://wiki.openstreetmap.org/wiki/Fi:Tag:shop=dry_cleaning"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:shop=dry_cleaning"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:shop=dry_cleaning"
pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:shop=dry_cleaning"
ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:shop=dry_cleaning" />
......@@ -8794,6 +8830,7 @@
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:shop=video_games"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:shop=video_games"
es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:shop=video_games"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:shop=video_games"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:shop=video_games" />
<space />
<key key="shop" value="video_games" />
......@@ -8980,6 +9017,7 @@
<link href="https://wiki.openstreetmap.org/wiki/Tag:shop=interior_decoration"
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:shop=interior_decoration"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:shop=interior_decoration"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:shop=interior_decoration"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:shop=interior_decoration"
pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:shop=interior_decoration"
ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:shop=interior_decoration" />
......@@ -9235,6 +9273,7 @@
<link href="https://wiki.openstreetmap.org/wiki/Tag:shop=erotic"
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:shop=erotic"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:shop=erotic"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:shop=erotic"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:shop=erotic"
pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:shop=erotic"
pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:shop=erotic"
......@@ -9738,6 +9777,7 @@
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:office=insurance"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:office=insurance"
es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:office=insurance"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:office=insurance"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:office=insurance"
pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:office=insurance"
ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:office=insurance"
......@@ -10081,6 +10121,7 @@
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:craft=handicraft"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:craft=handicraft"
es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:craft=handicraft"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:craft=handicraft"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:craft=handicraft"
pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:craft=handicraft"
ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:craft=handicraft" />
......@@ -11204,6 +11245,7 @@
<link href="https://wiki.openstreetmap.org/wiki/Tag:landuse=retail"
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=retail"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:landuse=retail"
es.href="https://wiki.openstreetmap.org/wiki/ES:Tag:landuse=retail"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:landuse=retail"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:landuse=retail"
pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=retail"
......@@ -11837,6 +11879,7 @@
<link href="https://wiki.openstreetmap.org/wiki/Tag:route=railway"
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:route=railway"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:route=railway"
fr.href="https://wiki.openstreetmap.org/wiki/FR:Tag:route=railway"
it.href="https://wiki.openstreetmap.org/wiki/IT:Tag:route=railway"
ja.href="https://wiki.openstreetmap.org/wiki/JA:Tag:route=railway"
pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:route=railway"
......
data/validator/combinations.mapcss
View file @ f5647df0
......@@ -192,9 +192,9 @@ way[usage=penstock][waterway!=pressurised] {
}
/* {0.key} without {1.key}, {2.tag} or {3.tag} */
*[intermittent ][!waterway][natural!~/^(water|spring)$/][ford!=yes],
*[boat ][!waterway][natural!=water][landuse!=basin] {
throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.tag}", "{3.tag}");
*[intermittent ][!waterway][natural!~/^(water|spring)$/][landuse!~/^(basin|reservoir)$/][ford!=yes],
*[boat ][!waterway][natural!=water ][landuse!~/^(basin|reservoir)$/][ford!=yes] {
throwWarning: tr("{0} without {1}, {2}, {3} or {4}", "{0.key}", "{1.key}", "{2.tag}", "{3.tag}", "{4.tag}");
group: tr("missing tag");
}
......
data/validator/geometry.mapcss
View file @ f5647df0
......@@ -96,6 +96,8 @@ way[man_made=survey_point],
way[aeroway=holding_position],
way[power=transformer],
way[power=pole],
way[power=catenary_mast],
way[power=terminal],
way[power=tower]!:closed,
way[amenity=vending_machine],
way[natural=peak],
......
data/validator/ignoretags.cfg
View file @ f5647df0
......@@ -166,8 +166,9 @@ K:building=houseboat
K:building=static_caravan
K:building=semi
K:building=semidetached_house
K:building=slurry_tank
K:leisure=recreation_ground
K:old_railway_operator=PRR
E:old_railway_operator
K:maintenance=gritting
K:glacier:edge=calving_line
K:glacier:edge=grounding_line
......@@ -323,10 +324,9 @@ K:type=tmc
K:type=TMC
;
; Tags not yet decided (to remove from this section when added or deprecated)
; see josm tickets: 10759 15769 16315
; see josm tickets: 10759 16315
;
K:man_made=mast
K:amenity=childcare
K:landuse=logging
K:power=catenary_mast
K:indoor=room
\ No newline at end of file
data/validator/relation.mapcss
View file @ f5647df0
......@@ -34,7 +34,9 @@ relation[type=enforcement][!enforcement] {
assertNoMatch: "relation type=enforcement enforcement=maxspeed";
}
/* #15208 */
/* #15208, #16242 */
relation[type=route][route=mtb ] > way[bicycle=no],
relation[type=route][route=bicycle] > way[bicycle=no],
relation[type=route][route=mtb ] > way[bicycle=use_sidepath],
relation[type=route][route=bicycle] > way[bicycle=use_sidepath] {
throwWarning: tr("way with {0} is part of a bicycle route relation", "{0.tag}");
......