Skip to content
Commits on Source (5)
Show whitespace changes
Inline Side-by-side
.classpath
View file @ ddebdd69
......@@ -2,35 +2,161 @@
<classpath>
<classpathentry excluding="org/apache/commons/compress/PasswordRequiredException.java|org/apache/commons/compress/archivers/|org/apache/commons/compress/changes/|org/apache/commons/compress/compressors/CompressorException.java|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/CompressorStreamProvider.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/brotli/|org/apache/commons/compress/compressors/bzip2/BZip2Utils.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzip/|org/apache/commons/compress/compressors/lz4/|org/apache/commons/compress/compressors/lz77support/|org/apache/commons/compress/compressors/lzma/|org/apache/commons/compress/compressors/pack200/|org/apache/commons/compress/compressors/snappy/|org/apache/commons/compress/compressors/xz/XZUtils.java|org/apache/commons/compress/compressors/z/|org/apache/commons/compress/compressors/zstandard/|org/apache/commons/compress/parallel/|org/apache/commons/compress/utils/ArchiveUtils.java|org/apache/commons/jcs/JCS.java|org/apache/commons/jcs/access/GroupCacheAccess.java|org/apache/commons/jcs/access/PartitionedCacheAccess.java|org/apache/commons/jcs/access/behavior/IGroupCacheAccess.java|org/apache/commons/jcs/access/exception/InvalidGroupException.java|org/apache/commons/jcs/admin/servlet/|org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheMonitor.java|org/apache/commons/jcs/auxiliary/disk/jdbc/|org/apache/commons/jcs/auxiliary/lateral/|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java|org/apache/commons/jcs/auxiliary/remote/RemoteCache.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheRestore.java|org/apache/commons/jcs/auxiliary/remote/http/|org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java|org/apache/commons/jcs/auxiliary/remote/server/TimeoutConfigurableRMISocketFactory.java|org/apache/commons/jcs/engine/CacheAdaptor.java|org/apache/commons/jcs/engine/CacheGroup.java|org/apache/commons/jcs/engine/CacheWatchRepairable.java|org/apache/commons/jcs/engine/ZombieCacheService.java|org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java|org/apache/commons/jcs/engine/ZombieCacheWatch.java|org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java|org/apache/commons/jcs/utils/access/|org/apache/commons/jcs/utils/discovery/|org/apache/commons/jcs/utils/net/|org/apache/commons/jcs/utils/props/|org/apache/commons/jcs/utils/servlet/|org/apache/commons/logging/impl/AvalonLogger.java|org/apache/commons/logging/impl/Jdk13LumberjackLogger.java|org/apache/commons/logging/impl/Log4JLogger.java|org/apache/commons/logging/impl/LogKitLogger.java|org/apache/commons/logging/impl/ServletContextCleaner.java|org/openstreetmap/gui/jmapviewer/Demo.java|org/openstreetmap/gui/jmapviewer/JMapViewerTree.java|org/openstreetmap/gui/jmapviewer/checkBoxTree/" kind="src" path="src"/>
<classpathentry including="data/|images/|resources/|styles/" kind="src" path=""/>
<classpathentry kind="src" path="test/unit"/>
<classpathentry kind="src" path="test/functional"/>
<classpathentry kind="src" path="test/performance"/>
<classpathentry kind="src" path="scripts"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="test/lib/fest/fest-assert-1.0.jar"/>
<classpathentry kind="lib" path="test/lib/fest/fest-reflect-1.1.jar"/>
<classpathentry kind="lib" path="test/lib/fest/fest-swing-1.1.jar"/>
<classpathentry kind="lib" path="test/lib/fest/fest-util-1.0.jar"/>
<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.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.18.0.jar"/>
<classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.1.0.jar"/>
<classpathentry kind="src" output="bintest" path="test/unit">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bintest" path="test/functional">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bintest" path="test/performance">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bintest" path="scripts">
<attributes>
<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">
<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">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/jfcunit.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.4.8.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/reflections/reflections-0.9.10.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/reflections/guava-21.0.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/reflections/javassist-3.21.0-GA.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/system-rules-1.16.1.jar">
<attributes>
<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"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.18.0.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.1.0.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<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"/>
<classpathentry kind="lib" path="test/lib/unitils-core/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="test/lib/unitils-core/commons-logging-1.1.3.jar"/>
<classpathentry kind="lib" path="test/lib/unitils-core/ognl-2.6.9.jar"/>
<classpathentry kind="lib" path="test/lib/fest/debug-1.0.jar"/>
<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
<classpathentry exported="true" kind="lib" path="tools/spotbugs/spotbugs-annotations.jar"/>
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT">
<attributes>
<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">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="tools/spotbugs/spotbugs-annotations.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="tools/groovy/groovy-cli-commons-2.5.0.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="tools/groovy/groovy-xml-2.5.0.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
.settings/org.codehaus.groovy.eclipse.core.prefs 0 → 100644
View file @ ddebdd69
eclipse.preferences.version=1
groovy.classpath.use.groovy,lib=false
.settings/org.eclipse.jdt.groovy.core.prefs
View file @ ddebdd69
eclipse.preferences.version=1
groovy.compiler.level=24
groovy.compiler.level=25
groovy.script.filters=**/*.dsld,y,**/*.gradle,n
REVISION
View file @ ddebdd69
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
kind="dir"
path="trunk"
revision="13996">
revision="14026"
kind="dir">
<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="13996">
revision="14026">
<author>Don-vip</author>
<date>2018-07-01T21:07:04.227861Z</date>
<date>2018-07-08T23:47:59.959896Z</date>
</commit>
</entry>
</info>
build.xml
View file @ ddebdd69
......@@ -38,7 +38,6 @@
<property name="proj-build.dir" location="${base.dir}/build2"/>
<property name="checkstyle-build.dir" location="${base.dir}/build2"/>
<property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
<property name="groovy.jar" location="${tools.dir}/groovy-all.jar"/>
<property name="error_prone_ant.jar" location="${tools.dir}/error_prone_ant.jar"/>
<property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
<property name="dist-optimized.jar" location="${dist.dir}/josm-custom-optimized.jar"/>
......@@ -74,12 +73,17 @@
<isset property="isJava11"/>
</not>
</condition>
<path id="groovy.classpath">
<fileset dir="${tools.dir}/groovy">
<include name="*.jar"/>
</fileset>
</path>
<path id="test.classpath">
<fileset dir="${test.dir}/lib">
<include name="**/*.jar"/>
</fileset>
<pathelement path="${dist.jar}"/>
<pathelement path="${groovy.jar}"/>
<pathelement path="${toString:groovy.classpath}"/>
<pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
</path>
<path id="pmd.classpath">
......@@ -467,7 +471,7 @@ Build-Date: ${build.tstamp}
</sequential>
</macrodef>
<target name="test-compile" depends="test-init,dist">
<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${groovy.jar}"/>
<taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${toString:groovy.classpath}"/>
<call-groovyc testfamily="unit">
<cp-elements>
<path refid="test.classpath"/>
......@@ -786,7 +790,7 @@ Build-Date: ${build.tstamp}
<attribute name="output"/>
<sequential>
<echo message="Generating Taginfo for type @{type} to @{output}"/>
<groovy src="${taginfoextract}" classpath="${dist.jar}:${spotbugs.dir}/spotbugs-annotations.jar">
<groovy src="${taginfoextract}" classpath="${dist.jar};${toString:groovy.classpath};${spotbugs.dir}/spotbugs-annotations.jar">
<arg value="-t"/>
<arg value="@{type}"/>
<arg value="--noexit"/>
......@@ -800,7 +804,8 @@ Build-Date: ${build.tstamp}
</macrodef>
<target name="taginfo" depends="dist">
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};${tools.dir}/commons-cli-1.3.1.jar"/>
<!-- http://docs.groovy-lang.org/2.5.0/html/documentation/#_the_groovy_ant_task -->
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="groovy.classpath"/>
<property name="taginfoextract" value="scripts/TagInfoExtract.groovy"/>
<property name="imgurlprefix" value="http://josm.openstreetmap.de/download/taginfo/taginfo-img"/>
<_taginfo type="mappaint" output="taginfo_style.json"/>
......@@ -809,7 +814,7 @@ Build-Date: ${build.tstamp}
</target>
<target name="imageryindex" depends="init-properties">
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};${tools.dir}/commons-cli-1.3.1.jar"/>
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpathref="groovy.classpath"/>
<echo message="Checking editor imagery difference"/>
<groovy src="scripts/SyncEditorLayerIndex.groovy" classpath="${dist.jar}">
<arg value="-noeli"/>
......
data/defaultpresets.xml
View file @ ddebdd69
......@@ -438,6 +438,14 @@
<chunk id="motorcycle_brands">
<multiselect key="brand" text="Motorcycle brand" values="Aprillia;BMW;Ducati;Gilera;Harley-Davidson;Honda;Kawasaki;KTM;Kymco;Piaggio;Peugeot;Piaggio;Suzuki;Triumph;Vespa;Yamaha" values_no_i18n="true" />
</chunk>
<chunk id="walking_routes_roles">
<roles>
<role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
<role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
<role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
<role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
</roles>
</chunk>
<!-- Link chunks -->
<chunk id="link_contact_address">
<preset_link preset_name="Contact (Common Schema)" />
......@@ -7531,7 +7539,7 @@
ja.href="https://wiki.openstreetmap.org/wiki/JA:Key:bridge:support"
pl.href="https://wiki.openstreetmap.org/wiki/Pl:Key:bridge:support" />
<space />
<combo key="bridge:support" text="Type" values="pier,abutment,lift_pier,pivot_pier" match="key" />
<combo key="bridge:support" text="Type" values="pier,abutment,lift_pier,pivot_pier,pylon" match="key" />
</item> <!-- Bridge Support -->
<item name="Bridge outline" icon="presets/transport/bridge/bridge_outline.svg" type="closedway,multipolygon" preset_name_label="true">
<link href="https://wiki.openstreetmap.org/wiki/Tag:man_made=bridge"
......@@ -11693,11 +11701,7 @@
<optional>
<reference ref="route_hikebike_optionals" />
</optional>
<roles>
<role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
<role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
<role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
</roles>
<reference ref="walking_routes_roles" />
</item> <!-- Hiking Route -->
<item name="Walking Route" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
<link href="https://wiki.openstreetmap.org/wiki/Tag:route=foot"
......@@ -11711,11 +11715,7 @@
<optional>
<reference ref="route_hikebike_optionals" />
</optional>
<roles>
<role key="" text="route segment" requisite="required" type="way,closedway" member_expression="highway|route=ferry"/>
<role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
<role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
</roles>
<reference ref="walking_routes_roles" />
</item> <!-- Walking Route -->
<item name="Riding Route" icon="presets/misc/route.svg" type="relation" preset_name_label="true">
<link href="https://wiki.openstreetmap.org/wiki/Tag:route=horse"
......
data/tagging-preset.xsd
View file @ ddebdd69
......@@ -93,6 +93,7 @@
<group ref="tns:optional_elements" />
<element name="key" type="tns:key" />
<element name="optional" type="tns:optional" minOccurs="0" />
<element name="roles" type="tns:roles" minOccurs="0" />
</choice>
</sequence>
<sequence>
......
data_nodist/trans/en_GB.lang
View file @ ddebdd69
File suppressed by a .gitattributes entry or the file's encoding is unsupported.