Changeset 16006 in josm
- Timestamp:
- 2020-03-03T02:12:44+01:00 (5 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 51 edited
- 11 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/.checkstyle
r15034 r16006 26 26 <filter-data value="build"/> 27 27 <filter-data value="build2"/> 28 <filter-data value="data"/>29 <filter-data value="data_nodist"/>30 28 <filter-data value="dist"/> 31 <filter-data value="eclipse"/> 32 <filter-data value="images"/> 33 <filter-data value="images_nodist"/> 29 <filter-data value="ide"/> 34 30 <filter-data value="javadoc"/> 35 <filter-data value="linux"/> 36 <filter-data value="macosx"/> 37 <filter-data value="netbeans"/> 31 <filter-data value="native"/> 32 <filter-data value="nodist"/> 38 33 <filter-data value="patches"/> 39 34 <filter-data value="resources"/> 40 <filter-data value="styles"/>41 <filter-data value="styles_nodist"/>42 35 <filter-data value="test/build"/> 43 36 <filter-data value="test/config"/> … … 46 39 <filter-data value="test/report"/> 47 40 <filter-data value="tools"/> 48 <filter-data value="windows"/>49 41 </filter> 50 42 </fileset-config> -
trunk/.classpath
r15977 r16006 3 3 <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"/> 4 4 <classpathentry kind="src" path="resources"/> 5 <classpathentry including="data/|images/|styles/" kind="src" path=""/>6 5 <classpathentry kind="src" output="bintest" path="test/unit"> 7 6 <attributes> -
trunk/.project
r15977 r16006 36 36 </arguments> 37 37 </buildCommand> 38 <buildCommand> 39 <name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name> 40 <arguments> 41 </arguments> 42 </buildCommand> 38 43 </buildSpec> 39 44 <natures> … … 44 49 <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> 45 50 <nature>org.apache.ivyde.eclipse.ivynature</nature> 51 <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> 46 52 </natures> 47 53 </projectDescription> -
trunk/.settings/org.eclipse.core.resources.prefs
r13307 r16006 1 1 eclipse.preferences.version=1 2 encoding// windows/locale=ISO-8859-12 encoding//native/windows/locale=ISO-8859-1 3 3 encoding/<project>=UTF-8 -
trunk/README
r15978 r16006 58 58 - build.xml ant build file (standard way to create a JOSM binary) 59 59 - CONTRIBUTION list of major code contributors 60 - data/ data files that will be included in the JOSM jar file 61 - fonts/ font files used for map rendering 62 - gpx/ different color gradients for gpx drawing 63 - projection/ projection files 64 - custom-epsg list of projection definitions, auto-generated file created by ant task 'epsg' 65 - security/*.pem certificates that we like to accept for TLS connections, but are missing in the 66 default Java certificate store 67 - validator/ data files used by the JOSM validator 68 - *.cfg files designed for the old tagchecker, still in use 69 - *.mapcss default validation rules for the MapCSS-based tagchecker 70 - boundaries.osm OSM file containing boundary data for the states of the earth, including 71 data for right and left-hand traffic 72 - defaultpresets.xml data file for the core tagging presets 73 - help-browser.css CSS file for the help sites (HTML content is downloaded from the website 74 on demand, but displayed inside the programm in a Java web browser component.) 75 - overpass-wizard.js Javascript code to provide a wizard-GUI for creating Overpass requests 76 (external library, see https://github.com/tyrasd/overpass-wizard) 77 - *.lang translation data 78 - *.xsd xml schema files for validation of configuration files 79 - data_nodist/ data files that are useful for development, but not distributed 60 - gpl-2.0.txt, gpl-3.0.txt full text of the GNU General Public License 61 - ide IDE-specific files 62 - eclipse/ preconfigured Eclipse configuration files 63 - netbeans/ preconfigured Netbeans project 64 - josm.jnlp Java Web Start launcher file (used on the website for the tested version) 65 - josm-latest.jnlp Java Web Start launcher file (used on the website for the latest version) 66 - LICENSE the JOSM license terms 67 - native/ OS-specific files 68 - linux/ files useful for Linux distributions, including Appdata files, .desktop 69 files, Debian/Ubuntu scripts, man pages, icons, etc. 70 - macosx/ files needed to create the MacOS X package 71 - windows/ files needed to create the Windows installer 72 - nodist/ files not included in JOSM binary 73 - data/ data files that are useful for development, but not distributed 80 74 - exif-direction-example.jpg 81 75 sample image, that contains direction information in the EXIF header … … 107 101 currently contains plugin descriptions in order to include translations 108 102 in the downloaded plugin list 109 - gpl-2.0.txt, gpl-3.0.txt full text of the GNU General Public License 110 - images/ images distributed with the JOSM binary 111 - icons images for the Potlatch 2 style 112 - presets images for the main mappaint style and the internal presets 113 - images_nodist/ images, which are not for distribution, but may be useful later (e.g. high 103 - images/ images, which are not for distribution, but may be useful later (e.g. high 114 104 resolution and vector versions) 115 - josm.jnlp Java Web Start launcher file (used on the website for the tested version) 116 - josm-latest.jnlp Java Web Start launcher file (used on the website for the latest version) 117 - LICENSE the JOSM license terms 118 - linux/ files useful for Linux distributions, including Appdata files, .desktop 119 files, Debian/Ubuntu scripts, man pages, icons, etc. 120 - macosx/ files needed to create the MacOS X package 121 - netbeans/ preconfigured Netbeans project 105 - styles/ files needed for map style maintenance 106 - potlatch2/README infos on how to update the Potlatch 2 style from upstream sources 122 107 - patches/ patches for external libraries used in JOSM (see below) 123 108 - README this file 124 109 - resources/ resource files that will be included in the JOSM jar file 110 - data/ data files that will be included in the JOSM jar file 111 - fonts/ font files used for map rendering 112 - gpx/ different color gradients for gpx drawing 113 - projection/ projection files 114 - custom-epsg list of projection definitions, auto-generated file created by ant task 'epsg' 115 - security/*.pem certificates that we like to accept for TLS connections, but are missing in the 116 default Java certificate store 117 - validator/ data files used by the JOSM validator 118 - *.cfg files designed for the old tagchecker, still in use 119 - *.mapcss default validation rules for the MapCSS-based tagchecker 120 - boundaries.osm OSM file containing boundary data for the states of the earth, including 121 data for right and left-hand traffic 122 - defaultpresets.xml data file for the core tagging presets 123 - help-browser.css CSS file for the help sites (HTML content is downloaded from the website 124 on demand, but displayed inside the programm in a Java web browser component.) 125 - overpass-wizard.js Javascript code to provide a wizard-GUI for creating Overpass requests 126 (external library, see https://github.com/tyrasd/overpass-wizard) 127 - *.lang translation data 128 - *.xsd xml schema files for validation of configuration files 129 - images/ images distributed with the JOSM binary 130 - icons images for the Potlatch 2 style 131 - presets images for the main mappaint style and the internal presets 132 - styles/ map styles included in JOSM 125 133 - scripts/ various scripts used by JOSM developers 126 134 - BuildProjectionDefinitions.java … … 137 145 - src/ the source code of the application 138 146 - start.html HTML page to run the applet version of JOSM 139 - styles/ map styles included in JOSM140 - sytles_nodist/ files needed for map style maintenance141 - potlatch2/README infos on how to update the Potlatch 2 style from upstream sources142 147 - test/ automated software tests 143 148 - data/ resources used for some tests … … 153 158 problems in source code); can be launched as an ant target in build.xml 154 159 - error_prone_ant.jar used to detect code errors during compilation 155 - spotbugs/ libs and config files for spotbugs (automatically detects common bugs and potential 156 problems in source code); can be launched as an ant target in build.xml 160 - ivy/ Apache Ivy binary, configuration file, and downloaded dependencies 157 161 - jacocoant.jar used to include coverage data into JUnit test reports 158 162 - japicc/ used to generate a compatibility report between optimized jar and normal one … … 160 164 (src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj) 161 165 - proguard.jar optimize final binary jar - see build.xml (not used in production so far) 166 - spotbugs/ libs and config files for spotbugs (automatically detects common bugs and potential 167 problems in source code); can be launched as an ant target in build.xml 162 168 - xmltask.jar used to edit XML files from Ant for the OSX package 163 - windows/ files needed to create the Windows installer164 169 165 170 The 'patches' directory -
trunk/build.xml
r16002 r16006 51 51 <property name="script-build.dir" location="${base.dir}/build2"/> 52 52 <property name="checkstyle-build.dir" location="${base.dir}/build2"/> 53 <property name="epsg.output" location="${base.dir}/ data/projection/custom-epsg"/>53 <property name="epsg.output" location="${base.dir}/resources/data/projection/custom-epsg"/> 54 54 <property name="error_prone_core.jar" location="${tools.dir}/error_prone_core.jar"/> 55 55 <property name="error_prone_javac.jar" location="${tools.dir}/error_prone_javac.jar"/> … … 97 97 </fileset> 98 98 <pathelement path="${build.dir}"/> 99 <pathelement path="${base.dir}/resources"/> 99 100 <pathelement path="${failureaccess.jar}"/> 100 101 <pathelement path="${guava.jar}"/> … … 187 188 --> 188 189 <target name="check-schemas" unless="check-schemas.notRequired" depends="init-properties"> 189 <schemavalidate file=" data/defaultpresets.xml" >190 <schema namespace="http://josm.openstreetmap.de/tagging-preset-1.0" file=" data/tagging-preset.xsd" />190 <schemavalidate file="resources/data/defaultpresets.xml" > 191 <schema namespace="http://josm.openstreetmap.de/tagging-preset-1.0" file="resources/data/tagging-preset.xsd" /> 191 192 </schemavalidate> 192 193 </target> … … 215 216 </manifest> 216 217 <service type="java.text.spi.DecimalFormatSymbolsProvider" provider="org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider" /> 217 <zipfileset dir="images" prefix="images"/>218 <zipfileset dir="data" prefix="data"/>219 <zipfileset dir="styles" prefix="styles"/>220 218 <zipfileset dir="${src.dir}/org/openstreetmap/gui/jmapviewer/images" prefix="org/openstreetmap/gui/jmapviewer/images"/> 221 219 </jar> … … 494 492 </sequential> 495 493 </macrodef> 496 <target name="test-compile" depends="test-init,compile ">494 <target name="test-compile" depends="test-init,compile,epsg"> 497 495 <call-javac testfamily="unit"> 498 496 <cp-elements> -
trunk/ide/eclipse/JOSM (Java 8).launch
r15973 r16006 7 7 <listEntry value="1"/> 8 8 </listAttribute> 9 <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>10 <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;josm-atlas&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-DXFImport&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM/test\/lib\/equalsverifier-2.4.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-apache-commons&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathContainer path=&quot;GROOVY_SUPPORT&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathContainer"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-addrinterpolation&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-alignways&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-areaselector&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-buildings_tools&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-cadastre-fr&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-GeoTools&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/commons-beanutils-1.7.0.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/commons-pool-1.5.4.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/vecmath-1.3.2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/jsr-275-1.0-beta-2.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/hsqldb-2.2.8.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/imageio-ext-tiff-1.1.10.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/imageio-ext-utilities-1.1.10.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/jai_codec-1.1.3.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/jai_core-1.1.3.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/jai_imageio-1.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/jdom-1.1.3.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/jt-contour-1.3.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/jt-rangelookup-1.3.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/jt-utils-1.3.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/jt-vectorbinarize-1.3.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/jt-vectorize-1.3.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-GeoTools/lib\/jt-zonalstats-1.3.1.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-jts&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-jts/lib\/jts-1.13.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-canvec_helper&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-colorscheme&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-commandline&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-conflation&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-utilsplugin2&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-create_grid_of_ways&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-czechaddress&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-dataimport&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-dataimport/lib\/jsr173-1.0_api.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-dataimport/lib\/jaxb-api.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-DirectDownload&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-DirectUpload&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-download_along&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-editgpx&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-ElevationProfile&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-EPCI-fr&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-ext_tools&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-FastDraw&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-FixAddresses&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-geochat&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-globalsat&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-gpsblam&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-gpxfilter&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-graphview&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-HouseNumberTaggingTool&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-imagery_offset_db&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-Imagery-XML-Bounds&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-imageryadjust&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-imagerycache&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-imagewaypoint&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-ImportImage&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-log4j&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;packageFragmentRoot handle=&quot;=JOSM-log4j/lib\/log4j-1.2.17.jar&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.packageFragmentRoot"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-importvec&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-InfoMode&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-irsrectify&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-junctionchecking&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-lakewalker&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-livegps&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-mapdust&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-Measurement&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-merge-overlap&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-michigan_left&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-mirrored_download&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-namemanager&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-NanoLog&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-native-password-manager&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-OpenData&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-OpeningHoursEditor&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-openvisible&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-osmarender&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-OsmInspectorPlugin&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-PBF&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-pdfimport&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-photo_geotaging&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-photoadjust&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-piclayer&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-plastic_laf&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-Poly&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-print&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-proj4j&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-public_transport&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-reltoolbox&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-Reverter&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-roadsigns&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-routes&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-routing&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-sds&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-SeaMapEditor&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-SimplifyArea&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-surveyor&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-tageditor&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;josm-tagging-preset-tester&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-terracer&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-tracer&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-tracer2&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-trustosm&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-turnlanes&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-turnrestrictions&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;classpathContainer path=&quot;GROOVY_DSL_SUPPORT&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathContainer"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-undelete&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-videomapping&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-walkingpapers&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-waydownloader&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-waypoint_search&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-wayselector&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-wikipedia&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;JOSM-wms-turbo-challenge2&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;default/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>11 9 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> 12 10 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/> -
trunk/nodist/data/tagchecker.cfg
r8309 r16006 45 45 46 46 47 # all former checks are now located in data/validator/*mapcss :-)47 # all former checks are now located in resources/data/validator/*mapcss :-) -
trunk/nodist/images/downloadprimitive.svg
r7668 r16006 67 67 inkscape:window-maximized="0" /> 68 68 <image 69 sodipodi:absref="C:\Documents and Settings\matthiasj\My Documents\Eclipse\core\images_nodist\..\images\download.png"70 69 xlink:href="..\images\download.png" 71 70 y="4" -
trunk/nodist/images/presets/passingplace.svg
r7668 r16006 1 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?> 2 <!-- Created with Inkscape (http://www.inkscape.org/) -->3 4 2 <svg 5 3 xmlns:dc="http://purl.org/dc/elements/1.1/" … … 13 11 height="340" 14 12 id="svg2" 15 version="1.1" 16 inkscape:version="0.47 r22583" 17 sodipodi:docname="Zeichnung.svg" 18 inkscape:export-filename="/home/stoecker/josm/core/images/presets/passingplace.png" 19 inkscape:export-xdpi="10.19" 20 inkscape:export-ydpi="10.19"> 13 version="1.1"> 21 14 <defs 22 15 id="defs4"> -
trunk/nodist/styles/potlatch2/README
r9343 r16006 3 3 Potlatch 2's repository is git://git.openstreetmap.org/potlatch2.git 4 4 5 * styles_nodist/potlatch2/source5 * nodist/styles/potlatch2/source 6 6 contains the unmodified source files copied from git.openstreetmap.org/potlatch2.git/history/master:/resources/stylesheets 7 8 * styles_nodist/potlatch2/patched7 8 * nodist/styles/potlatch2/patched 9 9 contains the manually edited version 10 11 * images/icons10 11 * resources/images/icons 12 12 copy of git.openstreetmap.org/potlatch2.git/tree/HEAD:/resources/icons 13 14 * styles/standard/potlatch2.mapcss13 14 * resources/styles/standard/potlatch2.mapcss 15 15 concatination of the patched files; the ant task 'assemble' helps with this (use build.xml in the current folder) 16 16 -
trunk/nodist/styles/potlatch2/build.xml
r4771 r16006 3 3 <!-- concatinate the files to one mapcss style file --> 4 4 <target name="assemble"> 5 <concat destfile="../../ styles/standard/potlatch2.mapcss">6 <header trimleading="yes">/* THIS FILE IS AUTO-GENERATED (SEE styles_nodist/potlatch2/README) */5 <concat destfile="../../../resources/styles/standard/potlatch2.mapcss"> 6 <header trimleading="yes">/* THIS FILE IS AUTO-GENERATED (SEE nodist/styles/potlatch2/README) */ 7 7 </header> 8 8 <filelist dir="." files="prelude.css"/> -
trunk/resources/images/dialogs/mapstyle.svg
r13363 r16006 292 292 d="m 147.02879,324.18592 c -0.50495,-0.005 -1.16404,0.0401 -2.01092,0.14425 -10.84002,1.33279 -9.68531,12.70602 -9.68531,12.70602 2.04361,18.92561 31.00767,-7.64198 15.90272,-6.6646 -13.92488,0.90102 1.7519,-6.12628 -4.20649,-6.18567 z m -2.68027,5.95775 c 0.11478,-0.005 0.22429,0.0115 0.32602,0.0519 0.54255,0.21561 0.63766,1.02729 0.2135,1.81184 -0.42417,0.78456 -1.20871,1.2456 -1.75126,1.02999 -0.54256,-0.21561 -0.63766,-1.02729 -0.2135,-1.81185 0.34463,-0.63745 0.92788,-1.06084 1.42524,-1.08191 z" 293 293 id="path2176" 294 inkscape:export-filename="/home/te/programmierung/josm-eclipse2/images/dialogs/path2176.png"295 294 inkscape:export-xdpi="17.598721" 296 295 inkscape:export-ydpi="17.598721" -
trunk/resources/images/presets/misc/construction.svg
r13363 r16006 2 2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" 3 3 "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> 4 <svg height="76.7998" id="svg1117" inkscape:version="0.40" sodipodi:docbase="/mnt/donnees/09-Mes_images/Travaux/Travaux vectoriel/pictogrammes/sécu SVG/Avertissement" sodipodi:docname="BandeMarquageSecurite.svg" sodipodi:version="0.32"width="173.177" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink">4 <svg height="76.7998" id="svg1117" inkscape:version="0.40" width="173.177" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink"> 5 5 <metadata> 6 6 <rdf:RDF xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> -
trunk/resources/images/presets/misc/danger.svg
r13363 r16006 2 2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" 3 3 "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> 4 <svg height="144.407" id="svg1609" inkscape:version="0.40" sodipodi:docbase="/mnt/donnees/09-Mes_images/Travaux/Travaux vectoriel/pictogrammes/sécu SVG/Avertissement" sodipodi:docname="DangerGeneral.svg" sodipodi:version="0.32"width="156.262" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink">4 <svg height="144.407" id="svg1609" inkscape:version="0.40" width="156.262" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink"> 5 5 <metadata> 6 6 <rdf:RDF xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> -
trunk/resources/styles/standard/potlatch2.mapcss
r10706 r16006 1 /* THIS FILE IS AUTO-GENERATED (SEE styles_nodist/potlatch2/README) */1 /* THIS FILE IS AUTO-GENERATED (SEE nodist/styles/potlatch2/README) */ 2 2 /* 3 3 -
trunk/scripts/BuildProjectionDefinitions.java
r14638 r16006 31 31 public final class BuildProjectionDefinitions { 32 32 33 private static final String PROJ_DIR = " data_nodist/projection";33 private static final String PROJ_DIR = "nodist/data/projection"; 34 34 private static final String JOSM_EPSG_FILE = "josm-epsg"; 35 35 private static final String PROJ4_EPSG_FILE = "epsg"; 36 36 private static final String PROJ4_ESRI_FILE = "esri"; 37 private static final String OUTPUT_EPSG_FILE = " data/projection/custom-epsg";37 private static final String OUTPUT_EPSG_FILE = "resources/data/projection/custom-epsg"; 38 38 39 39 private static final Map<String, ProjectionDefinition> epsgProj4 = new LinkedHashMap<>(); -
trunk/scripts/TagInfoExtract.java
r15988 r16006 208 208 final Path f = baseDir.resolve("images").resolve(path); 209 209 if (Files.exists(f)) { 210 return "https://josm.openstreetmap.de/export/" + josmSvnRevision + "/josm/trunk/ images/" + path;210 return "https://josm.openstreetmap.de/export/" + josmSvnRevision + "/josm/trunk/resources/images/" + path; 211 211 } 212 212 throw new IllegalStateException("Cannot find image url for " + path); … … 226 226 .add("description", description) 227 227 .add("project_url", "https://josm.openstreetmap.de/") 228 .add("icon_url", "https://josm.openstreetmap.de/export/7770/josm/trunk/ images/logo_16x16x8.png")228 .add("icon_url", "https://josm.openstreetmap.de/export/7770/josm/trunk/resources/images/logo_16x16x8.png") 229 229 .add("contact_name", "JOSM developer team") 230 230 .add("contact_email", "josm-dev@openstreetmap.org"); -
trunk/scripts/geticons.pl
r13857 r16006 4 4 5 5 my @default = ( 6 " styles/standard/*.xml",7 " styles/standard/*.mapcss",8 " data/*.xml",6 "resources/styles/standard/*.xml", 7 "resources/styles/standard/*.mapcss", 8 "resources/data/*.xml", 9 9 "src/org/openstreetmap/josm/*.java", 10 10 "src/org/openstreetmap/josm/*/*.java", … … 134 134 my %haveicons; 135 135 136 for($i = 1; my @ifiles = (glob(" images".("/*" x $i).".png"), glob("images".("/*" x $i).".svg")); ++$i)136 for($i = 1; my @ifiles = (glob("resources/images".("/*" x $i).".png"), glob("resources/images".("/*" x $i).".svg")); ++$i) 137 137 { 138 138 for my $ifile (sort @ifiles) 139 139 { 140 $ifile =~ s/^ images\///;140 $ifile =~ s/^resources\/images\///; 141 141 # svg comes after png due to the glob, so only check for svg's 142 142 if($ifile =~ /^(.*)\.svg$/) … … 147 147 } 148 148 # check for unwanted svg effects 149 if(open FILE, "<"," images/$ifile")149 if(open FILE, "<","resources/images/$ifile") 150 150 { 151 151 undef $/; … … 181 181 if($img =~ /\.(png|svg)/) 182 182 { 183 print STDERR "$img: File does not exist!\n" if(!-f " images/$img");183 print STDERR "$img: File does not exist!\n" if(!-f "resources/images/$img"); 184 184 delete $haveicons{$img}; 185 185 } 186 186 else 187 187 { 188 print STDERR "$img(.svg|.png): File does not exist!\n" if(!-f " images/$img.png" && !-f "images/$img.svg");188 print STDERR "$img(.svg|.png): File does not exist!\n" if(!-f "resources/images/$img.png" && !-f "resources/images/$img.svg"); 189 189 delete $haveicons{"$img.svg"}; 190 190 delete $haveicons{"$img.png"}; -
trunk/scripts/optimize-images
r15916 r16006 1 1 #!/bin/sh 2 2 3 find images/ -name "*.png" \3 find resources/images/ -name "*.png" \ 4 4 -exec echo "Processing {}" \; \ 5 5 -exec optipng -o7 -quiet "{}" \; -
trunk/src/org/openstreetmap/josm/gui/GettingStarted.java
r14578 r16006 196 196 197 197 static String fixImageLinks(String s) { 198 Matcher m = Pattern.compile("src=\"/browser/trunk (/images/.*?\\.png)\\?format=raw\"").matcher(s);198 Matcher m = Pattern.compile("src=\"/browser/trunk/resources(/images/.*?\\.png)\\?format=raw\"").matcher(s); 199 199 StringBuffer sb = new StringBuffer(); 200 200 while (m.find()) { -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java
r14119 r16006 74 74 public String[] getUsageExamples() { 75 75 return new String[] {"/import?url=" + Utils.encodeUrl( 76 Config.getUrls().getJOSMWebsite()+"/browser/josm/trunk/ data_nodist/direction-arrows.osm?format=txt")};76 Config.getUrls().getJOSMWebsite()+"/browser/josm/trunk/nodist/data/direction-arrows.osm?format=txt")}; 77 77 } 78 78 -
trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java
r11171 r16006 40 40 @Test 41 41 public void testImageReplacementStatic() { 42 final String html = "the download button <img src=\"/browser/trunk/ images/download.png?format=raw\" " +43 "alt=\"source:trunk/ images/download.png\" title=\"source:trunk/images/download.png\" />.";42 final String html = "the download button <img src=\"/browser/trunk/resources/images/download.png?format=raw\" " + 43 "alt=\"source:trunk/resources/images/download.png\" title=\"source:trunk/resources/images/download.png\" />."; 44 44 assertFalse(GettingStarted.fixImageLinks(html).equals(html)); 45 45 -
trunk/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java
r14138 r16006 63 63 64 64 try ( 65 InputStream fisC = Compression.getUncompressedFileInputStream(new File(" data_nodist/neubrandenburg.osm.bz2"));65 InputStream fisC = Compression.getUncompressedFileInputStream(new File("nodist/data/neubrandenburg.osm.bz2")); 66 66 ) { 67 67 dsCity = OsmReader.parseDataSet(fisC, NullProgressMonitor.INSTANCE); -
trunk/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java
r14093 r16006 18 18 private static final int DEFAULT_KEY_VALUE_RATIO = 3; 19 19 private static final int DEFAULT_NODE_COUNT = 1000; 20 private static final String DATA_DIR = " data_nodist" + File.separator + "osmfiles";20 private static final String DATA_DIR = "nodist/data" + File.separator + "osmfiles"; 21 21 22 22 private OsmDataGenerator() { -
trunk/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRendererPerformanceTestParent.java
r15034 r16006 81 81 StyledMapRenderer.PREFERENCE_TEXT_ANTIALIASING.put("gasp"); 82 82 83 try (InputStream fisR = Files.newInputStream(Paths.get(" data_nodist/restriction.osm"));84 InputStream fisM = Files.newInputStream(Paths.get(" data_nodist/multipolygon.osm"));85 InputStream fisC = Compression.getUncompressedFileInputStream(new File(" data_nodist/neubrandenburg.osm.bz2"));86 InputStream fisO = Compression.getUncompressedFileInputStream(new File(" data_nodist/overpass-download.osm.bz2"));) {83 try (InputStream fisR = Files.newInputStream(Paths.get("nodist/data/restriction.osm")); 84 InputStream fisM = Files.newInputStream(Paths.get("nodist/data/multipolygon.osm")); 85 InputStream fisC = Compression.getUncompressedFileInputStream(new File("nodist/data/neubrandenburg.osm.bz2")); 86 InputStream fisO = Compression.getUncompressedFileInputStream(new File("nodist/data/overpass-download.osm.bz2"));) { 87 87 dsRestriction = OsmReader.parseDataSet(fisR, NullProgressMonitor.INSTANCE); 88 88 dsMultipolygon = OsmReader.parseDataSet(fisM, NullProgressMonitor.INSTANCE); -
trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java
r15987 r16006 19 19 import javax.imageio.ImageIO; 20 20 21 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;22 21 import org.junit.AfterClass; 23 22 import org.junit.Assert; … … 49 48 import org.openstreetmap.josm.tools.Logging; 50 49 50 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 51 51 52 /** 52 53 * Performance test of map renderer. … … 152 153 153 154 try ( 154 InputStream fisC = Compression.getUncompressedFileInputStream(new File(" data_nodist/neubrandenburg.osm.bz2"));155 InputStream fisC = Compression.getUncompressedFileInputStream(new File("nodist/data/neubrandenburg.osm.bz2")); 155 156 ) { 156 157 dsCity = OsmReader.parseDataSet(fisC, NullProgressMonitor.INSTANCE); -
trunk/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSPerformanceTest.java
r12825 r16006 35 35 * The path to the style file used for rendering. 36 36 */ 37 static final String STYLE_FILE = " styles/standard/elemstyles.mapcss";37 static final String STYLE_FILE = "resources/styles/standard/elemstyles.mapcss"; 38 38 39 39 /** 40 40 * The data file to be rendered 41 41 */ 42 static final String DATA_FILE = " data_nodist/neubrandenburg.osm.bz2";42 static final String DATA_FILE = "nodist/data/neubrandenburg.osm.bz2"; 43 43 /* ------------------------ / configuration section ---------------------------- */ 44 44 -
trunk/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java
r10758 r16006 31 31 public class OsmReaderPerformanceTest { 32 32 private static final int TIMES = 4; 33 private static String DATA_FILE = " data_nodist/neubrandenburg.osm.bz2";33 private static String DATA_FILE = "nodist/data/neubrandenburg.osm.bz2"; 34 34 35 35 /** -
trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java
r15883 r16006 146 146 147 147 /** 148 * Non-regression test which checks example files in data_nodist148 * Non-regression test which checks example files in nodist/data 149 149 * @throws Exception if an error occurs 150 150 */ … … 153 153 public void testExamples() throws Exception { 154 154 DataSet dsToJoin, dsExpected; 155 try (InputStream is = Files.newInputStream(Paths.get(" data_nodist/Join_Areas_Tests.osm"))) {155 try (InputStream is = Files.newInputStream(Paths.get("nodist/data/Join_Areas_Tests.osm"))) { 156 156 dsToJoin = OsmReader.parseDataSet(is, NullProgressMonitor.INSTANCE); 157 157 } 158 try (InputStream is = Files.newInputStream(Paths.get(" data_nodist/Join_Areas_Tests_joined.osm"))) {158 try (InputStream is = Files.newInputStream(Paths.get("nodist/data/Join_Areas_Tests_joined.osm"))) { 159 159 dsExpected = OsmReader.parseDataSet(is, NullProgressMonitor.INSTANCE); 160 160 } -
trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java
r15034 r16006 74 74 for (int i : new int[] {1, 2, 3, 11, 12, 13, 14, 15}) { 75 75 DataSet ds; 76 try (InputStream is = Files.newInputStream(Paths.get(" data_nodist/filterTests.osm"))) {76 try (InputStream is = Files.newInputStream(Paths.get("nodist/data/filterTests.osm"))) { 77 77 ds = OsmReader.parseDataSet(is, NullProgressMonitor.INSTANCE); 78 78 } -
trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java
r15034 r16006 85 85 public void testRemove() throws Exception { 86 86 ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator 87 try (InputStream fis = Files.newInputStream(Paths.get(" data_nodist/restriction.osm"))) {87 try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/restriction.osm"))) { 88 88 DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); 89 89 removeAllTest(ds); … … 98 98 public void testMove() throws Exception { 99 99 ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator 100 try (InputStream fis = Files.newInputStream(Paths.get(" data_nodist/restriction.osm"))) {100 try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/restriction.osm"))) { 101 101 DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); 102 102 -
trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java
r15716 r16006 47 47 * Test projections using reference data from external program. 48 48 * 49 * To update the reference data file <code> data_nodist/projection/projection-reference-data</code>,49 * To update the reference data file <code>nodist/data/projection/projection-reference-data</code>, 50 50 * run the main method of this class. For this, you need to have the cs2cs 51 51 * program from the proj.4 library in path (or use <code>CS2CS_EXE</code> to set 52 52 * the full path of the executable). Make sure the required *.gsb grid files 53 * can be accessed, i.e. copy them from <code> data_nodist/projection</code> to <code>/usr/share/proj</code> or53 * can be accessed, i.e. copy them from <code>nodist/data/projection</code> to <code>/usr/share/proj</code> or 54 54 * wherever cs2cs expects them to be placed. 55 55 * … … 63 63 private static final String CS2CS_EXE = "cs2cs"; 64 64 65 private static final String REFERENCE_DATA_FILE = " data_nodist/projection/projection-reference-data";66 private static final String PROJ_LIB_DIR = " data_nodist/projection";65 private static final String REFERENCE_DATA_FILE = "nodist/data/projection/projection-reference-data"; 66 private static final String PROJ_LIB_DIR = "nodist/data/projection"; 67 67 68 68 private static class RefEntry { -
trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
r15034 r16006 34 34 * This test is used to monitor changes in projection code. 35 35 * 36 * It keeps a record of test data in the file data_nodist/projection/projection-regression-test-data.36 * It keeps a record of test data in the file nodist/data/projection/projection-regression-test-data. 37 37 * This record is generated from the current Projection classes available in JOSM. It needs to 38 38 * be updated, whenever a projection is added / removed or an algorithm is changed, such that … … 44 44 public class ProjectionRegressionTest { 45 45 46 private static final String PROJECTION_DATA_FILE = " data_nodist/projection/projection-regression-test-data";46 private static final String PROJECTION_DATA_FILE = "nodist/data/projection/projection-regression-test-data"; 47 47 48 48 private static class TestData { -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java
r15043 r16006 31 31 @Test 32 32 public void testCoastlineFile() throws Exception { 33 ValidatorTestUtils.testSampleFile(" data_nodist/coastlines.osm",33 ValidatorTestUtils.testSampleFile("nodist/data/coastlines.osm", 34 34 ds -> ds.getWays().stream().filter( 35 35 w -> "coastline".equals(w.get("natural"))).collect(Collectors.toList()), -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java
r15183 r16006 38 38 final MultipolygonTest MULTIPOLYGON_TEST = new MultipolygonTest(); 39 39 final RelationChecker RELATION_TEST = new RelationChecker(); 40 ValidatorTestUtils.testSampleFile(" data_nodist/multipolygon.osm",40 ValidatorTestUtils.testSampleFile("nodist/data/multipolygon.osm", 41 41 ds -> ds.getRelations().stream().filter(Relation::isMultipolygon).collect(Collectors.toList()), 42 42 name -> name.startsWith("06") || name.startsWith("07") || name.startsWith("08"), MULTIPOLYGON_TEST, RELATION_TEST); -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TurnRestrictionTestTest.java
r14966 r16006 29 29 @Test 30 30 public void testTurnrestrictionFile() throws Exception { 31 ValidatorTestUtils.testSampleFile(" data_nodist/restriction.osm",31 ValidatorTestUtils.testSampleFile("nodist/data/restriction.osm", 32 32 ds -> ds.getRelations(), 33 33 name -> name.startsWith("E"), TURNRESTRICTION_TEST, RELATION_TEST); -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java
r15354 r16006 49 49 @Test 50 50 public void testTicket6313() throws IOException, IllegalDataException, FileNotFoundException { 51 try (InputStream fis = Files.newInputStream(Paths.get(" data_nodist/UnconnectedWaysTest.osm"))) {51 try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/UnconnectedWaysTest.osm"))) { 52 52 final DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); 53 53 MainApplication.getLayerManager().addLayer(new OsmDataLayer(ds, null, null)); -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java
r15034 r16006 45 45 public void loadData() throws IllegalDataException, IOException { 46 46 if (testDataset == null) { 47 try (InputStream fis = Files.newInputStream(Paths.get(" data_nodist/relation_sort.osm"))) {47 try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/relation_sort.osm"))) { 48 48 testDataset = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); 49 49 } -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java
r15076 r16006 52 52 public void loadData() throws IllegalDataException, IOException { 53 53 if (testDataset == null) { 54 try (InputStream fis = Files.newInputStream(Paths.get(" data_nodist/relation_sort.osm"))) {54 try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/relation_sort.osm"))) { 55 55 testDataset = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); 56 56 } -
trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java
r14205 r16006 46 46 @Test 47 47 public void testAutoGuess() throws Exception { 48 final GpxData gpx = GpxReaderTest.parseGpxData(" data_nodist/2094047.gpx");48 final GpxData gpx = GpxReaderTest.parseGpxData("nodist/data/2094047.gpx"); 49 49 final ImageEntry i0 = new ImageEntry(); 50 50 i0.setExifTime(DateUtils.fromString("2016:01:03 11:59:54")); // 4 sec before start of GPX -
trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java
r15497 r16006 60 60 @Test 61 61 public void testNone() throws IOException, SAXException { 62 final List<String> colors = calculateColors(" data_nodist/2094047.gpx", ImmutableMap.of(), 10);62 final List<String> colors = calculateColors("nodist/data/2094047.gpx", ImmutableMap.of(), 10); 63 63 assertEquals("[#000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000]", colors.toString()); 64 64 } … … 72 72 @Test 73 73 public void testVelocity() throws IOException, SAXException { 74 final List<String> colors = calculateColors(" data_nodist/2094047.gpx",74 final List<String> colors = calculateColors("nodist/data/2094047.gpx", 75 75 ImmutableMap.of("colormode", Integer.toString(ColorMode.VELOCITY.toIndex())), 10); 76 76 assertEquals("[#000000, #FFAD00, #FFA800, #FFA800, #FF9E00, #FF9400, #FF7000, #FF7000, #FF8000, #FF9400]", colors.toString()); … … 85 85 @Test 86 86 public void testVelocityDynamic() throws IOException, SAXException { 87 final List<String> colors = calculateColors(" data_nodist/2094047.gpx",87 final List<String> colors = calculateColors("nodist/data/2094047.gpx", 88 88 ImmutableMap.of("colormode.dynamic-range", "true", 89 89 "colormode", Integer.toString(ColorMode.VELOCITY.toIndex())), … … 100 100 @Test 101 101 public void testDirection() throws IOException, SAXException { 102 final List<String> colors = calculateColors(" data_nodist/2094047.gpx",102 final List<String> colors = calculateColors("nodist/data/2094047.gpx", 103 103 ImmutableMap.of("colormode", Integer.toString(ColorMode.DIRECTION.toIndex())), 10); 104 104 assertEquals("[#000000, #EAEC25, #EDEA26, #EDE525, #ECD322, #EBB81D, #E85A0D, #E73708, #E84D0B, #EA8A15]", colors.toString()); … … 113 113 @Test 114 114 public void testTime() throws IOException, SAXException { 115 final List<String> colors = calculateColors(" data_nodist/2094047.gpx",115 final List<String> colors = calculateColors("nodist/data/2094047.gpx", 116 116 ImmutableMap.of("colormode", Integer.toString(ColorMode.TIME.toIndex())), 10); 117 117 assertEquals("[#000000, #FF0000, #FF0000, #FF0500, #FF0500, #FF0A00, #FF0A00, #FF1F00, #FF2E00, #FF3300]", colors.toString()); -
trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.java
r15988 r16006 192 192 @Test 193 193 public void testContains() throws Exception { 194 ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get(" data_nodist/amenity-in-amenity.osm")), null);194 ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get("nodist/data/amenity-in-amenity.osm")), null); 195 195 ChildOrParentSelector css = parse("node[tag(\"amenity\") = parent_tag(\"amenity\")] ∈ *[amenity] {}"); 196 196 assertFalse(css.matches(new Environment(ds.getPrimitiveById(123, OsmPrimitiveType.NODE)))); -
trunk/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java
r15034 r16006 128 128 @Test 129 129 public void testMultipolygonRobustness() throws Exception { 130 try (InputStream in = Files.newInputStream(Paths.get(" data_nodist/multipolygon.osm"))) {130 try (InputStream in = Files.newInputStream(Paths.get("nodist/data/multipolygon.osm"))) { 131 131 DataSet ds = OsmReader.parseDataSet(in, null); 132 132 final GeoJSONWriter writer = new GeoJSONWriter(ds); -
trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java
r15496 r16006 61 61 @Test 62 62 public void testMunich() throws Exception { 63 final GpxData result = parseGpxData(" data_nodist/munich.gpx");63 final GpxData result = parseGpxData("nodist/data/munich.gpx"); 64 64 assertEquals(2762, result.getTracks().size()); 65 65 assertEquals(0, result.getRoutes().size()); -
trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java
r15502 r16006 62 62 public void testReader() throws Exception { 63 63 TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin")); 64 final NmeaReader in = new NmeaReader(Files.newInputStream(Paths.get(" data_nodist/btnmeatrack_2016-01-25.nmea")));64 final NmeaReader in = new NmeaReader(Files.newInputStream(Paths.get("nodist/data/btnmeatrack_2016-01-25.nmea"))); 65 65 in.parse(true); 66 66 assertEquals(30, in.getNumberOfCoordinates()); -
trunk/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java
r15343 r16006 58 58 @Test 59 59 public void testReader() throws Exception { 60 RtkLibPosReader in = read(" data_nodist/rtklib_example.pos");60 RtkLibPosReader in = read("nodist/data/rtklib_example.pos"); 61 61 assertEquals(137, in.getNumberOfCoordinates()); 62 62 … … 84 84 @Test 85 85 public void testReader2() throws Exception { 86 RtkLibPosReader in = read(" data_nodist/rtklib_example2.pos");86 RtkLibPosReader in = read("nodist/data/rtklib_example2.pos"); 87 87 assertEquals(6, in.getNumberOfCoordinates()); 88 88 } -
trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java
r15672 r16006 42 42 @Before 43 43 public void setUp() { 44 directionSampleFile = new File(" data_nodist/exif-example_direction.jpg");45 orientationSampleFile = new File(" data_nodist/exif-example_orientation=6.jpg");44 directionSampleFile = new File("nodist/data/exif-example_direction.jpg"); 45 orientationSampleFile = new File("nodist/data/exif-example_orientation=6.jpg"); 46 46 } 47 47 … … 62 62 @Test 63 63 public void testReadTimeSubSecond1() throws ParseException { 64 Date date = ExifReader.readTime(new File(" data_nodist/IMG_20150711_193419.jpg"));64 Date date = ExifReader.readTime(new File("nodist/data/IMG_20150711_193419.jpg")); 65 65 doTest("2015-07-11T19:34:19.100", date); 66 66 } … … 108 108 @Test 109 109 public void testReadSpeed() { 110 assertEquals(Double.valueOf(12.3), ExifReader.readSpeed(new File(" data_nodist/exif-example_speed_ele.jpg")));110 assertEquals(Double.valueOf(12.3), ExifReader.readSpeed(new File("nodist/data/exif-example_speed_ele.jpg"))); 111 111 } 112 112 … … 116 116 @Test 117 117 public void testReadElevation() { 118 assertEquals(Double.valueOf(23.4), ExifReader.readElevation(new File(" data_nodist/exif-example_speed_ele.jpg")));118 assertEquals(Double.valueOf(23.4), ExifReader.readElevation(new File("nodist/data/exif-example_speed_ele.jpg"))); 119 119 } 120 120 -
trunk/tools
-
Property svn:ignore
set to
ivy-report
-
Property svn:ignore
set to
-
trunk/tools/checkstyle/josm_filters.xml
r15588 r16006 8 8 <suppress checks="." files="[\\/]build[\\/]" /> 9 9 <suppress checks="." files="[\\/]build2[\\/]" /> 10 <suppress checks="." files="[\\/]data_nodist[\\/]" />11 10 <suppress checks="." files="[\\/]dist[\\/]" /> 12 <suppress checks="." files="[\\/]eclipse[\\/]" />13 11 <suppress checks="." files="[\\/]foobar[\\/]" /> 14 <suppress checks="." files="[\\/]images[\\/]" /> 15 <suppress checks="." files="[\\/]images_nodist[\\/]" /> 16 <suppress checks="." files="[\\/]linux[\\/]" /> 17 <suppress checks="." files="[\\/]macosx[\\/]" /> 18 <suppress checks="." files="[\\/]netbeans[\\/]" /> 12 <suppress checks="." files="[\\/]ide[\\/]" /> 13 <suppress checks="." files="[\\/]native[\\/]" /> 14 <suppress checks="." files="[\\/]nodist[\\/]" /> 19 15 <suppress checks="." files="[\\/]patches[\\/]" /> 20 <suppress checks="." files="[\\/]styles_nodist[\\/]" />21 16 <suppress checks="." files="[\\/]taginfo-img[\\/]" /> 22 17 <suppress checks="." files="[\\/]taginfo_.*\.json" /> … … 28 23 <suppress checks="." files="[\\/]tools[\\/]japicc[\\/]" /> 29 24 <suppress checks="." files="[\\/]tools[\\/]pmd[\\/]" /> 30 <suppress checks="." files="[\\/]windows[\\/]" />31 25 <suppress checks="HeaderCheck" files="josm[\\/]tools[\\/]commons[\\/]" /> 32 26 <suppress checks="HeaderCheck" files="Ellipsoid\.java" /> -
trunk/tools/ivy
-
Property svn:ignore
set to
OpeningHoursParser*.jar
annotations*.jar
-
Property svn:ignore
set to
Note:
See TracChangeset
for help on using the changeset viewer.