Commit a83d6d39 authored by Bas Couwenberg's avatar Bas Couwenberg

New upstream version 0.0.svn13367+dfsg

parent ffef1aff
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="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/|org/apache/commons/compress/compressors/z/|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/|org/apache/commons/compress/archivers/|org/apache/commons/compress/changes/|org/apache/commons/compress/parallel/|org/apache/commons/compress/PasswordRequiredException.java|org/apache/commons/compress/compressors/zstandard/" kind="src" path="src"/>
<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"/>
......@@ -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.jar"/>
<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.4.2.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.10.1.jar"/>
<classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.13.0.jar"/>
<classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.0.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
......
eclipse.preferences.version=1
encoding//windows/locale=ISO-8859-1
encoding/<project>=UTF-8
......@@ -70,6 +70,10 @@ The opening hour validation uses code from opening_hour.js
(https://github.com/ypid/opening_hours.js) which is licensed
with the New (2-clause) BSD license.
The XZ code (https://tukaani.org/xz/java.html)
is from Lasse Collin and Igor Pavlov
and license free Public Domain.
------------------------------- PROJECTION DATA -------------------------------
French NTF_R93 NTV2 grid: Source: IGN - Institut national de l'information
......
......@@ -59,15 +59,25 @@ This is an overview of the files and directories in the JOSM code repository:
- CONTRIBUTION list of major code contributors
- data/ data files that will be included in the JOSM jar file
- fonts/ font files used for map rendering
- gpx/ different color gradients for gpx drawing
- projection/ projection files
- epsg list of projection definitions
- *.lang translation data
- *.xsd xml schema files for validation of configuration files
- custom-epsg list of projection definitions, auto-generated file created by ant task 'epsg'
- security/*.pem certificates that we like to accept for TLS connections, but are missing in the
default Java certificate store
- validator/ data files used by the JOSM validator
- *.cfg files designed for the old tagchecker, still in use
- *.mapcss default validation rules for the MapCSS-based tagchecker
- opening_hours.js Javascript code to validate opening hours tag
(external library, see https://github.com/opening-hours/opening_hours.js)
- boundaries.osm OSM file containing boundary data for the states of the earth, including
data for right and left-hand traffic
- defaultpresets.xml data file for the core tagging presets
- help-browser.css CSS file for the help sites (HTML content is downloaded from the website
on demand, but displayed inside the programm in a Java web browser component.)
- validator/ data files used by the JOSM validator feature
- *.cfg files designed for the old tagchecker, still used
- *.mapcss default validation rules for the new mapcss-based tagchecker
- overpass-wizard.js Javascript code to provide a wizard-GUI for creating Overpass requests
(external library, see https://github.com/tyrasd/overpass-wizard)
- *.lang translation data
- *.xsd xml schema files for validation of configuration files
- data_nodist/ data files that are useful for development, but not distributed
- exif-direction-example.jpg
sample image, that contains direction information in the EXIF header
......@@ -75,17 +85,27 @@ This is an overview of the files and directories in the JOSM code repository:
- filterTests.osm used for unit testing of the filter feature
(see test/unit/org/openstreetmap/josm/data/osm/FilterTest.java)
- Join_Areas_Tests.osm some examples to test the 'join areas' feature
- mapcss/ sample map styles and corresponding data files for regression testing
- *.* various other data files used for unit testing and as reference file
- projection/ projection files
- *.gsb NTv2 grid files for projection support (see CONTRIBUTION)
- *.gsb NTv2 grid files for projection support, downloaded by the
client on demand (see CONTRIBUTION)
- CHENyx06-Distribution.pdf
archive of terms of use for the CHENyx06.gsb file
- epsg EPSG data file, taken from the proj.4 project
(see https://github.com/OSGeo/proj.4/blob/master/nad/epsg)
- josm-epsg customizations to the epsg file, used together with the epsg file
to generate data/projection/custom-epsg
- projection-reference-data.csv
reference data for projection tests
(see test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java)
- projection-regression-test-data.csv
regression data for projection tests
(see test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java)
- geticons.pl tool to find all used icons and allows deleting unused icons
searches also for images with incompatible svg code
- trans/*.lang translation data for files that are not distributed, but used
by the server for localization of the services;
currently contains plugin descriptions in order to include translations
in the downloaded plugin list
- gpl-2.0.txt, gpl-3.0.txt full text of the GNU General Public License
- images/ images distributed with the JOSM binary
- icons images for the Potlatch 2 style
......@@ -99,12 +119,23 @@ This is an overview of the files and directories in the JOSM code repository:
files, Debian/Ubuntu scripts, man pages, icons, etc.
- macosx/ files needed to create the MacOS X package
- netbeans/ preconfigured Netbeans project
- optimize-images short script to decrease size of PNG images
- patches/ patches for external libraries used in JOSM (see below)
- README this file
- resources/ resource files that will be included in the JOSM jar file
- scripts/ various scripts used by JOSM developers
- src/ the source code of the program
- BuildProjectionDefinitions.java
called from the ant build file to combine the files epsg and josm-epsg
to create the custom-epsg file for distribution
- geticons.pl tool to find all used icons and allows deleting unused icons
searches also for images with incompatible svg code
- optimize-images short script to decrease size of PNG images
- presets_lang.pl helper script to update language links in presets file
- since_xxx.py developer tool to replace "@since xxx" in Javadoc by the upcoming revision number
- SyncEditorLayerIndex.groovy
script to compare and analyse the differences of the editor layer index and the
JOSM imagery list (see https://josm.openstreetmap.de/wiki/ImageryCompare)
- TagInfoExtract.groovy extracts tag information for the taginfo project
- src/ the source code of the application
- start.html HTML page to run the applet version of JOSM
- styles/ map styles included in JOSM
- sytles_nodist/ files needed for map style maintenance
......@@ -180,3 +211,6 @@ There are some third party libraries which are directly included in the source c
* swinghelper: Class CheckThreadViolationRepaintManager to find classpath violations
src/org/jdesktop/swinghelper/debug/CheckThreadViolationRepaintManager.java
-> https://github.com/floscher/swinghelper
* xz extractor
src/org/tukaani
-> https://tukaani.org/xz/java.html
......@@ -2,7 +2,7 @@
<info>
<entry
path="trunk"
revision="13265"
revision="13367"
kind="dir">
<url>https://josm.openstreetmap.de/svn/trunk</url>
<relative-url>^/trunk</relative-url>
......@@ -11,9 +11,9 @@
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<commit
revision="13265">
revision="13367">
<author>Don-vip</author>
<date>2017-12-31T02:09:43.768156Z</date>
<date>2018-01-28T22:08:56.144724Z</date>
</commit>
</entry>
</info>
......@@ -22,8 +22,6 @@ artifacts:
- path: checkstyle-josm.xml
- path: pmd-josm.xml
- path: spotbugs-josm.xml
- path: javadoc
type: zip
- path: test\report
type: zip
- path: hs_err_pid*.log
......@@ -241,7 +241,7 @@ Build-Date: ${build.tstamp}
</target>
<target name="compile-cots" depends="init">
<!-- COTS -->
<javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,gnu/**" nowarn="on" encoding="iso-8859-1"
<javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**,gnu/**" nowarn="on" encoding="iso-8859-1"
destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
<!-- get rid of "internal proprietary API" warning -->
<compilerarg value="-XDignore.symbol.file"/>
......@@ -250,8 +250,6 @@ Build-Date: ${build.tstamp}
<exclude name="org/apache/commons/compress/changes/**"/>
<exclude name="org/apache/commons/compress/compressors/bzip2/BZip2Utils.java"/>
<exclude name="org/apache/commons/compress/compressors/brotli/**"/>
<exclude name="org/apache/commons/compress/compressors/lzma/**"/>
<exclude name="org/apache/commons/compress/compressors/xz/**"/>
<exclude name="org/apache/commons/compress/compressors/CompressorStreamFactory.java"/>
<exclude name="org/apache/commons/compress/compressors/CompressorStreamProvider.java"/>
<exclude name="org/apache/commons/compress/compressors/CompressorException.java"/>
......@@ -259,9 +257,11 @@ Build-Date: ${build.tstamp}
<exclude name="org/apache/commons/compress/compressors/deflate/**"/>
<exclude name="org/apache/commons/compress/compressors/gzip/**"/>
<exclude name="org/apache/commons/compress/compressors/lz4/**"/>
<exclude name="org/apache/commons/compress/compressors/lzma/**"/>
<exclude name="org/apache/commons/compress/compressors/lz77support/**"/>
<exclude name="org/apache/commons/compress/compressors/pack200/**"/>
<exclude name="org/apache/commons/compress/compressors/snappy/**"/>
<exclude name="org/apache/commons/compress/compressors/xz/XZUtils.java"/>
<exclude name="org/apache/commons/compress/compressors/z/**"/>
<exclude name="org/apache/commons/compress/compressors/zstandard/**"/>
<exclude name="org/apache/commons/compress/parallel/**"/>
......@@ -296,7 +296,7 @@ Build-Date: ${build.tstamp}
<target name="compile-jmapviewer" depends="init">
<!-- JMapViewer -->
<javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,gnu/**"
excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,org/tukaani/**,gnu/**"
destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
<compilerclasspath>
<pathelement location="${error_prone_ant.jar}"/>
......@@ -315,13 +315,14 @@ Build-Date: ${build.tstamp}
<!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
<compilerarg value="-XDignore.symbol.file"/>
<compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
<compilerarg value="-Xep:StringSplitter:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
<compilerarg line="-Xmaxwarns 1000"/>
</javac>
</target>
<target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer">
<!-- JOSM -->
<javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**"
excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
<compilerclasspath>
<pathelement location="${error_prone_ant.jar}"/>
......@@ -344,6 +345,7 @@ Build-Date: ${build.tstamp}
<compilerarg value="-Xep:FutureReturnValueIgnored:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
<compilerarg value="-Xep:FloatingPointLiteralPrecision:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
<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 line="-Xmaxwarns 1000"/>
<exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/>
......@@ -813,6 +815,16 @@ Build-Date: ${build.tstamp}
encoding="UTF-8" classpath="${checkstyle.dir}/checkstyle-all.jar">
</javac>
</target>
<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:'"/>
</exec>
<exec append="false" osfamily="windows" executable="powershell" failifexecutionfails="true">
<arg value="/c"/>
<arg value="svn status -q --ignore-externals src test | ForEach-Object {java -cp '${checkstyle.dir}/checkstyle-all.jar;${checkstyle-build.dir}' com.puppycrawl.tools.checkstyle.Main -c ${checkstyle.dir}/josm_checks.xml $_.split(' ')[7]}"/>
</exec>
</target>
<target name="checkstyle" depends="checkstyle-compile">
<taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
classpath="${checkstyle.dir}/checkstyle-all.jar:${checkstyle-build.dir}"/>
......
This diff is collapsed.
......@@ -698,8 +698,10 @@
</xs:element>
<!-- is imagery properly georeferenced (i.e. no need to check offsets). Defaults to false. Affects showing warnings. -->
<xs:element name="valid-georeference" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<!-- does imagery server supports JOSM 4326 to 3857 reprojection and non-square queries. Affects showing warnings. -->
<!-- old unused feature, ignored -->
<xs:element name="epsg4326to3857Supported" minOccurs="0" maxOccurs="1" type="xs:boolean" />
<!-- 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" />
</xs:choice>
</xs:sequence>
<xs:attribute name="last-check" type="xs:date" use="optional" />
......
......@@ -348,7 +348,7 @@ way[highway][natural][natural!=ridge],
}
/* #9593, #11183, #12418, #12761 */
*[sport][sport!=skiing][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground|ice_rink|horse_riding|fitness_centre|fitness_station|bowling_alley)$/][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
*[sport][sport!=skiing][!building][!club][tourism != hotel][highway != raceway][!leisure][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
throwWarning: tr("sport without physical feature");
group: tr("missing tag");
assertMatch: "node sport=tennis";
......
......@@ -1171,3 +1171,47 @@ way[building=1] {
group: tr("misspelled value");
fixAdd: "building=yes";
}
/* #15675 */
node[power=transformer][location=pole][transformer] {
throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
group: tr("deprecated tagging");
fixChangeKey: "location => power";
}
node[power=transformer][location=pole][!transformer] {
throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
group: tr("deprecated tagging");
fixChangeKey: "location => power";
fixAdd: "transformer=yes";
}
node[tourism=picnic_table],
node[amenity=picnic_table],
node[leisure=picnic],
node[leisure=picnic_site] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "tourism=picnic_site";
suggestAlternative: "leisure=picnic_table";
group: tr("deprecated tagging");
}
/* #15804 */
relation[water=salt],
way[water=salt],
way[water=salt_pool],
way[water=salt_panne],
way[water=salt_pond] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "salt=yes";
suggestAlternative: "landuse=salt_pond";
group: tr("deprecated tagging");
}
/* #15805 */
way[water=tidal] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "tidal=yes";
fixAdd: "tidal=yes";
fixRemove: "water";
group: tr("deprecated tagging");
}
\ No newline at end of file
......@@ -174,6 +174,7 @@ K:glacier:type=mountain
K:glacier:type=ice_tongue
K:glacier:type=icecap
K:waterway=drystream
K:allotments=plot
;
; Highway Key/Value Pairs
;
......@@ -319,8 +320,10 @@ K:type=tmc
K:type=TMC
;
; Tags not yet decided (to remove from this section when added or deprecated)
; see https://josm.openstreetmap.de/ticket/10759
; see josm tickets 10759 and 15769
;
K:man_made=mast
K:amenity=childcare
K:landuse=logging
K:power=catenary_mast
K:man_made=kiln
\ No newline at end of file
This diff is collapsed.
......@@ -16,7 +16,7 @@
area:closed[amenity ][area?][!highway],
area:closed[building][area?],
area:closed[landuse ][area?][!highway],
area:closed[leisure ][area?][!highway],
area:closed[leisure ][area?][!highway][leisure!=track][leisure!=slipway],
area:closed[natural ][area?],
area:closed[shop ][area?] {
throwWarning: tr("{0} is unnecessary for {1}", "{2.key}", "{1.key}");
......
FIELD_DELIMITER WHITESPACE
RECORD_DELIMITER NEWLINE
BADCHARS COMMA
IFIELD LAT_DECIMAL, "", "%f"
IFIELD LON_DECIMAL, "", "%f"
IFIELD ALT_METERS, "", "%f"
IFIELD IGNORE, "", ""
This diff is collapsed.
......@@ -44,7 +44,28 @@
</exec>
<copy file="specialmessages.java" todir="${i18n.build.dir}"/>
</target>
<target name="po/josm.pot" description="Extracts message keys from the source code" depends="trans_.java,init">
<!-- Create the file build/pluginSrc.txt, which contains a list of include patterns for all *.java files that should be translated relative to "${plugin.dir}" -->
<target name="filterpluginsources" depends="init">
<delete file="${po.build.dir}/pluginSrc.txt"/>
<foreach param="path" target="filterpluginsource">
<path>
<dirset dir="${plugin.dir}" includes="*" excludes="00_*" />
</path>
</foreach>
</target>
<!-- Helper task for `filterpluginsources`: Appends an include pattern to the file `build/pluginSrc.txt` if there is no file `.tx/config` for a plugin -->
<target name="filterpluginsource">
<if>
<not>
<available file="${path}/.tx/config" type="file" />
</not>
<then>
<basename file="${path}" property="dir"/>
<echo file="${po.build.dir}/pluginSrc.txt" append="true" message="${dir}/**/*.java&#xa;"></echo>
</then>
</if>
</target>
<target name="po/josm.pot" description="Extracts message keys from the source code" depends="trans_.java,init,filterpluginsources">
<gettext-extract keysFile="josm.raw.pot" poDirectory="po" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
<!-- core.port -->
<fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
......@@ -57,7 +78,7 @@
<fileset dir="${i18n.build.dir}" includes="trans_plugins.java"/>
<!-- <fileset dir="${i18n.build.dir}/josmfiles" includes="trans_*.*"/> disable for now -->
<!-- plugins.pot -->
<fileset dir="${plugin.dir}" includes="**/*.java"/>
<fileset dir="${plugin.dir}" includesfile="${po.build.dir}/pluginSrc.txt"/>
<fileset dir="${i18n.build.dir}" includes="trans_surveyor.java"/>
<fileset dir="${i18n.build.dir}" includes="trans_tag2link.java"/>
</gettext-extract>
......@@ -93,7 +114,7 @@
</target>
<target name="po/plugins.pot" description="Extracts message keys from the plugins source code (minus core and data strings)" depends="trans_.java,po/core.pot,po/data.pot,init">
<gettext-extract keysFile="plugins.raw.pot" poDirectory="${i18n.build.dir}" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
<fileset dir="${plugin.dir}" includes="**/*.java"/>
<fileset dir="${plugin.dir}" includesfile="${po.build.dir}/pluginSrc.txt"/>
<fileset dir="${i18n.build.dir}" includes="trans_surveyor.java"/>
<fileset dir="${i18n.build.dir}" includes="trans_tag2link.java"/>
</gettext-extract>
......@@ -138,6 +159,7 @@
<arg line="i18n.pl --potfile=po/data.pot --basedir=${i18n_data.install.dir}/ po/*.po"/>
</exec>
</target>
<!-- If the file `josm.pot` is present and the plugin has a `data/` directory, update its *.po files based on the ones in the `po/` directory. -->
<target name="plugintrans">
<basename file="${path}" property="dir"/>
<mkdir dir="${po.build.dir}/plugin_${dir}"/>
......@@ -150,7 +172,10 @@
<fileset dir="${i18n.build.dir}" includes="trans_${dir}.java"/> <!-- include plugin specific translation -->
</gettext-extract>
<if>
<available file="${po.build.dir}/plugin_${dir}/josm.pot"/>
<and>
<available file="${po.build.dir}/plugin_${dir}/josm.pot" type="file"/>
<available file="${plugin.dir}/${dir}/data/" type="dir"/>
</and>
<then>
<exec executable="perl" failonerror="true">
<arg line="i18n.pl --potfile=${po.build.dir}/plugin_${dir}/josm.pot --basedir=${plugin.dir}/${dir}/data/ po/*.po"/>
......
#! /usr/bin/perl -w
# fileformat documentation: JOSM I18n.java function load()
use utf8;
use strict;
......
#! /usr/bin/perl -w -CDSL
# fileformat documentation: JOSM I18n.java function load()
use Term::ReadKey;
use strict;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<