diff --git a/.checkstyle b/.checkstyle index b5804d37273..ac4947a0fc5 100644 --- a/.checkstyle +++ b/.checkstyle @@ -25,26 +25,18 @@ - - - - - + - - - + + - - - diff --git a/.classpath b/.classpath index 7755f6fadaf..22e582e39f9 100644 --- a/.classpath +++ b/.classpath @@ -2,7 +2,6 @@ - diff --git a/.pmd b/.pmd new file mode 100644 index 00000000000..d4d52d2932d --- /dev/null +++ b/.pmd @@ -0,0 +1,8 @@ + + + true + tools\pmd\josm-ruleset.xml + false + false + false + diff --git a/.project b/.project index 0a7793fbdca..c82979ddfaa 100644 --- a/.project +++ b/.project @@ -35,6 +35,11 @@ + + net.sourceforge.pmd.eclipse.plugin.pmdBuilder + + + org.sonarlint.eclipse.core.sonarlintNature @@ -43,5 +48,6 @@ sf.eclipse.javacc.javaccnature net.sf.eclipsecs.core.CheckstyleNature org.apache.ivyde.eclipse.ivynature + net.sourceforge.pmd.eclipse.plugin.pmdNature diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 4add34aca36..841284bd1ba 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ eclipse.preferences.version=1 -encoding//windows/locale=ISO-8859-1 +encoding//native/windows/locale=ISO-8859-1 encoding/=UTF-8 diff --git a/README b/README index 0661aaece1d..09b8a0e95a3 100644 --- a/README +++ b/README @@ -57,26 +57,20 @@ Files & directories This is an overview of the files and directories in the JOSM code repository: - build.xml ant build file (standard way to create a JOSM binary) - 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 - - 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 - - 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.) - - 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 +- gpl-2.0.txt, gpl-3.0.txt full text of the GNU General Public License +- ide IDE-specific files + - eclipse/ preconfigured Eclipse configuration files + - netbeans/ preconfigured Netbeans project +- josm.jnlp Java Web Start launcher file (used on the website for the tested version) +- josm-latest.jnlp Java Web Start launcher file (used on the website for the latest version) +- LICENSE the JOSM license terms +- native/ OS-specific files + - linux/ files useful for Linux distributions, including Appdata files, .desktop + files, Debian/Ubuntu scripts, man pages, icons, etc. + - macosx/ files needed to create the MacOS X package + - windows/ files needed to create the Windows installer +- nodist/ files not included in JOSM binary + - data/ data files that are useful for development, but not distributed - exif-direction-example.jpg sample image, that contains direction information in the EXIF header (keys: Exif.GPSInfo.GPSImgDirectionRef, Exif.GPSInfo.GPSImgDirection) @@ -106,22 +100,36 @@ This is an overview of the files and directories in the JOSM code repository: 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 - - presets images for the main mappaint style and the internal presets -- images_nodist/ images, which are not for distribution, but may be useful later (e.g. high + - images/ images, which are not for distribution, but may be useful later (e.g. high resolution and vector versions) -- josm.jnlp Java Web Start launcher file (used on the website for the tested version) -- josm-latest.jnlp Java Web Start launcher file (used on the website for the latest version) -- LICENSE the JOSM license terms -- linux/ files useful for Linux distributions, including Appdata files, .desktop - files, Debian/Ubuntu scripts, man pages, icons, etc. -- macosx/ files needed to create the MacOS X package -- netbeans/ preconfigured Netbeans project + - styles/ files needed for map style maintenance + - potlatch2/README infos on how to update the Potlatch 2 style from upstream sources - 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 + - 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 + - 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 + - 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.) + - 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 + - images/ images distributed with the JOSM binary + - icons images for the Potlatch 2 style + - presets images for the main mappaint style and the internal presets + - styles/ map styles included in JOSM - scripts/ various scripts used by JOSM developers - BuildProjectionDefinitions.java called from the ant build file to combine the files epsg and josm-epsg @@ -136,9 +144,6 @@ This is an overview of the files and directories in the JOSM code repository: - TagInfoExtract.java 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 - - potlatch2/README infos on how to update the Potlatch 2 style from upstream sources - test/ automated software tests - data/ resources used for some tests - functional/ functional tests (source code) @@ -152,15 +157,15 @@ This is an overview of the files and directories in the JOSM code repository: - checkstyle/ libs and config files for checkstyle (automatically detects code style problems in source code); can be launched as an ant target in build.xml - error_prone_ant.jar used to detect code errors during compilation - - spotbugs/ libs and config files for spotbugs (automatically detects common bugs and potential - problems in source code); can be launched as an ant target in build.xml + - ivy/ Apache Ivy binary, configuration file, and downloaded dependencies - jacocoant.jar used to include coverage data into JUnit test reports - japicc/ used to generate a compatibility report between optimized jar and normal one - javacc.jar used in the build process to generate some .java files from a javacc source file (src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj) - proguard.jar optimize final binary jar - see build.xml (not used in production so far) + - spotbugs/ libs and config files for spotbugs (automatically detects common bugs and potential + problems in source code); can be launched as an ant target in build.xml - xmltask.jar used to edit XML files from Ant for the OSX package -- windows/ files needed to create the Windows installer The 'patches' directory ----------------------- diff --git a/build.xml b/build.xml index 72ca3d6e384..9df267711ff 100644 --- a/build.xml +++ b/build.xml @@ -50,7 +50,7 @@ - + @@ -96,6 +96,7 @@ + @@ -186,8 +187,8 @@ Build-Date: ${build.tstamp} ** Check internal XML files against their XSD --> - - + + - + version="1.1"> - -
/* THIS FILE IS AUTO-GENERATED (SEE styles_nodist/potlatch2/README) */ + +
/* THIS FILE IS AUTO-GENERATED (SEE nodist/styles/potlatch2/README) */
diff --git a/styles_nodist/potlatch2/patched/core_landuse.css b/nodist/styles/potlatch2/patched/core_landuse.css similarity index 100% rename from styles_nodist/potlatch2/patched/core_landuse.css rename to nodist/styles/potlatch2/patched/core_landuse.css diff --git a/styles_nodist/potlatch2/patched/core_pois.css b/nodist/styles/potlatch2/patched/core_pois.css similarity index 100% rename from styles_nodist/potlatch2/patched/core_pois.css rename to nodist/styles/potlatch2/patched/core_pois.css diff --git a/styles_nodist/potlatch2/patched/core_relations.css b/nodist/styles/potlatch2/patched/core_relations.css similarity index 100% rename from styles_nodist/potlatch2/patched/core_relations.css rename to nodist/styles/potlatch2/patched/core_relations.css diff --git a/styles_nodist/potlatch2/patched/core_ways.css b/nodist/styles/potlatch2/patched/core_ways.css similarity index 100% rename from styles_nodist/potlatch2/patched/core_ways.css rename to nodist/styles/potlatch2/patched/core_ways.css diff --git a/styles_nodist/potlatch2/patched/potlatch.css b/nodist/styles/potlatch2/patched/potlatch.css similarity index 100% rename from styles_nodist/potlatch2/patched/potlatch.css rename to nodist/styles/potlatch2/patched/potlatch.css diff --git a/styles_nodist/potlatch2/prelude.css b/nodist/styles/potlatch2/prelude.css similarity index 100% rename from styles_nodist/potlatch2/prelude.css rename to nodist/styles/potlatch2/prelude.css diff --git a/styles_nodist/potlatch2/source/bikeshops.css b/nodist/styles/potlatch2/source/bikeshops.css similarity index 100% rename from styles_nodist/potlatch2/source/bikeshops.css rename to nodist/styles/potlatch2/source/bikeshops.css diff --git a/styles_nodist/potlatch2/source/bugs.css b/nodist/styles/potlatch2/source/bugs.css similarity index 100% rename from styles_nodist/potlatch2/source/bugs.css rename to nodist/styles/potlatch2/source/bugs.css diff --git a/styles_nodist/potlatch2/source/core_interactive.css b/nodist/styles/potlatch2/source/core_interactive.css similarity index 100% rename from styles_nodist/potlatch2/source/core_interactive.css rename to nodist/styles/potlatch2/source/core_interactive.css diff --git a/styles_nodist/potlatch2/source/core_landuse.css b/nodist/styles/potlatch2/source/core_landuse.css similarity index 100% rename from styles_nodist/potlatch2/source/core_landuse.css rename to nodist/styles/potlatch2/source/core_landuse.css diff --git a/styles_nodist/potlatch2/source/core_pois.css b/nodist/styles/potlatch2/source/core_pois.css similarity index 100% rename from styles_nodist/potlatch2/source/core_pois.css rename to nodist/styles/potlatch2/source/core_pois.css diff --git a/styles_nodist/potlatch2/source/core_relations.css b/nodist/styles/potlatch2/source/core_relations.css similarity index 100% rename from styles_nodist/potlatch2/source/core_relations.css rename to nodist/styles/potlatch2/source/core_relations.css diff --git a/styles_nodist/potlatch2/source/core_ways.css b/nodist/styles/potlatch2/source/core_ways.css similarity index 100% rename from styles_nodist/potlatch2/source/core_ways.css rename to nodist/styles/potlatch2/source/core_ways.css diff --git a/styles_nodist/potlatch2/source/enhanced.css b/nodist/styles/potlatch2/source/enhanced.css similarity index 100% rename from styles_nodist/potlatch2/source/enhanced.css rename to nodist/styles/potlatch2/source/enhanced.css diff --git a/styles_nodist/potlatch2/source/gpx.css b/nodist/styles/potlatch2/source/gpx.css similarity index 100% rename from styles_nodist/potlatch2/source/gpx.css rename to nodist/styles/potlatch2/source/gpx.css diff --git a/styles_nodist/potlatch2/source/network.css b/nodist/styles/potlatch2/source/network.css similarity index 100% rename from styles_nodist/potlatch2/source/network.css rename to nodist/styles/potlatch2/source/network.css diff --git a/styles_nodist/potlatch2/source/opencyclemap.css b/nodist/styles/potlatch2/source/opencyclemap.css similarity index 100% rename from styles_nodist/potlatch2/source/opencyclemap.css rename to nodist/styles/potlatch2/source/opencyclemap.css diff --git a/styles_nodist/potlatch2/source/potlatch.css b/nodist/styles/potlatch2/source/potlatch.css similarity index 100% rename from styles_nodist/potlatch2/source/potlatch.css rename to nodist/styles/potlatch2/source/potlatch.css diff --git a/styles_nodist/potlatch2/source/snapshot.css b/nodist/styles/potlatch2/source/snapshot.css similarity index 100% rename from styles_nodist/potlatch2/source/snapshot.css rename to nodist/styles/potlatch2/source/snapshot.css diff --git a/styles_nodist/potlatch2/source/wireframe.css b/nodist/styles/potlatch2/source/wireframe.css similarity index 100% rename from styles_nodist/potlatch2/source/wireframe.css rename to nodist/styles/potlatch2/source/wireframe.css diff --git a/styles_nodist/standard/README.txt b/nodist/styles/standard/README.txt similarity index 100% rename from styles_nodist/standard/README.txt rename to nodist/styles/standard/README.txt diff --git a/styles_nodist/standard/makefile b/nodist/styles/standard/makefile similarity index 100% rename from styles_nodist/standard/makefile rename to nodist/styles/standard/makefile diff --git a/styles_nodist/standard/overview.osm b/nodist/styles/standard/overview.osm similarity index 100% rename from styles_nodist/standard/overview.osm rename to nodist/styles/standard/overview.osm diff --git a/styles_nodist/standard/overview.xsl b/nodist/styles/standard/overview.xsl similarity index 100% rename from styles_nodist/standard/overview.xsl rename to nodist/styles/standard/overview.xsl diff --git a/data/ast.lang b/resources/data/ast.lang similarity index 100% rename from data/ast.lang rename to resources/data/ast.lang diff --git a/data/be.lang b/resources/data/be.lang similarity index 100% rename from data/be.lang rename to resources/data/be.lang diff --git a/data/bg.lang b/resources/data/bg.lang similarity index 100% rename from data/bg.lang rename to resources/data/bg.lang diff --git a/data/boundaries.osm b/resources/data/boundaries.osm similarity index 100% rename from data/boundaries.osm rename to resources/data/boundaries.osm diff --git a/data/ca-valencia.lang b/resources/data/ca-valencia.lang similarity index 100% rename from data/ca-valencia.lang rename to resources/data/ca-valencia.lang diff --git a/data/ca.lang b/resources/data/ca.lang similarity index 100% rename from data/ca.lang rename to resources/data/ca.lang diff --git a/data/cs.lang b/resources/data/cs.lang similarity index 100% rename from data/cs.lang rename to resources/data/cs.lang diff --git a/data/da.lang b/resources/data/da.lang similarity index 100% rename from data/da.lang rename to resources/data/da.lang diff --git a/data/de.lang b/resources/data/de.lang similarity index 100% rename from data/de.lang rename to resources/data/de.lang diff --git a/data/defaultpresets.xml b/resources/data/defaultpresets.xml similarity index 100% rename from data/defaultpresets.xml rename to resources/data/defaultpresets.xml diff --git a/data/el.lang b/resources/data/el.lang similarity index 100% rename from data/el.lang rename to resources/data/el.lang diff --git a/data/en.lang b/resources/data/en.lang similarity index 100% rename from data/en.lang rename to resources/data/en.lang diff --git a/data/en_AU.lang b/resources/data/en_AU.lang similarity index 100% rename from data/en_AU.lang rename to resources/data/en_AU.lang diff --git a/data/en_GB.lang b/resources/data/en_GB.lang similarity index 100% rename from data/en_GB.lang rename to resources/data/en_GB.lang diff --git a/data/es.lang b/resources/data/es.lang similarity index 100% rename from data/es.lang rename to resources/data/es.lang diff --git a/data/et.lang b/resources/data/et.lang similarity index 100% rename from data/et.lang rename to resources/data/et.lang diff --git a/data/fi.lang b/resources/data/fi.lang similarity index 100% rename from data/fi.lang rename to resources/data/fi.lang diff --git a/data/fonts/DroidSans-Bold.ttf b/resources/data/fonts/DroidSans-Bold.ttf similarity index 100% rename from data/fonts/DroidSans-Bold.ttf rename to resources/data/fonts/DroidSans-Bold.ttf diff --git a/data/fonts/DroidSans.ttf b/resources/data/fonts/DroidSans.ttf similarity index 100% rename from data/fonts/DroidSans.ttf rename to resources/data/fonts/DroidSans.ttf diff --git a/data/fr.lang b/resources/data/fr.lang similarity index 100% rename from data/fr.lang rename to resources/data/fr.lang diff --git a/data/gl.lang b/resources/data/gl.lang similarity index 100% rename from data/gl.lang rename to resources/data/gl.lang diff --git a/data/gpx-drawing-extensions-1.0.xsd b/resources/data/gpx-drawing-extensions-1.0.xsd similarity index 100% rename from data/gpx-drawing-extensions-1.0.xsd rename to resources/data/gpx-drawing-extensions-1.0.xsd diff --git a/data/gpx-extensions-1.1.xsd b/resources/data/gpx-extensions-1.1.xsd similarity index 100% rename from data/gpx-extensions-1.1.xsd rename to resources/data/gpx-extensions-1.1.xsd diff --git a/data/gpx-extensions.xsd b/resources/data/gpx-extensions.xsd similarity index 100% rename from data/gpx-extensions.xsd rename to resources/data/gpx-extensions.xsd diff --git a/data/gpx/brown2green.txt b/resources/data/gpx/brown2green.txt similarity index 100% rename from data/gpx/brown2green.txt rename to resources/data/gpx/brown2green.txt diff --git a/data/gpx/inferno.txt b/resources/data/gpx/inferno.txt similarity index 100% rename from data/gpx/inferno.txt rename to resources/data/gpx/inferno.txt diff --git a/data/gpx/red2blue.txt b/resources/data/gpx/red2blue.txt similarity index 100% rename from data/gpx/red2blue.txt rename to resources/data/gpx/red2blue.txt diff --git a/data/gpx/viridis.txt b/resources/data/gpx/viridis.txt similarity index 100% rename from data/gpx/viridis.txt rename to resources/data/gpx/viridis.txt diff --git a/data/help-browser.css b/resources/data/help-browser.css similarity index 100% rename from data/help-browser.css rename to resources/data/help-browser.css diff --git a/data/hu.lang b/resources/data/hu.lang similarity index 100% rename from data/hu.lang rename to resources/data/hu.lang diff --git a/data/id.lang b/resources/data/id.lang similarity index 100% rename from data/id.lang rename to resources/data/id.lang diff --git a/data/it.lang b/resources/data/it.lang similarity index 100% rename from data/it.lang rename to resources/data/it.lang diff --git a/data/ja.lang b/resources/data/ja.lang similarity index 100% rename from data/ja.lang rename to resources/data/ja.lang diff --git a/data/km.lang b/resources/data/km.lang similarity index 100% rename from data/km.lang rename to resources/data/km.lang diff --git a/data/ko.lang b/resources/data/ko.lang similarity index 100% rename from data/ko.lang rename to resources/data/ko.lang diff --git a/data/lt.lang b/resources/data/lt.lang similarity index 100% rename from data/lt.lang rename to resources/data/lt.lang diff --git a/data/maps.xsd b/resources/data/maps.xsd similarity index 100% rename from data/maps.xsd rename to resources/data/maps.xsd diff --git a/data/mr.lang b/resources/data/mr.lang similarity index 100% rename from data/mr.lang rename to resources/data/mr.lang diff --git a/data/nb.lang b/resources/data/nb.lang similarity index 100% rename from data/nb.lang rename to resources/data/nb.lang diff --git a/data/nl.lang b/resources/data/nl.lang similarity index 100% rename from data/nl.lang rename to resources/data/nl.lang diff --git a/data/overpass-wizard.js b/resources/data/overpass-wizard.js similarity index 100% rename from data/overpass-wizard.js rename to resources/data/overpass-wizard.js diff --git a/data/pl.lang b/resources/data/pl.lang similarity index 100% rename from data/pl.lang rename to resources/data/pl.lang diff --git a/data/preferences.xsd b/resources/data/preferences.xsd similarity index 100% rename from data/preferences.xsd rename to resources/data/preferences.xsd diff --git a/data/pt.lang b/resources/data/pt.lang similarity index 100% rename from data/pt.lang rename to resources/data/pt.lang diff --git a/data/pt_BR.lang b/resources/data/pt_BR.lang similarity index 100% rename from data/pt_BR.lang rename to resources/data/pt_BR.lang diff --git a/data/ru.lang b/resources/data/ru.lang similarity index 100% rename from data/ru.lang rename to resources/data/ru.lang diff --git a/data/sk.lang b/resources/data/sk.lang similarity index 100% rename from data/sk.lang rename to resources/data/sk.lang diff --git a/data/sv.lang b/resources/data/sv.lang similarity index 100% rename from data/sv.lang rename to resources/data/sv.lang diff --git a/data/tag2link.sophox.sparql b/resources/data/tag2link.sophox.sparql similarity index 100% rename from data/tag2link.sophox.sparql rename to resources/data/tag2link.sophox.sparql diff --git a/data/tag2link.wikidata.sparql b/resources/data/tag2link.wikidata.sparql similarity index 100% rename from data/tag2link.wikidata.sparql rename to resources/data/tag2link.wikidata.sparql diff --git a/data/tagging-preset.xsd b/resources/data/tagging-preset.xsd similarity index 100% rename from data/tagging-preset.xsd rename to resources/data/tagging-preset.xsd diff --git a/data/uk.lang b/resources/data/uk.lang similarity index 100% rename from data/uk.lang rename to resources/data/uk.lang diff --git a/data/validator/addresses.mapcss b/resources/data/validator/addresses.mapcss similarity index 100% rename from data/validator/addresses.mapcss rename to resources/data/validator/addresses.mapcss diff --git a/data/validator/combinations.mapcss b/resources/data/validator/combinations.mapcss similarity index 100% rename from data/validator/combinations.mapcss rename to resources/data/validator/combinations.mapcss diff --git a/data/validator/deprecated.mapcss b/resources/data/validator/deprecated.mapcss similarity index 100% rename from data/validator/deprecated.mapcss rename to resources/data/validator/deprecated.mapcss diff --git a/data/validator/geometry.mapcss b/resources/data/validator/geometry.mapcss similarity index 100% rename from data/validator/geometry.mapcss rename to resources/data/validator/geometry.mapcss diff --git a/data/validator/highway.mapcss b/resources/data/validator/highway.mapcss similarity index 100% rename from data/validator/highway.mapcss rename to resources/data/validator/highway.mapcss diff --git a/data/validator/ignoretags.cfg b/resources/data/validator/ignoretags.cfg similarity index 100% rename from data/validator/ignoretags.cfg rename to resources/data/validator/ignoretags.cfg diff --git a/data/validator/multiple.mapcss b/resources/data/validator/multiple.mapcss similarity index 100% rename from data/validator/multiple.mapcss rename to resources/data/validator/multiple.mapcss diff --git a/data/validator/numeric.mapcss b/resources/data/validator/numeric.mapcss similarity index 100% rename from data/validator/numeric.mapcss rename to resources/data/validator/numeric.mapcss diff --git a/data/validator/relation.mapcss b/resources/data/validator/relation.mapcss similarity index 100% rename from data/validator/relation.mapcss rename to resources/data/validator/relation.mapcss diff --git a/data/validator/religion.mapcss b/resources/data/validator/religion.mapcss similarity index 100% rename from data/validator/religion.mapcss rename to resources/data/validator/religion.mapcss diff --git a/data/validator/territories.mapcss b/resources/data/validator/territories.mapcss similarity index 100% rename from data/validator/territories.mapcss rename to resources/data/validator/territories.mapcss diff --git a/data/validator/unnecessary.mapcss b/resources/data/validator/unnecessary.mapcss similarity index 100% rename from data/validator/unnecessary.mapcss rename to resources/data/validator/unnecessary.mapcss diff --git a/data/validator/wikipedia.mapcss b/resources/data/validator/wikipedia.mapcss similarity index 100% rename from data/validator/wikipedia.mapcss rename to resources/data/validator/wikipedia.mapcss diff --git a/data/validator/words.cfg b/resources/data/validator/words.cfg similarity index 100% rename from data/validator/words.cfg rename to resources/data/validator/words.cfg diff --git a/data/vi.lang b/resources/data/vi.lang similarity index 100% rename from data/vi.lang rename to resources/data/vi.lang diff --git a/data/zh_CN.lang b/resources/data/zh_CN.lang similarity index 100% rename from data/zh_CN.lang rename to resources/data/zh_CN.lang diff --git a/data/zh_TW.lang b/resources/data/zh_TW.lang similarity index 100% rename from data/zh_TW.lang rename to resources/data/zh_TW.lang diff --git a/images/Mf_closedway.svg b/resources/images/Mf_closedway.svg similarity index 100% rename from images/Mf_closedway.svg rename to resources/images/Mf_closedway.svg diff --git a/images/Mf_multipolygon.svg b/resources/images/Mf_multipolygon.svg similarity index 100% rename from images/Mf_multipolygon.svg rename to resources/images/Mf_multipolygon.svg diff --git a/images/Mf_node.svg b/resources/images/Mf_node.svg similarity index 100% rename from images/Mf_node.svg rename to resources/images/Mf_node.svg diff --git a/images/Mf_relation.svg b/resources/images/Mf_relation.svg similarity index 100% rename from images/Mf_relation.svg rename to resources/images/Mf_relation.svg diff --git a/images/Mf_way.svg b/resources/images/Mf_way.svg similarity index 100% rename from images/Mf_way.svg rename to resources/images/Mf_way.svg diff --git a/images/OLmarker.svg b/resources/images/OLmarker.svg similarity index 100% rename from images/OLmarker.svg rename to resources/images/OLmarker.svg diff --git a/images/addmarkers.png b/resources/images/addmarkers.png similarity index 100% rename from images/addmarkers.png rename to resources/images/addmarkers.png diff --git a/images/addnode.svg b/resources/images/addnode.svg similarity index 100% rename from images/addnode.svg rename to resources/images/addnode.svg diff --git a/images/aligncircle.svg b/resources/images/aligncircle.svg similarity index 100% rename from images/aligncircle.svg rename to resources/images/aligncircle.svg diff --git a/images/alignline.svg b/resources/images/alignline.svg similarity index 100% rename from images/alignline.svg rename to resources/images/alignline.svg diff --git a/images/anglesnap.svg b/resources/images/anglesnap.svg similarity index 100% rename from images/anglesnap.svg rename to resources/images/anglesnap.svg diff --git a/images/apply.svg b/resources/images/apply.svg similarity index 100% rename from images/apply.svg rename to resources/images/apply.svg diff --git a/images/audio-back.svg b/resources/images/audio-back.svg similarity index 100% rename from images/audio-back.svg rename to resources/images/audio-back.svg diff --git a/images/audio-faster.svg b/resources/images/audio-faster.svg similarity index 100% rename from images/audio-faster.svg rename to resources/images/audio-faster.svg diff --git a/images/audio-fwd.svg b/resources/images/audio-fwd.svg similarity index 100% rename from images/audio-fwd.svg rename to resources/images/audio-fwd.svg diff --git a/images/audio-next.svg b/resources/images/audio-next.svg similarity index 100% rename from images/audio-next.svg rename to resources/images/audio-next.svg diff --git a/images/audio-playpause.svg b/resources/images/audio-playpause.svg similarity index 100% rename from images/audio-playpause.svg rename to resources/images/audio-playpause.svg diff --git a/images/audio-prev.svg b/resources/images/audio-prev.svg similarity index 100% rename from images/audio-prev.svg rename to resources/images/audio-prev.svg diff --git a/images/audio-slower.svg b/resources/images/audio-slower.svg similarity index 100% rename from images/audio-slower.svg rename to resources/images/audio-slower.svg diff --git a/images/audio-sync.svg b/resources/images/audio-sync.svg similarity index 100% rename from images/audio-sync.svg rename to resources/images/audio-sync.svg diff --git a/images/bug.png b/resources/images/bug.png similarity index 100% rename from images/bug.png rename to resources/images/bug.png diff --git a/images/cancel.png b/resources/images/cancel.png similarity index 100% rename from images/cancel.png rename to resources/images/cancel.png diff --git a/images/clock.png b/resources/images/clock.png similarity index 100% rename from images/clock.png rename to resources/images/clock.png diff --git a/images/closechangeset.png b/resources/images/closechangeset.png similarity index 100% rename from images/closechangeset.png rename to resources/images/closechangeset.png diff --git a/images/colorchooser.png b/resources/images/colorchooser.png similarity index 100% rename from images/colorchooser.png rename to resources/images/colorchooser.png diff --git a/images/combineway.svg b/resources/images/combineway.svg similarity index 100% rename from images/combineway.svg rename to resources/images/combineway.svg diff --git a/images/converttogpx.png b/resources/images/converttogpx.png similarity index 100% rename from images/converttogpx.png rename to resources/images/converttogpx.png diff --git a/images/converttoosm.png b/resources/images/converttoosm.png similarity index 100% rename from images/converttoosm.png rename to resources/images/converttoosm.png diff --git a/images/copy.svg b/resources/images/copy.svg similarity index 100% rename from images/copy.svg rename to resources/images/copy.svg diff --git a/images/cursor/crosshair.svg b/resources/images/cursor/crosshair.svg similarity index 100% rename from images/cursor/crosshair.svg rename to resources/images/cursor/crosshair.svg diff --git a/images/cursor/hand.png b/resources/images/cursor/hand.png similarity index 100% rename from images/cursor/hand.png rename to resources/images/cursor/hand.png diff --git a/images/cursor/modifier/add_node_lock.svg b/resources/images/cursor/modifier/add_node_lock.svg similarity index 100% rename from images/cursor/modifier/add_node_lock.svg rename to resources/images/cursor/modifier/add_node_lock.svg diff --git a/images/cursor/modifier/addnode.svg b/resources/images/cursor/modifier/addnode.svg similarity index 100% rename from images/cursor/modifier/addnode.svg rename to resources/images/cursor/modifier/addnode.svg diff --git a/images/cursor/modifier/create_note.svg b/resources/images/cursor/modifier/create_note.svg similarity index 100% rename from images/cursor/modifier/create_note.svg rename to resources/images/cursor/modifier/create_note.svg diff --git a/images/cursor/modifier/delete.png b/resources/images/cursor/modifier/delete.png similarity index 100% rename from images/cursor/modifier/delete.png rename to resources/images/cursor/modifier/delete.png diff --git a/images/cursor/modifier/delete_node.png b/resources/images/cursor/modifier/delete_node.png similarity index 100% rename from images/cursor/modifier/delete_node.png rename to resources/images/cursor/modifier/delete_node.png diff --git a/images/cursor/modifier/delete_segment.png b/resources/images/cursor/modifier/delete_segment.png similarity index 100% rename from images/cursor/modifier/delete_segment.png rename to resources/images/cursor/modifier/delete_segment.png diff --git a/images/cursor/modifier/delete_way_node_only.png b/resources/images/cursor/modifier/delete_way_node_only.png similarity index 100% rename from images/cursor/modifier/delete_way_node_only.png rename to resources/images/cursor/modifier/delete_way_node_only.png diff --git a/images/cursor/modifier/delete_way_normal.png b/resources/images/cursor/modifier/delete_way_normal.png similarity index 100% rename from images/cursor/modifier/delete_way_normal.png rename to resources/images/cursor/modifier/delete_way_normal.png diff --git a/images/cursor/modifier/delete_way_only.png b/resources/images/cursor/modifier/delete_way_only.png similarity index 100% rename from images/cursor/modifier/delete_way_only.png rename to resources/images/cursor/modifier/delete_way_only.png diff --git a/images/cursor/modifier/joinnode.svg b/resources/images/cursor/modifier/joinnode.svg similarity index 100% rename from images/cursor/modifier/joinnode.svg rename to resources/images/cursor/modifier/joinnode.svg diff --git a/images/cursor/modifier/joinway.svg b/resources/images/cursor/modifier/joinway.svg similarity index 100% rename from images/cursor/modifier/joinway.svg rename to resources/images/cursor/modifier/joinway.svg diff --git a/images/cursor/modifier/lock.svg b/resources/images/cursor/modifier/lock.svg similarity index 100% rename from images/cursor/modifier/lock.svg rename to resources/images/cursor/modifier/lock.svg diff --git a/images/cursor/modifier/mode.svg b/resources/images/cursor/modifier/mode.svg similarity index 100% rename from images/cursor/modifier/mode.svg rename to resources/images/cursor/modifier/mode.svg diff --git a/images/cursor/modifier/move.png b/resources/images/cursor/modifier/move.png similarity index 100% rename from images/cursor/modifier/move.png rename to resources/images/cursor/modifier/move.png diff --git a/images/cursor/modifier/parallel.svg b/resources/images/cursor/modifier/parallel.svg similarity index 100% rename from images/cursor/modifier/parallel.svg rename to resources/images/cursor/modifier/parallel.svg diff --git a/images/cursor/modifier/parallel_add.svg b/resources/images/cursor/modifier/parallel_add.svg similarity index 100% rename from images/cursor/modifier/parallel_add.svg rename to resources/images/cursor/modifier/parallel_add.svg diff --git a/images/cursor/modifier/parallel_remove.svg b/resources/images/cursor/modifier/parallel_remove.svg similarity index 100% rename from images/cursor/modifier/parallel_remove.svg rename to resources/images/cursor/modifier/parallel_remove.svg diff --git a/images/cursor/modifier/rectangle.svg b/resources/images/cursor/modifier/rectangle.svg similarity index 100% rename from images/cursor/modifier/rectangle.svg rename to resources/images/cursor/modifier/rectangle.svg diff --git a/images/cursor/modifier/rectangle_move.png b/resources/images/cursor/modifier/rectangle_move.png similarity index 100% rename from images/cursor/modifier/rectangle_move.png rename to resources/images/cursor/modifier/rectangle_move.png diff --git a/images/cursor/modifier/rectangle_plus.png b/resources/images/cursor/modifier/rectangle_plus.png similarity index 100% rename from images/cursor/modifier/rectangle_plus.png rename to resources/images/cursor/modifier/rectangle_plus.png diff --git a/images/cursor/modifier/rectangle_plussmall.png b/resources/images/cursor/modifier/rectangle_plussmall.png similarity index 100% rename from images/cursor/modifier/rectangle_plussmall.png rename to resources/images/cursor/modifier/rectangle_plussmall.png diff --git a/images/cursor/modifier/rope.png b/resources/images/cursor/modifier/rope.png similarity index 100% rename from images/cursor/modifier/rope.png rename to resources/images/cursor/modifier/rope.png diff --git a/images/cursor/modifier/select_add.svg b/resources/images/cursor/modifier/select_add.svg similarity index 100% rename from images/cursor/modifier/select_add.svg rename to resources/images/cursor/modifier/select_add.svg diff --git a/images/cursor/modifier/select_node.svg b/resources/images/cursor/modifier/select_node.svg similarity index 100% rename from images/cursor/modifier/select_node.svg rename to resources/images/cursor/modifier/select_node.svg diff --git a/images/cursor/modifier/select_node_add.svg b/resources/images/cursor/modifier/select_node_add.svg similarity index 100% rename from images/cursor/modifier/select_node_add.svg rename to resources/images/cursor/modifier/select_node_add.svg diff --git a/images/cursor/modifier/select_node_remove.svg b/resources/images/cursor/modifier/select_node_remove.svg similarity index 100% rename from images/cursor/modifier/select_node_remove.svg rename to resources/images/cursor/modifier/select_node_remove.svg diff --git a/images/cursor/modifier/select_remove.svg b/resources/images/cursor/modifier/select_remove.svg similarity index 100% rename from images/cursor/modifier/select_remove.svg rename to resources/images/cursor/modifier/select_remove.svg diff --git a/images/cursor/modifier/select_way.svg b/resources/images/cursor/modifier/select_way.svg similarity index 100% rename from images/cursor/modifier/select_way.svg rename to resources/images/cursor/modifier/select_way.svg diff --git a/images/cursor/modifier/select_way_add.svg b/resources/images/cursor/modifier/select_way_add.svg similarity index 100% rename from images/cursor/modifier/select_way_add.svg rename to resources/images/cursor/modifier/select_way_add.svg diff --git a/images/cursor/modifier/select_way_remove.svg b/resources/images/cursor/modifier/select_way_remove.svg similarity index 100% rename from images/cursor/modifier/select_way_remove.svg rename to resources/images/cursor/modifier/select_way_remove.svg diff --git a/images/cursor/modifier/selection.svg b/resources/images/cursor/modifier/selection.svg similarity index 100% rename from images/cursor/modifier/selection.svg rename to resources/images/cursor/modifier/selection.svg diff --git a/images/cursor/modifier/zoom.png b/resources/images/cursor/modifier/zoom.png similarity index 100% rename from images/cursor/modifier/zoom.png rename to resources/images/cursor/modifier/zoom.png diff --git a/images/cursor/normal.svg b/resources/images/cursor/normal.svg similarity index 100% rename from images/cursor/normal.svg rename to resources/images/cursor/normal.svg diff --git a/images/cursor/rotate.png b/resources/images/cursor/rotate.png similarity index 100% rename from images/cursor/rotate.png rename to resources/images/cursor/rotate.png diff --git a/images/cursor/scale.png b/resources/images/cursor/scale.png similarity index 100% rename from images/cursor/scale.png rename to resources/images/cursor/scale.png diff --git a/images/data/changeset.svg b/resources/images/data/changeset.svg similarity index 100% rename from images/data/changeset.svg rename to resources/images/data/changeset.svg diff --git a/images/data/closedway.svg b/resources/images/data/closedway.svg similarity index 100% rename from images/data/closedway.svg rename to resources/images/data/closedway.svg diff --git a/images/data/error.png b/resources/images/data/error.png similarity index 100% rename from images/data/error.png rename to resources/images/data/error.png diff --git a/images/data/imagery/elevation.png b/resources/images/data/imagery/elevation.png similarity index 100% rename from images/data/imagery/elevation.png rename to resources/images/data/imagery/elevation.png diff --git a/images/data/imagery/historicmap.svg b/resources/images/data/imagery/historicmap.svg similarity index 100% rename from images/data/imagery/historicmap.svg rename to resources/images/data/imagery/historicmap.svg diff --git a/images/data/imagery/historicphoto.svg b/resources/images/data/imagery/historicphoto.svg similarity index 100% rename from images/data/imagery/historicphoto.svg rename to resources/images/data/imagery/historicphoto.svg diff --git a/images/data/imagery/map.svg b/resources/images/data/imagery/map.svg similarity index 100% rename from images/data/imagery/map.svg rename to resources/images/data/imagery/map.svg diff --git a/images/data/imagery/osmbasedmap.svg b/resources/images/data/imagery/osmbasedmap.svg similarity index 100% rename from images/data/imagery/osmbasedmap.svg rename to resources/images/data/imagery/osmbasedmap.svg diff --git a/images/data/imagery/other.svg b/resources/images/data/imagery/other.svg similarity index 100% rename from images/data/imagery/other.svg rename to resources/images/data/imagery/other.svg diff --git a/images/data/imagery/photo.svg b/resources/images/data/imagery/photo.svg similarity index 100% rename from images/data/imagery/photo.svg rename to resources/images/data/imagery/photo.svg diff --git a/images/data/imagery/qa.png b/resources/images/data/imagery/qa.png similarity index 100% rename from images/data/imagery/qa.png rename to resources/images/data/imagery/qa.png diff --git a/images/data/key.png b/resources/images/data/key.png similarity index 100% rename from images/data/key.png rename to resources/images/data/key.png diff --git a/images/data/multipolygon.svg b/resources/images/data/multipolygon.svg similarity index 100% rename from images/data/multipolygon.svg rename to resources/images/data/multipolygon.svg diff --git a/images/data/node.svg b/resources/images/data/node.svg similarity index 100% rename from images/data/node.svg rename to resources/images/data/node.svg diff --git a/images/data/object.png b/resources/images/data/object.png similarity index 100% rename from images/data/object.png rename to resources/images/data/object.png diff --git a/images/data/other.png b/resources/images/data/other.png similarity index 100% rename from images/data/other.png rename to resources/images/data/other.png diff --git a/images/data/projection/Departements_Lambert4Zones.svg b/resources/images/data/projection/Departements_Lambert4Zones.svg similarity index 100% rename from images/data/projection/Departements_Lambert4Zones.svg rename to resources/images/data/projection/Departements_Lambert4Zones.svg diff --git a/images/data/projection/LambertCC9Zones.svg b/resources/images/data/projection/LambertCC9Zones.svg similarity index 100% rename from images/data/projection/LambertCC9Zones.svg rename to resources/images/data/projection/LambertCC9Zones.svg diff --git a/images/data/purge.png b/resources/images/data/purge.png similarity index 100% rename from images/data/purge.png rename to resources/images/data/purge.png diff --git a/images/data/relation.png b/resources/images/data/relation.png similarity index 100% rename from images/data/relation.png rename to resources/images/data/relation.png diff --git a/images/data/sequence.svg b/resources/images/data/sequence.svg similarity index 100% rename from images/data/sequence.svg rename to resources/images/data/sequence.svg diff --git a/images/data/user.png b/resources/images/data/user.png similarity index 100% rename from images/data/user.png rename to resources/images/data/user.png diff --git a/images/data/warning.png b/resources/images/data/warning.png similarity index 100% rename from images/data/warning.png rename to resources/images/data/warning.png diff --git a/images/data/way.svg b/resources/images/data/way.svg similarity index 100% rename from images/data/way.svg rename to resources/images/data/way.svg diff --git a/images/dialogs/about/facebook.svg b/resources/images/dialogs/about/facebook.svg similarity index 100% rename from images/dialogs/about/facebook.svg rename to resources/images/dialogs/about/facebook.svg diff --git a/images/dialogs/about/github.svg b/resources/images/dialogs/about/github.svg similarity index 100% rename from images/dialogs/about/github.svg rename to resources/images/dialogs/about/github.svg diff --git a/images/dialogs/about/openstreetmap.svg b/resources/images/dialogs/about/openstreetmap.svg similarity index 100% rename from images/dialogs/about/openstreetmap.svg rename to resources/images/dialogs/about/openstreetmap.svg diff --git a/images/dialogs/about/twitter.svg b/resources/images/dialogs/about/twitter.svg similarity index 100% rename from images/dialogs/about/twitter.svg rename to resources/images/dialogs/about/twitter.svg diff --git a/images/dialogs/activate.svg b/resources/images/dialogs/activate.svg similarity index 100% rename from images/dialogs/activate.svg rename to resources/images/dialogs/activate.svg diff --git a/images/dialogs/add.png b/resources/images/dialogs/add.png similarity index 100% rename from images/dialogs/add.png rename to resources/images/dialogs/add.png diff --git a/images/dialogs/add_tms.png b/resources/images/dialogs/add_tms.png similarity index 100% rename from images/dialogs/add_tms.png rename to resources/images/dialogs/add_tms.png diff --git a/images/dialogs/add_wms.png b/resources/images/dialogs/add_wms.png similarity index 100% rename from images/dialogs/add_wms.png rename to resources/images/dialogs/add_wms.png diff --git a/images/dialogs/add_wmts.png b/resources/images/dialogs/add_wmts.png similarity index 100% rename from images/dialogs/add_wmts.png rename to resources/images/dialogs/add_wmts.png diff --git a/images/dialogs/addrelation.png b/resources/images/dialogs/addrelation.png similarity index 100% rename from images/dialogs/addrelation.png rename to resources/images/dialogs/addrelation.png diff --git a/images/dialogs/autoscale/conflict.png b/resources/images/dialogs/autoscale/conflict.png similarity index 100% rename from images/dialogs/autoscale/conflict.png rename to resources/images/dialogs/autoscale/conflict.png diff --git a/images/dialogs/autoscale/data.png b/resources/images/dialogs/autoscale/data.png similarity index 100% rename from images/dialogs/autoscale/data.png rename to resources/images/dialogs/autoscale/data.png diff --git a/images/dialogs/autoscale/download.png b/resources/images/dialogs/autoscale/download.png similarity index 100% rename from images/dialogs/autoscale/download.png rename to resources/images/dialogs/autoscale/download.png diff --git a/images/dialogs/autoscale/layer.png b/resources/images/dialogs/autoscale/layer.png similarity index 100% rename from images/dialogs/autoscale/layer.png rename to resources/images/dialogs/autoscale/layer.png diff --git a/images/dialogs/autoscale/next.png b/resources/images/dialogs/autoscale/next.png similarity index 100% rename from images/dialogs/autoscale/next.png rename to resources/images/dialogs/autoscale/next.png diff --git a/images/dialogs/autoscale/previous.png b/resources/images/dialogs/autoscale/previous.png similarity index 100% rename from images/dialogs/autoscale/previous.png rename to resources/images/dialogs/autoscale/previous.png diff --git a/images/dialogs/autoscale/problem.png b/resources/images/dialogs/autoscale/problem.png similarity index 100% rename from images/dialogs/autoscale/problem.png rename to resources/images/dialogs/autoscale/problem.png diff --git a/images/dialogs/autoscale/selection.png b/resources/images/dialogs/autoscale/selection.png similarity index 100% rename from images/dialogs/autoscale/selection.png rename to resources/images/dialogs/autoscale/selection.png diff --git a/images/dialogs/bookmark-new.svg b/resources/images/dialogs/bookmark-new.svg similarity index 100% rename from images/dialogs/bookmark-new.svg rename to resources/images/dialogs/bookmark-new.svg diff --git a/images/dialogs/bookmark.svg b/resources/images/dialogs/bookmark.svg similarity index 100% rename from images/dialogs/bookmark.svg rename to resources/images/dialogs/bookmark.svg diff --git a/images/dialogs/centreview.png b/resources/images/dialogs/centreview.png similarity index 100% rename from images/dialogs/centreview.png rename to resources/images/dialogs/centreview.png diff --git a/images/dialogs/changeset/changesetmanager.svg b/resources/images/dialogs/changeset/changesetmanager.svg similarity index 100% rename from images/dialogs/changeset/changesetmanager.svg rename to resources/images/dialogs/changeset/changesetmanager.svg diff --git a/images/dialogs/changeset/downloadchangeset.svg b/resources/images/dialogs/changeset/downloadchangeset.svg similarity index 100% rename from images/dialogs/changeset/downloadchangeset.svg rename to resources/images/dialogs/changeset/downloadchangeset.svg diff --git a/images/dialogs/changeset/downloadchangesetcontent.svg b/resources/images/dialogs/changeset/downloadchangesetcontent.svg similarity index 100% rename from images/dialogs/changeset/downloadchangesetcontent.svg rename to resources/images/dialogs/changeset/downloadchangesetcontent.svg diff --git a/images/dialogs/changeset/updatechangeset.svg b/resources/images/dialogs/changeset/updatechangeset.svg similarity index 100% rename from images/dialogs/changeset/updatechangeset.svg rename to resources/images/dialogs/changeset/updatechangeset.svg diff --git a/images/dialogs/changeset/updatechangesetcontent.svg b/resources/images/dialogs/changeset/updatechangesetcontent.svg similarity index 100% rename from images/dialogs/changeset/updatechangesetcontent.svg rename to resources/images/dialogs/changeset/updatechangesetcontent.svg diff --git a/images/dialogs/changesetdialog.svg b/resources/images/dialogs/changesetdialog.svg similarity index 100% rename from images/dialogs/changesetdialog.svg rename to resources/images/dialogs/changesetdialog.svg diff --git a/images/dialogs/collapse.svg b/resources/images/dialogs/collapse.svg similarity index 100% rename from images/dialogs/collapse.svg rename to resources/images/dialogs/collapse.svg diff --git a/images/dialogs/commandstack.png b/resources/images/dialogs/commandstack.png similarity index 100% rename from images/dialogs/commandstack.png rename to resources/images/dialogs/commandstack.png diff --git a/images/dialogs/conflict.png b/resources/images/dialogs/conflict.png similarity index 100% rename from images/dialogs/conflict.png rename to resources/images/dialogs/conflict.png diff --git a/images/dialogs/conflict/copyaftercurrentleft.svg b/resources/images/dialogs/conflict/copyaftercurrentleft.svg similarity index 100% rename from images/dialogs/conflict/copyaftercurrentleft.svg rename to resources/images/dialogs/conflict/copyaftercurrentleft.svg diff --git a/images/dialogs/conflict/copyaftercurrentright.svg b/resources/images/dialogs/conflict/copyaftercurrentright.svg similarity index 100% rename from images/dialogs/conflict/copyaftercurrentright.svg rename to resources/images/dialogs/conflict/copyaftercurrentright.svg diff --git a/images/dialogs/conflict/copybeforecurrentleft.svg b/resources/images/dialogs/conflict/copybeforecurrentleft.svg similarity index 100% rename from images/dialogs/conflict/copybeforecurrentleft.svg rename to resources/images/dialogs/conflict/copybeforecurrentleft.svg diff --git a/images/dialogs/conflict/copybeforecurrentright.svg b/resources/images/dialogs/conflict/copybeforecurrentright.svg similarity index 100% rename from images/dialogs/conflict/copybeforecurrentright.svg rename to resources/images/dialogs/conflict/copybeforecurrentright.svg diff --git a/images/dialogs/conflict/copyendleft.svg b/resources/images/dialogs/conflict/copyendleft.svg similarity index 100% rename from images/dialogs/conflict/copyendleft.svg rename to resources/images/dialogs/conflict/copyendleft.svg diff --git a/images/dialogs/conflict/copyendright.svg b/resources/images/dialogs/conflict/copyendright.svg similarity index 100% rename from images/dialogs/conflict/copyendright.svg rename to resources/images/dialogs/conflict/copyendright.svg diff --git a/images/dialogs/conflict/copystartleft.svg b/resources/images/dialogs/conflict/copystartleft.svg similarity index 100% rename from images/dialogs/conflict/copystartleft.svg rename to resources/images/dialogs/conflict/copystartleft.svg diff --git a/images/dialogs/conflict/copystartright.svg b/resources/images/dialogs/conflict/copystartright.svg similarity index 100% rename from images/dialogs/conflict/copystartright.svg rename to resources/images/dialogs/conflict/copystartright.svg diff --git a/images/dialogs/conflict/mergeincomplete.svg b/resources/images/dialogs/conflict/mergeincomplete.svg similarity index 100% rename from images/dialogs/conflict/mergeincomplete.svg rename to resources/images/dialogs/conflict/mergeincomplete.svg diff --git a/images/dialogs/conflict/movedown.svg b/resources/images/dialogs/conflict/movedown.svg similarity index 100% rename from images/dialogs/conflict/movedown.svg rename to resources/images/dialogs/conflict/movedown.svg diff --git a/images/dialogs/conflict/moveup.svg b/resources/images/dialogs/conflict/moveup.svg similarity index 100% rename from images/dialogs/conflict/moveup.svg rename to resources/images/dialogs/conflict/moveup.svg diff --git a/images/dialogs/conflict/remove.svg b/resources/images/dialogs/conflict/remove.svg similarity index 100% rename from images/dialogs/conflict/remove.svg rename to resources/images/dialogs/conflict/remove.svg diff --git a/images/dialogs/conflict/tagconflictresolved.svg b/resources/images/dialogs/conflict/tagconflictresolved.svg similarity index 100% rename from images/dialogs/conflict/tagconflictresolved.svg rename to resources/images/dialogs/conflict/tagconflictresolved.svg diff --git a/images/dialogs/conflict/tagconflictunresolved.svg b/resources/images/dialogs/conflict/tagconflictunresolved.svg similarity index 100% rename from images/dialogs/conflict/tagconflictunresolved.svg rename to resources/images/dialogs/conflict/tagconflictunresolved.svg diff --git a/images/dialogs/conflict/tagkeepmine.svg b/resources/images/dialogs/conflict/tagkeepmine.svg similarity index 100% rename from images/dialogs/conflict/tagkeepmine.svg rename to resources/images/dialogs/conflict/tagkeepmine.svg diff --git a/images/dialogs/conflict/tagkeeptheir.svg b/resources/images/dialogs/conflict/tagkeeptheir.svg similarity index 100% rename from images/dialogs/conflict/tagkeeptheir.svg rename to resources/images/dialogs/conflict/tagkeeptheir.svg diff --git a/images/dialogs/conflict/tagundecide.svg b/resources/images/dialogs/conflict/tagundecide.svg similarity index 100% rename from images/dialogs/conflict/tagundecide.svg rename to resources/images/dialogs/conflict/tagundecide.svg diff --git a/images/dialogs/conflict/useallleft.png b/resources/images/dialogs/conflict/useallleft.png similarity index 100% rename from images/dialogs/conflict/useallleft.png rename to resources/images/dialogs/conflict/useallleft.png diff --git a/images/dialogs/conflict/useallright.png b/resources/images/dialogs/conflict/useallright.png similarity index 100% rename from images/dialogs/conflict/useallright.png rename to resources/images/dialogs/conflict/useallright.png diff --git a/images/dialogs/delete.svg b/resources/images/dialogs/delete.svg similarity index 100% rename from images/dialogs/delete.svg rename to resources/images/dialogs/delete.svg diff --git a/images/dialogs/down.svg b/resources/images/dialogs/down.svg similarity index 100% rename from images/dialogs/down.svg rename to resources/images/dialogs/down.svg diff --git a/images/dialogs/downloadincomplete.png b/resources/images/dialogs/downloadincomplete.png similarity index 100% rename from images/dialogs/downloadincomplete.png rename to resources/images/dialogs/downloadincomplete.png diff --git a/images/dialogs/duplicatelayer.png b/resources/images/dialogs/duplicatelayer.png similarity index 100% rename from images/dialogs/duplicatelayer.png rename to resources/images/dialogs/duplicatelayer.png diff --git a/images/dialogs/edit.png b/resources/images/dialogs/edit.png similarity index 100% rename from images/dialogs/edit.png rename to resources/images/dialogs/edit.png diff --git a/images/dialogs/filter.png b/resources/images/dialogs/filter.png similarity index 100% rename from images/dialogs/filter.png rename to resources/images/dialogs/filter.png diff --git a/images/dialogs/first.svg b/resources/images/dialogs/first.svg similarity index 100% rename from images/dialogs/first.svg rename to resources/images/dialogs/first.svg diff --git a/images/dialogs/fix.png b/resources/images/dialogs/fix.png similarity index 100% rename from images/dialogs/fix.png rename to resources/images/dialogs/fix.png diff --git a/images/dialogs/geoimage.svg b/resources/images/dialogs/geoimage.svg similarity index 100% rename from images/dialogs/geoimage.svg rename to resources/images/dialogs/geoimage.svg diff --git a/images/dialogs/geoimage/deletefromdisk.png b/resources/images/dialogs/geoimage/deletefromdisk.png similarity index 100% rename from images/dialogs/geoimage/deletefromdisk.png rename to resources/images/dialogs/geoimage/deletefromdisk.png diff --git a/images/dialogs/geoimage/gpx2img.png b/resources/images/dialogs/geoimage/gpx2img.png similarity index 100% rename from images/dialogs/geoimage/gpx2img.png rename to resources/images/dialogs/geoimage/gpx2img.png diff --git a/images/dialogs/geoimage/photo-marker-selected.png b/resources/images/dialogs/geoimage/photo-marker-selected.png similarity index 100% rename from images/dialogs/geoimage/photo-marker-selected.png rename to resources/images/dialogs/geoimage/photo-marker-selected.png diff --git a/images/dialogs/geoimage/photo-marker.png b/resources/images/dialogs/geoimage/photo-marker.png similarity index 100% rename from images/dialogs/geoimage/photo-marker.png rename to resources/images/dialogs/geoimage/photo-marker.png diff --git a/images/dialogs/geoimage/togglegit.png b/resources/images/dialogs/geoimage/togglegit.png similarity index 100% rename from images/dialogs/geoimage/togglegit.png rename to resources/images/dialogs/geoimage/togglegit.png diff --git a/images/dialogs/history.png b/resources/images/dialogs/history.png similarity index 100% rename from images/dialogs/history.png rename to resources/images/dialogs/history.png diff --git a/images/dialogs/last.svg b/resources/images/dialogs/last.svg similarity index 100% rename from images/dialogs/last.svg rename to resources/images/dialogs/last.svg diff --git a/images/dialogs/layerlist.png b/resources/images/dialogs/layerlist.png similarity index 100% rename from images/dialogs/layerlist.png rename to resources/images/dialogs/layerlist.png diff --git a/images/dialogs/layerlist/active-pressed.png b/resources/images/dialogs/layerlist/active-pressed.png similarity index 100% rename from images/dialogs/layerlist/active-pressed.png rename to resources/images/dialogs/layerlist/active-pressed.png diff --git a/images/dialogs/layerlist/active.png b/resources/images/dialogs/layerlist/active.png similarity index 100% rename from images/dialogs/layerlist/active.png rename to resources/images/dialogs/layerlist/active.png diff --git a/images/dialogs/layerlist/colorfulness.png b/resources/images/dialogs/layerlist/colorfulness.png similarity index 100% rename from images/dialogs/layerlist/colorfulness.png rename to resources/images/dialogs/layerlist/colorfulness.png diff --git a/images/dialogs/layerlist/eye-off.png b/resources/images/dialogs/layerlist/eye-off.png similarity index 100% rename from images/dialogs/layerlist/eye-off.png rename to resources/images/dialogs/layerlist/eye-off.png diff --git a/images/dialogs/layerlist/eye-pressed.png b/resources/images/dialogs/layerlist/eye-pressed.png similarity index 100% rename from images/dialogs/layerlist/eye-pressed.png rename to resources/images/dialogs/layerlist/eye-pressed.png diff --git a/images/dialogs/layerlist/eye-translucent.png b/resources/images/dialogs/layerlist/eye-translucent.png similarity index 100% rename from images/dialogs/layerlist/eye-translucent.png rename to resources/images/dialogs/layerlist/eye-translucent.png diff --git a/images/dialogs/layerlist/eye.png b/resources/images/dialogs/layerlist/eye.png similarity index 100% rename from images/dialogs/layerlist/eye.png rename to resources/images/dialogs/layerlist/eye.png diff --git a/images/dialogs/layerlist/gamma.png b/resources/images/dialogs/layerlist/gamma.png similarity index 100% rename from images/dialogs/layerlist/gamma.png rename to resources/images/dialogs/layerlist/gamma.png diff --git a/images/dialogs/layerlist/offset.png b/resources/images/dialogs/layerlist/offset.png similarity index 100% rename from images/dialogs/layerlist/offset.png rename to resources/images/dialogs/layerlist/offset.png diff --git a/images/dialogs/layerlist/scale.svg b/resources/images/dialogs/layerlist/scale.svg similarity index 100% rename from images/dialogs/layerlist/scale.svg rename to resources/images/dialogs/layerlist/scale.svg diff --git a/images/dialogs/layerlist/sharpness.png b/resources/images/dialogs/layerlist/sharpness.png similarity index 100% rename from images/dialogs/layerlist/sharpness.png rename to resources/images/dialogs/layerlist/sharpness.png diff --git a/images/dialogs/layerlist/transparency.png b/resources/images/dialogs/layerlist/transparency.png similarity index 100% rename from images/dialogs/layerlist/transparency.png rename to resources/images/dialogs/layerlist/transparency.png diff --git a/images/dialogs/layerlist/visibility.png b/resources/images/dialogs/layerlist/visibility.png similarity index 100% rename from images/dialogs/layerlist/visibility.png rename to resources/images/dialogs/layerlist/visibility.png diff --git a/images/dialogs/mappaint/pencil.png b/resources/images/dialogs/mappaint/pencil.png similarity index 100% rename from images/dialogs/mappaint/pencil.png rename to resources/images/dialogs/mappaint/pencil.png diff --git a/images/dialogs/mappaint/pl2_small.png b/resources/images/dialogs/mappaint/pl2_small.png similarity index 100% rename from images/dialogs/mappaint/pl2_small.png rename to resources/images/dialogs/mappaint/pl2_small.png diff --git a/images/dialogs/mappaint/wireframe_small.svg b/resources/images/dialogs/mappaint/wireframe_small.svg similarity index 100% rename from images/dialogs/mappaint/wireframe_small.svg rename to resources/images/dialogs/mappaint/wireframe_small.svg diff --git a/images/dialogs/mappaintpreference.png b/resources/images/dialogs/mappaintpreference.png similarity index 100% rename from images/dialogs/mappaintpreference.png rename to resources/images/dialogs/mappaintpreference.png diff --git a/images/dialogs/mapstyle.svg b/resources/images/dialogs/mapstyle.svg similarity index 99% rename from images/dialogs/mapstyle.svg rename to resources/images/dialogs/mapstyle.svg index 5e20cd21b3e..bc6f7684a9a 100644 --- a/images/dialogs/mapstyle.svg +++ b/resources/images/dialogs/mapstyle.svg @@ -291,7 +291,6 @@ style="fill:#b5b6d9;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.09232347px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 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" id="path2176" - inkscape:export-filename="/home/te/programmierung/josm-eclipse2/images/dialogs/path2176.png" inkscape:export-xdpi="17.598721" inkscape:export-ydpi="17.598721" inkscape:connector-curvature="0" /> diff --git a/images/dialogs/mergedown.png b/resources/images/dialogs/mergedown.png similarity index 100% rename from images/dialogs/mergedown.png rename to resources/images/dialogs/mergedown.png diff --git a/images/dialogs/minimap.png b/resources/images/dialogs/minimap.png similarity index 100% rename from images/dialogs/minimap.png rename to resources/images/dialogs/minimap.png diff --git a/images/dialogs/movedown.png b/resources/images/dialogs/movedown.png similarity index 100% rename from images/dialogs/movedown.png rename to resources/images/dialogs/movedown.png diff --git a/images/dialogs/moveup.png b/resources/images/dialogs/moveup.png similarity index 100% rename from images/dialogs/moveup.png rename to resources/images/dialogs/moveup.png diff --git a/images/dialogs/next.svg b/resources/images/dialogs/next.svg similarity index 100% rename from images/dialogs/next.svg rename to resources/images/dialogs/next.svg diff --git a/images/dialogs/notes/note_closed.png b/resources/images/dialogs/notes/note_closed.png similarity index 100% rename from images/dialogs/notes/note_closed.png rename to resources/images/dialogs/notes/note_closed.png diff --git a/images/dialogs/notes/note_comment.png b/resources/images/dialogs/notes/note_comment.png similarity index 100% rename from images/dialogs/notes/note_comment.png rename to resources/images/dialogs/notes/note_comment.png diff --git a/images/dialogs/notes/note_new.png b/resources/images/dialogs/notes/note_new.png similarity index 100% rename from images/dialogs/notes/note_new.png rename to resources/images/dialogs/notes/note_new.png diff --git a/images/dialogs/notes/note_open.png b/resources/images/dialogs/notes/note_open.png similarity index 100% rename from images/dialogs/notes/note_open.png rename to resources/images/dialogs/notes/note_open.png diff --git a/images_nodist/presets/waypoint/pin.png b/resources/images/dialogs/pin.png similarity index 100% rename from images_nodist/presets/waypoint/pin.png rename to resources/images/dialogs/pin.png diff --git a/images/dialogs/previous.svg b/resources/images/dialogs/previous.svg similarity index 100% rename from images/dialogs/previous.svg rename to resources/images/dialogs/previous.svg diff --git a/images/dialogs/propertiesdialog.svg b/resources/images/dialogs/propertiesdialog.svg similarity index 100% rename from images/dialogs/propertiesdialog.svg rename to resources/images/dialogs/propertiesdialog.svg diff --git a/images/dialogs/refresh.png b/resources/images/dialogs/refresh.png similarity index 100% rename from images/dialogs/refresh.png rename to resources/images/dialogs/refresh.png diff --git a/images/dialogs/relation/arrowdown.png b/resources/images/dialogs/relation/arrowdown.png similarity index 100% rename from images/dialogs/relation/arrowdown.png rename to resources/images/dialogs/relation/arrowdown.png diff --git a/images/dialogs/relation/arrowup.png b/resources/images/dialogs/relation/arrowup.png similarity index 100% rename from images/dialogs/relation/arrowup.png rename to resources/images/dialogs/relation/arrowup.png diff --git a/images/dialogs/relation/deletemembers.svg b/resources/images/dialogs/relation/deletemembers.svg similarity index 100% rename from images/dialogs/relation/deletemembers.svg rename to resources/images/dialogs/relation/deletemembers.svg diff --git a/images/dialogs/relation/downloadincomplete.png b/resources/images/dialogs/relation/downloadincomplete.png similarity index 100% rename from images/dialogs/relation/downloadincomplete.png rename to resources/images/dialogs/relation/downloadincomplete.png diff --git a/images/dialogs/relation/downloadincompleteselected.png b/resources/images/dialogs/relation/downloadincompleteselected.png similarity index 100% rename from images/dialogs/relation/downloadincompleteselected.png rename to resources/images/dialogs/relation/downloadincompleteselected.png diff --git a/images/dialogs/relation/roundabout_left_tiny.png b/resources/images/dialogs/relation/roundabout_left_tiny.png similarity index 100% rename from images/dialogs/relation/roundabout_left_tiny.png rename to resources/images/dialogs/relation/roundabout_left_tiny.png diff --git a/images/dialogs/relation/roundabout_right_tiny.png b/resources/images/dialogs/relation/roundabout_right_tiny.png similarity index 100% rename from images/dialogs/relation/roundabout_right_tiny.png rename to resources/images/dialogs/relation/roundabout_right_tiny.png diff --git a/images/dialogs/relation/roundedcorners.png b/resources/images/dialogs/relation/roundedcorners.png similarity index 100% rename from images/dialogs/relation/roundedcorners.png rename to resources/images/dialogs/relation/roundedcorners.png diff --git a/images/dialogs/relation/selectmembers.svg b/resources/images/dialogs/relation/selectmembers.svg similarity index 100% rename from images/dialogs/relation/selectmembers.svg rename to resources/images/dialogs/relation/selectmembers.svg diff --git a/images/dialogs/relation/selectprimitives.svg b/resources/images/dialogs/relation/selectprimitives.svg similarity index 100% rename from images/dialogs/relation/selectprimitives.svg rename to resources/images/dialogs/relation/selectprimitives.svg diff --git a/images/dialogs/relationlist.png b/resources/images/dialogs/relationlist.png similarity index 100% rename from images/dialogs/relationlist.png rename to resources/images/dialogs/relationlist.png diff --git a/images/dialogs/reorderlayers.png b/resources/images/dialogs/reorderlayers.png similarity index 100% rename from images/dialogs/reorderlayers.png rename to resources/images/dialogs/reorderlayers.png diff --git a/images/dialogs/reverse.png b/resources/images/dialogs/reverse.png similarity index 100% rename from images/dialogs/reverse.png rename to resources/images/dialogs/reverse.png diff --git a/images/dialogs/search.png b/resources/images/dialogs/search.png similarity index 100% rename from images/dialogs/search.png rename to resources/images/dialogs/search.png diff --git a/images/dialogs/select.png b/resources/images/dialogs/select.png similarity index 100% rename from images/dialogs/select.png rename to resources/images/dialogs/select.png diff --git a/images/dialogs/selectionlist.png b/resources/images/dialogs/selectionlist.png similarity index 100% rename from images/dialogs/selectionlist.png rename to resources/images/dialogs/selectionlist.png diff --git a/images/dialogs/settings.png b/resources/images/dialogs/settings.png similarity index 100% rename from images/dialogs/settings.png rename to resources/images/dialogs/settings.png diff --git a/images/dialogs/showhide.png b/resources/images/dialogs/showhide.png similarity index 100% rename from images/dialogs/showhide.png rename to resources/images/dialogs/showhide.png diff --git a/images/dialogs/sort.png b/resources/images/dialogs/sort.png similarity index 100% rename from images/dialogs/sort.png rename to resources/images/dialogs/sort.png diff --git a/images/dialogs/sort_below.png b/resources/images/dialogs/sort_below.png similarity index 100% rename from images/dialogs/sort_below.png rename to resources/images/dialogs/sort_below.png diff --git a/images/dialogs/taginfo.svg b/resources/images/dialogs/taginfo.svg similarity index 100% rename from images/dialogs/taginfo.svg rename to resources/images/dialogs/taginfo.svg diff --git a/images/dialogs/up.svg b/resources/images/dialogs/up.svg similarity index 100% rename from images/dialogs/up.svg rename to resources/images/dialogs/up.svg diff --git a/images/dialogs/uploadproperties.png b/resources/images/dialogs/uploadproperties.png similarity index 100% rename from images/dialogs/uploadproperties.png rename to resources/images/dialogs/uploadproperties.png diff --git a/images/dialogs/userlist.png b/resources/images/dialogs/userlist.png similarity index 100% rename from images/dialogs/userlist.png rename to resources/images/dialogs/userlist.png diff --git a/images/dialogs/validator.png b/resources/images/dialogs/validator.png similarity index 100% rename from images/dialogs/validator.png rename to resources/images/dialogs/validator.png diff --git a/images/dialogs/zoom-best-fit.png b/resources/images/dialogs/zoom-best-fit.png similarity index 100% rename from images/dialogs/zoom-best-fit.png rename to resources/images/dialogs/zoom-best-fit.png diff --git a/images/dialogs/zoomin.png b/resources/images/dialogs/zoomin.png similarity index 100% rename from images/dialogs/zoomin.png rename to resources/images/dialogs/zoomin.png diff --git a/images/dialogs/zoomout.png b/resources/images/dialogs/zoomout.png similarity index 100% rename from images/dialogs/zoomout.png rename to resources/images/dialogs/zoomout.png diff --git a/images/distribute.png b/resources/images/distribute.png similarity index 100% rename from images/distribute.png rename to resources/images/distribute.png diff --git a/images/download-overpass.png b/resources/images/download-overpass.png similarity index 100% rename from images/download-overpass.png rename to resources/images/download-overpass.png diff --git a/images/download.png b/resources/images/download.png similarity index 100% rename from images/download.png rename to resources/images/download.png diff --git a/images/download_along_way.svg b/resources/images/download_along_way.svg similarity index 100% rename from images/download_along_way.svg rename to resources/images/download_along_way.svg diff --git a/images/download_in_view.png b/resources/images/download_in_view.png similarity index 100% rename from images/download_in_view.png rename to resources/images/download_in_view.png diff --git a/images/download_new_layer.png b/resources/images/download_new_layer.png similarity index 100% rename from images/download_new_layer.png rename to resources/images/download_new_layer.png diff --git a/images/downloadalongtrack.svg b/resources/images/downloadalongtrack.svg similarity index 100% rename from images/downloadalongtrack.svg rename to resources/images/downloadalongtrack.svg diff --git a/images/downloadprimitive.png b/resources/images/downloadprimitive.png similarity index 100% rename from images/downloadprimitive.png rename to resources/images/downloadprimitive.png diff --git a/images/duplicate.png b/resources/images/duplicate.png similarity index 100% rename from images/duplicate.png rename to resources/images/duplicate.png diff --git a/images/exit.svg b/resources/images/exit.svg similarity index 100% rename from images/exit.svg rename to resources/images/exit.svg diff --git a/images/expert.png b/resources/images/expert.png similarity index 100% rename from images/expert.png rename to resources/images/expert.png diff --git a/images/exportgpx.png b/resources/images/exportgpx.png similarity index 100% rename from images/exportgpx.png rename to resources/images/exportgpx.png diff --git a/images/eye.png b/resources/images/eye.png similarity index 100% rename from images/eye.png rename to resources/images/eye.png diff --git a/images/followline.svg b/resources/images/followline.svg similarity index 100% rename from images/followline.svg rename to resources/images/followline.svg diff --git a/images/help.svg b/resources/images/help.svg similarity index 100% rename from images/help.svg rename to resources/images/help.svg diff --git a/images/help/home.svg b/resources/images/help/home.svg similarity index 100% rename from images/help/home.svg rename to resources/images/help/home.svg diff --git a/images/help/internet.png b/resources/images/help/internet.png similarity index 100% rename from images/help/internet.png rename to resources/images/help/internet.png diff --git a/images/icons/accommodation_alpinehut.n.16.png b/resources/images/icons/accommodation_alpinehut.n.16.png similarity index 100% rename from images/icons/accommodation_alpinehut.n.16.png rename to resources/images/icons/accommodation_alpinehut.n.16.png diff --git a/images/icons/accommodation_bed_and_breakfast.n.16.png b/resources/images/icons/accommodation_bed_and_breakfast.n.16.png similarity index 100% rename from images/icons/accommodation_bed_and_breakfast.n.16.png rename to resources/images/icons/accommodation_bed_and_breakfast.n.16.png diff --git a/images/icons/accommodation_camping.n.16.png b/resources/images/icons/accommodation_camping.n.16.png similarity index 100% rename from images/icons/accommodation_camping.n.16.png rename to resources/images/icons/accommodation_camping.n.16.png diff --git a/images/icons/accommodation_caravan_park.n.16.png b/resources/images/icons/accommodation_caravan_park.n.16.png similarity index 100% rename from images/icons/accommodation_caravan_park.n.16.png rename to resources/images/icons/accommodation_caravan_park.n.16.png diff --git a/images/icons/accommodation_chalet.n.16.png b/resources/images/icons/accommodation_chalet.n.16.png similarity index 100% rename from images/icons/accommodation_chalet.n.16.png rename to resources/images/icons/accommodation_chalet.n.16.png diff --git a/images/icons/accommodation_hotel.n.16.png b/resources/images/icons/accommodation_hotel.n.16.png similarity index 100% rename from images/icons/accommodation_hotel.n.16.png rename to resources/images/icons/accommodation_hotel.n.16.png diff --git a/images/icons/accommodation_motel.n.16.png b/resources/images/icons/accommodation_motel.n.16.png similarity index 100% rename from images/icons/accommodation_motel.n.16.png rename to resources/images/icons/accommodation_motel.n.16.png diff --git a/images/icons/accommodation_shelter2.n.16.png b/resources/images/icons/accommodation_shelter2.n.16.png similarity index 100% rename from images/icons/accommodation_shelter2.n.16.png rename to resources/images/icons/accommodation_shelter2.n.16.png diff --git a/images/icons/accommodation_youth_hostel.n.16.png b/resources/images/icons/accommodation_youth_hostel.n.16.png similarity index 100% rename from images/icons/accommodation_youth_hostel.n.16.png rename to resources/images/icons/accommodation_youth_hostel.n.16.png diff --git a/images/icons/amenity_bench.n.16.png b/resources/images/icons/amenity_bench.n.16.png similarity index 100% rename from images/icons/amenity_bench.n.16.png rename to resources/images/icons/amenity_bench.n.16.png diff --git a/images/icons/amenity_firestation2.n.16.png b/resources/images/icons/amenity_firestation2.n.16.png similarity index 100% rename from images/icons/amenity_firestation2.n.16.png rename to resources/images/icons/amenity_firestation2.n.16.png diff --git a/images/icons/amenity_fountain2.n.16.png b/resources/images/icons/amenity_fountain2.n.16.png similarity index 100% rename from images/icons/amenity_fountain2.n.16.png rename to resources/images/icons/amenity_fountain2.n.16.png diff --git a/images/icons/amenity_library.n.16.png b/resources/images/icons/amenity_library.n.16.png similarity index 100% rename from images/icons/amenity_library.n.16.png rename to resources/images/icons/amenity_library.n.16.png diff --git a/images/icons/amenity_playground.n.16.png b/resources/images/icons/amenity_playground.n.16.png similarity index 100% rename from images/icons/amenity_playground.n.16.png rename to resources/images/icons/amenity_playground.n.16.png diff --git a/images/icons/amenity_police2.n.16.png b/resources/images/icons/amenity_police2.n.16.png similarity index 100% rename from images/icons/amenity_police2.n.16.png rename to resources/images/icons/amenity_police2.n.16.png diff --git a/images/icons/amenity_post_box.n.16.png b/resources/images/icons/amenity_post_box.n.16.png similarity index 100% rename from images/icons/amenity_post_box.n.16.png rename to resources/images/icons/amenity_post_box.n.16.png diff --git a/images/icons/amenity_post_office.n.16.png b/resources/images/icons/amenity_post_office.n.16.png similarity index 100% rename from images/icons/amenity_post_office.n.16.png rename to resources/images/icons/amenity_post_office.n.16.png diff --git a/images/icons/amenity_recycling.n.16.png b/resources/images/icons/amenity_recycling.n.16.png similarity index 100% rename from images/icons/amenity_recycling.n.16.png rename to resources/images/icons/amenity_recycling.n.16.png diff --git a/images/icons/amenity_toilets.n.16.png b/resources/images/icons/amenity_toilets.n.16.png similarity index 100% rename from images/icons/amenity_toilets.n.16.png rename to resources/images/icons/amenity_toilets.n.16.png diff --git a/images/icons/amenity_town_hall.n.16.png b/resources/images/icons/amenity_town_hall.n.16.png similarity index 100% rename from images/icons/amenity_town_hall.n.16.png rename to resources/images/icons/amenity_town_hall.n.16.png diff --git a/images/icons/amenity_waste_bin.n.16.png b/resources/images/icons/amenity_waste_bin.n.16.png similarity index 100% rename from images/icons/amenity_waste_bin.n.16.png rename to resources/images/icons/amenity_waste_bin.n.16.png diff --git a/images/icons/barrier_blocks.16.png b/resources/images/icons/barrier_blocks.16.png similarity index 100% rename from images/icons/barrier_blocks.16.png rename to resources/images/icons/barrier_blocks.16.png diff --git a/images/icons/barrier_bollard.n.16.png b/resources/images/icons/barrier_bollard.n.16.png similarity index 100% rename from images/icons/barrier_bollard.n.16.png rename to resources/images/icons/barrier_bollard.n.16.png diff --git a/images/icons/barrier_cattle_grid.16.png b/resources/images/icons/barrier_cattle_grid.16.png similarity index 100% rename from images/icons/barrier_cattle_grid.16.png rename to resources/images/icons/barrier_cattle_grid.16.png diff --git a/images/icons/barrier_cycle_barrier.16.png b/resources/images/icons/barrier_cycle_barrier.16.png similarity index 100% rename from images/icons/barrier_cycle_barrier.16.png rename to resources/images/icons/barrier_cycle_barrier.16.png diff --git a/images/icons/barrier_gate.n.16.png b/resources/images/icons/barrier_gate.n.16.png similarity index 100% rename from images/icons/barrier_gate.n.16.png rename to resources/images/icons/barrier_gate.n.16.png diff --git a/images/icons/barrier_kissing_gate.16.png b/resources/images/icons/barrier_kissing_gate.16.png similarity index 100% rename from images/icons/barrier_kissing_gate.16.png rename to resources/images/icons/barrier_kissing_gate.16.png diff --git a/images/icons/barrier_lift_gate.n.16.png b/resources/images/icons/barrier_lift_gate.n.16.png similarity index 100% rename from images/icons/barrier_lift_gate.n.16.png rename to resources/images/icons/barrier_lift_gate.n.16.png diff --git a/images/icons/barrier_stile.n.16.png b/resources/images/icons/barrier_stile.n.16.png similarity index 100% rename from images/icons/barrier_stile.n.16.png rename to resources/images/icons/barrier_stile.n.16.png diff --git a/images/icons/barrier_toll_booth.n.16.png b/resources/images/icons/barrier_toll_booth.n.16.png similarity index 100% rename from images/icons/barrier_toll_booth.n.16.png rename to resources/images/icons/barrier_toll_booth.n.16.png diff --git a/images/icons/cattle_grid.png b/resources/images/icons/cattle_grid.png similarity index 100% rename from images/icons/cattle_grid.png rename to resources/images/icons/cattle_grid.png diff --git a/images/icons/education_nursery3.n.16.png b/resources/images/icons/education_nursery3.n.16.png similarity index 100% rename from images/icons/education_nursery3.n.16.png rename to resources/images/icons/education_nursery3.n.16.png diff --git a/images/icons/education_school.n.16.png b/resources/images/icons/education_school.n.16.png similarity index 100% rename from images/icons/education_school.n.16.png rename to resources/images/icons/education_school.n.16.png diff --git a/images/icons/emergency-telephone-16.png b/resources/images/icons/emergency-telephone-16.png similarity index 100% rename from images/icons/emergency-telephone-16.png rename to resources/images/icons/emergency-telephone-16.png diff --git a/images/icons/emergency_hydrant.n.16.png b/resources/images/icons/emergency_hydrant.n.16.png similarity index 100% rename from images/icons/emergency_hydrant.n.16.png rename to resources/images/icons/emergency_hydrant.n.16.png diff --git a/images/icons/food_bar.n.16.png b/resources/images/icons/food_bar.n.16.png similarity index 100% rename from images/icons/food_bar.n.16.png rename to resources/images/icons/food_bar.n.16.png diff --git a/images/icons/food_cafe.n.16.png b/resources/images/icons/food_cafe.n.16.png similarity index 100% rename from images/icons/food_cafe.n.16.png rename to resources/images/icons/food_cafe.n.16.png diff --git a/images/icons/food_drinkingtap.n.16.png b/resources/images/icons/food_drinkingtap.n.16.png similarity index 100% rename from images/icons/food_drinkingtap.n.16.png rename to resources/images/icons/food_drinkingtap.n.16.png diff --git a/images/icons/food_fastfood.n.16.png b/resources/images/icons/food_fastfood.n.16.png similarity index 100% rename from images/icons/food_fastfood.n.16.png rename to resources/images/icons/food_fastfood.n.16.png diff --git a/images/icons/food_nightclub.n.16.png b/resources/images/icons/food_nightclub.n.16.png similarity index 100% rename from images/icons/food_nightclub.n.16.png rename to resources/images/icons/food_nightclub.n.16.png diff --git a/images/icons/food_pub.n.16.png b/resources/images/icons/food_pub.n.16.png similarity index 100% rename from images/icons/food_pub.n.16.png rename to resources/images/icons/food_pub.n.16.png diff --git a/images/icons/food_restaurant.n.16.png b/resources/images/icons/food_restaurant.n.16.png similarity index 100% rename from images/icons/food_restaurant.n.16.png rename to resources/images/icons/food_restaurant.n.16.png diff --git a/images/icons/health_hospital.n.16.png b/resources/images/icons/health_hospital.n.16.png similarity index 100% rename from images/icons/health_hospital.n.16.png rename to resources/images/icons/health_hospital.n.16.png diff --git a/images/icons/health_pharmacy.n.16.png b/resources/images/icons/health_pharmacy.n.16.png similarity index 100% rename from images/icons/health_pharmacy.n.16.png rename to resources/images/icons/health_pharmacy.n.16.png diff --git a/images/icons/health_veterinary.n.8E7409.16.png b/resources/images/icons/health_veterinary.n.8E7409.16.png similarity index 100% rename from images/icons/health_veterinary.n.8E7409.16.png rename to resources/images/icons/health_veterinary.n.8E7409.16.png diff --git a/images/icons/manmade_lighthouse.png b/resources/images/icons/manmade_lighthouse.png similarity index 100% rename from images/icons/manmade_lighthouse.png rename to resources/images/icons/manmade_lighthouse.png diff --git a/images/icons/manmade_tower.png b/resources/images/icons/manmade_tower.png similarity index 100% rename from images/icons/manmade_tower.png rename to resources/images/icons/manmade_tower.png diff --git a/images/icons/money_atm.n.16.png b/resources/images/icons/money_atm.n.16.png similarity index 100% rename from images/icons/money_atm.n.16.png rename to resources/images/icons/money_atm.n.16.png diff --git a/images/icons/money_bank2.n.16.png b/resources/images/icons/money_bank2.n.16.png similarity index 100% rename from images/icons/money_bank2.n.16.png rename to resources/images/icons/money_bank2.n.16.png diff --git a/images/icons/natural_peak.n.16.png b/resources/images/icons/natural_peak.n.16.png similarity index 100% rename from images/icons/natural_peak.n.16.png rename to resources/images/icons/natural_peak.n.16.png diff --git a/images/icons/natural_tree.n.16.png b/resources/images/icons/natural_tree.n.16.png similarity index 100% rename from images/icons/natural_tree.n.16.png rename to resources/images/icons/natural_tree.n.16.png diff --git a/images/icons/place.png b/resources/images/icons/place.png similarity index 100% rename from images/icons/place.png rename to resources/images/icons/place.png diff --git a/images/icons/place_of_worship_unknown.n.16.png b/resources/images/icons/place_of_worship_unknown.n.16.png similarity index 100% rename from images/icons/place_of_worship_unknown.n.16.png rename to resources/images/icons/place_of_worship_unknown.n.16.png diff --git a/images/icons/power_station.png b/resources/images/icons/power_station.png similarity index 100% rename from images/icons/power_station.png rename to resources/images/icons/power_station.png diff --git a/images/icons/power_substation.n.16.png b/resources/images/icons/power_substation.n.16.png similarity index 100% rename from images/icons/power_substation.n.16.png rename to resources/images/icons/power_substation.n.16.png diff --git a/images/icons/power_tower_high2.n.16.png b/resources/images/icons/power_tower_high2.n.16.png similarity index 100% rename from images/icons/power_tower_high2.n.16.png rename to resources/images/icons/power_tower_high2.n.16.png diff --git a/images/icons/power_tower_low.n.16.png b/resources/images/icons/power_tower_low.n.16.png similarity index 100% rename from images/icons/power_tower_low.n.16.png rename to resources/images/icons/power_tower_low.n.16.png diff --git a/images/icons/shopping_alcohol.n.16.png b/resources/images/icons/shopping_alcohol.n.16.png similarity index 100% rename from images/icons/shopping_alcohol.n.16.png rename to resources/images/icons/shopping_alcohol.n.16.png diff --git a/images/icons/shopping_bakery.n.16.png b/resources/images/icons/shopping_bakery.n.16.png similarity index 100% rename from images/icons/shopping_bakery.n.16.png rename to resources/images/icons/shopping_bakery.n.16.png diff --git a/images/icons/shopping_bicycle.n.16.png b/resources/images/icons/shopping_bicycle.n.16.png similarity index 100% rename from images/icons/shopping_bicycle.n.16.png rename to resources/images/icons/shopping_bicycle.n.16.png diff --git a/images/icons/shopping_book.n.16.png b/resources/images/icons/shopping_book.n.16.png similarity index 100% rename from images/icons/shopping_book.n.16.png rename to resources/images/icons/shopping_book.n.16.png diff --git a/images/icons/shopping_butcher.n.16.png b/resources/images/icons/shopping_butcher.n.16.png similarity index 100% rename from images/icons/shopping_butcher.n.16.png rename to resources/images/icons/shopping_butcher.n.16.png diff --git a/images/icons/shopping_car.n.16.png b/resources/images/icons/shopping_car.n.16.png similarity index 100% rename from images/icons/shopping_car.n.16.png rename to resources/images/icons/shopping_car.n.16.png diff --git a/images/icons/shopping_car_repair.n.16.png b/resources/images/icons/shopping_car_repair.n.16.png similarity index 100% rename from images/icons/shopping_car_repair.n.16.png rename to resources/images/icons/shopping_car_repair.n.16.png diff --git a/images/icons/shopping_clothes.n.16.png b/resources/images/icons/shopping_clothes.n.16.png similarity index 100% rename from images/icons/shopping_clothes.n.16.png rename to resources/images/icons/shopping_clothes.n.16.png diff --git a/images/icons/shopping_confectionery.n.16.png b/resources/images/icons/shopping_confectionery.n.16.png similarity index 100% rename from images/icons/shopping_confectionery.n.16.png rename to resources/images/icons/shopping_confectionery.n.16.png diff --git a/images/icons/shopping_convenience.n.16.png b/resources/images/icons/shopping_convenience.n.16.png similarity index 100% rename from images/icons/shopping_convenience.n.16.png rename to resources/images/icons/shopping_convenience.n.16.png diff --git a/images/icons/shopping_department_store.n.16.png b/resources/images/icons/shopping_department_store.n.16.png similarity index 100% rename from images/icons/shopping_department_store.n.16.png rename to resources/images/icons/shopping_department_store.n.16.png diff --git a/images/icons/shopping_diy.n.16.png b/resources/images/icons/shopping_diy.n.16.png similarity index 100% rename from images/icons/shopping_diy.n.16.png rename to resources/images/icons/shopping_diy.n.16.png diff --git a/images/icons/shopping_fish.n.16.png b/resources/images/icons/shopping_fish.n.16.png similarity index 100% rename from images/icons/shopping_fish.n.16.png rename to resources/images/icons/shopping_fish.n.16.png diff --git a/images/icons/shopping_florist.n.16.png b/resources/images/icons/shopping_florist.n.16.png similarity index 100% rename from images/icons/shopping_florist.n.16.png rename to resources/images/icons/shopping_florist.n.16.png diff --git a/images/icons/shopping_garden_centre.n.16.png b/resources/images/icons/shopping_garden_centre.n.16.png similarity index 100% rename from images/icons/shopping_garden_centre.n.16.png rename to resources/images/icons/shopping_garden_centre.n.16.png diff --git a/images/icons/shopping_gift.n.16.png b/resources/images/icons/shopping_gift.n.16.png similarity index 100% rename from images/icons/shopping_gift.n.16.png rename to resources/images/icons/shopping_gift.n.16.png diff --git a/images/icons/shopping_greengrocer.n.16.png b/resources/images/icons/shopping_greengrocer.n.16.png similarity index 100% rename from images/icons/shopping_greengrocer.n.16.png rename to resources/images/icons/shopping_greengrocer.n.16.png diff --git a/images/icons/shopping_hairdresser.n.16.png b/resources/images/icons/shopping_hairdresser.n.16.png similarity index 100% rename from images/icons/shopping_hairdresser.n.16.png rename to resources/images/icons/shopping_hairdresser.n.16.png diff --git a/images/icons/shopping_hifi.n.16.png b/resources/images/icons/shopping_hifi.n.16.png similarity index 100% rename from images/icons/shopping_hifi.n.16.png rename to resources/images/icons/shopping_hifi.n.16.png diff --git a/images/icons/shopping_jewelry.n.16.png b/resources/images/icons/shopping_jewelry.n.16.png similarity index 100% rename from images/icons/shopping_jewelry.n.16.png rename to resources/images/icons/shopping_jewelry.n.16.png diff --git a/images/icons/shopping_kiosk.n.16.png b/resources/images/icons/shopping_kiosk.n.16.png similarity index 100% rename from images/icons/shopping_kiosk.n.16.png rename to resources/images/icons/shopping_kiosk.n.16.png diff --git a/images/icons/shopping_laundrette.n.16.png b/resources/images/icons/shopping_laundrette.n.16.png similarity index 100% rename from images/icons/shopping_laundrette.n.16.png rename to resources/images/icons/shopping_laundrette.n.16.png diff --git a/images/icons/shopping_marketplace.n.16.png b/resources/images/icons/shopping_marketplace.n.16.png similarity index 100% rename from images/icons/shopping_marketplace.n.16.png rename to resources/images/icons/shopping_marketplace.n.16.png diff --git a/images/icons/shopping_motorcycle.n.16.png b/resources/images/icons/shopping_motorcycle.n.16.png similarity index 100% rename from images/icons/shopping_motorcycle.n.16.png rename to resources/images/icons/shopping_motorcycle.n.16.png diff --git a/images/icons/shopping_music.n.16.png b/resources/images/icons/shopping_music.n.16.png similarity index 100% rename from images/icons/shopping_music.n.16.png rename to resources/images/icons/shopping_music.n.16.png diff --git a/images/icons/shopping_supermarket.n.16.png b/resources/images/icons/shopping_supermarket.n.16.png similarity index 100% rename from images/icons/shopping_supermarket.n.16.png rename to resources/images/icons/shopping_supermarket.n.16.png diff --git a/images/icons/shopping_toys.n.16.png b/resources/images/icons/shopping_toys.n.16.png similarity index 100% rename from images/icons/shopping_toys.n.16.png rename to resources/images/icons/shopping_toys.n.16.png diff --git a/images/icons/shopping_vending_machine.n.16.png b/resources/images/icons/shopping_vending_machine.n.16.png similarity index 100% rename from images/icons/shopping_vending_machine.n.16.png rename to resources/images/icons/shopping_vending_machine.n.16.png diff --git a/images/icons/sport_leisure_centre.n.16.png b/resources/images/icons/sport_leisure_centre.n.16.png similarity index 100% rename from images/icons/sport_leisure_centre.n.16.png rename to resources/images/icons/sport_leisure_centre.n.16.png diff --git a/images/icons/sport_shooting.n.16.png b/resources/images/icons/sport_shooting.n.16.png similarity index 100% rename from images/icons/sport_shooting.n.16.png rename to resources/images/icons/sport_shooting.n.16.png diff --git a/images/icons/sport_swimming_outdoor.n.16.png b/resources/images/icons/sport_swimming_outdoor.n.16.png similarity index 100% rename from images/icons/sport_swimming_outdoor.n.16.png rename to resources/images/icons/sport_swimming_outdoor.n.16.png diff --git a/images/icons/telephone.png b/resources/images/icons/telephone.png similarity index 100% rename from images/icons/telephone.png rename to resources/images/icons/telephone.png diff --git a/images/icons/tourist_archaeological.n.16.png b/resources/images/icons/tourist_archaeological.n.16.png similarity index 100% rename from images/icons/tourist_archaeological.n.16.png rename to resources/images/icons/tourist_archaeological.n.16.png diff --git a/images/icons/tourist_art_gallery2.n.16.png b/resources/images/icons/tourist_art_gallery2.n.16.png similarity index 100% rename from images/icons/tourist_art_gallery2.n.16.png rename to resources/images/icons/tourist_art_gallery2.n.16.png diff --git a/images/icons/tourist_battlefield.n.16.png b/resources/images/icons/tourist_battlefield.n.16.png similarity index 100% rename from images/icons/tourist_battlefield.n.16.png rename to resources/images/icons/tourist_battlefield.n.16.png diff --git a/images/icons/tourist_castle.n.16.png b/resources/images/icons/tourist_castle.n.16.png similarity index 100% rename from images/icons/tourist_castle.n.16.png rename to resources/images/icons/tourist_castle.n.16.png diff --git a/images/icons/tourist_cinema.n.16.png b/resources/images/icons/tourist_cinema.n.16.png similarity index 100% rename from images/icons/tourist_cinema.n.16.png rename to resources/images/icons/tourist_cinema.n.16.png diff --git a/images_nodist/icons/tourist_information.png b/resources/images/icons/tourist_information.png similarity index 100% rename from images_nodist/icons/tourist_information.png rename to resources/images/icons/tourist_information.png diff --git a/images/icons/tourist_memorial.n.16.png b/resources/images/icons/tourist_memorial.n.16.png similarity index 100% rename from images/icons/tourist_memorial.n.16.png rename to resources/images/icons/tourist_memorial.n.16.png diff --git a/images/icons/tourist_monument.n.16.png b/resources/images/icons/tourist_monument.n.16.png similarity index 100% rename from images/icons/tourist_monument.n.16.png rename to resources/images/icons/tourist_monument.n.16.png diff --git a/images/icons/tourist_museum.n.16.png b/resources/images/icons/tourist_museum.n.16.png similarity index 100% rename from images/icons/tourist_museum.n.16.png rename to resources/images/icons/tourist_museum.n.16.png diff --git a/images/icons/tourist_picnic.n.16.png b/resources/images/icons/tourist_picnic.n.16.png similarity index 100% rename from images/icons/tourist_picnic.n.16.png rename to resources/images/icons/tourist_picnic.n.16.png diff --git a/images/icons/tourist_ruin.n.16.png b/resources/images/icons/tourist_ruin.n.16.png similarity index 100% rename from images/icons/tourist_ruin.n.16.png rename to resources/images/icons/tourist_ruin.n.16.png diff --git a/images/icons/tourist_theatre.n.16.png b/resources/images/icons/tourist_theatre.n.16.png similarity index 100% rename from images/icons/tourist_theatre.n.16.png rename to resources/images/icons/tourist_theatre.n.16.png diff --git a/images/icons/tourist_theme_park.n.16.png b/resources/images/icons/tourist_theme_park.n.16.png similarity index 100% rename from images/icons/tourist_theme_park.n.16.png rename to resources/images/icons/tourist_theme_park.n.16.png diff --git a/images/icons/tourist_view_point.n.16.png b/resources/images/icons/tourist_view_point.n.16.png similarity index 100% rename from images/icons/tourist_view_point.n.16.png rename to resources/images/icons/tourist_view_point.n.16.png diff --git a/images/icons/tourist_zoo.n.16.png b/resources/images/icons/tourist_zoo.n.16.png similarity index 100% rename from images/icons/tourist_zoo.n.16.png rename to resources/images/icons/tourist_zoo.n.16.png diff --git a/images/icons/transport_aerodrome.n.16.png b/resources/images/icons/transport_aerodrome.n.16.png similarity index 100% rename from images/icons/transport_aerodrome.n.16.png rename to resources/images/icons/transport_aerodrome.n.16.png diff --git a/images/icons/transport_airport_gate.n.16.png b/resources/images/icons/transport_airport_gate.n.16.png similarity index 100% rename from images/icons/transport_airport_gate.n.16.png rename to resources/images/icons/transport_airport_gate.n.16.png diff --git a/images/icons/transport_airport_terminal.n.16.png b/resources/images/icons/transport_airport_terminal.n.16.png similarity index 100% rename from images/icons/transport_airport_terminal.n.16.png rename to resources/images/icons/transport_airport_terminal.n.16.png diff --git a/images/icons/transport_bus_station.n.16.png b/resources/images/icons/transport_bus_station.n.16.png similarity index 100% rename from images/icons/transport_bus_station.n.16.png rename to resources/images/icons/transport_bus_station.n.16.png diff --git a/images/icons/transport_bus_stop2.n.16.png b/resources/images/icons/transport_bus_stop2.n.16.png similarity index 100% rename from images/icons/transport_bus_stop2.n.16.png rename to resources/images/icons/transport_bus_stop2.n.16.png diff --git a/images/icons/transport_car_wash.n.16.png b/resources/images/icons/transport_car_wash.n.16.png similarity index 100% rename from images/icons/transport_car_wash.n.16.png rename to resources/images/icons/transport_car_wash.n.16.png diff --git a/images/icons/transport_fuel.n.16.png b/resources/images/icons/transport_fuel.n.16.png similarity index 100% rename from images/icons/transport_fuel.n.16.png rename to resources/images/icons/transport_fuel.n.16.png diff --git a/images/icons/transport_helicopter_pad.n.16.png b/resources/images/icons/transport_helicopter_pad.n.16.png similarity index 100% rename from images/icons/transport_helicopter_pad.n.16.png rename to resources/images/icons/transport_helicopter_pad.n.16.png diff --git a/images/icons/transport_marina.n.16.png b/resources/images/icons/transport_marina.n.16.png similarity index 100% rename from images/icons/transport_marina.n.16.png rename to resources/images/icons/transport_marina.n.16.png diff --git a/images/icons/transport_miniroundabout_anticlockwise.n.16.png b/resources/images/icons/transport_miniroundabout_anticlockwise.n.16.png similarity index 100% rename from images/icons/transport_miniroundabout_anticlockwise.n.16.png rename to resources/images/icons/transport_miniroundabout_anticlockwise.n.16.png diff --git a/images/icons/transport_parking_bicycle.n.16.png b/resources/images/icons/transport_parking_bicycle.n.16.png similarity index 100% rename from images/icons/transport_parking_bicycle.n.16.png rename to resources/images/icons/transport_parking_bicycle.n.16.png diff --git a/images/icons/transport_parking_car.n.16.png b/resources/images/icons/transport_parking_car.n.16.png similarity index 100% rename from images/icons/transport_parking_car.n.16.png rename to resources/images/icons/transport_parking_car.n.16.png diff --git a/images/icons/transport_port.n.16.png b/resources/images/icons/transport_port.n.16.png similarity index 100% rename from images/icons/transport_port.n.16.png rename to resources/images/icons/transport_port.n.16.png diff --git a/images/icons/transport_rental_bicycle.n.16.png b/resources/images/icons/transport_rental_bicycle.n.16.png similarity index 100% rename from images/icons/transport_rental_bicycle.n.16.png rename to resources/images/icons/transport_rental_bicycle.n.16.png diff --git a/images/icons/transport_rental_car.n.16.png b/resources/images/icons/transport_rental_car.n.16.png similarity index 100% rename from images/icons/transport_rental_car.n.16.png rename to resources/images/icons/transport_rental_car.n.16.png diff --git a/images/icons/transport_taxi_rank.n.16.png b/resources/images/icons/transport_taxi_rank.n.16.png similarity index 100% rename from images/icons/transport_taxi_rank.n.16.png rename to resources/images/icons/transport_taxi_rank.n.16.png diff --git a/images/icons/transport_train_station.n.16.png b/resources/images/icons/transport_train_station.n.16.png similarity index 100% rename from images/icons/transport_train_station.n.16.png rename to resources/images/icons/transport_train_station.n.16.png diff --git a/images/icons/transport_tram_stop.n.16.png b/resources/images/icons/transport_tram_stop.n.16.png similarity index 100% rename from images/icons/transport_tram_stop.n.16.png rename to resources/images/icons/transport_tram_stop.n.16.png diff --git a/images/icons/transport_weir.n.16.png b/resources/images/icons/transport_weir.n.16.png similarity index 100% rename from images/icons/transport_weir.n.16.png rename to resources/images/icons/transport_weir.n.16.png diff --git a/images/icons/transport_zebracrossing.n.16.png b/resources/images/icons/transport_zebracrossing.n.16.png similarity index 100% rename from images/icons/transport_zebracrossing.n.16.png rename to resources/images/icons/transport_zebracrossing.n.16.png diff --git a/images/imagery_menu.png b/resources/images/imagery_menu.png similarity index 100% rename from images/imagery_menu.png rename to resources/images/imagery_menu.png diff --git a/images/imagery_small.png b/resources/images/imagery_small.png similarity index 100% rename from images/imagery_small.png rename to resources/images/imagery_small.png diff --git a/images/importaudio.png b/resources/images/importaudio.png similarity index 100% rename from images/importaudio.png rename to resources/images/importaudio.png diff --git a/images/info.png b/resources/images/info.png similarity index 100% rename from images/info.png rename to resources/images/info.png diff --git a/images/java.png b/resources/images/java.png similarity index 100% rename from images/java.png rename to resources/images/java.png diff --git a/images/joinareas.svg b/resources/images/joinareas.svg similarity index 100% rename from images/joinareas.svg rename to resources/images/joinareas.svg diff --git a/images/joinnodeway.svg b/resources/images/joinnodeway.svg similarity index 100% rename from images/joinnodeway.svg rename to resources/images/joinnodeway.svg diff --git a/images/layer/gpx_small.png b/resources/images/layer/gpx_small.png similarity index 100% rename from images/layer/gpx_small.png rename to resources/images/layer/gpx_small.png diff --git a/images/layer/marker_small.png b/resources/images/layer/marker_small.png similarity index 100% rename from images/layer/marker_small.png rename to resources/images/layer/marker_small.png diff --git a/images/layer/osmdata_small.png b/resources/images/layer/osmdata_small.png similarity index 100% rename from images/layer/osmdata_small.png rename to resources/images/layer/osmdata_small.png diff --git a/images/layer/validator_small.png b/resources/images/layer/validator_small.png similarity index 100% rename from images/layer/validator_small.png rename to resources/images/layer/validator_small.png diff --git a/images/lock.svg b/resources/images/lock.svg similarity index 100% rename from images/lock.svg rename to resources/images/lock.svg diff --git a/images/logo.svg b/resources/images/logo.svg similarity index 100% rename from images/logo.svg rename to resources/images/logo.svg diff --git a/images/logo_16x16x32.png b/resources/images/logo_16x16x32.png similarity index 100% rename from images/logo_16x16x32.png rename to resources/images/logo_16x16x32.png diff --git a/images/logo_16x16x8.png b/resources/images/logo_16x16x8.png similarity index 100% rename from images/logo_16x16x8.png rename to resources/images/logo_16x16x8.png diff --git a/images/logo_32x32x32.png b/resources/images/logo_32x32x32.png similarity index 100% rename from images/logo_32x32x32.png rename to resources/images/logo_32x32x32.png diff --git a/images/logo_32x32x8.png b/resources/images/logo_32x32x8.png similarity index 100% rename from images/logo_32x32x8.png rename to resources/images/logo_32x32x8.png diff --git a/images/logo_48x48x32.png b/resources/images/logo_48x48x32.png similarity index 100% rename from images/logo_48x48x32.png rename to resources/images/logo_48x48x32.png diff --git a/images/logo_48x48x8.png b/resources/images/logo_48x48x8.png similarity index 100% rename from images/logo_48x48x8.png rename to resources/images/logo_48x48x8.png diff --git a/images/mapmode/addnote.svg b/resources/images/mapmode/addnote.svg similarity index 100% rename from images/mapmode/addnote.svg rename to resources/images/mapmode/addnote.svg diff --git a/images/mapmode/addsegment.svg b/resources/images/mapmode/addsegment.svg similarity index 100% rename from images/mapmode/addsegment.svg rename to resources/images/mapmode/addsegment.svg diff --git a/images/mapmode/adjustimg.png b/resources/images/mapmode/adjustimg.png similarity index 100% rename from images/mapmode/adjustimg.png rename to resources/images/mapmode/adjustimg.png diff --git a/images/mapmode/delete.png b/resources/images/mapmode/delete.png similarity index 100% rename from images/mapmode/delete.png rename to resources/images/mapmode/delete.png diff --git a/images/mapmode/extrude/dualalign.png b/resources/images/mapmode/extrude/dualalign.png similarity index 100% rename from images/mapmode/extrude/dualalign.png rename to resources/images/mapmode/extrude/dualalign.png diff --git a/images/mapmode/extrude/extrude.png b/resources/images/mapmode/extrude/extrude.png similarity index 100% rename from images/mapmode/extrude/extrude.png rename to resources/images/mapmode/extrude/extrude.png diff --git a/images/mapmode/improvewayaccuracy.png b/resources/images/mapmode/improvewayaccuracy.png similarity index 100% rename from images/mapmode/improvewayaccuracy.png rename to resources/images/mapmode/improvewayaccuracy.png diff --git a/images/mapmode/move/move.png b/resources/images/mapmode/move/move.png similarity index 100% rename from images/mapmode/move/move.png rename to resources/images/mapmode/move/move.png diff --git a/images/mapmode/node/autonode.png b/resources/images/mapmode/node/autonode.png similarity index 100% rename from images/mapmode/node/autonode.png rename to resources/images/mapmode/node/autonode.png diff --git a/images/mapmode/parallel.svg b/resources/images/mapmode/parallel.svg similarity index 100% rename from images/mapmode/parallel.svg rename to resources/images/mapmode/parallel.svg diff --git a/images/mapmode/playheaddrag.png b/resources/images/mapmode/playheaddrag.png similarity index 100% rename from images/mapmode/playheaddrag.png rename to resources/images/mapmode/playheaddrag.png diff --git a/images/mapmode/rope.png b/resources/images/mapmode/rope.png similarity index 100% rename from images/mapmode/rope.png rename to resources/images/mapmode/rope.png diff --git a/images/mapmode/zoom.png b/resources/images/mapmode/zoom.png similarity index 100% rename from images/mapmode/zoom.png rename to resources/images/mapmode/zoom.png diff --git a/images/markers/Bridge.svg b/resources/images/markers/Bridge.svg similarity index 100% rename from images/markers/Bridge.svg rename to resources/images/markers/Bridge.svg diff --git a/images/markers/Crossing.svg b/resources/images/markers/Crossing.svg similarity index 100% rename from images/markers/Crossing.svg rename to resources/images/markers/Crossing.svg diff --git a/images/markers/audio-tracer.svg b/resources/images/markers/audio-tracer.svg similarity index 100% rename from images/markers/audio-tracer.svg rename to resources/images/markers/audio-tracer.svg diff --git a/images/markers/photo.png b/resources/images/markers/photo.png similarity index 100% rename from images/markers/photo.png rename to resources/images/markers/photo.png diff --git a/images/markers/speech.png b/resources/images/markers/speech.png similarity index 100% rename from images/markers/speech.png rename to resources/images/markers/speech.png diff --git a/images/markers/web.png b/resources/images/markers/web.png similarity index 100% rename from images/markers/web.png rename to resources/images/markers/web.png diff --git a/images/mergenodes.svg b/resources/images/mergenodes.svg similarity index 100% rename from images/mergenodes.svg rename to resources/images/mergenodes.svg diff --git a/images/mirror.svg b/resources/images/mirror.svg similarity index 100% rename from images/mirror.svg rename to resources/images/mirror.svg diff --git a/images/misc/black_x.svg b/resources/images/misc/black_x.svg similarity index 100% rename from images/misc/black_x.svg rename to resources/images/misc/black_x.svg diff --git a/images/misc/buttonhide.png b/resources/images/misc/buttonhide.png similarity index 100% rename from images/misc/buttonhide.png rename to resources/images/misc/buttonhide.png diff --git a/images/misc/buttonshow.png b/resources/images/misc/buttonshow.png similarity index 100% rename from images/misc/buttonshow.png rename to resources/images/misc/buttonshow.png diff --git a/images/misc/check_large.png b/resources/images/misc/check_large.png similarity index 100% rename from images/misc/check_large.png rename to resources/images/misc/check_large.png diff --git a/images/misc/close.svg b/resources/images/misc/close.svg similarity index 100% rename from images/misc/close.svg rename to resources/images/misc/close.svg diff --git a/images/misc/error.svg b/resources/images/misc/error.svg similarity index 100% rename from images/misc/error.svg rename to resources/images/misc/error.svg diff --git a/images/misc/green_check.svg b/resources/images/misc/green_check.svg similarity index 100% rename from images/misc/green_check.svg rename to resources/images/misc/green_check.svg diff --git a/images/misc/grey_x.svg b/resources/images/misc/grey_x.svg similarity index 100% rename from images/misc/grey_x.svg rename to resources/images/misc/grey_x.svg diff --git a/images/misc/minimized.svg b/resources/images/misc/minimized.svg similarity index 100% rename from images/misc/minimized.svg rename to resources/images/misc/minimized.svg diff --git a/images/misc/normal.svg b/resources/images/misc/normal.svg similarity index 100% rename from images/misc/normal.svg rename to resources/images/misc/normal.svg diff --git a/images/misc/rectangle.svg b/resources/images/misc/rectangle.svg similarity index 100% rename from images/misc/rectangle.svg rename to resources/images/misc/rectangle.svg diff --git a/images/misc/sticky.png b/resources/images/misc/sticky.png similarity index 100% rename from images/misc/sticky.png rename to resources/images/misc/sticky.png diff --git a/images/movenode.png b/resources/images/movenode.png similarity index 100% rename from images/movenode.png rename to resources/images/movenode.png diff --git a/images/movenodeontoway.png b/resources/images/movenodeontoway.png similarity index 100% rename from images/movenodeontoway.png rename to resources/images/movenodeontoway.png diff --git a/images/multipoly_create.svg b/resources/images/multipoly_create.svg similarity index 100% rename from images/multipoly_create.svg rename to resources/images/multipoly_create.svg diff --git a/images/new.svg b/resources/images/new.svg similarity index 100% rename from images/new.svg rename to resources/images/new.svg diff --git a/images/no_upload.svg b/resources/images/no_upload.svg similarity index 100% rename from images/no_upload.svg rename to resources/images/no_upload.svg diff --git a/images/note_search.png b/resources/images/note_search.png similarity index 100% rename from images/note_search.png rename to resources/images/note_search.png diff --git a/images/oauth/oauth-logo.svg b/resources/images/oauth/oauth-logo.svg similarity index 100% rename from images/oauth/oauth-logo.svg rename to resources/images/oauth/oauth-logo.svg diff --git a/images/oauth/oauth-small.svg b/resources/images/oauth/oauth-small.svg similarity index 100% rename from images/oauth/oauth-small.svg rename to resources/images/oauth/oauth-small.svg diff --git a/images/ok.png b/resources/images/ok.png similarity index 100% rename from images/ok.png rename to resources/images/ok.png diff --git a/images/open.png b/resources/images/open.png similarity index 100% rename from images/open.png rename to resources/images/open.png diff --git a/images/openlocation.png b/resources/images/openlocation.png similarity index 100% rename from images/openlocation.png rename to resources/images/openlocation.png diff --git a/images/openrecent.png b/resources/images/openrecent.png similarity index 100% rename from images/openrecent.png rename to resources/images/openrecent.png diff --git a/images/ortho.svg b/resources/images/ortho.svg similarity index 100% rename from images/ortho.svg rename to resources/images/ortho.svg diff --git a/images/paste.svg b/resources/images/paste.svg similarity index 100% rename from images/paste.svg rename to resources/images/paste.svg diff --git a/images/pastetags.png b/resources/images/pastetags.png similarity index 100% rename from images/pastetags.png rename to resources/images/pastetags.png diff --git a/images/preference.png b/resources/images/preference.png similarity index 100% rename from images/preference.png rename to resources/images/preference.png diff --git a/images/preferences/activate-down.png b/resources/images/preferences/activate-down.png similarity index 100% rename from images/preferences/activate-down.png rename to resources/images/preferences/activate-down.png diff --git a/images/preferences/activate-right.png b/resources/images/preferences/activate-right.png similarity index 100% rename from images/preferences/activate-right.png rename to resources/images/preferences/activate-right.png diff --git a/images/preferences/advanced.png b/resources/images/preferences/advanced.png similarity index 100% rename from images/preferences/advanced.png rename to resources/images/preferences/advanced.png diff --git a/images/preferences/audio.png b/resources/images/preferences/audio.png similarity index 100% rename from images/preferences/audio.png rename to resources/images/preferences/audio.png diff --git a/images/preferences/connection.png b/resources/images/preferences/connection.png similarity index 100% rename from images/preferences/connection.png rename to resources/images/preferences/connection.png diff --git a/images/preferences/display.png b/resources/images/preferences/display.png similarity index 100% rename from images/preferences/display.png rename to resources/images/preferences/display.png diff --git a/images/preferences/imagery.png b/resources/images/preferences/imagery.png similarity index 100% rename from images/preferences/imagery.png rename to resources/images/preferences/imagery.png diff --git a/images/preferences/map.png b/resources/images/preferences/map.png similarity index 100% rename from images/preferences/map.png rename to resources/images/preferences/map.png diff --git a/images/preferences/plugin.png b/resources/images/preferences/plugin.png similarity index 100% rename from images/preferences/plugin.png rename to resources/images/preferences/plugin.png diff --git a/images/preferences/remotecontrol.png b/resources/images/preferences/remotecontrol.png similarity index 100% rename from images/preferences/remotecontrol.png rename to resources/images/preferences/remotecontrol.png diff --git a/images/preferences/reset.png b/resources/images/preferences/reset.png similarity index 100% rename from images/preferences/reset.png rename to resources/images/preferences/reset.png diff --git a/images/preferences/separator.svg b/resources/images/preferences/separator.svg similarity index 100% rename from images/preferences/separator.svg rename to resources/images/preferences/separator.svg diff --git a/images/preferences/shortcuts.png b/resources/images/preferences/shortcuts.png similarity index 100% rename from images/preferences/shortcuts.png rename to resources/images/preferences/shortcuts.png diff --git a/images/preferences/toolbar.png b/resources/images/preferences/toolbar.png similarity index 100% rename from images/preferences/toolbar.png rename to resources/images/preferences/toolbar.png diff --git a/images/preferences/validator.png b/resources/images/preferences/validator.png similarity index 100% rename from images/preferences/validator.png rename to resources/images/preferences/validator.png diff --git a/images/presets/accommodation/alpine_hut.svg b/resources/images/presets/accommodation/alpine_hut.svg similarity index 100% rename from images/presets/accommodation/alpine_hut.svg rename to resources/images/presets/accommodation/alpine_hut.svg diff --git a/images/presets/accommodation/apartment.svg b/resources/images/presets/accommodation/apartment.svg similarity index 100% rename from images/presets/accommodation/apartment.svg rename to resources/images/presets/accommodation/apartment.svg diff --git a/images/presets/accommodation/basic_hut.svg b/resources/images/presets/accommodation/basic_hut.svg similarity index 100% rename from images/presets/accommodation/basic_hut.svg rename to resources/images/presets/accommodation/basic_hut.svg diff --git a/images/presets/accommodation/camp_pitch.svg b/resources/images/presets/accommodation/camp_pitch.svg similarity index 100% rename from images/presets/accommodation/camp_pitch.svg rename to resources/images/presets/accommodation/camp_pitch.svg diff --git a/images/presets/accommodation/camping.svg b/resources/images/presets/accommodation/camping.svg similarity index 100% rename from images/presets/accommodation/camping.svg rename to resources/images/presets/accommodation/camping.svg diff --git a/images/presets/accommodation/caravan.svg b/resources/images/presets/accommodation/caravan.svg similarity index 100% rename from images/presets/accommodation/caravan.svg rename to resources/images/presets/accommodation/caravan.svg diff --git a/images/presets/accommodation/chalet.svg b/resources/images/presets/accommodation/chalet.svg similarity index 100% rename from images/presets/accommodation/chalet.svg rename to resources/images/presets/accommodation/chalet.svg diff --git a/images/presets/accommodation/guest_house.svg b/resources/images/presets/accommodation/guest_house.svg similarity index 100% rename from images/presets/accommodation/guest_house.svg rename to resources/images/presets/accommodation/guest_house.svg diff --git a/images/presets/accommodation/hostel.svg b/resources/images/presets/accommodation/hostel.svg similarity index 100% rename from images/presets/accommodation/hostel.svg rename to resources/images/presets/accommodation/hostel.svg diff --git a/images/presets/accommodation/hotel.svg b/resources/images/presets/accommodation/hotel.svg similarity index 100% rename from images/presets/accommodation/hotel.svg rename to resources/images/presets/accommodation/hotel.svg diff --git a/images/presets/accommodation/motel.svg b/resources/images/presets/accommodation/motel.svg similarity index 100% rename from images/presets/accommodation/motel.svg rename to resources/images/presets/accommodation/motel.svg diff --git a/images/presets/accommodation/shelter.svg b/resources/images/presets/accommodation/shelter.svg similarity index 100% rename from images/presets/accommodation/shelter.svg rename to resources/images/presets/accommodation/shelter.svg diff --git a/images/presets/accommodation/shelter_lean_to.svg b/resources/images/presets/accommodation/shelter_lean_to.svg similarity index 100% rename from images/presets/accommodation/shelter_lean_to.svg rename to resources/images/presets/accommodation/shelter_lean_to.svg diff --git a/images/presets/accommodation/shelter_picnic.svg b/resources/images/presets/accommodation/shelter_picnic.svg similarity index 100% rename from images/presets/accommodation/shelter_picnic.svg rename to resources/images/presets/accommodation/shelter_picnic.svg diff --git a/images/presets/accommodation/shelter_public_transport.svg b/resources/images/presets/accommodation/shelter_public_transport.svg similarity index 100% rename from images/presets/accommodation/shelter_public_transport.svg rename to resources/images/presets/accommodation/shelter_public_transport.svg diff --git a/images/presets/accommodation/water.svg b/resources/images/presets/accommodation/water.svg similarity index 100% rename from images/presets/accommodation/water.svg rename to resources/images/presets/accommodation/water.svg diff --git a/images/presets/accommodation/wilderness_hut.svg b/resources/images/presets/accommodation/wilderness_hut.svg similarity index 100% rename from images/presets/accommodation/wilderness_hut.svg rename to resources/images/presets/accommodation/wilderness_hut.svg diff --git a/images/presets/attraction/animal.svg b/resources/images/presets/attraction/animal.svg similarity index 100% rename from images/presets/attraction/animal.svg rename to resources/images/presets/attraction/animal.svg diff --git a/images/presets/barrier/block.svg b/resources/images/presets/barrier/block.svg similarity index 100% rename from images/presets/barrier/block.svg rename to resources/images/presets/barrier/block.svg diff --git a/images/presets/barrier/bollard.svg b/resources/images/presets/barrier/bollard.svg similarity index 100% rename from images/presets/barrier/bollard.svg rename to resources/images/presets/barrier/bollard.svg diff --git a/images/presets/barrier/cable_barrier.svg b/resources/images/presets/barrier/cable_barrier.svg similarity index 100% rename from images/presets/barrier/cable_barrier.svg rename to resources/images/presets/barrier/cable_barrier.svg diff --git a/images/presets/barrier/cattle_grid.svg b/resources/images/presets/barrier/cattle_grid.svg similarity index 100% rename from images/presets/barrier/cattle_grid.svg rename to resources/images/presets/barrier/cattle_grid.svg diff --git a/images/presets/barrier/chain.svg b/resources/images/presets/barrier/chain.svg similarity index 100% rename from images/presets/barrier/chain.svg rename to resources/images/presets/barrier/chain.svg diff --git a/images/presets/barrier/city_wall.svg b/resources/images/presets/barrier/city_wall.svg similarity index 100% rename from images/presets/barrier/city_wall.svg rename to resources/images/presets/barrier/city_wall.svg diff --git a/images/presets/barrier/cycle_barrier.svg b/resources/images/presets/barrier/cycle_barrier.svg similarity index 100% rename from images/presets/barrier/cycle_barrier.svg rename to resources/images/presets/barrier/cycle_barrier.svg diff --git a/images/presets/barrier/douane.svg b/resources/images/presets/barrier/douane.svg similarity index 100% rename from images/presets/barrier/douane.svg rename to resources/images/presets/barrier/douane.svg diff --git a/images/presets/barrier/entrance.svg b/resources/images/presets/barrier/entrance.svg similarity index 100% rename from images/presets/barrier/entrance.svg rename to resources/images/presets/barrier/entrance.svg diff --git a/images/presets/barrier/fence.svg b/resources/images/presets/barrier/fence.svg similarity index 100% rename from images/presets/barrier/fence.svg rename to resources/images/presets/barrier/fence.svg diff --git a/images/presets/barrier/gate.svg b/resources/images/presets/barrier/gate.svg similarity index 100% rename from images/presets/barrier/gate.svg rename to resources/images/presets/barrier/gate.svg diff --git a/images/presets/barrier/guard_rail.svg b/resources/images/presets/barrier/guard_rail.svg similarity index 100% rename from images/presets/barrier/guard_rail.svg rename to resources/images/presets/barrier/guard_rail.svg diff --git a/images/presets/barrier/handrail.svg b/resources/images/presets/barrier/handrail.svg similarity index 100% rename from images/presets/barrier/handrail.svg rename to resources/images/presets/barrier/handrail.svg diff --git a/images/presets/barrier/hedge.svg b/resources/images/presets/barrier/hedge.svg similarity index 100% rename from images/presets/barrier/hedge.svg rename to resources/images/presets/barrier/hedge.svg diff --git a/images/presets/barrier/jersey_barrier.svg b/resources/images/presets/barrier/jersey_barrier.svg similarity index 100% rename from images/presets/barrier/jersey_barrier.svg rename to resources/images/presets/barrier/jersey_barrier.svg diff --git a/images/presets/barrier/kerb.svg b/resources/images/presets/barrier/kerb.svg similarity index 100% rename from images/presets/barrier/kerb.svg rename to resources/images/presets/barrier/kerb.svg diff --git a/images/presets/barrier/kerb_pattern.svg b/resources/images/presets/barrier/kerb_pattern.svg similarity index 100% rename from images/presets/barrier/kerb_pattern.svg rename to resources/images/presets/barrier/kerb_pattern.svg diff --git a/images/presets/barrier/kissing_gate.svg b/resources/images/presets/barrier/kissing_gate.svg similarity index 100% rename from images/presets/barrier/kissing_gate.svg rename to resources/images/presets/barrier/kissing_gate.svg diff --git a/images/presets/barrier/lift_gate.svg b/resources/images/presets/barrier/lift_gate.svg similarity index 100% rename from images/presets/barrier/lift_gate.svg rename to resources/images/presets/barrier/lift_gate.svg diff --git a/images/presets/barrier/retaining_wall.svg b/resources/images/presets/barrier/retaining_wall.svg similarity index 100% rename from images/presets/barrier/retaining_wall.svg rename to resources/images/presets/barrier/retaining_wall.svg diff --git a/images/presets/barrier/sally_port.svg b/resources/images/presets/barrier/sally_port.svg similarity index 100% rename from images/presets/barrier/sally_port.svg rename to resources/images/presets/barrier/sally_port.svg diff --git a/images/presets/barrier/spikes.svg b/resources/images/presets/barrier/spikes.svg similarity index 100% rename from images/presets/barrier/spikes.svg rename to resources/images/presets/barrier/spikes.svg diff --git a/images/presets/barrier/stile.svg b/resources/images/presets/barrier/stile.svg similarity index 100% rename from images/presets/barrier/stile.svg rename to resources/images/presets/barrier/stile.svg diff --git a/images/presets/barrier/swing_gate.svg b/resources/images/presets/barrier/swing_gate.svg similarity index 100% rename from images/presets/barrier/swing_gate.svg rename to resources/images/presets/barrier/swing_gate.svg diff --git a/images/presets/barrier/toll_station.svg b/resources/images/presets/barrier/toll_station.svg similarity index 100% rename from images/presets/barrier/toll_station.svg rename to resources/images/presets/barrier/toll_station.svg diff --git a/images/presets/barrier/turnstile.svg b/resources/images/presets/barrier/turnstile.svg similarity index 100% rename from images/presets/barrier/turnstile.svg rename to resources/images/presets/barrier/turnstile.svg diff --git a/images/presets/barrier/wall.svg b/resources/images/presets/barrier/wall.svg similarity index 100% rename from images/presets/barrier/wall.svg rename to resources/images/presets/barrier/wall.svg diff --git a/images/presets/craft/beekeeper.svg b/resources/images/presets/craft/beekeeper.svg similarity index 100% rename from images/presets/craft/beekeeper.svg rename to resources/images/presets/craft/beekeeper.svg diff --git a/images/presets/craft/blacksmith.svg b/resources/images/presets/craft/blacksmith.svg similarity index 100% rename from images/presets/craft/blacksmith.svg rename to resources/images/presets/craft/blacksmith.svg diff --git a/images/presets/craft/carpenter.svg b/resources/images/presets/craft/carpenter.svg similarity index 100% rename from images/presets/craft/carpenter.svg rename to resources/images/presets/craft/carpenter.svg diff --git a/images/presets/craft/electrician.svg b/resources/images/presets/craft/electrician.svg similarity index 100% rename from images/presets/craft/electrician.svg rename to resources/images/presets/craft/electrician.svg diff --git a/images/presets/craft/gardener.svg b/resources/images/presets/craft/gardener.svg similarity index 100% rename from images/presets/craft/gardener.svg rename to resources/images/presets/craft/gardener.svg diff --git a/images/presets/craft/hvac.svg b/resources/images/presets/craft/hvac.svg similarity index 100% rename from images/presets/craft/hvac.svg rename to resources/images/presets/craft/hvac.svg diff --git a/images/presets/craft/key_cutter.svg b/resources/images/presets/craft/key_cutter.svg similarity index 100% rename from images/presets/craft/key_cutter.svg rename to resources/images/presets/craft/key_cutter.svg diff --git a/images/presets/craft/locksmith.svg b/resources/images/presets/craft/locksmith.svg similarity index 100% rename from images/presets/craft/locksmith.svg rename to resources/images/presets/craft/locksmith.svg diff --git a/images/presets/craft/metal_construction.svg b/resources/images/presets/craft/metal_construction.svg similarity index 100% rename from images/presets/craft/metal_construction.svg rename to resources/images/presets/craft/metal_construction.svg diff --git a/images/presets/craft/painter.svg b/resources/images/presets/craft/painter.svg similarity index 100% rename from images/presets/craft/painter.svg rename to resources/images/presets/craft/painter.svg diff --git a/images/presets/craft/plumber.svg b/resources/images/presets/craft/plumber.svg similarity index 100% rename from images/presets/craft/plumber.svg rename to resources/images/presets/craft/plumber.svg diff --git a/images/presets/craft/pottery.svg b/resources/images/presets/craft/pottery.svg similarity index 100% rename from images/presets/craft/pottery.svg rename to resources/images/presets/craft/pottery.svg diff --git a/images/presets/craft/roofer.svg b/resources/images/presets/craft/roofer.svg similarity index 100% rename from images/presets/craft/roofer.svg rename to resources/images/presets/craft/roofer.svg diff --git a/images/presets/craft/sawmill.svg b/resources/images/presets/craft/sawmill.svg similarity index 100% rename from images/presets/craft/sawmill.svg rename to resources/images/presets/craft/sawmill.svg diff --git a/images/presets/craft/shoemaker.svg b/resources/images/presets/craft/shoemaker.svg similarity index 100% rename from images/presets/craft/shoemaker.svg rename to resources/images/presets/craft/shoemaker.svg diff --git a/images/presets/craft/stonemason.svg b/resources/images/presets/craft/stonemason.svg similarity index 100% rename from images/presets/craft/stonemason.svg rename to resources/images/presets/craft/stonemason.svg diff --git a/images/presets/craft/tiler.svg b/resources/images/presets/craft/tiler.svg similarity index 100% rename from images/presets/craft/tiler.svg rename to resources/images/presets/craft/tiler.svg diff --git a/images/presets/craft/upholsterer.svg b/resources/images/presets/craft/upholsterer.svg similarity index 100% rename from images/presets/craft/upholsterer.svg rename to resources/images/presets/craft/upholsterer.svg diff --git a/images/presets/craft/window_construction.svg b/resources/images/presets/craft/window_construction.svg similarity index 100% rename from images/presets/craft/window_construction.svg rename to resources/images/presets/craft/window_construction.svg diff --git a/images/presets/education/college.svg b/resources/images/presets/education/college.svg similarity index 100% rename from images/presets/education/college.svg rename to resources/images/presets/education/college.svg diff --git a/images/presets/education/driving_school.svg b/resources/images/presets/education/driving_school.svg similarity index 100% rename from images/presets/education/driving_school.svg rename to resources/images/presets/education/driving_school.svg diff --git a/images/presets/education/kindergarten.svg b/resources/images/presets/education/kindergarten.svg similarity index 100% rename from images/presets/education/kindergarten.svg rename to resources/images/presets/education/kindergarten.svg diff --git a/images/presets/education/library.svg b/resources/images/presets/education/library.svg similarity index 100% rename from images/presets/education/library.svg rename to resources/images/presets/education/library.svg diff --git a/images/presets/education/school.svg b/resources/images/presets/education/school.svg similarity index 100% rename from images/presets/education/school.svg rename to resources/images/presets/education/school.svg diff --git a/images/presets/education/university.svg b/resources/images/presets/education/university.svg similarity index 100% rename from images/presets/education/university.svg rename to resources/images/presets/education/university.svg diff --git a/images/presets/emergency/aed.svg b/resources/images/presets/emergency/aed.svg similarity index 100% rename from images/presets/emergency/aed.svg rename to resources/images/presets/emergency/aed.svg diff --git a/images/presets/emergency/ambulance_station.svg b/resources/images/presets/emergency/ambulance_station.svg similarity index 100% rename from images/presets/emergency/ambulance_station.svg rename to resources/images/presets/emergency/ambulance_station.svg diff --git a/images/presets/emergency/assembly_point.svg b/resources/images/presets/emergency/assembly_point.svg similarity index 100% rename from images/presets/emergency/assembly_point.svg rename to resources/images/presets/emergency/assembly_point.svg diff --git a/images/presets/emergency/emergency_ward_entrance.svg b/resources/images/presets/emergency/emergency_ward_entrance.svg similarity index 100% rename from images/presets/emergency/emergency_ward_entrance.svg rename to resources/images/presets/emergency/emergency_ward_entrance.svg diff --git a/images/presets/emergency/fire_extinguisher.svg b/resources/images/presets/emergency/fire_extinguisher.svg similarity index 100% rename from images/presets/emergency/fire_extinguisher.svg rename to resources/images/presets/emergency/fire_extinguisher.svg diff --git a/images/presets/emergency/fire_hose.svg b/resources/images/presets/emergency/fire_hose.svg similarity index 100% rename from images/presets/emergency/fire_hose.svg rename to resources/images/presets/emergency/fire_hose.svg diff --git a/images/presets/emergency/siren.svg b/resources/images/presets/emergency/siren.svg similarity index 100% rename from images/presets/emergency/siren.svg rename to resources/images/presets/emergency/siren.svg diff --git a/images/presets/emergency/water_tank.svg b/resources/images/presets/emergency/water_tank.svg similarity index 100% rename from images/presets/emergency/water_tank.svg rename to resources/images/presets/emergency/water_tank.svg diff --git a/images/presets/food/bar.svg b/resources/images/presets/food/bar.svg similarity index 100% rename from images/presets/food/bar.svg rename to resources/images/presets/food/bar.svg diff --git a/images/presets/food/biergarten.svg b/resources/images/presets/food/biergarten.svg similarity index 100% rename from images/presets/food/biergarten.svg rename to resources/images/presets/food/biergarten.svg diff --git a/images/presets/food/cafe.svg b/resources/images/presets/food/cafe.svg similarity index 100% rename from images/presets/food/cafe.svg rename to resources/images/presets/food/cafe.svg diff --git a/images/presets/food/diet.svg b/resources/images/presets/food/diet.svg similarity index 100% rename from images/presets/food/diet.svg rename to resources/images/presets/food/diet.svg diff --git a/images/presets/food/drinking_water.svg b/resources/images/presets/food/drinking_water.svg similarity index 100% rename from images/presets/food/drinking_water.svg rename to resources/images/presets/food/drinking_water.svg diff --git a/images/presets/food/fast_food.svg b/resources/images/presets/food/fast_food.svg similarity index 100% rename from images/presets/food/fast_food.svg rename to resources/images/presets/food/fast_food.svg diff --git a/images/presets/food/food_court.svg b/resources/images/presets/food/food_court.svg similarity index 100% rename from images/presets/food/food_court.svg rename to resources/images/presets/food/food_court.svg diff --git a/images/presets/food/ice_cream.svg b/resources/images/presets/food/ice_cream.svg similarity index 100% rename from images/presets/food/ice_cream.svg rename to resources/images/presets/food/ice_cream.svg diff --git a/images/presets/food/pub.svg b/resources/images/presets/food/pub.svg similarity index 100% rename from images/presets/food/pub.svg rename to resources/images/presets/food/pub.svg diff --git a/images/presets/food/restaurant.svg b/resources/images/presets/food/restaurant.svg similarity index 100% rename from images/presets/food/restaurant.svg rename to resources/images/presets/food/restaurant.svg diff --git a/images/presets/health/baby_hatch.svg b/resources/images/presets/health/baby_hatch.svg similarity index 100% rename from images/presets/health/baby_hatch.svg rename to resources/images/presets/health/baby_hatch.svg diff --git a/images/presets/health/clinic.svg b/resources/images/presets/health/clinic.svg similarity index 100% rename from images/presets/health/clinic.svg rename to resources/images/presets/health/clinic.svg diff --git a/images/presets/health/dentist.svg b/resources/images/presets/health/dentist.svg similarity index 100% rename from images/presets/health/dentist.svg rename to resources/images/presets/health/dentist.svg diff --git a/images/presets/health/doctors.svg b/resources/images/presets/health/doctors.svg similarity index 100% rename from images/presets/health/doctors.svg rename to resources/images/presets/health/doctors.svg diff --git a/images/presets/health/hospital.svg b/resources/images/presets/health/hospital.svg similarity index 100% rename from images/presets/health/hospital.svg rename to resources/images/presets/health/hospital.svg diff --git a/images/presets/health/pharmacy.svg b/resources/images/presets/health/pharmacy.svg similarity index 100% rename from images/presets/health/pharmacy.svg rename to resources/images/presets/health/pharmacy.svg diff --git a/images/presets/health/veterinary.svg b/resources/images/presets/health/veterinary.svg similarity index 100% rename from images/presets/health/veterinary.svg rename to resources/images/presets/health/veterinary.svg diff --git a/images/presets/landmark/adit.svg b/resources/images/presets/landmark/adit.svg similarity index 100% rename from images/presets/landmark/adit.svg rename to resources/images/presets/landmark/adit.svg diff --git a/images/presets/landmark/beacon.svg b/resources/images/presets/landmark/beacon.svg similarity index 100% rename from images/presets/landmark/beacon.svg rename to resources/images/presets/landmark/beacon.svg diff --git a/images/presets/landmark/boundary_stone.svg b/resources/images/presets/landmark/boundary_stone.svg similarity index 100% rename from images/presets/landmark/boundary_stone.svg rename to resources/images/presets/landmark/boundary_stone.svg diff --git a/images/presets/landmark/building.svg b/resources/images/presets/landmark/building.svg similarity index 100% rename from images/presets/landmark/building.svg rename to resources/images/presets/landmark/building.svg diff --git a/images/presets/landmark/bunker.svg b/resources/images/presets/landmark/bunker.svg similarity index 100% rename from images/presets/landmark/bunker.svg rename to resources/images/presets/landmark/bunker.svg diff --git a/images/presets/landmark/bunker_silo.svg b/resources/images/presets/landmark/bunker_silo.svg similarity index 100% rename from images/presets/landmark/bunker_silo.svg rename to resources/images/presets/landmark/bunker_silo.svg diff --git a/images/presets/landmark/cave_entrance.svg b/resources/images/presets/landmark/cave_entrance.svg similarity index 100% rename from images/presets/landmark/cave_entrance.svg rename to resources/images/presets/landmark/cave_entrance.svg diff --git a/images/presets/landmark/chimney.svg b/resources/images/presets/landmark/chimney.svg similarity index 100% rename from images/presets/landmark/chimney.svg rename to resources/images/presets/landmark/chimney.svg diff --git a/images/presets/landmark/crane.svg b/resources/images/presets/landmark/crane.svg similarity index 100% rename from images/presets/landmark/crane.svg rename to resources/images/presets/landmark/crane.svg diff --git a/images/presets/landmark/cross.svg b/resources/images/presets/landmark/cross.svg similarity index 100% rename from images/presets/landmark/cross.svg rename to resources/images/presets/landmark/cross.svg diff --git a/images/presets/landmark/cutline.svg b/resources/images/presets/landmark/cutline.svg similarity index 100% rename from images/presets/landmark/cutline.svg rename to resources/images/presets/landmark/cutline.svg diff --git a/images/presets/landmark/forest.svg b/resources/images/presets/landmark/forest.svg similarity index 100% rename from images/presets/landmark/forest.svg rename to resources/images/presets/landmark/forest.svg diff --git a/images/presets/landmark/gasometer.svg b/resources/images/presets/landmark/gasometer.svg similarity index 100% rename from images/presets/landmark/gasometer.svg rename to resources/images/presets/landmark/gasometer.svg diff --git a/images/presets/landmark/glacier.svg b/resources/images/presets/landmark/glacier.svg similarity index 100% rename from images/presets/landmark/glacier.svg rename to resources/images/presets/landmark/glacier.svg diff --git a/images/presets/landmark/hunting_stand.svg b/resources/images/presets/landmark/hunting_stand.svg similarity index 100% rename from images/presets/landmark/hunting_stand.svg rename to resources/images/presets/landmark/hunting_stand.svg diff --git a/images/presets/landmark/lighthouse.svg b/resources/images/presets/landmark/lighthouse.svg similarity index 100% rename from images/presets/landmark/lighthouse.svg rename to resources/images/presets/landmark/lighthouse.svg diff --git a/images/presets/landmark/mine.svg b/resources/images/presets/landmark/mine.svg similarity index 100% rename from images/presets/landmark/mine.svg rename to resources/images/presets/landmark/mine.svg diff --git a/images/presets/landmark/mountain_pass.svg b/resources/images/presets/landmark/mountain_pass.svg similarity index 100% rename from images/presets/landmark/mountain_pass.svg rename to resources/images/presets/landmark/mountain_pass.svg diff --git a/images/presets/landmark/peak.svg b/resources/images/presets/landmark/peak.svg similarity index 100% rename from images/presets/landmark/peak.svg rename to resources/images/presets/landmark/peak.svg diff --git a/images/presets/landmark/pipeline.svg b/resources/images/presets/landmark/pipeline.svg similarity index 100% rename from images/presets/landmark/pipeline.svg rename to resources/images/presets/landmark/pipeline.svg diff --git a/images/presets/landmark/reef.svg b/resources/images/presets/landmark/reef.svg similarity index 100% rename from images/presets/landmark/reef.svg rename to resources/images/presets/landmark/reef.svg diff --git a/images/presets/landmark/reservoir_covered.svg b/resources/images/presets/landmark/reservoir_covered.svg similarity index 100% rename from images/presets/landmark/reservoir_covered.svg rename to resources/images/presets/landmark/reservoir_covered.svg diff --git a/images/presets/landmark/ridge.svg b/resources/images/presets/landmark/ridge.svg similarity index 100% rename from images/presets/landmark/ridge.svg rename to resources/images/presets/landmark/ridge.svg diff --git a/images/presets/landmark/saddle.svg b/resources/images/presets/landmark/saddle.svg similarity index 100% rename from images/presets/landmark/saddle.svg rename to resources/images/presets/landmark/saddle.svg diff --git a/images/presets/landmark/silo.svg b/resources/images/presets/landmark/silo.svg similarity index 100% rename from images/presets/landmark/silo.svg rename to resources/images/presets/landmark/silo.svg diff --git a/images/presets/landmark/spring.svg b/resources/images/presets/landmark/spring.svg similarity index 100% rename from images/presets/landmark/spring.svg rename to resources/images/presets/landmark/spring.svg diff --git a/images/presets/landmark/storage_tank.svg b/resources/images/presets/landmark/storage_tank.svg similarity index 100% rename from images/presets/landmark/storage_tank.svg rename to resources/images/presets/landmark/storage_tank.svg diff --git a/images/presets/landmark/survey_point.svg b/resources/images/presets/landmark/survey_point.svg similarity index 100% rename from images/presets/landmark/survey_point.svg rename to resources/images/presets/landmark/survey_point.svg diff --git a/images/presets/landmark/tower.svg b/resources/images/presets/landmark/tower.svg similarity index 100% rename from images/presets/landmark/tower.svg rename to resources/images/presets/landmark/tower.svg diff --git a/images/presets/landmark/tree_row.svg b/resources/images/presets/landmark/tree_row.svg similarity index 100% rename from images/presets/landmark/tree_row.svg rename to resources/images/presets/landmark/tree_row.svg diff --git a/images/presets/landmark/trees.svg b/resources/images/presets/landmark/trees.svg similarity index 100% rename from images/presets/landmark/trees.svg rename to resources/images/presets/landmark/trees.svg diff --git a/images/presets/landmark/trees_broad_leaved.svg b/resources/images/presets/landmark/trees_broad_leaved.svg similarity index 100% rename from images/presets/landmark/trees_broad_leaved.svg rename to resources/images/presets/landmark/trees_broad_leaved.svg diff --git a/images/presets/landmark/trees_conifer.svg b/resources/images/presets/landmark/trees_conifer.svg similarity index 100% rename from images/presets/landmark/trees_conifer.svg rename to resources/images/presets/landmark/trees_conifer.svg diff --git a/images/presets/landmark/valley.svg b/resources/images/presets/landmark/valley.svg similarity index 100% rename from images/presets/landmark/valley.svg rename to resources/images/presets/landmark/valley.svg diff --git a/images/presets/landmark/volcano.svg b/resources/images/presets/landmark/volcano.svg similarity index 100% rename from images/presets/landmark/volcano.svg rename to resources/images/presets/landmark/volcano.svg diff --git a/images/presets/landmark/wastewater_plant.svg b/resources/images/presets/landmark/wastewater_plant.svg similarity index 100% rename from images/presets/landmark/wastewater_plant.svg rename to resources/images/presets/landmark/wastewater_plant.svg diff --git a/images/presets/landmark/water_tower.svg b/resources/images/presets/landmark/water_tower.svg similarity index 100% rename from images/presets/landmark/water_tower.svg rename to resources/images/presets/landmark/water_tower.svg diff --git a/images/presets/landmark/water_well.svg b/resources/images/presets/landmark/water_well.svg similarity index 100% rename from images/presets/landmark/water_well.svg rename to resources/images/presets/landmark/water_well.svg diff --git a/images/presets/landmark/water_works.svg b/resources/images/presets/landmark/water_works.svg similarity index 100% rename from images/presets/landmark/water_works.svg rename to resources/images/presets/landmark/water_works.svg diff --git a/images/presets/landmark/watermill.svg b/resources/images/presets/landmark/watermill.svg similarity index 100% rename from images/presets/landmark/watermill.svg rename to resources/images/presets/landmark/watermill.svg diff --git a/images/presets/landmark/windmill.svg b/resources/images/presets/landmark/windmill.svg similarity index 100% rename from images/presets/landmark/windmill.svg rename to resources/images/presets/landmark/windmill.svg diff --git a/images/presets/landmark/works.svg b/resources/images/presets/landmark/works.svg similarity index 100% rename from images/presets/landmark/works.svg rename to resources/images/presets/landmark/works.svg diff --git a/images/presets/landuse/allotments.svg b/resources/images/presets/landuse/allotments.svg similarity index 100% rename from images/presets/landuse/allotments.svg rename to resources/images/presets/landuse/allotments.svg diff --git a/images/presets/landuse/aquaculture.svg b/resources/images/presets/landuse/aquaculture.svg similarity index 100% rename from images/presets/landuse/aquaculture.svg rename to resources/images/presets/landuse/aquaculture.svg diff --git a/images/presets/landuse/basin.svg b/resources/images/presets/landuse/basin.svg similarity index 100% rename from images/presets/landuse/basin.svg rename to resources/images/presets/landuse/basin.svg diff --git a/images/presets/landuse/brownfield.svg b/resources/images/presets/landuse/brownfield.svg similarity index 100% rename from images/presets/landuse/brownfield.svg rename to resources/images/presets/landuse/brownfield.svg diff --git a/images/presets/landuse/cemetery.svg b/resources/images/presets/landuse/cemetery.svg similarity index 100% rename from images/presets/landuse/cemetery.svg rename to resources/images/presets/landuse/cemetery.svg diff --git a/images/presets/landuse/commercial.svg b/resources/images/presets/landuse/commercial.svg similarity index 100% rename from images/presets/landuse/commercial.svg rename to resources/images/presets/landuse/commercial.svg diff --git a/images/presets/landuse/construction.svg b/resources/images/presets/landuse/construction.svg similarity index 100% rename from images/presets/landuse/construction.svg rename to resources/images/presets/landuse/construction.svg diff --git a/images/presets/landuse/farmland.svg b/resources/images/presets/landuse/farmland.svg similarity index 100% rename from images/presets/landuse/farmland.svg rename to resources/images/presets/landuse/farmland.svg diff --git a/images/presets/landuse/farmyard.svg b/resources/images/presets/landuse/farmyard.svg similarity index 100% rename from images/presets/landuse/farmyard.svg rename to resources/images/presets/landuse/farmyard.svg diff --git a/images/presets/landuse/flowerbed.svg b/resources/images/presets/landuse/flowerbed.svg similarity index 100% rename from images/presets/landuse/flowerbed.svg rename to resources/images/presets/landuse/flowerbed.svg diff --git a/images/presets/landuse/garages.svg b/resources/images/presets/landuse/garages.svg similarity index 100% rename from images/presets/landuse/garages.svg rename to resources/images/presets/landuse/garages.svg diff --git a/images/presets/landuse/graveyard.svg b/resources/images/presets/landuse/graveyard.svg similarity index 100% rename from images/presets/landuse/graveyard.svg rename to resources/images/presets/landuse/graveyard.svg diff --git a/images/presets/landuse/greenfield.svg b/resources/images/presets/landuse/greenfield.svg similarity index 100% rename from images/presets/landuse/greenfield.svg rename to resources/images/presets/landuse/greenfield.svg diff --git a/images/presets/landuse/greenhouse_horticulture.svg b/resources/images/presets/landuse/greenhouse_horticulture.svg similarity index 100% rename from images/presets/landuse/greenhouse_horticulture.svg rename to resources/images/presets/landuse/greenhouse_horticulture.svg diff --git a/images/presets/landuse/landfill.svg b/resources/images/presets/landuse/landfill.svg similarity index 100% rename from images/presets/landuse/landfill.svg rename to resources/images/presets/landuse/landfill.svg diff --git a/images/presets/landuse/meadow.svg b/resources/images/presets/landuse/meadow.svg similarity index 100% rename from images/presets/landuse/meadow.svg rename to resources/images/presets/landuse/meadow.svg diff --git a/images/presets/landuse/military.svg b/resources/images/presets/landuse/military.svg similarity index 100% rename from images/presets/landuse/military.svg rename to resources/images/presets/landuse/military.svg diff --git a/images/presets/landuse/mud.svg b/resources/images/presets/landuse/mud.svg similarity index 100% rename from images/presets/landuse/mud.svg rename to resources/images/presets/landuse/mud.svg diff --git a/images/presets/landuse/orchard.svg b/resources/images/presets/landuse/orchard.svg similarity index 100% rename from images/presets/landuse/orchard.svg rename to resources/images/presets/landuse/orchard.svg diff --git a/images/presets/landuse/plant_nursery.svg b/resources/images/presets/landuse/plant_nursery.svg similarity index 100% rename from images/presets/landuse/plant_nursery.svg rename to resources/images/presets/landuse/plant_nursery.svg diff --git a/images/presets/landuse/railway.svg b/resources/images/presets/landuse/railway.svg similarity index 100% rename from images/presets/landuse/railway.svg rename to resources/images/presets/landuse/railway.svg diff --git a/images/presets/landuse/reservoir.svg b/resources/images/presets/landuse/reservoir.svg similarity index 100% rename from images/presets/landuse/reservoir.svg rename to resources/images/presets/landuse/reservoir.svg diff --git a/images/presets/landuse/salt_pond.svg b/resources/images/presets/landuse/salt_pond.svg similarity index 100% rename from images/presets/landuse/salt_pond.svg rename to resources/images/presets/landuse/salt_pond.svg diff --git a/images/presets/landuse/sand.svg b/resources/images/presets/landuse/sand.svg similarity index 100% rename from images/presets/landuse/sand.svg rename to resources/images/presets/landuse/sand.svg diff --git a/images/presets/landuse/scree.svg b/resources/images/presets/landuse/scree.svg similarity index 100% rename from images/presets/landuse/scree.svg rename to resources/images/presets/landuse/scree.svg diff --git a/images/presets/landuse/scrub.svg b/resources/images/presets/landuse/scrub.svg similarity index 100% rename from images/presets/landuse/scrub.svg rename to resources/images/presets/landuse/scrub.svg diff --git a/images/presets/landuse/shingle.svg b/resources/images/presets/landuse/shingle.svg similarity index 100% rename from images/presets/landuse/shingle.svg rename to resources/images/presets/landuse/shingle.svg diff --git a/images/presets/landuse/vineyard.svg b/resources/images/presets/landuse/vineyard.svg similarity index 100% rename from images/presets/landuse/vineyard.svg rename to resources/images/presets/landuse/vineyard.svg diff --git a/images/presets/landuse/wetland.svg b/resources/images/presets/landuse/wetland.svg similarity index 100% rename from images/presets/landuse/wetland.svg rename to resources/images/presets/landuse/wetland.svg diff --git a/images/presets/leisure/advertising_column.svg b/resources/images/presets/leisure/advertising_column.svg similarity index 100% rename from images/presets/leisure/advertising_column.svg rename to resources/images/presets/leisure/advertising_column.svg diff --git a/images/presets/leisure/bandstand.svg b/resources/images/presets/leisure/bandstand.svg similarity index 100% rename from images/presets/leisure/bandstand.svg rename to resources/images/presets/leisure/bandstand.svg diff --git a/images/presets/leisure/bbq.svg b/resources/images/presets/leisure/bbq.svg similarity index 100% rename from images/presets/leisure/bbq.svg rename to resources/images/presets/leisure/bbq.svg diff --git a/images/presets/leisure/beach_resort.svg b/resources/images/presets/leisure/beach_resort.svg similarity index 100% rename from images/presets/leisure/beach_resort.svg rename to resources/images/presets/leisure/beach_resort.svg diff --git a/images/presets/leisure/bench.svg b/resources/images/presets/leisure/bench.svg similarity index 100% rename from images/presets/leisure/bench.svg rename to resources/images/presets/leisure/bench.svg diff --git a/images/presets/leisure/billboard.svg b/resources/images/presets/leisure/billboard.svg similarity index 100% rename from images/presets/leisure/billboard.svg rename to resources/images/presets/leisure/billboard.svg diff --git a/images/presets/leisure/bird_hide.svg b/resources/images/presets/leisure/bird_hide.svg similarity index 100% rename from images/presets/leisure/bird_hide.svg rename to resources/images/presets/leisure/bird_hide.svg diff --git a/images/presets/leisure/brothel.svg b/resources/images/presets/leisure/brothel.svg similarity index 100% rename from images/presets/leisure/brothel.svg rename to resources/images/presets/leisure/brothel.svg diff --git a/images/presets/leisure/casino.svg b/resources/images/presets/leisure/casino.svg similarity index 100% rename from images/presets/leisure/casino.svg rename to resources/images/presets/leisure/casino.svg diff --git a/images/presets/leisure/cinema.svg b/resources/images/presets/leisure/cinema.svg similarity index 100% rename from images/presets/leisure/cinema.svg rename to resources/images/presets/leisure/cinema.svg diff --git a/images/presets/leisure/common.svg b/resources/images/presets/leisure/common.svg similarity index 100% rename from images/presets/leisure/common.svg rename to resources/images/presets/leisure/common.svg diff --git a/images/presets/leisure/dive_centre.svg b/resources/images/presets/leisure/dive_centre.svg similarity index 100% rename from images/presets/leisure/dive_centre.svg rename to resources/images/presets/leisure/dive_centre.svg diff --git a/images/presets/leisure/dogpark.svg b/resources/images/presets/leisure/dogpark.svg similarity index 100% rename from images/presets/leisure/dogpark.svg rename to resources/images/presets/leisure/dogpark.svg diff --git a/images/presets/leisure/firepit.svg b/resources/images/presets/leisure/firepit.svg similarity index 100% rename from images/presets/leisure/firepit.svg rename to resources/images/presets/leisure/firepit.svg diff --git a/images/presets/leisure/fitness_station.svg b/resources/images/presets/leisure/fitness_station.svg similarity index 100% rename from images/presets/leisure/fitness_station.svg rename to resources/images/presets/leisure/fitness_station.svg diff --git a/images/presets/leisure/garden.svg b/resources/images/presets/leisure/garden.svg similarity index 100% rename from images/presets/leisure/garden.svg rename to resources/images/presets/leisure/garden.svg diff --git a/images/presets/leisure/hackerspace.svg b/resources/images/presets/leisure/hackerspace.svg similarity index 100% rename from images/presets/leisure/hackerspace.svg rename to resources/images/presets/leisure/hackerspace.svg diff --git a/images/presets/leisure/horse_riding.svg b/resources/images/presets/leisure/horse_riding.svg similarity index 100% rename from images/presets/leisure/horse_riding.svg rename to resources/images/presets/leisure/horse_riding.svg diff --git a/images/presets/leisure/nature_reserve.svg b/resources/images/presets/leisure/nature_reserve.svg similarity index 100% rename from images/presets/leisure/nature_reserve.svg rename to resources/images/presets/leisure/nature_reserve.svg diff --git a/images/presets/leisure/nightclub.svg b/resources/images/presets/leisure/nightclub.svg similarity index 100% rename from images/presets/leisure/nightclub.svg rename to resources/images/presets/leisure/nightclub.svg diff --git a/images/presets/leisure/outdoor_seating.svg b/resources/images/presets/leisure/outdoor_seating.svg similarity index 100% rename from images/presets/leisure/outdoor_seating.svg rename to resources/images/presets/leisure/outdoor_seating.svg diff --git a/images/presets/leisure/park.svg b/resources/images/presets/leisure/park.svg similarity index 100% rename from images/presets/leisure/park.svg rename to resources/images/presets/leisure/park.svg diff --git a/images/presets/leisure/picnic.svg b/resources/images/presets/leisure/picnic.svg similarity index 100% rename from images/presets/leisure/picnic.svg rename to resources/images/presets/leisure/picnic.svg diff --git a/images/presets/leisure/playground.svg b/resources/images/presets/leisure/playground.svg similarity index 100% rename from images/presets/leisure/playground.svg rename to resources/images/presets/leisure/playground.svg diff --git a/images/presets/leisure/resort.svg b/resources/images/presets/leisure/resort.svg similarity index 100% rename from images/presets/leisure/resort.svg rename to resources/images/presets/leisure/resort.svg diff --git a/images/presets/leisure/sauna.svg b/resources/images/presets/leisure/sauna.svg similarity index 100% rename from images/presets/leisure/sauna.svg rename to resources/images/presets/leisure/sauna.svg diff --git a/images/presets/leisure/stripclub.svg b/resources/images/presets/leisure/stripclub.svg similarity index 100% rename from images/presets/leisure/stripclub.svg rename to resources/images/presets/leisure/stripclub.svg diff --git a/images/presets/leisure/theater.svg b/resources/images/presets/leisure/theater.svg similarity index 100% rename from images/presets/leisure/theater.svg rename to resources/images/presets/leisure/theater.svg diff --git a/images/presets/leisure/theme_park.svg b/resources/images/presets/leisure/theme_park.svg similarity index 100% rename from images/presets/leisure/theme_park.svg rename to resources/images/presets/leisure/theme_park.svg diff --git a/images/presets/leisure/water_park.svg b/resources/images/presets/leisure/water_park.svg similarity index 100% rename from images/presets/leisure/water_park.svg rename to resources/images/presets/leisure/water_park.svg diff --git a/images/presets/leisure/zoo.svg b/resources/images/presets/leisure/zoo.svg similarity index 100% rename from images/presets/leisure/zoo.svg rename to resources/images/presets/leisure/zoo.svg diff --git a/images/presets/misc/angles.svg b/resources/images/presets/misc/angles.svg similarity index 100% rename from images/presets/misc/angles.svg rename to resources/images/presets/misc/angles.svg diff --git a/images/presets/misc/boundaries.svg b/resources/images/presets/misc/boundaries.svg similarity index 100% rename from images/presets/misc/boundaries.svg rename to resources/images/presets/misc/boundaries.svg diff --git a/images/presets/misc/cemetery_sector.svg b/resources/images/presets/misc/cemetery_sector.svg similarity index 100% rename from images/presets/misc/cemetery_sector.svg rename to resources/images/presets/misc/cemetery_sector.svg diff --git a/images/presets/misc/cliff.svg b/resources/images/presets/misc/cliff.svg similarity index 100% rename from images/presets/misc/cliff.svg rename to resources/images/presets/misc/cliff.svg diff --git a/images/presets/misc/cliff_pattern.svg b/resources/images/presets/misc/cliff_pattern.svg similarity index 100% rename from images/presets/misc/cliff_pattern.svg rename to resources/images/presets/misc/cliff_pattern.svg diff --git a/images/presets/misc/construction.svg b/resources/images/presets/misc/construction.svg similarity index 86% rename from images/presets/misc/construction.svg rename to resources/images/presets/misc/construction.svg index 22b7088427b..87319290e57 100644 --- a/images/presets/misc/construction.svg +++ b/resources/images/presets/misc/construction.svg @@ -1,7 +1,7 @@ - + diff --git a/images/presets/misc/contact.svg b/resources/images/presets/misc/contact.svg similarity index 100% rename from images/presets/misc/contact.svg rename to resources/images/presets/misc/contact.svg diff --git a/images/presets/misc/danger.svg b/resources/images/presets/misc/danger.svg similarity index 88% rename from images/presets/misc/danger.svg rename to resources/images/presets/misc/danger.svg index 61b20b0b396..62532bae55c 100644 --- a/images/presets/misc/danger.svg +++ b/resources/images/presets/misc/danger.svg @@ -1,7 +1,7 @@ - + diff --git a/images/presets/misc/deprecated.svg b/resources/images/presets/misc/deprecated.svg similarity index 100% rename from images/presets/misc/deprecated.svg rename to resources/images/presets/misc/deprecated.svg diff --git a/images/presets/misc/description.svg b/resources/images/presets/misc/description.svg similarity index 100% rename from images/presets/misc/description.svg rename to resources/images/presets/misc/description.svg diff --git a/images/presets/misc/dyke.svg b/resources/images/presets/misc/dyke.svg similarity index 100% rename from images/presets/misc/dyke.svg rename to resources/images/presets/misc/dyke.svg diff --git a/images/presets/misc/embankment-pattern-centered.png b/resources/images/presets/misc/embankment-pattern-centered.png similarity index 100% rename from images/presets/misc/embankment-pattern-centered.png rename to resources/images/presets/misc/embankment-pattern-centered.png diff --git a/images/presets/misc/embankment-pattern.png b/resources/images/presets/misc/embankment-pattern.png similarity index 100% rename from images/presets/misc/embankment-pattern.png rename to resources/images/presets/misc/embankment-pattern.png diff --git a/images/presets/misc/embankment.svg b/resources/images/presets/misc/embankment.svg similarity index 100% rename from images/presets/misc/embankment.svg rename to resources/images/presets/misc/embankment.svg diff --git a/images/presets/misc/entrance_emergency.svg b/resources/images/presets/misc/entrance_emergency.svg similarity index 100% rename from images/presets/misc/entrance_emergency.svg rename to resources/images/presets/misc/entrance_emergency.svg diff --git a/images/presets/misc/entrance_exit.svg b/resources/images/presets/misc/entrance_exit.svg similarity index 100% rename from images/presets/misc/entrance_exit.svg rename to resources/images/presets/misc/entrance_exit.svg diff --git a/images/presets/misc/entrance_main.svg b/resources/images/presets/misc/entrance_main.svg similarity index 100% rename from images/presets/misc/entrance_main.svg rename to resources/images/presets/misc/entrance_main.svg diff --git a/images/presets/misc/entrance_service.svg b/resources/images/presets/misc/entrance_service.svg similarity index 100% rename from images/presets/misc/entrance_service.svg rename to resources/images/presets/misc/entrance_service.svg diff --git a/images/presets/misc/entrance_yes.svg b/resources/images/presets/misc/entrance_yes.svg similarity index 100% rename from images/presets/misc/entrance_yes.svg rename to resources/images/presets/misc/entrance_yes.svg diff --git a/images/presets/misc/fixme.svg b/resources/images/presets/misc/fixme.svg similarity index 100% rename from images/presets/misc/fixme.svg rename to resources/images/presets/misc/fixme.svg diff --git a/images/presets/misc/fixme_annotation.svg b/resources/images/presets/misc/fixme_annotation.svg similarity index 100% rename from images/presets/misc/fixme_annotation.svg rename to resources/images/presets/misc/fixme_annotation.svg diff --git a/images/presets/misc/flag.svg b/resources/images/presets/misc/flag.svg similarity index 100% rename from images/presets/misc/flag.svg rename to resources/images/presets/misc/flag.svg diff --git a/images/presets/misc/fountain.svg b/resources/images/presets/misc/fountain.svg similarity index 100% rename from images/presets/misc/fountain.svg rename to resources/images/presets/misc/fountain.svg diff --git a/images/presets/misc/grave.svg b/resources/images/presets/misc/grave.svg similarity index 100% rename from images/presets/misc/grave.svg rename to resources/images/presets/misc/grave.svg diff --git a/images/presets/misc/grit_bin.svg b/resources/images/presets/misc/grit_bin.svg similarity index 100% rename from images/presets/misc/grit_bin.svg rename to resources/images/presets/misc/grit_bin.svg diff --git a/images/presets/misc/housenumber.svg b/resources/images/presets/misc/housenumber.svg similarity index 100% rename from images/presets/misc/housenumber.svg rename to resources/images/presets/misc/housenumber.svg diff --git a/images/presets/misc/housenumber_small.svg b/resources/images/presets/misc/housenumber_small.svg similarity index 100% rename from images/presets/misc/housenumber_small.svg rename to resources/images/presets/misc/housenumber_small.svg diff --git a/images/presets/misc/information/board.svg b/resources/images/presets/misc/information/board.svg similarity index 100% rename from images/presets/misc/information/board.svg rename to resources/images/presets/misc/information/board.svg diff --git a/images/presets/misc/information/guidepost.svg b/resources/images/presets/misc/information/guidepost.svg similarity index 100% rename from images/presets/misc/information/guidepost.svg rename to resources/images/presets/misc/information/guidepost.svg diff --git a/images/presets/misc/information/information.svg b/resources/images/presets/misc/information/information.svg similarity index 100% rename from images/presets/misc/information/information.svg rename to resources/images/presets/misc/information/information.svg diff --git a/images/presets/misc/information/informationoffice.svg b/resources/images/presets/misc/information/informationoffice.svg similarity index 100% rename from images/presets/misc/information/informationoffice.svg rename to resources/images/presets/misc/information/informationoffice.svg diff --git a/images/presets/misc/information/map.svg b/resources/images/presets/misc/information/map.svg similarity index 100% rename from images/presets/misc/information/map.svg rename to resources/images/presets/misc/information/map.svg diff --git a/images/presets/misc/interpolation.svg b/resources/images/presets/misc/interpolation.svg similarity index 100% rename from images/presets/misc/interpolation.svg rename to resources/images/presets/misc/interpolation.svg diff --git a/images/presets/misc/kiln.svg b/resources/images/presets/misc/kiln.svg similarity index 100% rename from images/presets/misc/kiln.svg rename to resources/images/presets/misc/kiln.svg diff --git a/images/presets/misc/manhole.svg b/resources/images/presets/misc/manhole.svg similarity index 100% rename from images/presets/misc/manhole.svg rename to resources/images/presets/misc/manhole.svg diff --git a/images/presets/misc/monitoring_station.svg b/resources/images/presets/misc/monitoring_station.svg similarity index 100% rename from images/presets/misc/monitoring_station.svg rename to resources/images/presets/misc/monitoring_station.svg diff --git a/images/presets/misc/multipolygon.svg b/resources/images/presets/misc/multipolygon.svg similarity index 100% rename from images/presets/misc/multipolygon.svg rename to resources/images/presets/misc/multipolygon.svg diff --git a/images/presets/misc/name.svg b/resources/images/presets/misc/name.svg similarity index 100% rename from images/presets/misc/name.svg rename to resources/images/presets/misc/name.svg diff --git a/images/presets/misc/no_icon.svg b/resources/images/presets/misc/no_icon.svg similarity index 100% rename from images/presets/misc/no_icon.svg rename to resources/images/presets/misc/no_icon.svg diff --git a/images/presets/misc/note.svg b/resources/images/presets/misc/note.svg similarity index 100% rename from images/presets/misc/note.svg rename to resources/images/presets/misc/note.svg diff --git a/images/presets/misc/note_annotation.svg b/resources/images/presets/misc/note_annotation.svg similarity index 100% rename from images/presets/misc/note_annotation.svg rename to resources/images/presets/misc/note_annotation.svg diff --git a/images/presets/misc/note_fixme_annotation.svg b/resources/images/presets/misc/note_fixme_annotation.svg similarity index 100% rename from images/presets/misc/note_fixme_annotation.svg rename to resources/images/presets/misc/note_fixme_annotation.svg diff --git a/images/presets/misc/pipeline_marker.svg b/resources/images/presets/misc/pipeline_marker.svg similarity index 100% rename from images/presets/misc/pipeline_marker.svg rename to resources/images/presets/misc/pipeline_marker.svg diff --git a/images/presets/misc/relations.svg b/resources/images/presets/misc/relations.svg similarity index 100% rename from images/presets/misc/relations.svg rename to resources/images/presets/misc/relations.svg diff --git a/images/presets/misc/rock.svg b/resources/images/presets/misc/rock.svg similarity index 100% rename from images/presets/misc/rock.svg rename to resources/images/presets/misc/rock.svg diff --git a/images/presets/misc/route.svg b/resources/images/presets/misc/route.svg similarity index 100% rename from images/presets/misc/route.svg rename to resources/images/presets/misc/route.svg diff --git a/images/presets/misc/stone.svg b/resources/images/presets/misc/stone.svg similarity index 100% rename from images/presets/misc/stone.svg rename to resources/images/presets/misc/stone.svg diff --git a/images/presets/misc/street_cabinet.svg b/resources/images/presets/misc/street_cabinet.svg similarity index 100% rename from images/presets/misc/street_cabinet.svg rename to resources/images/presets/misc/street_cabinet.svg diff --git a/images/presets/misc/streetlamp.svg b/resources/images/presets/misc/streetlamp.svg similarity index 100% rename from images/presets/misc/streetlamp.svg rename to resources/images/presets/misc/streetlamp.svg diff --git a/images/presets/misc/tomb.svg b/resources/images/presets/misc/tomb.svg similarity index 100% rename from images/presets/misc/tomb.svg rename to resources/images/presets/misc/tomb.svg diff --git a/images/presets/misc/valve.svg b/resources/images/presets/misc/valve.svg similarity index 100% rename from images/presets/misc/valve.svg rename to resources/images/presets/misc/valve.svg diff --git a/images/presets/misc/watering_place.svg b/resources/images/presets/misc/watering_place.svg similarity index 100% rename from images/presets/misc/watering_place.svg rename to resources/images/presets/misc/watering_place.svg diff --git a/images/presets/money/atm.svg b/resources/images/presets/money/atm.svg similarity index 100% rename from images/presets/money/atm.svg rename to resources/images/presets/money/atm.svg diff --git a/images/presets/money/bank.svg b/resources/images/presets/money/bank.svg similarity index 100% rename from images/presets/money/bank.svg rename to resources/images/presets/money/bank.svg diff --git a/images/presets/money/dollar.svg b/resources/images/presets/money/dollar.svg similarity index 100% rename from images/presets/money/dollar.svg rename to resources/images/presets/money/dollar.svg diff --git a/images/presets/money/exchange.svg b/resources/images/presets/money/exchange.svg similarity index 100% rename from images/presets/money/exchange.svg rename to resources/images/presets/money/exchange.svg diff --git a/images/presets/money/money_transfer.svg b/resources/images/presets/money/money_transfer.svg similarity index 100% rename from images/presets/money/money_transfer.svg rename to resources/images/presets/money/money_transfer.svg diff --git a/images/presets/nautical/bay.svg b/resources/images/presets/nautical/bay.svg similarity index 100% rename from images/presets/nautical/bay.svg rename to resources/images/presets/nautical/bay.svg diff --git a/images/presets/nautical/beach.svg b/resources/images/presets/nautical/beach.svg similarity index 100% rename from images/presets/nautical/beach.svg rename to resources/images/presets/nautical/beach.svg diff --git a/images/presets/nautical/boatyard.svg b/resources/images/presets/nautical/boatyard.svg similarity index 100% rename from images/presets/nautical/boatyard.svg rename to resources/images/presets/nautical/boatyard.svg diff --git a/images/presets/nautical/breakwater.svg b/resources/images/presets/nautical/breakwater.svg similarity index 100% rename from images/presets/nautical/breakwater.svg rename to resources/images/presets/nautical/breakwater.svg diff --git a/images/presets/nautical/cape.svg b/resources/images/presets/nautical/cape.svg similarity index 100% rename from images/presets/nautical/cape.svg rename to resources/images/presets/nautical/cape.svg diff --git a/images/presets/nautical/coast_line.svg b/resources/images/presets/nautical/coast_line.svg similarity index 100% rename from images/presets/nautical/coast_line.svg rename to resources/images/presets/nautical/coast_line.svg diff --git a/images/presets/nautical/dam.svg b/resources/images/presets/nautical/dam.svg similarity index 100% rename from images/presets/nautical/dam.svg rename to resources/images/presets/nautical/dam.svg diff --git a/images/presets/nautical/ferry.svg b/resources/images/presets/nautical/ferry.svg similarity index 100% rename from images/presets/nautical/ferry.svg rename to resources/images/presets/nautical/ferry.svg diff --git a/images/presets/nautical/groyne.svg b/resources/images/presets/nautical/groyne.svg similarity index 100% rename from images/presets/nautical/groyne.svg rename to resources/images/presets/nautical/groyne.svg diff --git a/images/presets/nautical/lock_gate.svg b/resources/images/presets/nautical/lock_gate.svg similarity index 100% rename from images/presets/nautical/lock_gate.svg rename to resources/images/presets/nautical/lock_gate.svg diff --git a/images/presets/nautical/marina.svg b/resources/images/presets/nautical/marina.svg similarity index 100% rename from images/presets/nautical/marina.svg rename to resources/images/presets/nautical/marina.svg diff --git a/images/presets/nautical/marine_fuel.svg b/resources/images/presets/nautical/marine_fuel.svg similarity index 100% rename from images/presets/nautical/marine_fuel.svg rename to resources/images/presets/nautical/marine_fuel.svg diff --git a/images/presets/nautical/penstock.svg b/resources/images/presets/nautical/penstock.svg similarity index 100% rename from images/presets/nautical/penstock.svg rename to resources/images/presets/nautical/penstock.svg diff --git a/images/presets/nautical/pier.svg b/resources/images/presets/nautical/pier.svg similarity index 100% rename from images/presets/nautical/pier.svg rename to resources/images/presets/nautical/pier.svg diff --git a/images/presets/nautical/slipway.svg b/resources/images/presets/nautical/slipway.svg similarity index 100% rename from images/presets/nautical/slipway.svg rename to resources/images/presets/nautical/slipway.svg diff --git a/images/presets/nautical/strait.svg b/resources/images/presets/nautical/strait.svg similarity index 100% rename from images/presets/nautical/strait.svg rename to resources/images/presets/nautical/strait.svg diff --git a/images/presets/nautical/tidal_channel.svg b/resources/images/presets/nautical/tidal_channel.svg similarity index 100% rename from images/presets/nautical/tidal_channel.svg rename to resources/images/presets/nautical/tidal_channel.svg diff --git a/images/presets/nautical/turning.svg b/resources/images/presets/nautical/turning.svg similarity index 100% rename from images/presets/nautical/turning.svg rename to resources/images/presets/nautical/turning.svg diff --git a/images/presets/nautical/water.svg b/resources/images/presets/nautical/water.svg similarity index 100% rename from images/presets/nautical/water.svg rename to resources/images/presets/nautical/water.svg diff --git a/images/presets/nautical/waterfall.svg b/resources/images/presets/nautical/waterfall.svg similarity index 100% rename from images/presets/nautical/waterfall.svg rename to resources/images/presets/nautical/waterfall.svg diff --git a/images/presets/nautical/waterway_canal.svg b/resources/images/presets/nautical/waterway_canal.svg similarity index 100% rename from images/presets/nautical/waterway_canal.svg rename to resources/images/presets/nautical/waterway_canal.svg diff --git a/images/presets/nautical/waterway_ditch.svg b/resources/images/presets/nautical/waterway_ditch.svg similarity index 100% rename from images/presets/nautical/waterway_ditch.svg rename to resources/images/presets/nautical/waterway_ditch.svg diff --git a/images/presets/nautical/waterway_drain.svg b/resources/images/presets/nautical/waterway_drain.svg similarity index 100% rename from images/presets/nautical/waterway_drain.svg rename to resources/images/presets/nautical/waterway_drain.svg diff --git a/images/presets/nautical/waterway_river.svg b/resources/images/presets/nautical/waterway_river.svg similarity index 100% rename from images/presets/nautical/waterway_river.svg rename to resources/images/presets/nautical/waterway_river.svg diff --git a/images/presets/nautical/waterway_riverbank.svg b/resources/images/presets/nautical/waterway_riverbank.svg similarity index 100% rename from images/presets/nautical/waterway_riverbank.svg rename to resources/images/presets/nautical/waterway_riverbank.svg diff --git a/images/presets/nautical/waterway_stream.svg b/resources/images/presets/nautical/waterway_stream.svg similarity index 100% rename from images/presets/nautical/waterway_stream.svg rename to resources/images/presets/nautical/waterway_stream.svg diff --git a/images/presets/nautical/weir.svg b/resources/images/presets/nautical/weir.svg similarity index 100% rename from images/presets/nautical/weir.svg rename to resources/images/presets/nautical/weir.svg diff --git a/images/presets/office/accountant.svg b/resources/images/presets/office/accountant.svg similarity index 100% rename from images/presets/office/accountant.svg rename to resources/images/presets/office/accountant.svg diff --git a/images/presets/office/advertising_agency.svg b/resources/images/presets/office/advertising_agency.svg similarity index 100% rename from images/presets/office/advertising_agency.svg rename to resources/images/presets/office/advertising_agency.svg diff --git a/images/presets/office/architect.svg b/resources/images/presets/office/architect.svg similarity index 100% rename from images/presets/office/architect.svg rename to resources/images/presets/office/architect.svg diff --git a/images/presets/office/association.svg b/resources/images/presets/office/association.svg similarity index 100% rename from images/presets/office/association.svg rename to resources/images/presets/office/association.svg diff --git a/images/presets/office/educational_institution.svg b/resources/images/presets/office/educational_institution.svg similarity index 100% rename from images/presets/office/educational_institution.svg rename to resources/images/presets/office/educational_institution.svg diff --git a/images/presets/office/employment_agency.svg b/resources/images/presets/office/employment_agency.svg similarity index 100% rename from images/presets/office/employment_agency.svg rename to resources/images/presets/office/employment_agency.svg diff --git a/images/presets/office/foundation.svg b/resources/images/presets/office/foundation.svg similarity index 100% rename from images/presets/office/foundation.svg rename to resources/images/presets/office/foundation.svg diff --git a/images/presets/office/government.svg b/resources/images/presets/office/government.svg similarity index 100% rename from images/presets/office/government.svg rename to resources/images/presets/office/government.svg diff --git a/images/presets/office/insurance.svg b/resources/images/presets/office/insurance.svg similarity index 100% rename from images/presets/office/insurance.svg rename to resources/images/presets/office/insurance.svg diff --git a/images/presets/office/it.svg b/resources/images/presets/office/it.svg similarity index 100% rename from images/presets/office/it.svg rename to resources/images/presets/office/it.svg diff --git a/images/presets/office/lawyer.svg b/resources/images/presets/office/lawyer.svg similarity index 100% rename from images/presets/office/lawyer.svg rename to resources/images/presets/office/lawyer.svg diff --git a/images/presets/office/newspaper.svg b/resources/images/presets/office/newspaper.svg similarity index 100% rename from images/presets/office/newspaper.svg rename to resources/images/presets/office/newspaper.svg diff --git a/images/presets/office/notary.svg b/resources/images/presets/office/notary.svg similarity index 100% rename from images/presets/office/notary.svg rename to resources/images/presets/office/notary.svg diff --git a/images/presets/office/ong.svg b/resources/images/presets/office/ong.svg similarity index 100% rename from images/presets/office/ong.svg rename to resources/images/presets/office/ong.svg diff --git a/images/presets/office/political_party.svg b/resources/images/presets/office/political_party.svg similarity index 100% rename from images/presets/office/political_party.svg rename to resources/images/presets/office/political_party.svg diff --git a/images/presets/office/private_company.svg b/resources/images/presets/office/private_company.svg similarity index 100% rename from images/presets/office/private_company.svg rename to resources/images/presets/office/private_company.svg diff --git a/images/presets/office/real_state.svg b/resources/images/presets/office/real_state.svg similarity index 100% rename from images/presets/office/real_state.svg rename to resources/images/presets/office/real_state.svg diff --git a/images/presets/office/religion.svg b/resources/images/presets/office/religion.svg similarity index 100% rename from images/presets/office/religion.svg rename to resources/images/presets/office/religion.svg diff --git a/images/presets/office/research.svg b/resources/images/presets/office/research.svg similarity index 100% rename from images/presets/office/research.svg rename to resources/images/presets/office/research.svg diff --git a/images/presets/office/tax_advisor.svg b/resources/images/presets/office/tax_advisor.svg similarity index 100% rename from images/presets/office/tax_advisor.svg rename to resources/images/presets/office/tax_advisor.svg diff --git a/images/presets/office/telecommunication.svg b/resources/images/presets/office/telecommunication.svg similarity index 100% rename from images/presets/office/telecommunication.svg rename to resources/images/presets/office/telecommunication.svg diff --git a/images/presets/place/capital.svg b/resources/images/presets/place/capital.svg similarity index 100% rename from images/presets/place/capital.svg rename to resources/images/presets/place/capital.svg diff --git a/images/presets/place/city.svg b/resources/images/presets/place/city.svg similarity index 100% rename from images/presets/place/city.svg rename to resources/images/presets/place/city.svg diff --git a/images/presets/place/farm.svg b/resources/images/presets/place/farm.svg similarity index 100% rename from images/presets/place/farm.svg rename to resources/images/presets/place/farm.svg diff --git a/images/presets/place/hamlet.svg b/resources/images/presets/place/hamlet.svg similarity index 100% rename from images/presets/place/hamlet.svg rename to resources/images/presets/place/hamlet.svg diff --git a/images/presets/place/island.svg b/resources/images/presets/place/island.svg similarity index 100% rename from images/presets/place/island.svg rename to resources/images/presets/place/island.svg diff --git a/images/presets/place/islet.svg b/resources/images/presets/place/islet.svg similarity index 100% rename from images/presets/place/islet.svg rename to resources/images/presets/place/islet.svg diff --git a/images/presets/place/isolated_dwelling.svg b/resources/images/presets/place/isolated_dwelling.svg similarity index 100% rename from images/presets/place/isolated_dwelling.svg rename to resources/images/presets/place/isolated_dwelling.svg diff --git a/images/presets/place/locality.svg b/resources/images/presets/place/locality.svg similarity index 100% rename from images/presets/place/locality.svg rename to resources/images/presets/place/locality.svg diff --git a/images/presets/place/neighbourhood.svg b/resources/images/presets/place/neighbourhood.svg similarity index 100% rename from images/presets/place/neighbourhood.svg rename to resources/images/presets/place/neighbourhood.svg diff --git a/images/presets/place/quarter.svg b/resources/images/presets/place/quarter.svg similarity index 100% rename from images/presets/place/quarter.svg rename to resources/images/presets/place/quarter.svg diff --git a/images/presets/place/square.svg b/resources/images/presets/place/square.svg similarity index 100% rename from images/presets/place/square.svg rename to resources/images/presets/place/square.svg diff --git a/images/presets/place/suburb.svg b/resources/images/presets/place/suburb.svg similarity index 100% rename from images/presets/place/suburb.svg rename to resources/images/presets/place/suburb.svg diff --git a/images/presets/place/town.svg b/resources/images/presets/place/town.svg similarity index 100% rename from images/presets/place/town.svg rename to resources/images/presets/place/town.svg diff --git a/images/presets/place/village.svg b/resources/images/presets/place/village.svg similarity index 100% rename from images/presets/place/village.svg rename to resources/images/presets/place/village.svg diff --git a/images/presets/power/bay.svg b/resources/images/presets/power/bay.svg similarity index 100% rename from images/presets/power/bay.svg rename to resources/images/presets/power/bay.svg diff --git a/images/presets/power/busbar.svg b/resources/images/presets/power/busbar.svg similarity index 100% rename from images/presets/power/busbar.svg rename to resources/images/presets/power/busbar.svg diff --git a/images/presets/power/cable.svg b/resources/images/presets/power/cable.svg similarity index 100% rename from images/presets/power/cable.svg rename to resources/images/presets/power/cable.svg diff --git a/images/presets/power/cable_distribution_cabinet.svg b/resources/images/presets/power/cable_distribution_cabinet.svg similarity index 100% rename from images/presets/power/cable_distribution_cabinet.svg rename to resources/images/presets/power/cable_distribution_cabinet.svg diff --git a/images/presets/power/catenary_mast.svg b/resources/images/presets/power/catenary_mast.svg similarity index 100% rename from images/presets/power/catenary_mast.svg rename to resources/images/presets/power/catenary_mast.svg diff --git a/images/presets/power/compensator.svg b/resources/images/presets/power/compensator.svg similarity index 100% rename from images/presets/power/compensator.svg rename to resources/images/presets/power/compensator.svg diff --git a/images/presets/power/converter.svg b/resources/images/presets/power/converter.svg similarity index 100% rename from images/presets/power/converter.svg rename to resources/images/presets/power/converter.svg diff --git a/images/presets/power/generator.svg b/resources/images/presets/power/generator.svg similarity index 100% rename from images/presets/power/generator.svg rename to resources/images/presets/power/generator.svg diff --git a/images/presets/power/insulator.svg b/resources/images/presets/power/insulator.svg similarity index 100% rename from images/presets/power/insulator.svg rename to resources/images/presets/power/insulator.svg diff --git a/images/presets/power/line.svg b/resources/images/presets/power/line.svg similarity index 100% rename from images/presets/power/line.svg rename to resources/images/presets/power/line.svg diff --git a/images/presets/power/plant.svg b/resources/images/presets/power/plant.svg similarity index 100% rename from images/presets/power/plant.svg rename to resources/images/presets/power/plant.svg diff --git a/images/presets/power/pole.svg b/resources/images/presets/power/pole.svg similarity index 100% rename from images/presets/power/pole.svg rename to resources/images/presets/power/pole.svg diff --git a/images/presets/power/pole_switch.svg b/resources/images/presets/power/pole_switch.svg similarity index 100% rename from images/presets/power/pole_switch.svg rename to resources/images/presets/power/pole_switch.svg diff --git a/images/presets/power/pole_transformer.svg b/resources/images/presets/power/pole_transformer.svg similarity index 100% rename from images/presets/power/pole_transformer.svg rename to resources/images/presets/power/pole_transformer.svg diff --git a/images/presets/power/portal.svg b/resources/images/presets/power/portal.svg similarity index 100% rename from images/presets/power/portal.svg rename to resources/images/presets/power/portal.svg diff --git a/images/presets/power/power.svg b/resources/images/presets/power/power.svg similarity index 100% rename from images/presets/power/power.svg rename to resources/images/presets/power/power.svg diff --git a/images/presets/power/power_source-biofuel.svg b/resources/images/presets/power/power_source-biofuel.svg similarity index 100% rename from images/presets/power/power_source-biofuel.svg rename to resources/images/presets/power/power_source-biofuel.svg diff --git a/images/presets/power/power_source-coal.svg b/resources/images/presets/power/power_source-coal.svg similarity index 100% rename from images/presets/power/power_source-coal.svg rename to resources/images/presets/power/power_source-coal.svg diff --git a/images/presets/power/power_source-gas.svg b/resources/images/presets/power/power_source-gas.svg similarity index 100% rename from images/presets/power/power_source-gas.svg rename to resources/images/presets/power/power_source-gas.svg diff --git a/images/presets/power/power_source-geothermal.svg b/resources/images/presets/power/power_source-geothermal.svg similarity index 100% rename from images/presets/power/power_source-geothermal.svg rename to resources/images/presets/power/power_source-geothermal.svg diff --git a/images/presets/power/power_source-nuclear.svg b/resources/images/presets/power/power_source-nuclear.svg similarity index 100% rename from images/presets/power/power_source-nuclear.svg rename to resources/images/presets/power/power_source-nuclear.svg diff --git a/images/presets/power/power_source-oil.svg b/resources/images/presets/power/power_source-oil.svg similarity index 100% rename from images/presets/power/power_source-oil.svg rename to resources/images/presets/power/power_source-oil.svg diff --git a/images/presets/power/power_source-sun.svg b/resources/images/presets/power/power_source-sun.svg similarity index 100% rename from images/presets/power/power_source-sun.svg rename to resources/images/presets/power/power_source-sun.svg diff --git a/images/presets/power/power_source-waste.svg b/resources/images/presets/power/power_source-waste.svg similarity index 100% rename from images/presets/power/power_source-waste.svg rename to resources/images/presets/power/power_source-waste.svg diff --git a/images/presets/power/power_source-water.svg b/resources/images/presets/power/power_source-water.svg similarity index 100% rename from images/presets/power/power_source-water.svg rename to resources/images/presets/power/power_source-water.svg diff --git a/images/presets/power/power_source-wind.svg b/resources/images/presets/power/power_source-wind.svg similarity index 100% rename from images/presets/power/power_source-wind.svg rename to resources/images/presets/power/power_source-wind.svg diff --git a/images/presets/power/substation.svg b/resources/images/presets/power/substation.svg similarity index 100% rename from images/presets/power/substation.svg rename to resources/images/presets/power/substation.svg diff --git a/images/presets/power/switch.svg b/resources/images/presets/power/switch.svg similarity index 100% rename from images/presets/power/switch.svg rename to resources/images/presets/power/switch.svg diff --git a/images/presets/power/switchgear.svg b/resources/images/presets/power/switchgear.svg similarity index 100% rename from images/presets/power/switchgear.svg rename to resources/images/presets/power/switchgear.svg diff --git a/images/presets/power/terminal.svg b/resources/images/presets/power/terminal.svg similarity index 100% rename from images/presets/power/terminal.svg rename to resources/images/presets/power/terminal.svg diff --git a/images/presets/power/tower.svg b/resources/images/presets/power/tower.svg similarity index 100% rename from images/presets/power/tower.svg rename to resources/images/presets/power/tower.svg diff --git a/images/presets/power/transformer.svg b/resources/images/presets/power/transformer.svg similarity index 100% rename from images/presets/power/transformer.svg rename to resources/images/presets/power/transformer.svg diff --git a/images/presets/power/transformer_tower.svg b/resources/images/presets/power/transformer_tower.svg similarity index 100% rename from images/presets/power/transformer_tower.svg rename to resources/images/presets/power/transformer_tower.svg diff --git a/images/presets/religion/bahai.svg b/resources/images/presets/religion/bahai.svg similarity index 100% rename from images/presets/religion/bahai.svg rename to resources/images/presets/religion/bahai.svg diff --git a/images/presets/religion/buddhism.svg b/resources/images/presets/religion/buddhism.svg similarity index 100% rename from images/presets/religion/buddhism.svg rename to resources/images/presets/religion/buddhism.svg diff --git a/images/presets/religion/church.svg b/resources/images/presets/religion/church.svg similarity index 100% rename from images/presets/religion/church.svg rename to resources/images/presets/religion/church.svg diff --git a/images/presets/religion/confucian.svg b/resources/images/presets/religion/confucian.svg similarity index 100% rename from images/presets/religion/confucian.svg rename to resources/images/presets/religion/confucian.svg diff --git a/images/presets/religion/hinduism.svg b/resources/images/presets/religion/hinduism.svg similarity index 100% rename from images/presets/religion/hinduism.svg rename to resources/images/presets/religion/hinduism.svg diff --git a/images/presets/religion/jainism.svg b/resources/images/presets/religion/jainism.svg similarity index 100% rename from images/presets/religion/jainism.svg rename to resources/images/presets/religion/jainism.svg diff --git a/images/presets/religion/jewish.svg b/resources/images/presets/religion/jewish.svg similarity index 100% rename from images/presets/religion/jewish.svg rename to resources/images/presets/religion/jewish.svg diff --git a/images/presets/religion/muslim.svg b/resources/images/presets/religion/muslim.svg similarity index 100% rename from images/presets/religion/muslim.svg rename to resources/images/presets/religion/muslim.svg diff --git a/images/presets/religion/religion.svg b/resources/images/presets/religion/religion.svg similarity index 100% rename from images/presets/religion/religion.svg rename to resources/images/presets/religion/religion.svg diff --git a/images/presets/religion/shinto.svg b/resources/images/presets/religion/shinto.svg similarity index 100% rename from images/presets/religion/shinto.svg rename to resources/images/presets/religion/shinto.svg diff --git a/images/presets/religion/sikhism.svg b/resources/images/presets/religion/sikhism.svg similarity index 100% rename from images/presets/religion/sikhism.svg rename to resources/images/presets/religion/sikhism.svg diff --git a/images/presets/religion/taoism.svg b/resources/images/presets/religion/taoism.svg similarity index 100% rename from images/presets/religion/taoism.svg rename to resources/images/presets/religion/taoism.svg diff --git a/images/presets/religion/tenrikyo.svg b/resources/images/presets/religion/tenrikyo.svg similarity index 100% rename from images/presets/religion/tenrikyo.svg rename to resources/images/presets/religion/tenrikyo.svg diff --git a/images/presets/religion/wayside_cross.svg b/resources/images/presets/religion/wayside_cross.svg similarity index 100% rename from images/presets/religion/wayside_cross.svg rename to resources/images/presets/religion/wayside_cross.svg diff --git a/images/presets/religion/wayside_shrine.svg b/resources/images/presets/religion/wayside_shrine.svg similarity index 100% rename from images/presets/religion/wayside_shrine.svg rename to resources/images/presets/religion/wayside_shrine.svg diff --git a/images/presets/service/changing_table.svg b/resources/images/presets/service/changing_table.svg similarity index 100% rename from images/presets/service/changing_table.svg rename to resources/images/presets/service/changing_table.svg diff --git a/images/presets/service/clock.svg b/resources/images/presets/service/clock.svg similarity index 100% rename from images/presets/service/clock.svg rename to resources/images/presets/service/clock.svg diff --git a/images/presets/service/community_centre.svg b/resources/images/presets/service/community_centre.svg similarity index 100% rename from images/presets/service/community_centre.svg rename to resources/images/presets/service/community_centre.svg diff --git a/images/presets/service/courthouse.svg b/resources/images/presets/service/courthouse.svg similarity index 100% rename from images/presets/service/courthouse.svg rename to resources/images/presets/service/courthouse.svg diff --git a/images/presets/service/elevator.svg b/resources/images/presets/service/elevator.svg similarity index 100% rename from images/presets/service/elevator.svg rename to resources/images/presets/service/elevator.svg diff --git a/images/presets/service/embassy.svg b/resources/images/presets/service/embassy.svg similarity index 100% rename from images/presets/service/embassy.svg rename to resources/images/presets/service/embassy.svg diff --git a/images/presets/service/emergency_access_point.svg b/resources/images/presets/service/emergency_access_point.svg similarity index 100% rename from images/presets/service/emergency_access_point.svg rename to resources/images/presets/service/emergency_access_point.svg diff --git a/images/presets/service/excrement_bags.svg b/resources/images/presets/service/excrement_bags.svg similarity index 100% rename from images/presets/service/excrement_bags.svg rename to resources/images/presets/service/excrement_bags.svg diff --git a/images/presets/service/fire_hydrant.svg b/resources/images/presets/service/fire_hydrant.svg similarity index 100% rename from images/presets/service/fire_hydrant.svg rename to resources/images/presets/service/fire_hydrant.svg diff --git a/images/presets/service/firebrigade.svg b/resources/images/presets/service/firebrigade.svg similarity index 100% rename from images/presets/service/firebrigade.svg rename to resources/images/presets/service/firebrigade.svg diff --git a/images/presets/service/internet_cafe.svg b/resources/images/presets/service/internet_cafe.svg similarity index 100% rename from images/presets/service/internet_cafe.svg rename to resources/images/presets/service/internet_cafe.svg diff --git a/images/presets/service/network-wireless.svg b/resources/images/presets/service/network-wireless.svg similarity index 100% rename from images/presets/service/network-wireless.svg rename to resources/images/presets/service/network-wireless.svg diff --git a/images/presets/service/photo_booth.svg b/resources/images/presets/service/photo_booth.svg similarity index 100% rename from images/presets/service/photo_booth.svg rename to resources/images/presets/service/photo_booth.svg diff --git a/images/presets/service/police.svg b/resources/images/presets/service/police.svg similarity index 100% rename from images/presets/service/police.svg rename to resources/images/presets/service/police.svg diff --git a/images/presets/service/police_non_public.svg b/resources/images/presets/service/police_non_public.svg similarity index 100% rename from images/presets/service/police_non_public.svg rename to resources/images/presets/service/police_non_public.svg diff --git a/images/presets/service/post_box.svg b/resources/images/presets/service/post_box.svg similarity index 100% rename from images/presets/service/post_box.svg rename to resources/images/presets/service/post_box.svg diff --git a/images/presets/service/post_office.svg b/resources/images/presets/service/post_office.svg similarity index 100% rename from images/presets/service/post_office.svg rename to resources/images/presets/service/post_office.svg diff --git a/images/presets/service/prison.svg b/resources/images/presets/service/prison.svg similarity index 100% rename from images/presets/service/prison.svg rename to resources/images/presets/service/prison.svg diff --git a/images/presets/service/ranger_station.svg b/resources/images/presets/service/ranger_station.svg similarity index 100% rename from images/presets/service/ranger_station.svg rename to resources/images/presets/service/ranger_station.svg diff --git a/images/presets/service/recycling/recycling.svg b/resources/images/presets/service/recycling/recycling.svg similarity index 100% rename from images/presets/service/recycling/recycling.svg rename to resources/images/presets/service/recycling/recycling.svg diff --git a/images/presets/service/recycling/recycling_centre.svg b/resources/images/presets/service/recycling/recycling_centre.svg similarity index 100% rename from images/presets/service/recycling/recycling_centre.svg rename to resources/images/presets/service/recycling/recycling_centre.svg diff --git a/images/presets/service/recycling/recycling_container.svg b/resources/images/presets/service/recycling/recycling_container.svg similarity index 100% rename from images/presets/service/recycling/recycling_container.svg rename to resources/images/presets/service/recycling/recycling_container.svg diff --git a/images/presets/service/recycling/sanitary_dump_station.svg b/resources/images/presets/service/recycling/sanitary_dump_station.svg similarity index 100% rename from images/presets/service/recycling/sanitary_dump_station.svg rename to resources/images/presets/service/recycling/sanitary_dump_station.svg diff --git a/images/presets/service/recycling/waste_basket.svg b/resources/images/presets/service/recycling/waste_basket.svg similarity index 100% rename from images/presets/service/recycling/waste_basket.svg rename to resources/images/presets/service/recycling/waste_basket.svg diff --git a/images/presets/service/recycling/waste_disposal.svg b/resources/images/presets/service/recycling/waste_disposal.svg similarity index 100% rename from images/presets/service/recycling/waste_disposal.svg rename to resources/images/presets/service/recycling/waste_disposal.svg diff --git a/images/presets/service/shower.svg b/resources/images/presets/service/shower.svg similarity index 100% rename from images/presets/service/shower.svg rename to resources/images/presets/service/shower.svg diff --git a/images/presets/service/studio.svg b/resources/images/presets/service/studio.svg similarity index 100% rename from images/presets/service/studio.svg rename to resources/images/presets/service/studio.svg diff --git a/images/presets/service/surveillance.svg b/resources/images/presets/service/surveillance.svg similarity index 100% rename from images/presets/service/surveillance.svg rename to resources/images/presets/service/surveillance.svg diff --git a/images/presets/service/telephone.svg b/resources/images/presets/service/telephone.svg similarity index 100% rename from images/presets/service/telephone.svg rename to resources/images/presets/service/telephone.svg diff --git a/images/presets/service/toilets.svg b/resources/images/presets/service/toilets.svg similarity index 100% rename from images/presets/service/toilets.svg rename to resources/images/presets/service/toilets.svg diff --git a/images/presets/service/townhall.svg b/resources/images/presets/service/townhall.svg similarity index 100% rename from images/presets/service/townhall.svg rename to resources/images/presets/service/townhall.svg diff --git a/images/presets/shop/alcohol.svg b/resources/images/presets/shop/alcohol.svg similarity index 100% rename from images/presets/shop/alcohol.svg rename to resources/images/presets/shop/alcohol.svg diff --git a/images/presets/shop/antique.svg b/resources/images/presets/shop/antique.svg similarity index 100% rename from images/presets/shop/antique.svg rename to resources/images/presets/shop/antique.svg diff --git a/images/presets/shop/art.svg b/resources/images/presets/shop/art.svg similarity index 100% rename from images/presets/shop/art.svg rename to resources/images/presets/shop/art.svg diff --git a/images/presets/shop/bag.svg b/resources/images/presets/shop/bag.svg similarity index 100% rename from images/presets/shop/bag.svg rename to resources/images/presets/shop/bag.svg diff --git a/images/presets/shop/beauty.svg b/resources/images/presets/shop/beauty.svg similarity index 100% rename from images/presets/shop/beauty.svg rename to resources/images/presets/shop/beauty.svg diff --git a/images/presets/shop/bed.svg b/resources/images/presets/shop/bed.svg similarity index 100% rename from images/presets/shop/bed.svg rename to resources/images/presets/shop/bed.svg diff --git a/images/presets/shop/beverages.svg b/resources/images/presets/shop/beverages.svg similarity index 100% rename from images/presets/shop/beverages.svg rename to resources/images/presets/shop/beverages.svg diff --git a/images/presets/shop/bicycle.svg b/resources/images/presets/shop/bicycle.svg similarity index 100% rename from images/presets/shop/bicycle.svg rename to resources/images/presets/shop/bicycle.svg diff --git a/images/presets/shop/body.svg b/resources/images/presets/shop/body.svg similarity index 100% rename from images/presets/shop/body.svg rename to resources/images/presets/shop/body.svg diff --git a/images/presets/shop/book.svg b/resources/images/presets/shop/book.svg similarity index 100% rename from images/presets/shop/book.svg rename to resources/images/presets/shop/book.svg diff --git a/images/presets/shop/boutique.svg b/resources/images/presets/shop/boutique.svg similarity index 100% rename from images/presets/shop/boutique.svg rename to resources/images/presets/shop/boutique.svg diff --git a/images/presets/shop/carpet.svg b/resources/images/presets/shop/carpet.svg similarity index 100% rename from images/presets/shop/carpet.svg rename to resources/images/presets/shop/carpet.svg diff --git a/images/presets/shop/charity.svg b/resources/images/presets/shop/charity.svg similarity index 100% rename from images/presets/shop/charity.svg rename to resources/images/presets/shop/charity.svg diff --git a/images/presets/shop/chemist.svg b/resources/images/presets/shop/chemist.svg similarity index 100% rename from images/presets/shop/chemist.svg rename to resources/images/presets/shop/chemist.svg diff --git a/images/presets/shop/clothes.svg b/resources/images/presets/shop/clothes.svg similarity index 100% rename from images/presets/shop/clothes.svg rename to resources/images/presets/shop/clothes.svg diff --git a/images/presets/shop/computer.svg b/resources/images/presets/shop/computer.svg similarity index 100% rename from images/presets/shop/computer.svg rename to resources/images/presets/shop/computer.svg diff --git a/images/presets/shop/convenience.svg b/resources/images/presets/shop/convenience.svg similarity index 100% rename from images/presets/shop/convenience.svg rename to resources/images/presets/shop/convenience.svg diff --git a/images/presets/shop/copyshop.svg b/resources/images/presets/shop/copyshop.svg similarity index 100% rename from images/presets/shop/copyshop.svg rename to resources/images/presets/shop/copyshop.svg diff --git a/images/presets/shop/cosmetics.svg b/resources/images/presets/shop/cosmetics.svg similarity index 100% rename from images/presets/shop/cosmetics.svg rename to resources/images/presets/shop/cosmetics.svg diff --git a/images/presets/shop/curtain.svg b/resources/images/presets/shop/curtain.svg similarity index 100% rename from images/presets/shop/curtain.svg rename to resources/images/presets/shop/curtain.svg diff --git a/images/presets/shop/diy_store.svg b/resources/images/presets/shop/diy_store.svg similarity index 100% rename from images/presets/shop/diy_store.svg rename to resources/images/presets/shop/diy_store.svg diff --git a/images/presets/shop/doors.svg b/resources/images/presets/shop/doors.svg similarity index 100% rename from images/presets/shop/doors.svg rename to resources/images/presets/shop/doors.svg diff --git a/images/presets/shop/e-cigarette.svg b/resources/images/presets/shop/e-cigarette.svg similarity index 100% rename from images/presets/shop/e-cigarette.svg rename to resources/images/presets/shop/e-cigarette.svg diff --git a/images/presets/shop/electronics.svg b/resources/images/presets/shop/electronics.svg similarity index 100% rename from images/presets/shop/electronics.svg rename to resources/images/presets/shop/electronics.svg diff --git a/images/presets/shop/erotic.svg b/resources/images/presets/shop/erotic.svg similarity index 100% rename from images/presets/shop/erotic.svg rename to resources/images/presets/shop/erotic.svg diff --git a/images/presets/shop/fabric.svg b/resources/images/presets/shop/fabric.svg similarity index 100% rename from images/presets/shop/fabric.svg rename to resources/images/presets/shop/fabric.svg diff --git a/images/presets/shop/florist.svg b/resources/images/presets/shop/florist.svg similarity index 100% rename from images/presets/shop/florist.svg rename to resources/images/presets/shop/florist.svg diff --git a/images/presets/shop/frame.svg b/resources/images/presets/shop/frame.svg similarity index 100% rename from images/presets/shop/frame.svg rename to resources/images/presets/shop/frame.svg diff --git a/images/presets/shop/funeral_directors.svg b/resources/images/presets/shop/funeral_directors.svg similarity index 100% rename from images/presets/shop/funeral_directors.svg rename to resources/images/presets/shop/funeral_directors.svg diff --git a/images/presets/shop/furniture.svg b/resources/images/presets/shop/furniture.svg similarity index 100% rename from images/presets/shop/furniture.svg rename to resources/images/presets/shop/furniture.svg diff --git a/images/presets/shop/garden_centre.svg b/resources/images/presets/shop/garden_centre.svg similarity index 100% rename from images/presets/shop/garden_centre.svg rename to resources/images/presets/shop/garden_centre.svg diff --git a/images/presets/shop/gas.svg b/resources/images/presets/shop/gas.svg similarity index 100% rename from images/presets/shop/gas.svg rename to resources/images/presets/shop/gas.svg diff --git a/images/presets/shop/groceries/bakery.svg b/resources/images/presets/shop/groceries/bakery.svg similarity index 100% rename from images/presets/shop/groceries/bakery.svg rename to resources/images/presets/shop/groceries/bakery.svg diff --git a/images/presets/shop/groceries/butcher.svg b/resources/images/presets/shop/groceries/butcher.svg similarity index 100% rename from images/presets/shop/groceries/butcher.svg rename to resources/images/presets/shop/groceries/butcher.svg diff --git a/images/presets/shop/groceries/cheese.svg b/resources/images/presets/shop/groceries/cheese.svg similarity index 100% rename from images/presets/shop/groceries/cheese.svg rename to resources/images/presets/shop/groceries/cheese.svg diff --git a/images/presets/shop/groceries/coffee.svg b/resources/images/presets/shop/groceries/coffee.svg similarity index 100% rename from images/presets/shop/groceries/coffee.svg rename to resources/images/presets/shop/groceries/coffee.svg diff --git a/images/presets/shop/groceries/confectionery.svg b/resources/images/presets/shop/groceries/confectionery.svg similarity index 100% rename from images/presets/shop/groceries/confectionery.svg rename to resources/images/presets/shop/groceries/confectionery.svg diff --git a/images/presets/shop/groceries/dairy.svg b/resources/images/presets/shop/groceries/dairy.svg similarity index 100% rename from images/presets/shop/groceries/dairy.svg rename to resources/images/presets/shop/groceries/dairy.svg diff --git a/images/presets/shop/groceries/deli.svg b/resources/images/presets/shop/groceries/deli.svg similarity index 100% rename from images/presets/shop/groceries/deli.svg rename to resources/images/presets/shop/groceries/deli.svg diff --git a/images/presets/shop/groceries/farm.svg b/resources/images/presets/shop/groceries/farm.svg similarity index 100% rename from images/presets/shop/groceries/farm.svg rename to resources/images/presets/shop/groceries/farm.svg diff --git a/images/presets/shop/groceries/greengrocer.svg b/resources/images/presets/shop/groceries/greengrocer.svg similarity index 100% rename from images/presets/shop/groceries/greengrocer.svg rename to resources/images/presets/shop/groceries/greengrocer.svg diff --git a/images/presets/shop/groceries/pastry.svg b/resources/images/presets/shop/groceries/pastry.svg similarity index 100% rename from images/presets/shop/groceries/pastry.svg rename to resources/images/presets/shop/groceries/pastry.svg diff --git a/images/presets/shop/groceries/seafood.svg b/resources/images/presets/shop/groceries/seafood.svg similarity index 100% rename from images/presets/shop/groceries/seafood.svg rename to resources/images/presets/shop/groceries/seafood.svg diff --git a/images/presets/shop/groceries/tea.svg b/resources/images/presets/shop/groceries/tea.svg similarity index 100% rename from images/presets/shop/groceries/tea.svg rename to resources/images/presets/shop/groceries/tea.svg diff --git a/images/presets/shop/hairdresser.svg b/resources/images/presets/shop/hairdresser.svg similarity index 100% rename from images/presets/shop/hairdresser.svg rename to resources/images/presets/shop/hairdresser.svg diff --git a/images/presets/shop/hardware.svg b/resources/images/presets/shop/hardware.svg similarity index 100% rename from images/presets/shop/hardware.svg rename to resources/images/presets/shop/hardware.svg diff --git a/images/presets/shop/hearing_aids.svg b/resources/images/presets/shop/hearing_aids.svg similarity index 100% rename from images/presets/shop/hearing_aids.svg rename to resources/images/presets/shop/hearing_aids.svg diff --git a/images/presets/shop/hifi.svg b/resources/images/presets/shop/hifi.svg similarity index 100% rename from images/presets/shop/hifi.svg rename to resources/images/presets/shop/hifi.svg diff --git a/images/presets/shop/houseware.svg b/resources/images/presets/shop/houseware.svg similarity index 100% rename from images/presets/shop/houseware.svg rename to resources/images/presets/shop/houseware.svg diff --git a/images/presets/shop/interior_decoration.svg b/resources/images/presets/shop/interior_decoration.svg similarity index 100% rename from images/presets/shop/interior_decoration.svg rename to resources/images/presets/shop/interior_decoration.svg diff --git a/images/presets/shop/jewelry.svg b/resources/images/presets/shop/jewelry.svg similarity index 100% rename from images/presets/shop/jewelry.svg rename to resources/images/presets/shop/jewelry.svg diff --git a/images/presets/shop/kiosk.svg b/resources/images/presets/shop/kiosk.svg similarity index 100% rename from images/presets/shop/kiosk.svg rename to resources/images/presets/shop/kiosk.svg diff --git a/images/presets/shop/kitchen.svg b/resources/images/presets/shop/kitchen.svg similarity index 100% rename from images/presets/shop/kitchen.svg rename to resources/images/presets/shop/kitchen.svg diff --git a/images/presets/shop/laundry.svg b/resources/images/presets/shop/laundry.svg similarity index 100% rename from images/presets/shop/laundry.svg rename to resources/images/presets/shop/laundry.svg diff --git a/images/presets/shop/lottery.svg b/resources/images/presets/shop/lottery.svg similarity index 100% rename from images/presets/shop/lottery.svg rename to resources/images/presets/shop/lottery.svg diff --git a/images/presets/shop/mall.svg b/resources/images/presets/shop/mall.svg similarity index 100% rename from images/presets/shop/mall.svg rename to resources/images/presets/shop/mall.svg diff --git a/images/presets/shop/marketplace.svg b/resources/images/presets/shop/marketplace.svg similarity index 100% rename from images/presets/shop/marketplace.svg rename to resources/images/presets/shop/marketplace.svg diff --git a/images/presets/shop/massage.svg b/resources/images/presets/shop/massage.svg similarity index 100% rename from images/presets/shop/massage.svg rename to resources/images/presets/shop/massage.svg diff --git a/images/presets/shop/medical_supply.svg b/resources/images/presets/shop/medical_supply.svg similarity index 100% rename from images/presets/shop/medical_supply.svg rename to resources/images/presets/shop/medical_supply.svg diff --git a/images/presets/shop/mobile_phone.svg b/resources/images/presets/shop/mobile_phone.svg similarity index 100% rename from images/presets/shop/mobile_phone.svg rename to resources/images/presets/shop/mobile_phone.svg diff --git a/images/presets/shop/music.svg b/resources/images/presets/shop/music.svg similarity index 100% rename from images/presets/shop/music.svg rename to resources/images/presets/shop/music.svg diff --git a/images/presets/shop/musical_instrument.svg b/resources/images/presets/shop/musical_instrument.svg similarity index 100% rename from images/presets/shop/musical_instrument.svg rename to resources/images/presets/shop/musical_instrument.svg diff --git a/images/presets/shop/news.svg b/resources/images/presets/shop/news.svg similarity index 100% rename from images/presets/shop/news.svg rename to resources/images/presets/shop/news.svg diff --git a/images/presets/shop/optician.svg b/resources/images/presets/shop/optician.svg similarity index 100% rename from images/presets/shop/optician.svg rename to resources/images/presets/shop/optician.svg diff --git a/images/presets/shop/outdoor.svg b/resources/images/presets/shop/outdoor.svg similarity index 100% rename from images/presets/shop/outdoor.svg rename to resources/images/presets/shop/outdoor.svg diff --git a/images/presets/shop/paint.svg b/resources/images/presets/shop/paint.svg similarity index 100% rename from images/presets/shop/paint.svg rename to resources/images/presets/shop/paint.svg diff --git a/images/presets/shop/party.svg b/resources/images/presets/shop/party.svg similarity index 100% rename from images/presets/shop/party.svg rename to resources/images/presets/shop/party.svg diff --git a/images/presets/shop/pawnbroker.svg b/resources/images/presets/shop/pawnbroker.svg similarity index 100% rename from images/presets/shop/pawnbroker.svg rename to resources/images/presets/shop/pawnbroker.svg diff --git a/images/presets/shop/perfumery.svg b/resources/images/presets/shop/perfumery.svg similarity index 100% rename from images/presets/shop/perfumery.svg rename to resources/images/presets/shop/perfumery.svg diff --git a/images/presets/shop/pet.svg b/resources/images/presets/shop/pet.svg similarity index 100% rename from images/presets/shop/pet.svg rename to resources/images/presets/shop/pet.svg diff --git a/images/presets/shop/pet_grooming.svg b/resources/images/presets/shop/pet_grooming.svg similarity index 100% rename from images/presets/shop/pet_grooming.svg rename to resources/images/presets/shop/pet_grooming.svg diff --git a/images/presets/shop/photo.svg b/resources/images/presets/shop/photo.svg similarity index 100% rename from images/presets/shop/photo.svg rename to resources/images/presets/shop/photo.svg diff --git a/images/presets/shop/present.svg b/resources/images/presets/shop/present.svg similarity index 100% rename from images/presets/shop/present.svg rename to resources/images/presets/shop/present.svg diff --git a/images/presets/shop/scuba_diving.svg b/resources/images/presets/shop/scuba_diving.svg similarity index 100% rename from images/presets/shop/scuba_diving.svg rename to resources/images/presets/shop/scuba_diving.svg diff --git a/images/presets/shop/shoes.svg b/resources/images/presets/shop/shoes.svg similarity index 100% rename from images/presets/shop/shoes.svg rename to resources/images/presets/shop/shoes.svg diff --git a/images/presets/shop/stationery.svg b/resources/images/presets/shop/stationery.svg similarity index 100% rename from images/presets/shop/stationery.svg rename to resources/images/presets/shop/stationery.svg diff --git a/images/presets/shop/supermarket.svg b/resources/images/presets/shop/supermarket.svg similarity index 100% rename from images/presets/shop/supermarket.svg rename to resources/images/presets/shop/supermarket.svg diff --git a/images/presets/shop/tailor.svg b/resources/images/presets/shop/tailor.svg similarity index 100% rename from images/presets/shop/tailor.svg rename to resources/images/presets/shop/tailor.svg diff --git a/images/presets/shop/tattoo.svg b/resources/images/presets/shop/tattoo.svg similarity index 100% rename from images/presets/shop/tattoo.svg rename to resources/images/presets/shop/tattoo.svg diff --git a/images/presets/shop/ticket.svg b/resources/images/presets/shop/ticket.svg similarity index 100% rename from images/presets/shop/ticket.svg rename to resources/images/presets/shop/ticket.svg diff --git a/images/presets/shop/tobacco.svg b/resources/images/presets/shop/tobacco.svg similarity index 100% rename from images/presets/shop/tobacco.svg rename to resources/images/presets/shop/tobacco.svg diff --git a/images/presets/shop/toys.svg b/resources/images/presets/shop/toys.svg similarity index 100% rename from images/presets/shop/toys.svg rename to resources/images/presets/shop/toys.svg diff --git a/images/presets/shop/travel_agency.svg b/resources/images/presets/shop/travel_agency.svg similarity index 100% rename from images/presets/shop/travel_agency.svg rename to resources/images/presets/shop/travel_agency.svg diff --git a/images/presets/shop/vacuum_cleaner.svg b/resources/images/presets/shop/vacuum_cleaner.svg similarity index 100% rename from images/presets/shop/vacuum_cleaner.svg rename to resources/images/presets/shop/vacuum_cleaner.svg diff --git a/images/presets/shop/variety_store.svg b/resources/images/presets/shop/variety_store.svg similarity index 100% rename from images/presets/shop/variety_store.svg rename to resources/images/presets/shop/variety_store.svg diff --git a/images/presets/shop/vehicle.svg b/resources/images/presets/shop/vehicle.svg similarity index 100% rename from images/presets/shop/vehicle.svg rename to resources/images/presets/shop/vehicle.svg diff --git a/images/presets/shop/video.svg b/resources/images/presets/shop/video.svg similarity index 100% rename from images/presets/shop/video.svg rename to resources/images/presets/shop/video.svg diff --git a/images/presets/shop/video_games.svg b/resources/images/presets/shop/video_games.svg similarity index 100% rename from images/presets/shop/video_games.svg rename to resources/images/presets/shop/video_games.svg diff --git a/images/presets/shop/watches.svg b/resources/images/presets/shop/watches.svg similarity index 100% rename from images/presets/shop/watches.svg rename to resources/images/presets/shop/watches.svg diff --git a/images/presets/shop/weapons.svg b/resources/images/presets/shop/weapons.svg similarity index 100% rename from images/presets/shop/weapons.svg rename to resources/images/presets/shop/weapons.svg diff --git a/images/presets/shop/wine.svg b/resources/images/presets/shop/wine.svg similarity index 100% rename from images/presets/shop/wine.svg rename to resources/images/presets/shop/wine.svg diff --git a/images/presets/sightseeing/archaeological.svg b/resources/images/presets/sightseeing/archaeological.svg similarity index 100% rename from images/presets/sightseeing/archaeological.svg rename to resources/images/presets/sightseeing/archaeological.svg diff --git a/images/presets/sightseeing/arts_centre.svg b/resources/images/presets/sightseeing/arts_centre.svg similarity index 100% rename from images/presets/sightseeing/arts_centre.svg rename to resources/images/presets/sightseeing/arts_centre.svg diff --git a/images/presets/sightseeing/attraction.svg b/resources/images/presets/sightseeing/attraction.svg similarity index 100% rename from images/presets/sightseeing/attraction.svg rename to resources/images/presets/sightseeing/attraction.svg diff --git a/images/presets/sightseeing/battlefield.svg b/resources/images/presets/sightseeing/battlefield.svg similarity index 100% rename from images/presets/sightseeing/battlefield.svg rename to resources/images/presets/sightseeing/battlefield.svg diff --git a/images/presets/sightseeing/castle.svg b/resources/images/presets/sightseeing/castle.svg similarity index 100% rename from images/presets/sightseeing/castle.svg rename to resources/images/presets/sightseeing/castle.svg diff --git a/images/presets/sightseeing/fort.svg b/resources/images/presets/sightseeing/fort.svg similarity index 100% rename from images/presets/sightseeing/fort.svg rename to resources/images/presets/sightseeing/fort.svg diff --git a/images/presets/sightseeing/memorial.svg b/resources/images/presets/sightseeing/memorial.svg similarity index 100% rename from images/presets/sightseeing/memorial.svg rename to resources/images/presets/sightseeing/memorial.svg diff --git a/images/presets/sightseeing/monument.svg b/resources/images/presets/sightseeing/monument.svg similarity index 100% rename from images/presets/sightseeing/monument.svg rename to resources/images/presets/sightseeing/monument.svg diff --git a/images/presets/sightseeing/museum.svg b/resources/images/presets/sightseeing/museum.svg similarity index 100% rename from images/presets/sightseeing/museum.svg rename to resources/images/presets/sightseeing/museum.svg diff --git a/images/presets/sightseeing/palaeontological_site.svg b/resources/images/presets/sightseeing/palaeontological_site.svg similarity index 100% rename from images/presets/sightseeing/palaeontological_site.svg rename to resources/images/presets/sightseeing/palaeontological_site.svg diff --git a/images/presets/sightseeing/peak_viewpoint.svg b/resources/images/presets/sightseeing/peak_viewpoint.svg similarity index 100% rename from images/presets/sightseeing/peak_viewpoint.svg rename to resources/images/presets/sightseeing/peak_viewpoint.svg diff --git a/images/presets/sightseeing/ruins.svg b/resources/images/presets/sightseeing/ruins.svg similarity index 100% rename from images/presets/sightseeing/ruins.svg rename to resources/images/presets/sightseeing/ruins.svg diff --git a/images/presets/sightseeing/viewpoint.svg b/resources/images/presets/sightseeing/viewpoint.svg similarity index 100% rename from images/presets/sightseeing/viewpoint.svg rename to resources/images/presets/sightseeing/viewpoint.svg diff --git a/images/presets/social_facility/assisted_living.svg b/resources/images/presets/social_facility/assisted_living.svg similarity index 100% rename from images/presets/social_facility/assisted_living.svg rename to resources/images/presets/social_facility/assisted_living.svg diff --git a/images/presets/social_facility/food_bank.svg b/resources/images/presets/social_facility/food_bank.svg similarity index 100% rename from images/presets/social_facility/food_bank.svg rename to resources/images/presets/social_facility/food_bank.svg diff --git a/images/presets/social_facility/group_home.svg b/resources/images/presets/social_facility/group_home.svg similarity index 100% rename from images/presets/social_facility/group_home.svg rename to resources/images/presets/social_facility/group_home.svg diff --git a/images/presets/social_facility/nursing_home.svg b/resources/images/presets/social_facility/nursing_home.svg similarity index 100% rename from images/presets/social_facility/nursing_home.svg rename to resources/images/presets/social_facility/nursing_home.svg diff --git a/images/presets/social_facility/outreach.svg b/resources/images/presets/social_facility/outreach.svg similarity index 100% rename from images/presets/social_facility/outreach.svg rename to resources/images/presets/social_facility/outreach.svg diff --git a/images/presets/social_facility/shelter.svg b/resources/images/presets/social_facility/shelter.svg similarity index 100% rename from images/presets/social_facility/shelter.svg rename to resources/images/presets/social_facility/shelter.svg diff --git a/images/presets/sport/10pin.svg b/resources/images/presets/sport/10pin.svg similarity index 100% rename from images/presets/sport/10pin.svg rename to resources/images/presets/sport/10pin.svg diff --git a/images/presets/sport/9pin.svg b/resources/images/presets/sport/9pin.svg similarity index 100% rename from images/presets/sport/9pin.svg rename to resources/images/presets/sport/9pin.svg diff --git a/images/presets/sport/archery.svg b/resources/images/presets/sport/archery.svg similarity index 100% rename from images/presets/sport/archery.svg rename to resources/images/presets/sport/archery.svg diff --git a/images/presets/sport/athletics.svg b/resources/images/presets/sport/athletics.svg similarity index 100% rename from images/presets/sport/athletics.svg rename to resources/images/presets/sport/athletics.svg diff --git a/images/presets/sport/baseball.svg b/resources/images/presets/sport/baseball.svg similarity index 100% rename from images/presets/sport/baseball.svg rename to resources/images/presets/sport/baseball.svg diff --git a/images/presets/sport/basketball.svg b/resources/images/presets/sport/basketball.svg similarity index 100% rename from images/presets/sport/basketball.svg rename to resources/images/presets/sport/basketball.svg diff --git a/images/presets/sport/beachvolleyball.svg b/resources/images/presets/sport/beachvolleyball.svg similarity index 100% rename from images/presets/sport/beachvolleyball.svg rename to resources/images/presets/sport/beachvolleyball.svg diff --git a/images/presets/sport/billiards.svg b/resources/images/presets/sport/billiards.svg similarity index 100% rename from images/presets/sport/billiards.svg rename to resources/images/presets/sport/billiards.svg diff --git a/images/presets/sport/boule.svg b/resources/images/presets/sport/boule.svg similarity index 100% rename from images/presets/sport/boule.svg rename to resources/images/presets/sport/boule.svg diff --git a/images/presets/sport/canoe.svg b/resources/images/presets/sport/canoe.svg similarity index 100% rename from images/presets/sport/canoe.svg rename to resources/images/presets/sport/canoe.svg diff --git a/images/presets/sport/chess.svg b/resources/images/presets/sport/chess.svg similarity index 100% rename from images/presets/sport/chess.svg rename to resources/images/presets/sport/chess.svg diff --git a/images/presets/sport/climbing.svg b/resources/images/presets/sport/climbing.svg similarity index 100% rename from images/presets/sport/climbing.svg rename to resources/images/presets/sport/climbing.svg diff --git a/images/presets/sport/cricket.svg b/resources/images/presets/sport/cricket.svg similarity index 100% rename from images/presets/sport/cricket.svg rename to resources/images/presets/sport/cricket.svg diff --git a/images/presets/sport/croquet.svg b/resources/images/presets/sport/croquet.svg similarity index 100% rename from images/presets/sport/croquet.svg rename to resources/images/presets/sport/croquet.svg diff --git a/images/presets/sport/cycling.svg b/resources/images/presets/sport/cycling.svg similarity index 100% rename from images/presets/sport/cycling.svg rename to resources/images/presets/sport/cycling.svg diff --git a/images/presets/sport/dog_racing.svg b/resources/images/presets/sport/dog_racing.svg similarity index 100% rename from images/presets/sport/dog_racing.svg rename to resources/images/presets/sport/dog_racing.svg diff --git a/images/presets/sport/equestrian.svg b/resources/images/presets/sport/equestrian.svg similarity index 100% rename from images/presets/sport/equestrian.svg rename to resources/images/presets/sport/equestrian.svg diff --git a/images/presets/sport/field_hockey.svg b/resources/images/presets/sport/field_hockey.svg similarity index 100% rename from images/presets/sport/field_hockey.svg rename to resources/images/presets/sport/field_hockey.svg diff --git a/images/presets/sport/fishing.svg b/resources/images/presets/sport/fishing.svg similarity index 100% rename from images/presets/sport/fishing.svg rename to resources/images/presets/sport/fishing.svg diff --git a/images/presets/sport/fitness_centre.svg b/resources/images/presets/sport/fitness_centre.svg similarity index 100% rename from images/presets/sport/fitness_centre.svg rename to resources/images/presets/sport/fitness_centre.svg diff --git a/images/presets/sport/football.svg b/resources/images/presets/sport/football.svg similarity index 100% rename from images/presets/sport/football.svg rename to resources/images/presets/sport/football.svg diff --git a/images/presets/sport/golf.svg b/resources/images/presets/sport/golf.svg similarity index 100% rename from images/presets/sport/golf.svg rename to resources/images/presets/sport/golf.svg diff --git a/images/presets/sport/golf/bunker.svg b/resources/images/presets/sport/golf/bunker.svg similarity index 100% rename from images/presets/sport/golf/bunker.svg rename to resources/images/presets/sport/golf/bunker.svg diff --git a/images/presets/sport/golf/driving_range.svg b/resources/images/presets/sport/golf/driving_range.svg similarity index 100% rename from images/presets/sport/golf/driving_range.svg rename to resources/images/presets/sport/golf/driving_range.svg diff --git a/images/presets/sport/golf/fairway.svg b/resources/images/presets/sport/golf/fairway.svg similarity index 100% rename from images/presets/sport/golf/fairway.svg rename to resources/images/presets/sport/golf/fairway.svg diff --git a/images/presets/sport/golf/golf.svg b/resources/images/presets/sport/golf/golf.svg similarity index 100% rename from images/presets/sport/golf/golf.svg rename to resources/images/presets/sport/golf/golf.svg diff --git a/images/presets/sport/golf/green.svg b/resources/images/presets/sport/golf/green.svg similarity index 100% rename from images/presets/sport/golf/green.svg rename to resources/images/presets/sport/golf/green.svg diff --git a/images/presets/sport/golf/hole.svg b/resources/images/presets/sport/golf/hole.svg similarity index 100% rename from images/presets/sport/golf/hole.svg rename to resources/images/presets/sport/golf/hole.svg diff --git a/images/presets/sport/golf/lateral_water_hazard.svg b/resources/images/presets/sport/golf/lateral_water_hazard.svg similarity index 100% rename from images/presets/sport/golf/lateral_water_hazard.svg rename to resources/images/presets/sport/golf/lateral_water_hazard.svg diff --git a/images/presets/sport/golf/pin.svg b/resources/images/presets/sport/golf/pin.svg similarity index 100% rename from images/presets/sport/golf/pin.svg rename to resources/images/presets/sport/golf/pin.svg diff --git a/images/presets/sport/golf/rough.svg b/resources/images/presets/sport/golf/rough.svg similarity index 100% rename from images/presets/sport/golf/rough.svg rename to resources/images/presets/sport/golf/rough.svg diff --git a/images/presets/sport/golf/tee.svg b/resources/images/presets/sport/golf/tee.svg similarity index 100% rename from images/presets/sport/golf/tee.svg rename to resources/images/presets/sport/golf/tee.svg diff --git a/images/presets/sport/golf/water_hazard.svg b/resources/images/presets/sport/golf/water_hazard.svg similarity index 100% rename from images/presets/sport/golf/water_hazard.svg rename to resources/images/presets/sport/golf/water_hazard.svg diff --git a/images/presets/sport/gymnastics.svg b/resources/images/presets/sport/gymnastics.svg similarity index 100% rename from images/presets/sport/gymnastics.svg rename to resources/images/presets/sport/gymnastics.svg diff --git a/images/presets/sport/handball.svg b/resources/images/presets/sport/handball.svg similarity index 100% rename from images/presets/sport/handball.svg rename to resources/images/presets/sport/handball.svg diff --git a/images/presets/sport/ice_hockey.svg b/resources/images/presets/sport/ice_hockey.svg similarity index 100% rename from images/presets/sport/ice_hockey.svg rename to resources/images/presets/sport/ice_hockey.svg diff --git a/images/presets/sport/ice_skating.svg b/resources/images/presets/sport/ice_skating.svg similarity index 100% rename from images/presets/sport/ice_skating.svg rename to resources/images/presets/sport/ice_skating.svg diff --git a/images/presets/sport/karting.svg b/resources/images/presets/sport/karting.svg similarity index 100% rename from images/presets/sport/karting.svg rename to resources/images/presets/sport/karting.svg diff --git a/images/presets/sport/miniature_golf.svg b/resources/images/presets/sport/miniature_golf.svg similarity index 100% rename from images/presets/sport/miniature_golf.svg rename to resources/images/presets/sport/miniature_golf.svg diff --git a/images/presets/sport/motocross.svg b/resources/images/presets/sport/motocross.svg similarity index 100% rename from images/presets/sport/motocross.svg rename to resources/images/presets/sport/motocross.svg diff --git a/images/presets/sport/motor.svg b/resources/images/presets/sport/motor.svg similarity index 100% rename from images/presets/sport/motor.svg rename to resources/images/presets/sport/motor.svg diff --git a/images/presets/sport/multi.svg b/resources/images/presets/sport/multi.svg similarity index 100% rename from images/presets/sport/multi.svg rename to resources/images/presets/sport/multi.svg diff --git a/images/presets/sport/pelota.svg b/resources/images/presets/sport/pelota.svg similarity index 100% rename from images/presets/sport/pelota.svg rename to resources/images/presets/sport/pelota.svg diff --git a/images/presets/sport/pitch.svg b/resources/images/presets/sport/pitch.svg similarity index 100% rename from images/presets/sport/pitch.svg rename to resources/images/presets/sport/pitch.svg diff --git a/images/presets/sport/raceway.svg b/resources/images/presets/sport/raceway.svg similarity index 100% rename from images/presets/sport/raceway.svg rename to resources/images/presets/sport/raceway.svg diff --git a/images/presets/sport/racquetball.svg b/resources/images/presets/sport/racquetball.svg similarity index 100% rename from images/presets/sport/racquetball.svg rename to resources/images/presets/sport/racquetball.svg diff --git a/images/presets/sport/range.svg b/resources/images/presets/sport/range.svg similarity index 100% rename from images/presets/sport/range.svg rename to resources/images/presets/sport/range.svg diff --git a/images/presets/sport/rc_car.svg b/resources/images/presets/sport/rc_car.svg similarity index 100% rename from images/presets/sport/rc_car.svg rename to resources/images/presets/sport/rc_car.svg diff --git a/images/presets/sport/riding.svg b/resources/images/presets/sport/riding.svg similarity index 100% rename from images/presets/sport/riding.svg rename to resources/images/presets/sport/riding.svg diff --git a/images/presets/sport/roller_skating.svg b/resources/images/presets/sport/roller_skating.svg similarity index 100% rename from images/presets/sport/roller_skating.svg rename to resources/images/presets/sport/roller_skating.svg diff --git a/images/presets/sport/rowing.svg b/resources/images/presets/sport/rowing.svg similarity index 100% rename from images/presets/sport/rowing.svg rename to resources/images/presets/sport/rowing.svg diff --git a/images/presets/sport/running.svg b/resources/images/presets/sport/running.svg similarity index 100% rename from images/presets/sport/running.svg rename to resources/images/presets/sport/running.svg diff --git a/images/presets/sport/scuba_diving.svg b/resources/images/presets/sport/scuba_diving.svg similarity index 100% rename from images/presets/sport/scuba_diving.svg rename to resources/images/presets/sport/scuba_diving.svg diff --git a/images/presets/sport/skateboard.svg b/resources/images/presets/sport/skateboard.svg similarity index 100% rename from images/presets/sport/skateboard.svg rename to resources/images/presets/sport/skateboard.svg diff --git a/images/presets/sport/skiing.svg b/resources/images/presets/sport/skiing.svg similarity index 100% rename from images/presets/sport/skiing.svg rename to resources/images/presets/sport/skiing.svg diff --git a/images/presets/sport/soccer.svg b/resources/images/presets/sport/soccer.svg similarity index 100% rename from images/presets/sport/soccer.svg rename to resources/images/presets/sport/soccer.svg diff --git a/images/presets/sport/sports_centre.svg b/resources/images/presets/sport/sports_centre.svg similarity index 100% rename from images/presets/sport/sports_centre.svg rename to resources/images/presets/sport/sports_centre.svg diff --git a/images/presets/sport/stadium.svg b/resources/images/presets/sport/stadium.svg similarity index 100% rename from images/presets/sport/stadium.svg rename to resources/images/presets/sport/stadium.svg diff --git a/images/presets/sport/swimming.svg b/resources/images/presets/sport/swimming.svg similarity index 100% rename from images/presets/sport/swimming.svg rename to resources/images/presets/sport/swimming.svg diff --git a/images/presets/sport/table_tennis.svg b/resources/images/presets/sport/table_tennis.svg similarity index 100% rename from images/presets/sport/table_tennis.svg rename to resources/images/presets/sport/table_tennis.svg diff --git a/images/presets/sport/tennis.svg b/resources/images/presets/sport/tennis.svg similarity index 100% rename from images/presets/sport/tennis.svg rename to resources/images/presets/sport/tennis.svg diff --git a/images/presets/sport/track.svg b/resources/images/presets/sport/track.svg similarity index 100% rename from images/presets/sport/track.svg rename to resources/images/presets/sport/track.svg diff --git a/images/presets/sport/volleyball.svg b/resources/images/presets/sport/volleyball.svg similarity index 100% rename from images/presets/sport/volleyball.svg rename to resources/images/presets/sport/volleyball.svg diff --git a/images/presets/telecom/connection_point.svg b/resources/images/presets/telecom/connection_point.svg similarity index 100% rename from images/presets/telecom/connection_point.svg rename to resources/images/presets/telecom/connection_point.svg diff --git a/images/presets/telecom/exchange.svg b/resources/images/presets/telecom/exchange.svg similarity index 100% rename from images/presets/telecom/exchange.svg rename to resources/images/presets/telecom/exchange.svg diff --git a/images/presets/telecom/service_device.svg b/resources/images/presets/telecom/service_device.svg similarity index 100% rename from images/presets/telecom/service_device.svg rename to resources/images/presets/telecom/service_device.svg diff --git a/images/presets/telecom/telecom.svg b/resources/images/presets/telecom/telecom.svg similarity index 100% rename from images/presets/telecom/telecom.svg rename to resources/images/presets/telecom/telecom.svg diff --git a/images/presets/telecom/telecom_cabinet.svg b/resources/images/presets/telecom/telecom_cabinet.svg similarity index 100% rename from images/presets/telecom/telecom_cabinet.svg rename to resources/images/presets/telecom/telecom_cabinet.svg diff --git a/images/presets/transport/aerialway/cable_car.svg b/resources/images/presets/transport/aerialway/cable_car.svg similarity index 100% rename from images/presets/transport/aerialway/cable_car.svg rename to resources/images/presets/transport/aerialway/cable_car.svg diff --git a/images/presets/transport/aerialway/chair_lift.svg b/resources/images/presets/transport/aerialway/chair_lift.svg similarity index 100% rename from images/presets/transport/aerialway/chair_lift.svg rename to resources/images/presets/transport/aerialway/chair_lift.svg diff --git a/images/presets/transport/aerialway/drag_lift.svg b/resources/images/presets/transport/aerialway/drag_lift.svg similarity index 100% rename from images/presets/transport/aerialway/drag_lift.svg rename to resources/images/presets/transport/aerialway/drag_lift.svg diff --git a/images/presets/transport/aerialway/gondola.svg b/resources/images/presets/transport/aerialway/gondola.svg similarity index 100% rename from images/presets/transport/aerialway/gondola.svg rename to resources/images/presets/transport/aerialway/gondola.svg diff --git a/images/presets/transport/aerialway/goods.svg b/resources/images/presets/transport/aerialway/goods.svg similarity index 100% rename from images/presets/transport/aerialway/goods.svg rename to resources/images/presets/transport/aerialway/goods.svg diff --git a/images/presets/transport/aerialway/magic_carpet.svg b/resources/images/presets/transport/aerialway/magic_carpet.svg similarity index 100% rename from images/presets/transport/aerialway/magic_carpet.svg rename to resources/images/presets/transport/aerialway/magic_carpet.svg diff --git a/images/presets/transport/aerialway/mixed_lift.svg b/resources/images/presets/transport/aerialway/mixed_lift.svg similarity index 100% rename from images/presets/transport/aerialway/mixed_lift.svg rename to resources/images/presets/transport/aerialway/mixed_lift.svg diff --git a/images/presets/transport/aerialway/pylon.svg b/resources/images/presets/transport/aerialway/pylon.svg similarity index 100% rename from images/presets/transport/aerialway/pylon.svg rename to resources/images/presets/transport/aerialway/pylon.svg diff --git a/images/presets/transport/aerialway/station.svg b/resources/images/presets/transport/aerialway/station.svg similarity index 100% rename from images/presets/transport/aerialway/station.svg rename to resources/images/presets/transport/aerialway/station.svg diff --git a/images/presets/transport/aerialway/zip_line.svg b/resources/images/presets/transport/aerialway/zip_line.svg similarity index 100% rename from images/presets/transport/aerialway/zip_line.svg rename to resources/images/presets/transport/aerialway/zip_line.svg diff --git a/images/presets/transport/airport.svg b/resources/images/presets/transport/airport.svg similarity index 100% rename from images/presets/transport/airport.svg rename to resources/images/presets/transport/airport.svg diff --git a/images/presets/transport/airport/airfield.svg b/resources/images/presets/transport/airport/airfield.svg similarity index 100% rename from images/presets/transport/airport/airfield.svg rename to resources/images/presets/transport/airport/airfield.svg diff --git a/images/presets/transport/airport/airmark_beacon.svg b/resources/images/presets/transport/airport/airmark_beacon.svg similarity index 100% rename from images/presets/transport/airport/airmark_beacon.svg rename to resources/images/presets/transport/airport/airmark_beacon.svg diff --git a/images/presets/transport/airport/apron.svg b/resources/images/presets/transport/airport/apron.svg similarity index 100% rename from images/presets/transport/airport/apron.svg rename to resources/images/presets/transport/airport/apron.svg diff --git a/images/presets/transport/airport/gate.svg b/resources/images/presets/transport/airport/gate.svg similarity index 100% rename from images/presets/transport/airport/gate.svg rename to resources/images/presets/transport/airport/gate.svg diff --git a/images/presets/transport/airport/hangar.svg b/resources/images/presets/transport/airport/hangar.svg similarity index 100% rename from images/presets/transport/airport/hangar.svg rename to resources/images/presets/transport/airport/hangar.svg diff --git a/images/presets/transport/airport/helipad.svg b/resources/images/presets/transport/airport/helipad.svg similarity index 100% rename from images/presets/transport/airport/helipad.svg rename to resources/images/presets/transport/airport/helipad.svg diff --git a/images/presets/transport/airport/holding_position.svg b/resources/images/presets/transport/airport/holding_position.svg similarity index 100% rename from images/presets/transport/airport/holding_position.svg rename to resources/images/presets/transport/airport/holding_position.svg diff --git a/images/presets/transport/airport/navigationaid.svg b/resources/images/presets/transport/airport/navigationaid.svg similarity index 100% rename from images/presets/transport/airport/navigationaid.svg rename to resources/images/presets/transport/airport/navigationaid.svg diff --git a/images/presets/transport/airport/papi.svg b/resources/images/presets/transport/airport/papi.svg similarity index 100% rename from images/presets/transport/airport/papi.svg rename to resources/images/presets/transport/airport/papi.svg diff --git a/images/presets/transport/airport/parking_position.svg b/resources/images/presets/transport/airport/parking_position.svg similarity index 100% rename from images/presets/transport/airport/parking_position.svg rename to resources/images/presets/transport/airport/parking_position.svg diff --git a/images/presets/transport/airport/runway.svg b/resources/images/presets/transport/airport/runway.svg similarity index 100% rename from images/presets/transport/airport/runway.svg rename to resources/images/presets/transport/airport/runway.svg diff --git a/images/presets/transport/airport/taxiway.svg b/resources/images/presets/transport/airport/taxiway.svg similarity index 100% rename from images/presets/transport/airport/taxiway.svg rename to resources/images/presets/transport/airport/taxiway.svg diff --git a/images/presets/transport/airport/terminal.svg b/resources/images/presets/transport/airport/terminal.svg similarity index 100% rename from images/presets/transport/airport/terminal.svg rename to resources/images/presets/transport/airport/terminal.svg diff --git a/images/presets/transport/airport/vasi.svg b/resources/images/presets/transport/airport/vasi.svg similarity index 100% rename from images/presets/transport/airport/vasi.svg rename to resources/images/presets/transport/airport/vasi.svg diff --git a/images/presets/transport/airport/windsock.svg b/resources/images/presets/transport/airport/windsock.svg similarity index 100% rename from images/presets/transport/airport/windsock.svg rename to resources/images/presets/transport/airport/windsock.svg diff --git a/images/presets/transport/bridge/bridge.svg b/resources/images/presets/transport/bridge/bridge.svg similarity index 100% rename from images/presets/transport/bridge/bridge.svg rename to resources/images/presets/transport/bridge/bridge.svg diff --git a/images/presets/transport/bridge/bridge_movable.svg b/resources/images/presets/transport/bridge/bridge_movable.svg similarity index 100% rename from images/presets/transport/bridge/bridge_movable.svg rename to resources/images/presets/transport/bridge/bridge_movable.svg diff --git a/images/presets/transport/bridge/bridge_outline.svg b/resources/images/presets/transport/bridge/bridge_outline.svg similarity index 100% rename from images/presets/transport/bridge/bridge_outline.svg rename to resources/images/presets/transport/bridge/bridge_outline.svg diff --git a/images/presets/transport/bridge/bridge_support.svg b/resources/images/presets/transport/bridge/bridge_support.svg similarity index 100% rename from images/presets/transport/bridge/bridge_support.svg rename to resources/images/presets/transport/bridge/bridge_support.svg diff --git a/images/presets/transport/bus.svg b/resources/images/presets/transport/bus.svg similarity index 100% rename from images/presets/transport/bus.svg rename to resources/images/presets/transport/bus.svg diff --git a/images/presets/transport/bus_old.svg b/resources/images/presets/transport/bus_old.svg similarity index 100% rename from images/presets/transport/bus_old.svg rename to resources/images/presets/transport/bus_old.svg diff --git a/images/presets/transport/bus_small.svg b/resources/images/presets/transport/bus_small.svg similarity index 100% rename from images/presets/transport/bus_small.svg rename to resources/images/presets/transport/bus_small.svg diff --git a/images/presets/transport/passage/arcade.svg b/resources/images/presets/transport/passage/arcade.svg similarity index 100% rename from images/presets/transport/passage/arcade.svg rename to resources/images/presets/transport/passage/arcade.svg diff --git a/images/presets/transport/passage/colonnade.svg b/resources/images/presets/transport/passage/colonnade.svg similarity index 100% rename from images/presets/transport/passage/colonnade.svg rename to resources/images/presets/transport/passage/colonnade.svg diff --git a/images/presets/transport/passage/tunnel.svg b/resources/images/presets/transport/passage/tunnel.svg similarity index 100% rename from images/presets/transport/passage/tunnel.svg rename to resources/images/presets/transport/passage/tunnel.svg diff --git a/images/presets/transport/passage/tunnel_avalanche_protector.svg b/resources/images/presets/transport/passage/tunnel_avalanche_protector.svg similarity index 100% rename from images/presets/transport/passage/tunnel_avalanche_protector.svg rename to resources/images/presets/transport/passage/tunnel_avalanche_protector.svg diff --git a/images/presets/transport/passage/tunnel_building_passage.svg b/resources/images/presets/transport/passage/tunnel_building_passage.svg similarity index 100% rename from images/presets/transport/passage/tunnel_building_passage.svg rename to resources/images/presets/transport/passage/tunnel_building_passage.svg diff --git a/images/presets/transport/passage/tunnel_culvert.svg b/resources/images/presets/transport/passage/tunnel_culvert.svg similarity index 100% rename from images/presets/transport/passage/tunnel_culvert.svg rename to resources/images/presets/transport/passage/tunnel_culvert.svg diff --git a/images/presets/transport/platform.svg b/resources/images/presets/transport/platform.svg similarity index 100% rename from images/presets/transport/platform.svg rename to resources/images/presets/transport/platform.svg diff --git a/images/presets/transport/platform_bus.svg b/resources/images/presets/transport/platform_bus.svg similarity index 100% rename from images/presets/transport/platform_bus.svg rename to resources/images/presets/transport/platform_bus.svg diff --git a/images/presets/transport/platform_rail.svg b/resources/images/presets/transport/platform_rail.svg similarity index 100% rename from images/presets/transport/platform_rail.svg rename to resources/images/presets/transport/platform_rail.svg diff --git a/images/presets/transport/railway/abandoned_rail.svg b/resources/images/presets/transport/railway/abandoned_rail.svg similarity index 100% rename from images/presets/transport/railway/abandoned_rail.svg rename to resources/images/presets/transport/railway/abandoned_rail.svg diff --git a/images/presets/transport/railway/buffer_stop.svg b/resources/images/presets/transport/railway/buffer_stop.svg similarity index 100% rename from images/presets/transport/railway/buffer_stop.svg rename to resources/images/presets/transport/railway/buffer_stop.svg diff --git a/images/presets/transport/railway/bus_guideway.svg b/resources/images/presets/transport/railway/bus_guideway.svg similarity index 100% rename from images/presets/transport/railway/bus_guideway.svg rename to resources/images/presets/transport/railway/bus_guideway.svg diff --git a/images/presets/transport/railway/crossing.svg b/resources/images/presets/transport/railway/crossing.svg similarity index 100% rename from images/presets/transport/railway/crossing.svg rename to resources/images/presets/transport/railway/crossing.svg diff --git a/images/presets/transport/railway/disused_rail.svg b/resources/images/presets/transport/railway/disused_rail.svg similarity index 100% rename from images/presets/transport/railway/disused_rail.svg rename to resources/images/presets/transport/railway/disused_rail.svg diff --git a/images/presets/transport/railway/funicular.svg b/resources/images/presets/transport/railway/funicular.svg similarity index 100% rename from images/presets/transport/railway/funicular.svg rename to resources/images/presets/transport/railway/funicular.svg diff --git a/images/presets/transport/railway/level_crossing.svg b/resources/images/presets/transport/railway/level_crossing.svg similarity index 100% rename from images/presets/transport/railway/level_crossing.svg rename to resources/images/presets/transport/railway/level_crossing.svg diff --git a/images/presets/transport/railway/light_rail.svg b/resources/images/presets/transport/railway/light_rail.svg similarity index 100% rename from images/presets/transport/railway/light_rail.svg rename to resources/images/presets/transport/railway/light_rail.svg diff --git a/images/presets/transport/railway/milestone.svg b/resources/images/presets/transport/railway/milestone.svg similarity index 100% rename from images/presets/transport/railway/milestone.svg rename to resources/images/presets/transport/railway/milestone.svg diff --git a/images/presets/transport/railway/monorail.svg b/resources/images/presets/transport/railway/monorail.svg similarity index 100% rename from images/presets/transport/railway/monorail.svg rename to resources/images/presets/transport/railway/monorail.svg diff --git a/images/presets/transport/railway/narrow_gauge_rail.svg b/resources/images/presets/transport/railway/narrow_gauge_rail.svg similarity index 100% rename from images/presets/transport/railway/narrow_gauge_rail.svg rename to resources/images/presets/transport/railway/narrow_gauge_rail.svg diff --git a/images/presets/transport/railway/preserved.svg b/resources/images/presets/transport/railway/preserved.svg similarity index 100% rename from images/presets/transport/railway/preserved.svg rename to resources/images/presets/transport/railway/preserved.svg diff --git a/images/presets/transport/railway/rail.svg b/resources/images/presets/transport/railway/rail.svg similarity index 100% rename from images/presets/transport/railway/rail.svg rename to resources/images/presets/transport/railway/rail.svg diff --git a/images/presets/transport/railway/railway_construction.svg b/resources/images/presets/transport/railway/railway_construction.svg similarity index 100% rename from images/presets/transport/railway/railway_construction.svg rename to resources/images/presets/transport/railway/railway_construction.svg diff --git a/images/presets/transport/railway/railway_crossing.svg b/resources/images/presets/transport/railway/railway_crossing.svg similarity index 100% rename from images/presets/transport/railway/railway_crossing.svg rename to resources/images/presets/transport/railway/railway_crossing.svg diff --git a/images/presets/transport/railway/signal.svg b/resources/images/presets/transport/railway/signal.svg similarity index 100% rename from images/presets/transport/railway/signal.svg rename to resources/images/presets/transport/railway/signal.svg diff --git a/images/presets/transport/railway/subway.svg b/resources/images/presets/transport/railway/subway.svg similarity index 100% rename from images/presets/transport/railway/subway.svg rename to resources/images/presets/transport/railway/subway.svg diff --git a/images/presets/transport/railway/switch.svg b/resources/images/presets/transport/railway/switch.svg similarity index 100% rename from images/presets/transport/railway/switch.svg rename to resources/images/presets/transport/railway/switch.svg diff --git a/images/presets/transport/railway/tram.svg b/resources/images/presets/transport/railway/tram.svg similarity index 100% rename from images/presets/transport/railway/tram.svg rename to resources/images/presets/transport/railway/tram.svg diff --git a/images/presets/transport/railway/turntable.svg b/resources/images/presets/transport/railway/turntable.svg similarity index 100% rename from images/presets/transport/railway/turntable.svg rename to resources/images/presets/transport/railway/turntable.svg diff --git a/images/presets/transport/railway_halt.svg b/resources/images/presets/transport/railway_halt.svg similarity index 100% rename from images/presets/transport/railway_halt.svg rename to resources/images/presets/transport/railway_halt.svg diff --git a/images/presets/transport/railway_station.svg b/resources/images/presets/transport/railway_station.svg similarity index 100% rename from images/presets/transport/railway_station.svg rename to resources/images/presets/transport/railway_station.svg diff --git a/images/presets/transport/share_taxi.svg b/resources/images/presets/transport/share_taxi.svg similarity index 100% rename from images/presets/transport/share_taxi.svg rename to resources/images/presets/transport/share_taxi.svg diff --git a/images/presets/transport/station.svg b/resources/images/presets/transport/station.svg similarity index 100% rename from images/presets/transport/station.svg rename to resources/images/presets/transport/station.svg diff --git a/images/presets/transport/stop_position.svg b/resources/images/presets/transport/stop_position.svg similarity index 100% rename from images/presets/transport/stop_position.svg rename to resources/images/presets/transport/stop_position.svg diff --git a/images/presets/transport/taxi.svg b/resources/images/presets/transport/taxi.svg similarity index 100% rename from images/presets/transport/taxi.svg rename to resources/images/presets/transport/taxi.svg diff --git a/images/presets/transport/ticket-machine.svg b/resources/images/presets/transport/ticket-machine.svg similarity index 100% rename from images/presets/transport/ticket-machine.svg rename to resources/images/presets/transport/ticket-machine.svg diff --git a/images/presets/transport/train.svg b/resources/images/presets/transport/train.svg similarity index 100% rename from images/presets/transport/train.svg rename to resources/images/presets/transport/train.svg diff --git a/images/presets/transport/tram.svg b/resources/images/presets/transport/tram.svg similarity index 100% rename from images/presets/transport/tram.svg rename to resources/images/presets/transport/tram.svg diff --git a/images/presets/transport/trolleybus.svg b/resources/images/presets/transport/trolleybus.svg similarity index 100% rename from images/presets/transport/trolleybus.svg rename to resources/images/presets/transport/trolleybus.svg diff --git a/images/presets/transport/underground.svg b/resources/images/presets/transport/underground.svg similarity index 100% rename from images/presets/transport/underground.svg rename to resources/images/presets/transport/underground.svg diff --git a/images/presets/transport/way/combined_foot_cycleway.svg b/resources/images/presets/transport/way/combined_foot_cycleway.svg similarity index 100% rename from images/presets/transport/way/combined_foot_cycleway.svg rename to resources/images/presets/transport/way/combined_foot_cycleway.svg diff --git a/images/presets/transport/way/cycle_lane_track.svg b/resources/images/presets/transport/way/cycle_lane_track.svg similarity index 100% rename from images/presets/transport/way/cycle_lane_track.svg rename to resources/images/presets/transport/way/cycle_lane_track.svg diff --git a/images/presets/transport/way/dedicated_bridleway.svg b/resources/images/presets/transport/way/dedicated_bridleway.svg similarity index 100% rename from images/presets/transport/way/dedicated_bridleway.svg rename to resources/images/presets/transport/way/dedicated_bridleway.svg diff --git a/images/presets/transport/way/dedicated_cycleway.svg b/resources/images/presets/transport/way/dedicated_cycleway.svg similarity index 100% rename from images/presets/transport/way/dedicated_cycleway.svg rename to resources/images/presets/transport/way/dedicated_cycleway.svg diff --git a/images/presets/transport/way/dedicated_footway.svg b/resources/images/presets/transport/way/dedicated_footway.svg similarity index 100% rename from images/presets/transport/way/dedicated_footway.svg rename to resources/images/presets/transport/way/dedicated_footway.svg diff --git a/images/presets/transport/way/path.svg b/resources/images/presets/transport/way/path.svg similarity index 100% rename from images/presets/transport/way/path.svg rename to resources/images/presets/transport/way/path.svg diff --git a/images/presets/transport/way/segregated_foot_cycleway.svg b/resources/images/presets/transport/way/segregated_foot_cycleway.svg similarity index 100% rename from images/presets/transport/way/segregated_foot_cycleway.svg rename to resources/images/presets/transport/way/segregated_foot_cycleway.svg diff --git a/images/presets/transport/way/steps.svg b/resources/images/presets/transport/way/steps.svg similarity index 100% rename from images/presets/transport/way/steps.svg rename to resources/images/presets/transport/way/steps.svg diff --git a/images/presets/transport/way/track.svg b/resources/images/presets/transport/way/track.svg similarity index 100% rename from images/presets/transport/way/track.svg rename to resources/images/presets/transport/way/track.svg diff --git a/images/presets/transport/way/tracktype_grade1.svg b/resources/images/presets/transport/way/tracktype_grade1.svg similarity index 100% rename from images/presets/transport/way/tracktype_grade1.svg rename to resources/images/presets/transport/way/tracktype_grade1.svg diff --git a/images/presets/transport/way/tracktype_grade2.svg b/resources/images/presets/transport/way/tracktype_grade2.svg similarity index 100% rename from images/presets/transport/way/tracktype_grade2.svg rename to resources/images/presets/transport/way/tracktype_grade2.svg diff --git a/images/presets/transport/way/tracktype_grade3.svg b/resources/images/presets/transport/way/tracktype_grade3.svg similarity index 100% rename from images/presets/transport/way/tracktype_grade3.svg rename to resources/images/presets/transport/way/tracktype_grade3.svg diff --git a/images/presets/transport/way/tracktype_grade4.svg b/resources/images/presets/transport/way/tracktype_grade4.svg similarity index 100% rename from images/presets/transport/way/tracktype_grade4.svg rename to resources/images/presets/transport/way/tracktype_grade4.svg diff --git a/images/presets/transport/way/tracktype_grade5.svg b/resources/images/presets/transport/way/tracktype_grade5.svg similarity index 100% rename from images/presets/transport/way/tracktype_grade5.svg rename to resources/images/presets/transport/way/tracktype_grade5.svg diff --git a/images/presets/transport/way/way_bicycle_road.svg b/resources/images/presets/transport/way/way_bicycle_road.svg similarity index 100% rename from images/presets/transport/way/way_bicycle_road.svg rename to resources/images/presets/transport/way/way_bicycle_road.svg diff --git a/images/presets/transport/way/way_construction.svg b/resources/images/presets/transport/way/way_construction.svg similarity index 100% rename from images/presets/transport/way/way_construction.svg rename to resources/images/presets/transport/way/way_construction.svg diff --git a/images/presets/transport/way/way_escape.svg b/resources/images/presets/transport/way/way_escape.svg similarity index 100% rename from images/presets/transport/way/way_escape.svg rename to resources/images/presets/transport/way/way_escape.svg diff --git a/images/presets/transport/way/way_living_street.svg b/resources/images/presets/transport/way/way_living_street.svg similarity index 100% rename from images/presets/transport/way/way_living_street.svg rename to resources/images/presets/transport/way/way_living_street.svg diff --git a/images/presets/transport/way/way_motorway.svg b/resources/images/presets/transport/way/way_motorway.svg similarity index 100% rename from images/presets/transport/way/way_motorway.svg rename to resources/images/presets/transport/way/way_motorway.svg diff --git a/images/presets/transport/way/way_motorway_link.svg b/resources/images/presets/transport/way/way_motorway_link.svg similarity index 100% rename from images/presets/transport/way/way_motorway_link.svg rename to resources/images/presets/transport/way/way_motorway_link.svg diff --git a/images/presets/transport/way/way_pedestrian.svg b/resources/images/presets/transport/way/way_pedestrian.svg similarity index 100% rename from images/presets/transport/way/way_pedestrian.svg rename to resources/images/presets/transport/way/way_pedestrian.svg diff --git a/images/presets/transport/way/way_primary.svg b/resources/images/presets/transport/way/way_primary.svg similarity index 100% rename from images/presets/transport/way/way_primary.svg rename to resources/images/presets/transport/way/way_primary.svg diff --git a/images/presets/transport/way/way_primary_link.svg b/resources/images/presets/transport/way/way_primary_link.svg similarity index 100% rename from images/presets/transport/way/way_primary_link.svg rename to resources/images/presets/transport/way/way_primary_link.svg diff --git a/images/presets/transport/way/way_residential.svg b/resources/images/presets/transport/way/way_residential.svg similarity index 100% rename from images/presets/transport/way/way_residential.svg rename to resources/images/presets/transport/way/way_residential.svg diff --git a/images/presets/transport/way/way_road.svg b/resources/images/presets/transport/way/way_road.svg similarity index 100% rename from images/presets/transport/way/way_road.svg rename to resources/images/presets/transport/way/way_road.svg diff --git a/images/presets/transport/way/way_secondary.svg b/resources/images/presets/transport/way/way_secondary.svg similarity index 100% rename from images/presets/transport/way/way_secondary.svg rename to resources/images/presets/transport/way/way_secondary.svg diff --git a/images/presets/transport/way/way_secondary_link.svg b/resources/images/presets/transport/way/way_secondary_link.svg similarity index 100% rename from images/presets/transport/way/way_secondary_link.svg rename to resources/images/presets/transport/way/way_secondary_link.svg diff --git a/images/presets/transport/way/way_service.svg b/resources/images/presets/transport/way/way_service.svg similarity index 100% rename from images/presets/transport/way/way_service.svg rename to resources/images/presets/transport/way/way_service.svg diff --git a/images/presets/transport/way/way_service_parking_aisle.svg b/resources/images/presets/transport/way/way_service_parking_aisle.svg similarity index 100% rename from images/presets/transport/way/way_service_parking_aisle.svg rename to resources/images/presets/transport/way/way_service_parking_aisle.svg diff --git a/images/presets/transport/way/way_tertiary.svg b/resources/images/presets/transport/way/way_tertiary.svg similarity index 100% rename from images/presets/transport/way/way_tertiary.svg rename to resources/images/presets/transport/way/way_tertiary.svg diff --git a/images/presets/transport/way/way_tertiary_link.svg b/resources/images/presets/transport/way/way_tertiary_link.svg similarity index 100% rename from images/presets/transport/way/way_tertiary_link.svg rename to resources/images/presets/transport/way/way_tertiary_link.svg diff --git a/images/presets/transport/way/way_trunk.svg b/resources/images/presets/transport/way/way_trunk.svg similarity index 100% rename from images/presets/transport/way/way_trunk.svg rename to resources/images/presets/transport/way/way_trunk.svg diff --git a/images/presets/transport/way/way_trunk_link.svg b/resources/images/presets/transport/way/way_trunk_link.svg similarity index 100% rename from images/presets/transport/way/way_trunk_link.svg rename to resources/images/presets/transport/way/way_trunk_link.svg diff --git a/images/presets/transport/way/way_unclassified.svg b/resources/images/presets/transport/way/way_unclassified.svg similarity index 100% rename from images/presets/transport/way/way_unclassified.svg rename to resources/images/presets/transport/way/way_unclassified.svg diff --git a/images/presets/vehicle/asl.svg b/resources/images/presets/vehicle/asl.svg similarity index 100% rename from images/presets/vehicle/asl.svg rename to resources/images/presets/vehicle/asl.svg diff --git a/images/presets/vehicle/bicycle_rental.svg b/resources/images/presets/vehicle/bicycle_rental.svg similarity index 100% rename from images/presets/vehicle/bicycle_rental.svg rename to resources/images/presets/vehicle/bicycle_rental.svg diff --git a/images/presets/vehicle/bicycle_repair_station.svg b/resources/images/presets/vehicle/bicycle_repair_station.svg similarity index 100% rename from images/presets/vehicle/bicycle_repair_station.svg rename to resources/images/presets/vehicle/bicycle_repair_station.svg diff --git a/images/presets/vehicle/bump.svg b/resources/images/presets/vehicle/bump.svg similarity index 100% rename from images/presets/vehicle/bump.svg rename to resources/images/presets/vehicle/bump.svg diff --git a/images/presets/vehicle/car_parts.svg b/resources/images/presets/vehicle/car_parts.svg similarity index 100% rename from images/presets/vehicle/car_parts.svg rename to resources/images/presets/vehicle/car_parts.svg diff --git a/images/presets/vehicle/car_pooling.svg b/resources/images/presets/vehicle/car_pooling.svg similarity index 100% rename from images/presets/vehicle/car_pooling.svg rename to resources/images/presets/vehicle/car_pooling.svg diff --git a/images/presets/vehicle/car_rental.svg b/resources/images/presets/vehicle/car_rental.svg similarity index 100% rename from images/presets/vehicle/car_rental.svg rename to resources/images/presets/vehicle/car_rental.svg diff --git a/images/presets/vehicle/car_sharing.svg b/resources/images/presets/vehicle/car_sharing.svg similarity index 100% rename from images/presets/vehicle/car_sharing.svg rename to resources/images/presets/vehicle/car_sharing.svg diff --git a/images/presets/vehicle/car_wash.svg b/resources/images/presets/vehicle/car_wash.svg similarity index 100% rename from images/presets/vehicle/car_wash.svg rename to resources/images/presets/vehicle/car_wash.svg diff --git a/images/presets/vehicle/charging_station.svg b/resources/images/presets/vehicle/charging_station.svg similarity index 100% rename from images/presets/vehicle/charging_station.svg rename to resources/images/presets/vehicle/charging_station.svg diff --git a/images/presets/vehicle/chicane.svg b/resources/images/presets/vehicle/chicane.svg similarity index 100% rename from images/presets/vehicle/chicane.svg rename to resources/images/presets/vehicle/chicane.svg diff --git a/images/presets/vehicle/choker.svg b/resources/images/presets/vehicle/choker.svg similarity index 100% rename from images/presets/vehicle/choker.svg rename to resources/images/presets/vehicle/choker.svg diff --git a/images/presets/vehicle/compressed_air.svg b/resources/images/presets/vehicle/compressed_air.svg similarity index 100% rename from images/presets/vehicle/compressed_air.svg rename to resources/images/presets/vehicle/compressed_air.svg diff --git a/images/presets/vehicle/crossing.svg b/resources/images/presets/vehicle/crossing.svg similarity index 100% rename from images/presets/vehicle/crossing.svg rename to resources/images/presets/vehicle/crossing.svg diff --git a/images/presets/vehicle/crossing_island.svg b/resources/images/presets/vehicle/crossing_island.svg similarity index 100% rename from images/presets/vehicle/crossing_island.svg rename to resources/images/presets/vehicle/crossing_island.svg diff --git a/images/presets/vehicle/crossing_ref_zebra.svg b/resources/images/presets/vehicle/crossing_ref_zebra.svg similarity index 100% rename from images/presets/vehicle/crossing_ref_zebra.svg rename to resources/images/presets/vehicle/crossing_ref_zebra.svg diff --git a/images/presets/vehicle/crossing_traffic_signals.svg b/resources/images/presets/vehicle/crossing_traffic_signals.svg similarity index 100% rename from images/presets/vehicle/crossing_traffic_signals.svg rename to resources/images/presets/vehicle/crossing_traffic_signals.svg diff --git a/images/presets/vehicle/crossing_unmarked.svg b/resources/images/presets/vehicle/crossing_unmarked.svg similarity index 100% rename from images/presets/vehicle/crossing_unmarked.svg rename to resources/images/presets/vehicle/crossing_unmarked.svg diff --git a/images/presets/vehicle/cushion.svg b/resources/images/presets/vehicle/cushion.svg similarity index 100% rename from images/presets/vehicle/cushion.svg rename to resources/images/presets/vehicle/cushion.svg diff --git a/images/presets/vehicle/dip.svg b/resources/images/presets/vehicle/dip.svg similarity index 100% rename from images/presets/vehicle/dip.svg rename to resources/images/presets/vehicle/dip.svg diff --git a/images/presets/vehicle/emergency_phone.svg b/resources/images/presets/vehicle/emergency_phone.svg similarity index 100% rename from images/presets/vehicle/emergency_phone.svg rename to resources/images/presets/vehicle/emergency_phone.svg diff --git a/images/presets/vehicle/ford.svg b/resources/images/presets/vehicle/ford.svg similarity index 100% rename from images/presets/vehicle/ford.svg rename to resources/images/presets/vehicle/ford.svg diff --git a/images/presets/vehicle/fuel.svg b/resources/images/presets/vehicle/fuel.svg similarity index 100% rename from images/presets/vehicle/fuel.svg rename to resources/images/presets/vehicle/fuel.svg diff --git a/images/presets/vehicle/hump.svg b/resources/images/presets/vehicle/hump.svg similarity index 100% rename from images/presets/vehicle/hump.svg rename to resources/images/presets/vehicle/hump.svg diff --git a/images/presets/vehicle/island.svg b/resources/images/presets/vehicle/island.svg similarity index 100% rename from images/presets/vehicle/island.svg rename to resources/images/presets/vehicle/island.svg diff --git a/images/presets/vehicle/junction.svg b/resources/images/presets/vehicle/junction.svg similarity index 100% rename from images/presets/vehicle/junction.svg rename to resources/images/presets/vehicle/junction.svg diff --git a/images/presets/vehicle/milestone.svg b/resources/images/presets/vehicle/milestone.svg similarity index 100% rename from images/presets/vehicle/milestone.svg rename to resources/images/presets/vehicle/milestone.svg diff --git a/images/presets/vehicle/motorbike.svg b/resources/images/presets/vehicle/motorbike.svg similarity index 100% rename from images/presets/vehicle/motorbike.svg rename to resources/images/presets/vehicle/motorbike.svg diff --git a/images/presets/vehicle/motorway_junction.svg b/resources/images/presets/vehicle/motorway_junction.svg similarity index 100% rename from images/presets/vehicle/motorway_junction.svg rename to resources/images/presets/vehicle/motorway_junction.svg diff --git a/images/presets/vehicle/parking/bicycle.svg b/resources/images/presets/vehicle/parking/bicycle.svg similarity index 100% rename from images/presets/vehicle/parking/bicycle.svg rename to resources/images/presets/vehicle/parking/bicycle.svg diff --git a/images/presets/vehicle/parking/handicapped.svg b/resources/images/presets/vehicle/parking/handicapped.svg similarity index 100% rename from images/presets/vehicle/parking/handicapped.svg rename to resources/images/presets/vehicle/parking/handicapped.svg diff --git a/images/presets/vehicle/parking/motorbike.svg b/resources/images/presets/vehicle/parking/motorbike.svg similarity index 100% rename from images/presets/vehicle/parking/motorbike.svg rename to resources/images/presets/vehicle/parking/motorbike.svg diff --git a/images/presets/vehicle/parking/multi-storey.svg b/resources/images/presets/vehicle/parking/multi-storey.svg similarity index 100% rename from images/presets/vehicle/parking/multi-storey.svg rename to resources/images/presets/vehicle/parking/multi-storey.svg diff --git a/images/presets/vehicle/parking/park_ride.svg b/resources/images/presets/vehicle/parking/park_ride.svg similarity index 100% rename from images/presets/vehicle/parking/park_ride.svg rename to resources/images/presets/vehicle/parking/park_ride.svg diff --git a/images/presets/vehicle/parking/parking.svg b/resources/images/presets/vehicle/parking/parking.svg similarity index 100% rename from images/presets/vehicle/parking/parking.svg rename to resources/images/presets/vehicle/parking/parking.svg diff --git a/images/presets/vehicle/parking/parking_space.svg b/resources/images/presets/vehicle/parking/parking_space.svg similarity index 100% rename from images/presets/vehicle/parking/parking_space.svg rename to resources/images/presets/vehicle/parking/parking_space.svg diff --git a/images/presets/vehicle/parking/underground.svg b/resources/images/presets/vehicle/parking/underground.svg similarity index 100% rename from images/presets/vehicle/parking/underground.svg rename to resources/images/presets/vehicle/parking/underground.svg diff --git a/images/presets/vehicle/passing_place.svg b/resources/images/presets/vehicle/passing_place.svg similarity index 100% rename from images/presets/vehicle/passing_place.svg rename to resources/images/presets/vehicle/passing_place.svg diff --git a/images/presets/vehicle/repair_shop.svg b/resources/images/presets/vehicle/repair_shop.svg similarity index 100% rename from images/presets/vehicle/repair_shop.svg rename to resources/images/presets/vehicle/repair_shop.svg diff --git a/images/presets/vehicle/rest_area.svg b/resources/images/presets/vehicle/rest_area.svg similarity index 100% rename from images/presets/vehicle/rest_area.svg rename to resources/images/presets/vehicle/rest_area.svg diff --git a/images/presets/vehicle/restriction/bicycle-designated.svg b/resources/images/presets/vehicle/restriction/bicycle-designated.svg similarity index 100% rename from images/presets/vehicle/restriction/bicycle-designated.svg rename to resources/images/presets/vehicle/restriction/bicycle-designated.svg diff --git a/images/presets/vehicle/restriction/bicycle.svg b/resources/images/presets/vehicle/restriction/bicycle.svg similarity index 100% rename from images/presets/vehicle/restriction/bicycle.svg rename to resources/images/presets/vehicle/restriction/bicycle.svg diff --git a/images/presets/vehicle/restriction/city_limit.svg b/resources/images/presets/vehicle/restriction/city_limit.svg similarity index 100% rename from images/presets/vehicle/restriction/city_limit.svg rename to resources/images/presets/vehicle/restriction/city_limit.svg diff --git a/images/presets/vehicle/restriction/dead_end.svg b/resources/images/presets/vehicle/restriction/dead_end.svg similarity index 100% rename from images/presets/vehicle/restriction/dead_end.svg rename to resources/images/presets/vehicle/restriction/dead_end.svg diff --git a/images/presets/vehicle/restriction/foot-designated.svg b/resources/images/presets/vehicle/restriction/foot-designated.svg similarity index 100% rename from images/presets/vehicle/restriction/foot-designated.svg rename to resources/images/presets/vehicle/restriction/foot-designated.svg diff --git a/images/presets/vehicle/restriction/foot.svg b/resources/images/presets/vehicle/restriction/foot.svg similarity index 100% rename from images/presets/vehicle/restriction/foot.svg rename to resources/images/presets/vehicle/restriction/foot.svg diff --git a/images/presets/vehicle/restriction/give_way.svg b/resources/images/presets/vehicle/restriction/give_way.svg similarity index 100% rename from images/presets/vehicle/restriction/give_way.svg rename to resources/images/presets/vehicle/restriction/give_way.svg diff --git a/images/presets/vehicle/restriction/goods.svg b/resources/images/presets/vehicle/restriction/goods.svg similarity index 100% rename from images/presets/vehicle/restriction/goods.svg rename to resources/images/presets/vehicle/restriction/goods.svg diff --git a/images/presets/vehicle/restriction/horse-designated.svg b/resources/images/presets/vehicle/restriction/horse-designated.svg similarity index 100% rename from images/presets/vehicle/restriction/horse-designated.svg rename to resources/images/presets/vehicle/restriction/horse-designated.svg diff --git a/images/presets/vehicle/restriction/horse.svg b/resources/images/presets/vehicle/restriction/horse.svg similarity index 100% rename from images/presets/vehicle/restriction/horse.svg rename to resources/images/presets/vehicle/restriction/horse.svg diff --git a/images/presets/vehicle/restriction/maxheight.svg b/resources/images/presets/vehicle/restriction/maxheight.svg similarity index 100% rename from images/presets/vehicle/restriction/maxheight.svg rename to resources/images/presets/vehicle/restriction/maxheight.svg diff --git a/images/presets/vehicle/restriction/maxlength.svg b/resources/images/presets/vehicle/restriction/maxlength.svg similarity index 100% rename from images/presets/vehicle/restriction/maxlength.svg rename to resources/images/presets/vehicle/restriction/maxlength.svg diff --git a/images/presets/vehicle/restriction/maxspeed.svg b/resources/images/presets/vehicle/restriction/maxspeed.svg similarity index 100% rename from images/presets/vehicle/restriction/maxspeed.svg rename to resources/images/presets/vehicle/restriction/maxspeed.svg diff --git a/images/presets/vehicle/restriction/maxspeed_none.svg b/resources/images/presets/vehicle/restriction/maxspeed_none.svg similarity index 100% rename from images/presets/vehicle/restriction/maxspeed_none.svg rename to resources/images/presets/vehicle/restriction/maxspeed_none.svg diff --git a/images/presets/vehicle/restriction/maxweight.svg b/resources/images/presets/vehicle/restriction/maxweight.svg similarity index 100% rename from images/presets/vehicle/restriction/maxweight.svg rename to resources/images/presets/vehicle/restriction/maxweight.svg diff --git a/images/presets/vehicle/restriction/maxwidth.svg b/resources/images/presets/vehicle/restriction/maxwidth.svg similarity index 100% rename from images/presets/vehicle/restriction/maxwidth.svg rename to resources/images/presets/vehicle/restriction/maxwidth.svg diff --git a/images/presets/vehicle/restriction/mini_roundabout_left.svg b/resources/images/presets/vehicle/restriction/mini_roundabout_left.svg similarity index 100% rename from images/presets/vehicle/restriction/mini_roundabout_left.svg rename to resources/images/presets/vehicle/restriction/mini_roundabout_left.svg diff --git a/images/presets/vehicle/restriction/mini_roundabout_right.svg b/resources/images/presets/vehicle/restriction/mini_roundabout_right.svg similarity index 100% rename from images/presets/vehicle/restriction/mini_roundabout_right.svg rename to resources/images/presets/vehicle/restriction/mini_roundabout_right.svg diff --git a/images/presets/vehicle/restriction/minspeed.svg b/resources/images/presets/vehicle/restriction/minspeed.svg similarity index 100% rename from images/presets/vehicle/restriction/minspeed.svg rename to resources/images/presets/vehicle/restriction/minspeed.svg diff --git a/images/presets/vehicle/restriction/motorbike.svg b/resources/images/presets/vehicle/restriction/motorbike.svg similarity index 100% rename from images/presets/vehicle/restriction/motorbike.svg rename to resources/images/presets/vehicle/restriction/motorbike.svg diff --git a/images/presets/vehicle/restriction/motorcar.svg b/resources/images/presets/vehicle/restriction/motorcar.svg similarity index 100% rename from images/presets/vehicle/restriction/motorcar.svg rename to resources/images/presets/vehicle/restriction/motorcar.svg diff --git a/images/presets/vehicle/restriction/psv.svg b/resources/images/presets/vehicle/restriction/psv.svg similarity index 100% rename from images/presets/vehicle/restriction/psv.svg rename to resources/images/presets/vehicle/restriction/psv.svg diff --git a/images/presets/vehicle/restriction/restrictions.svg b/resources/images/presets/vehicle/restriction/restrictions.svg similarity index 100% rename from images/presets/vehicle/restriction/restrictions.svg rename to resources/images/presets/vehicle/restriction/restrictions.svg diff --git a/images/presets/vehicle/restriction/roundabout_left.svg b/resources/images/presets/vehicle/restriction/roundabout_left.svg similarity index 100% rename from images/presets/vehicle/restriction/roundabout_left.svg rename to resources/images/presets/vehicle/restriction/roundabout_left.svg diff --git a/images/presets/vehicle/restriction/roundabout_right.svg b/resources/images/presets/vehicle/restriction/roundabout_right.svg similarity index 100% rename from images/presets/vehicle/restriction/roundabout_right.svg rename to resources/images/presets/vehicle/restriction/roundabout_right.svg diff --git a/images/presets/vehicle/restriction/speed_camera.svg b/resources/images/presets/vehicle/restriction/speed_camera.svg similarity index 100% rename from images/presets/vehicle/restriction/speed_camera.svg rename to resources/images/presets/vehicle/restriction/speed_camera.svg diff --git a/images/presets/vehicle/restriction/stop.svg b/resources/images/presets/vehicle/restriction/stop.svg similarity index 100% rename from images/presets/vehicle/restriction/stop.svg rename to resources/images/presets/vehicle/restriction/stop.svg diff --git a/images/presets/vehicle/restriction/toll_gantry.svg b/resources/images/presets/vehicle/restriction/toll_gantry.svg similarity index 100% rename from images/presets/vehicle/restriction/toll_gantry.svg rename to resources/images/presets/vehicle/restriction/toll_gantry.svg diff --git a/images/presets/vehicle/restriction/turn_restrictions/no_left_turn.svg b/resources/images/presets/vehicle/restriction/turn_restrictions/no_left_turn.svg similarity index 100% rename from images/presets/vehicle/restriction/turn_restrictions/no_left_turn.svg rename to resources/images/presets/vehicle/restriction/turn_restrictions/no_left_turn.svg diff --git a/images/presets/vehicle/restriction/turn_restrictions/no_left_turn_red.svg b/resources/images/presets/vehicle/restriction/turn_restrictions/no_left_turn_red.svg similarity index 100% rename from images/presets/vehicle/restriction/turn_restrictions/no_left_turn_red.svg rename to resources/images/presets/vehicle/restriction/turn_restrictions/no_left_turn_red.svg diff --git a/images/presets/vehicle/restriction/turn_restrictions/no_right_turn.svg b/resources/images/presets/vehicle/restriction/turn_restrictions/no_right_turn.svg similarity index 100% rename from images/presets/vehicle/restriction/turn_restrictions/no_right_turn.svg rename to resources/images/presets/vehicle/restriction/turn_restrictions/no_right_turn.svg diff --git a/images/presets/vehicle/restriction/turn_restrictions/no_right_turn_red.svg b/resources/images/presets/vehicle/restriction/turn_restrictions/no_right_turn_red.svg similarity index 100% rename from images/presets/vehicle/restriction/turn_restrictions/no_right_turn_red.svg rename to resources/images/presets/vehicle/restriction/turn_restrictions/no_right_turn_red.svg diff --git a/images/presets/vehicle/restriction/turn_restrictions/no_straight_on.svg b/resources/images/presets/vehicle/restriction/turn_restrictions/no_straight_on.svg similarity index 100% rename from images/presets/vehicle/restriction/turn_restrictions/no_straight_on.svg rename to resources/images/presets/vehicle/restriction/turn_restrictions/no_straight_on.svg diff --git a/images/presets/vehicle/restriction/turn_restrictions/no_straight_on_red.svg b/resources/images/presets/vehicle/restriction/turn_restrictions/no_straight_on_red.svg similarity index 100% rename from images/presets/vehicle/restriction/turn_restrictions/no_straight_on_red.svg rename to resources/images/presets/vehicle/restriction/turn_restrictions/no_straight_on_red.svg diff --git a/images/presets/vehicle/restriction/turn_restrictions/no_u_turn.svg b/resources/images/presets/vehicle/restriction/turn_restrictions/no_u_turn.svg similarity index 100% rename from images/presets/vehicle/restriction/turn_restrictions/no_u_turn.svg rename to resources/images/presets/vehicle/restriction/turn_restrictions/no_u_turn.svg diff --git a/images/presets/vehicle/restriction/turn_restrictions/only_left_turn.svg b/resources/images/presets/vehicle/restriction/turn_restrictions/only_left_turn.svg similarity index 100% rename from images/presets/vehicle/restriction/turn_restrictions/only_left_turn.svg rename to resources/images/presets/vehicle/restriction/turn_restrictions/only_left_turn.svg diff --git a/images/presets/vehicle/restriction/turn_restrictions/only_right_turn.svg b/resources/images/presets/vehicle/restriction/turn_restrictions/only_right_turn.svg similarity index 100% rename from images/presets/vehicle/restriction/turn_restrictions/only_right_turn.svg rename to resources/images/presets/vehicle/restriction/turn_restrictions/only_right_turn.svg diff --git a/images/presets/vehicle/restriction/turn_restrictions/only_straight_on.svg b/resources/images/presets/vehicle/restriction/turn_restrictions/only_straight_on.svg similarity index 100% rename from images/presets/vehicle/restriction/turn_restrictions/only_straight_on.svg rename to resources/images/presets/vehicle/restriction/turn_restrictions/only_straight_on.svg diff --git a/images/presets/vehicle/rumble_strip.svg b/resources/images/presets/vehicle/rumble_strip.svg similarity index 100% rename from images/presets/vehicle/rumble_strip.svg rename to resources/images/presets/vehicle/rumble_strip.svg diff --git a/images/presets/vehicle/services.svg b/resources/images/presets/vehicle/services.svg similarity index 100% rename from images/presets/vehicle/services.svg rename to resources/images/presets/vehicle/services.svg diff --git a/images/presets/vehicle/table.svg b/resources/images/presets/vehicle/table.svg similarity index 100% rename from images/presets/vehicle/table.svg rename to resources/images/presets/vehicle/table.svg diff --git a/images/presets/vehicle/traffic_calming.svg b/resources/images/presets/vehicle/traffic_calming.svg similarity index 100% rename from images/presets/vehicle/traffic_calming.svg rename to resources/images/presets/vehicle/traffic_calming.svg diff --git a/images/presets/vehicle/traffic_mirror.svg b/resources/images/presets/vehicle/traffic_mirror.svg similarity index 100% rename from images/presets/vehicle/traffic_mirror.svg rename to resources/images/presets/vehicle/traffic_mirror.svg diff --git a/images/presets/vehicle/traffic_signals.svg b/resources/images/presets/vehicle/traffic_signals.svg similarity index 100% rename from images/presets/vehicle/traffic_signals.svg rename to resources/images/presets/vehicle/traffic_signals.svg diff --git a/images/presets/vehicle/traffic_signals_crossing.svg b/resources/images/presets/vehicle/traffic_signals_crossing.svg similarity index 100% rename from images/presets/vehicle/traffic_signals_crossing.svg rename to resources/images/presets/vehicle/traffic_signals_crossing.svg diff --git a/images/presets/vehicle/traffic_signals_crossing_island.svg b/resources/images/presets/vehicle/traffic_signals_crossing_island.svg similarity index 100% rename from images/presets/vehicle/traffic_signals_crossing_island.svg rename to resources/images/presets/vehicle/traffic_signals_crossing_island.svg diff --git a/images/presets/vehicle/traffic_signals_crossing_ref_zebra.svg b/resources/images/presets/vehicle/traffic_signals_crossing_ref_zebra.svg similarity index 100% rename from images/presets/vehicle/traffic_signals_crossing_ref_zebra.svg rename to resources/images/presets/vehicle/traffic_signals_crossing_ref_zebra.svg diff --git a/images/presets/vehicle/traffic_signals_crossing_traffic_signals.svg b/resources/images/presets/vehicle/traffic_signals_crossing_traffic_signals.svg similarity index 100% rename from images/presets/vehicle/traffic_signals_crossing_traffic_signals.svg rename to resources/images/presets/vehicle/traffic_signals_crossing_traffic_signals.svg diff --git a/images/presets/vehicle/turning_circle.svg b/resources/images/presets/vehicle/turning_circle.svg similarity index 100% rename from images/presets/vehicle/turning_circle.svg rename to resources/images/presets/vehicle/turning_circle.svg diff --git a/images/presets/vehicle/turning_loop.svg b/resources/images/presets/vehicle/turning_loop.svg similarity index 100% rename from images/presets/vehicle/turning_loop.svg rename to resources/images/presets/vehicle/turning_loop.svg diff --git a/images/presets/vehicle/tyres.svg b/resources/images/presets/vehicle/tyres.svg similarity index 100% rename from images/presets/vehicle/tyres.svg rename to resources/images/presets/vehicle/tyres.svg diff --git a/images/presets/vehicle/waypoints.svg b/resources/images/presets/vehicle/waypoints.svg similarity index 100% rename from images/presets/vehicle/waypoints.svg rename to resources/images/presets/vehicle/waypoints.svg diff --git a/images/purge.png b/resources/images/purge.png similarity index 100% rename from images/purge.png rename to resources/images/purge.png diff --git a/images/redo.svg b/resources/images/redo.svg similarity index 100% rename from images/redo.svg rename to resources/images/redo.svg diff --git a/images/reorder.svg b/resources/images/reorder.svg similarity index 100% rename from images/reorder.svg rename to resources/images/reorder.svg diff --git a/images/restart.png b/resources/images/restart.png similarity index 100% rename from images/restart.png rename to resources/images/restart.png diff --git a/images/save.png b/resources/images/save.png similarity index 100% rename from images/save.png rename to resources/images/save.png diff --git a/images/save_as.png b/resources/images/save_as.png similarity index 100% rename from images/save_as.png rename to resources/images/save_as.png diff --git a/images/selectall.svg b/resources/images/selectall.svg similarity index 100% rename from images/selectall.svg rename to resources/images/selectall.svg diff --git a/images/session.svg b/resources/images/session.svg similarity index 100% rename from images/session.svg rename to resources/images/session.svg diff --git a/images/simplify.png b/resources/images/simplify.png similarity index 100% rename from images/simplify.png rename to resources/images/simplify.png diff --git a/images/splitway.png b/resources/images/splitway.png similarity index 100% rename from images/splitway.png rename to resources/images/splitway.png diff --git a/images/statusline/angle.svg b/resources/images/statusline/angle.svg similarity index 100% rename from images/statusline/angle.svg rename to resources/images/statusline/angle.svg diff --git a/images/statusline/dist.svg b/resources/images/statusline/dist.svg similarity index 100% rename from images/statusline/dist.svg rename to resources/images/statusline/dist.svg diff --git a/images/statusline/easting.svg b/resources/images/statusline/easting.svg similarity index 100% rename from images/statusline/easting.svg rename to resources/images/statusline/easting.svg diff --git a/images/statusline/heading.svg b/resources/images/statusline/heading.svg similarity index 100% rename from images/statusline/heading.svg rename to resources/images/statusline/heading.svg diff --git a/images/statusline/lat.svg b/resources/images/statusline/lat.svg similarity index 100% rename from images/statusline/lat.svg rename to resources/images/statusline/lat.svg diff --git a/images/statusline/lon.svg b/resources/images/statusline/lon.svg similarity index 100% rename from images/statusline/lon.svg rename to resources/images/statusline/lon.svg diff --git a/images/statusline/name.png b/resources/images/statusline/name.png similarity index 100% rename from images/statusline/name.png rename to resources/images/statusline/name.png diff --git a/images/statusline/northing.svg b/resources/images/statusline/northing.svg similarity index 100% rename from images/statusline/northing.svg rename to resources/images/statusline/northing.svg diff --git a/images/svpDown.svg b/resources/images/svpDown.svg similarity index 100% rename from images/svpDown.svg rename to resources/images/svpDown.svg diff --git a/images/svpLeft.svg b/resources/images/svpLeft.svg similarity index 100% rename from images/svpLeft.svg rename to resources/images/svpLeft.svg diff --git a/images/svpRight.svg b/resources/images/svpRight.svg similarity index 100% rename from images/svpRight.svg rename to resources/images/svpRight.svg diff --git a/images/svpUp.svg b/resources/images/svpUp.svg similarity index 100% rename from images/svpUp.svg rename to resources/images/svpUp.svg diff --git a/images/undo.svg b/resources/images/undo.svg similarity index 100% rename from images/undo.svg rename to resources/images/undo.svg diff --git a/images/unglueways.png b/resources/images/unglueways.png similarity index 100% rename from images/unglueways.png rename to resources/images/unglueways.png diff --git a/images/unjoinnodeway.svg b/resources/images/unjoinnodeway.svg similarity index 100% rename from images/unjoinnodeway.svg rename to resources/images/unjoinnodeway.svg diff --git a/images/unselectall.svg b/resources/images/unselectall.svg similarity index 100% rename from images/unselectall.svg rename to resources/images/unselectall.svg diff --git a/images/updatedata.png b/resources/images/updatedata.png similarity index 100% rename from images/updatedata.png rename to resources/images/updatedata.png diff --git a/images/upload.png b/resources/images/upload.png similarity index 100% rename from images/upload.png rename to resources/images/upload.png diff --git a/images/uploadselection.png b/resources/images/uploadselection.png similarity index 100% rename from images/uploadselection.png rename to resources/images/uploadselection.png diff --git a/images/view-fullscreen-revert.png b/resources/images/view-fullscreen-revert.png similarity index 100% rename from images/view-fullscreen-revert.png rename to resources/images/view-fullscreen-revert.png diff --git a/images/view-fullscreen.png b/resources/images/view-fullscreen.png similarity index 100% rename from images/view-fullscreen.png rename to resources/images/view-fullscreen.png diff --git a/images/viewport-follow.svg b/resources/images/viewport-follow.svg similarity index 100% rename from images/viewport-follow.svg rename to resources/images/viewport-follow.svg diff --git a/images/warning-small.png b/resources/images/warning-small.png similarity index 100% rename from images/warning-small.png rename to resources/images/warning-small.png diff --git a/images/way-select.svg b/resources/images/way-select.svg similarity index 100% rename from images/way-select.svg rename to resources/images/way-select.svg diff --git a/images/wayflip.png b/resources/images/wayflip.png similarity index 100% rename from images/wayflip.png rename to resources/images/wayflip.png diff --git a/styles/standard/elemstyles.mapcss b/resources/styles/standard/elemstyles.mapcss similarity index 100% rename from styles/standard/elemstyles.mapcss rename to resources/styles/standard/elemstyles.mapcss diff --git a/styles/standard/potlatch2.mapcss b/resources/styles/standard/potlatch2.mapcss similarity index 99% rename from styles/standard/potlatch2.mapcss rename to resources/styles/standard/potlatch2.mapcss index d25a399edfd..835f9ea3709 100644 --- a/styles/standard/potlatch2.mapcss +++ b/resources/styles/standard/potlatch2.mapcss @@ -1,4 +1,4 @@ -/* THIS FILE IS AUTO-GENERATED (SEE styles_nodist/potlatch2/README) */ +/* THIS FILE IS AUTO-GENERATED (SEE nodist/styles/potlatch2/README) */ /* Potlatch 2 core stylesheet diff --git a/scripts/BuildProjectionDefinitions.java b/scripts/BuildProjectionDefinitions.java index 4dfcff10280..79ac14b7208 100644 --- a/scripts/BuildProjectionDefinitions.java +++ b/scripts/BuildProjectionDefinitions.java @@ -30,11 +30,11 @@ */ public final class BuildProjectionDefinitions { - private static final String PROJ_DIR = "data_nodist/projection"; + private static final String PROJ_DIR = "nodist/data/projection"; private static final String JOSM_EPSG_FILE = "josm-epsg"; private static final String PROJ4_EPSG_FILE = "epsg"; private static final String PROJ4_ESRI_FILE = "esri"; - private static final String OUTPUT_EPSG_FILE = "data/projection/custom-epsg"; + private static final String OUTPUT_EPSG_FILE = "resources/data/projection/custom-epsg"; private static final Map epsgProj4 = new LinkedHashMap<>(); private static final Map esriProj4 = new LinkedHashMap<>(); diff --git a/scripts/TagInfoExtract.java b/scripts/TagInfoExtract.java index cab22c95efc..531cc7520b3 100644 --- a/scripts/TagInfoExtract.java +++ b/scripts/TagInfoExtract.java @@ -207,7 +207,7 @@ void setNoExit() { private String findImageUrl(String path) { final Path f = baseDir.resolve("images").resolve(path); if (Files.exists(f)) { - return "https://josm.openstreetmap.de/export/" + josmSvnRevision + "/josm/trunk/images/" + path; + return "https://josm.openstreetmap.de/export/" + josmSvnRevision + "/josm/trunk/resources/images/" + path; } throw new IllegalStateException("Cannot find image url for " + path); } @@ -225,7 +225,7 @@ void writeJson(String name, String description, Iterable tags) throw .add("name", name) .add("description", description) .add("project_url", "https://josm.openstreetmap.de/") - .add("icon_url", "https://josm.openstreetmap.de/export/7770/josm/trunk/images/logo_16x16x8.png") + .add("icon_url", "https://josm.openstreetmap.de/export/7770/josm/trunk/resources/images/logo_16x16x8.png") .add("contact_name", "JOSM developer team") .add("contact_email", "josm-dev@openstreetmap.org"); final JsonArrayBuilder jsonTags = Json.createArrayBuilder(); diff --git a/scripts/geticons.pl b/scripts/geticons.pl index ea619d97ca1..0d3ca98ab96 100755 --- a/scripts/geticons.pl +++ b/scripts/geticons.pl @@ -3,9 +3,9 @@ # when building release files my @default = ( - "styles/standard/*.xml", - "styles/standard/*.mapcss", - "data/*.xml", + "resources/styles/standard/*.xml", + "resources/styles/standard/*.mapcss", + "resources/data/*.xml", "src/org/openstreetmap/josm/*.java", "src/org/openstreetmap/josm/*/*.java", "src/org/openstreetmap/josm/*/*/*.java", @@ -133,11 +133,11 @@ my %haveicons; -for($i = 1; my @ifiles = (glob("images".("/*" x $i).".png"), glob("images".("/*" x $i).".svg")); ++$i) +for($i = 1; my @ifiles = (glob("resources/images".("/*" x $i).".png"), glob("resources/images".("/*" x $i).".svg")); ++$i) { for my $ifile (sort @ifiles) { - $ifile =~ s/^images\///; + $ifile =~ s/^resources\/images\///; # svg comes after png due to the glob, so only check for svg's if($ifile =~ /^(.*)\.svg$/) { @@ -146,7 +146,7 @@ print STDERR "$1: File exists twice as .svg and .png.\n"; } # check for unwanted svg effects - if(open FILE, "<","images/$ifile") + if(open FILE, "<","resources/images/$ifile") { undef $/; my $f = ; @@ -180,12 +180,12 @@ { if($img =~ /\.(png|svg)/) { - print STDERR "$img: File does not exist!\n" if(!-f "images/$img"); + print STDERR "$img: File does not exist!\n" if(!-f "resources/images/$img"); delete $haveicons{$img}; } else { - print STDERR "$img(.svg|.png): File does not exist!\n" if(!-f "images/$img.png" && !-f "images/$img.svg"); + print STDERR "$img(.svg|.png): File does not exist!\n" if(!-f "resources/images/$img.png" && !-f "resources/images/$img.svg"); delete $haveicons{"$img.svg"}; delete $haveicons{"$img.png"}; } diff --git a/scripts/optimize-images b/scripts/optimize-images index 5565a81886d..0e57d2aae4f 100755 --- a/scripts/optimize-images +++ b/scripts/optimize-images @@ -1,5 +1,5 @@ #!/bin/sh -find images/ -name "*.png" \ +find resources/images/ -name "*.png" \ -exec echo "Processing {}" \; \ -exec optipng -o7 -quiet "{}" \; diff --git a/src/org/openstreetmap/josm/gui/GettingStarted.java b/src/org/openstreetmap/josm/gui/GettingStarted.java index 3ead025d16f..6083ed746eb 100644 --- a/src/org/openstreetmap/josm/gui/GettingStarted.java +++ b/src/org/openstreetmap/josm/gui/GettingStarted.java @@ -195,7 +195,7 @@ private void getMOTD() { } static String fixImageLinks(String s) { - Matcher m = Pattern.compile("src=\"/browser/trunk(/images/.*?\\.png)\\?format=raw\"").matcher(s); + Matcher m = Pattern.compile("src=\"/browser/trunk/resources(/images/.*?\\.png)\\?format=raw\"").matcher(s); StringBuffer sb = new StringBuffer(); while (m.find()) { String im = m.group(1); diff --git a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java index 1bad7e49310..f361f216265 100644 --- a/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java +++ b/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java @@ -73,7 +73,7 @@ public String getUsage() { @Override public String[] getUsageExamples() { return new String[] {"/import?url=" + Utils.encodeUrl( - Config.getUrls().getJOSMWebsite()+"/browser/josm/trunk/data_nodist/direction-arrows.osm?format=txt")}; + Config.getUrls().getJOSMWebsite()+"/browser/josm/trunk/nodist/data/direction-arrows.osm?format=txt")}; } @Override diff --git a/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java b/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java index 937a3732502..60f979a5033 100644 --- a/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java +++ b/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java @@ -39,8 +39,8 @@ public void testImageReplacement() throws IOException { */ @Test public void testImageReplacementStatic() { - final String html = "the download button
."; + final String html = "the download button ."; assertFalse(GettingStarted.fixImageLinks(html).equals(html)); } diff --git a/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java b/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java index 1782a2ae37b..32cce9bbf94 100644 --- a/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java +++ b/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java @@ -62,7 +62,7 @@ public static void load() throws Exception { img = new BufferedImage(IMG_WIDTH, IMG_HEIGHT, BufferedImage.TYPE_INT_ARGB); try ( - InputStream fisC = Compression.getUncompressedFileInputStream(new File("data_nodist/neubrandenburg.osm.bz2")); + InputStream fisC = Compression.getUncompressedFileInputStream(new File("nodist/data/neubrandenburg.osm.bz2")); ) { dsCity = OsmReader.parseDataSet(fisC, NullProgressMonitor.INSTANCE); } diff --git a/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java b/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java index 5aac40d15e7..ee1f1143718 100644 --- a/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java +++ b/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java @@ -17,7 +17,7 @@ public final class OsmDataGenerator { private static final int DEFAULT_KEY_VALUE_RATIO = 3; private static final int DEFAULT_NODE_COUNT = 1000; - private static final String DATA_DIR = "data_nodist" + File.separator + "osmfiles"; + private static final String DATA_DIR = "nodist/data" + File.separator + "osmfiles"; private OsmDataGenerator() { // private constructor for utility classes diff --git a/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRendererPerformanceTestParent.java b/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRendererPerformanceTestParent.java index f230fd8e027..fa1524cd256 100644 --- a/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRendererPerformanceTestParent.java +++ b/test/performance/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRendererPerformanceTestParent.java @@ -80,10 +80,10 @@ public Point getLocationOnScreen() { StyledMapRenderer.PREFERENCE_ANTIALIASING_USE.put(true); StyledMapRenderer.PREFERENCE_TEXT_ANTIALIASING.put("gasp"); - try (InputStream fisR = Files.newInputStream(Paths.get("data_nodist/restriction.osm")); - InputStream fisM = Files.newInputStream(Paths.get("data_nodist/multipolygon.osm")); - InputStream fisC = Compression.getUncompressedFileInputStream(new File("data_nodist/neubrandenburg.osm.bz2")); - InputStream fisO = Compression.getUncompressedFileInputStream(new File("data_nodist/overpass-download.osm.bz2"));) { + try (InputStream fisR = Files.newInputStream(Paths.get("nodist/data/restriction.osm")); + InputStream fisM = Files.newInputStream(Paths.get("nodist/data/multipolygon.osm")); + InputStream fisC = Compression.getUncompressedFileInputStream(new File("nodist/data/neubrandenburg.osm.bz2")); + InputStream fisO = Compression.getUncompressedFileInputStream(new File("nodist/data/overpass-download.osm.bz2"));) { dsRestriction = OsmReader.parseDataSet(fisR, NullProgressMonitor.INSTANCE); dsMultipolygon = OsmReader.parseDataSet(fisM, NullProgressMonitor.INSTANCE); dsCity = OsmReader.parseDataSet(fisC, NullProgressMonitor.INSTANCE); diff --git a/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java b/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java index d7b27a7ee9a..c20fe1ca1ed 100644 --- a/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java +++ b/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java @@ -18,7 +18,6 @@ import javax.imageio.ImageIO; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -48,6 +47,8 @@ import org.openstreetmap.josm.io.OsmReader; import org.openstreetmap.josm.tools.Logging; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Performance test of map renderer. */ @@ -151,7 +152,7 @@ public static void load() throws Exception { MapPaintStyleLoader.reloadStyles(defaultStyleIdx); try ( - InputStream fisC = Compression.getUncompressedFileInputStream(new File("data_nodist/neubrandenburg.osm.bz2")); + InputStream fisC = Compression.getUncompressedFileInputStream(new File("nodist/data/neubrandenburg.osm.bz2")); ) { dsCity = OsmReader.parseDataSet(fisC, NullProgressMonitor.INSTANCE); } diff --git a/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSPerformanceTest.java b/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSPerformanceTest.java index d58eb867ec7..0856e071a9c 100644 --- a/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSPerformanceTest.java +++ b/test/performance/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSPerformanceTest.java @@ -34,12 +34,12 @@ public class MapCSSPerformanceTest { /** * The path to the style file used for rendering. */ - static final String STYLE_FILE = "styles/standard/elemstyles.mapcss"; + static final String STYLE_FILE = "resources/styles/standard/elemstyles.mapcss"; /** * The data file to be rendered */ - static final String DATA_FILE = "data_nodist/neubrandenburg.osm.bz2"; + static final String DATA_FILE = "nodist/data/neubrandenburg.osm.bz2"; /* ------------------------ / configuration section ---------------------------- */ DataSet ds; diff --git a/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java b/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java index 91e47d6baac..d0dbf2223a6 100644 --- a/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java +++ b/test/performance/org/openstreetmap/josm/io/OsmReaderPerformanceTest.java @@ -30,7 +30,7 @@ */ public class OsmReaderPerformanceTest { private static final int TIMES = 4; - private static String DATA_FILE = "data_nodist/neubrandenburg.osm.bz2"; + private static String DATA_FILE = "nodist/data/neubrandenburg.osm.bz2"; /** * Global timeout applied to all test methods. diff --git a/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java b/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java index d336dbb991c..5aad902540b 100644 --- a/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java +++ b/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java @@ -145,17 +145,17 @@ public void testTicket11992() throws IOException, IllegalDataException { } /** - * Non-regression test which checks example files in data_nodist + * Non-regression test which checks example files in nodist/data * @throws Exception if an error occurs */ @Test @SuppressWarnings({ "rawtypes", "unchecked" }) public void testExamples() throws Exception { DataSet dsToJoin, dsExpected; - try (InputStream is = Files.newInputStream(Paths.get("data_nodist/Join_Areas_Tests.osm"))) { + try (InputStream is = Files.newInputStream(Paths.get("nodist/data/Join_Areas_Tests.osm"))) { dsToJoin = OsmReader.parseDataSet(is, NullProgressMonitor.INSTANCE); } - try (InputStream is = Files.newInputStream(Paths.get("data_nodist/Join_Areas_Tests_joined.osm"))) { + try (InputStream is = Files.newInputStream(Paths.get("nodist/data/Join_Areas_Tests_joined.osm"))) { dsExpected = OsmReader.parseDataSet(is, NullProgressMonitor.INSTANCE); } diff --git a/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java b/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java index a113f20313c..911c8ede4d2 100644 --- a/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java +++ b/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java @@ -73,7 +73,7 @@ public void testBasic() throws SearchParseError { public void testFilter() throws Exception { for (int i : new int[] {1, 2, 3, 11, 12, 13, 14, 15}) { DataSet ds; - try (InputStream is = Files.newInputStream(Paths.get("data_nodist/filterTests.osm"))) { + try (InputStream is = Files.newInputStream(Paths.get("nodist/data/filterTests.osm"))) { ds = OsmReader.parseDataSet(is, NullProgressMonitor.INSTANCE); } diff --git a/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java b/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java index 9456a776c04..b9a6be12ae2 100644 --- a/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java +++ b/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java @@ -84,7 +84,7 @@ private void checkIterator(Collection col, int expectedC @Test public void testRemove() throws Exception { ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator - try (InputStream fis = Files.newInputStream(Paths.get("data_nodist/restriction.osm"))) { + try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/restriction.osm"))) { DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); removeAllTest(ds); } @@ -97,7 +97,7 @@ public void testRemove() throws Exception { @Test public void testMove() throws Exception { ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator - try (InputStream fis = Files.newInputStream(Paths.get("data_nodist/restriction.osm"))) { + try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/restriction.osm"))) { DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); for (Node n: ds.getNodes()) { diff --git a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java index b7ad622f637..db8b9c36bd5 100644 --- a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java +++ b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java @@ -46,11 +46,11 @@ /** * Test projections using reference data from external program. * - * To update the reference data file data_nodist/projection/projection-reference-data, + * To update the reference data file nodist/data/projection/projection-reference-data, * run the main method of this class. For this, you need to have the cs2cs * program from the proj.4 library in path (or use CS2CS_EXE to set * the full path of the executable). Make sure the required *.gsb grid files - * can be accessed, i.e. copy them from data_nodist/projection to /usr/share/proj or + * can be accessed, i.e. copy them from nodist/data/projection to /usr/share/proj or * wherever cs2cs expects them to be placed. * * The input parameter for the external library is not the projection code @@ -62,8 +62,8 @@ public class ProjectionRefTest { private static final String CS2CS_EXE = "cs2cs"; - private static final String REFERENCE_DATA_FILE = "data_nodist/projection/projection-reference-data"; - private static final String PROJ_LIB_DIR = "data_nodist/projection"; + private static final String REFERENCE_DATA_FILE = "nodist/data/projection/projection-reference-data"; + private static final String PROJ_LIB_DIR = "nodist/data/projection"; private static class RefEntry { String code; diff --git a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java index d376f94c579..34beff8f8ec 100644 --- a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java +++ b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java @@ -33,7 +33,7 @@ /** * This test is used to monitor changes in projection code. * - * It keeps a record of test data in the file data_nodist/projection/projection-regression-test-data. + * It keeps a record of test data in the file nodist/data/projection/projection-regression-test-data. * This record is generated from the current Projection classes available in JOSM. It needs to * be updated, whenever a projection is added / removed or an algorithm is changed, such that * the computed values are numerically different. There is no error threshold, every change is reported. @@ -43,7 +43,7 @@ */ public class ProjectionRegressionTest { - private static final String PROJECTION_DATA_FILE = "data_nodist/projection/projection-regression-test-data"; + private static final String PROJECTION_DATA_FILE = "nodist/data/projection/projection-regression-test-data"; private static class TestData { public String code; diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java index 3c6d12a6dc6..ade37e00dec 100644 --- a/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java +++ b/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java @@ -30,7 +30,7 @@ public class CoastlinesTest { */ @Test public void testCoastlineFile() throws Exception { - ValidatorTestUtils.testSampleFile("data_nodist/coastlines.osm", + ValidatorTestUtils.testSampleFile("nodist/data/coastlines.osm", ds -> ds.getWays().stream().filter( w -> "coastline".equals(w.get("natural"))).collect(Collectors.toList()), null, COASTLINES, WRONGLY_ORDERED_WAYS); diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java index b19729badea..eb602df15b2 100644 --- a/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java +++ b/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java @@ -37,7 +37,7 @@ public class MultipolygonTestTest { public void testMultipolygonFile() throws Exception { final MultipolygonTest MULTIPOLYGON_TEST = new MultipolygonTest(); final RelationChecker RELATION_TEST = new RelationChecker(); - ValidatorTestUtils.testSampleFile("data_nodist/multipolygon.osm", + ValidatorTestUtils.testSampleFile("nodist/data/multipolygon.osm", ds -> ds.getRelations().stream().filter(Relation::isMultipolygon).collect(Collectors.toList()), name -> name.startsWith("06") || name.startsWith("07") || name.startsWith("08"), MULTIPOLYGON_TEST, RELATION_TEST); } diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/TurnRestrictionTestTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/TurnRestrictionTestTest.java index a483b8aed01..a83f9ffe9cd 100644 --- a/test/unit/org/openstreetmap/josm/data/validation/tests/TurnRestrictionTestTest.java +++ b/test/unit/org/openstreetmap/josm/data/validation/tests/TurnRestrictionTestTest.java @@ -28,7 +28,7 @@ public class TurnRestrictionTestTest { */ @Test public void testTurnrestrictionFile() throws Exception { - ValidatorTestUtils.testSampleFile("data_nodist/restriction.osm", + ValidatorTestUtils.testSampleFile("nodist/data/restriction.osm", ds -> ds.getRelations(), name -> name.startsWith("E"), TURNRESTRICTION_TEST, RELATION_TEST); } diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java index dc7676a4143..b9803c7080a 100644 --- a/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java +++ b/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java @@ -48,7 +48,7 @@ public void setUp() throws Exception { */ @Test public void testTicket6313() throws IOException, IllegalDataException, FileNotFoundException { - try (InputStream fis = Files.newInputStream(Paths.get("data_nodist/UnconnectedWaysTest.osm"))) { + try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/UnconnectedWaysTest.osm"))) { final DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); MainApplication.getLayerManager().addLayer(new OsmDataLayer(ds, null, null)); diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java index 2998712ff86..eb895be286a 100644 --- a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java +++ b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java @@ -44,7 +44,7 @@ public class RelationSorterTest { @Before public void loadData() throws IllegalDataException, IOException { if (testDataset == null) { - try (InputStream fis = Files.newInputStream(Paths.get("data_nodist/relation_sort.osm"))) { + try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/relation_sort.osm"))) { testDataset = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); } } diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java index e9c5d63333d..73926a68a78 100644 --- a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java +++ b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java @@ -51,7 +51,7 @@ public class WayConnectionTypeCalculatorTest { @Before public void loadData() throws IllegalDataException, IOException { if (testDataset == null) { - try (InputStream fis = Files.newInputStream(Paths.get("data_nodist/relation_sort.osm"))) { + try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/relation_sort.osm"))) { testDataset = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); } } diff --git a/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java b/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java index 1c43544a69a..285591f3e0d 100644 --- a/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java +++ b/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java @@ -45,7 +45,7 @@ public static void setUp() { */ @Test public void testAutoGuess() throws Exception { - final GpxData gpx = GpxReaderTest.parseGpxData("data_nodist/2094047.gpx"); + final GpxData gpx = GpxReaderTest.parseGpxData("nodist/data/2094047.gpx"); final ImageEntry i0 = new ImageEntry(); i0.setExifTime(DateUtils.fromString("2016:01:03 11:59:54")); // 4 sec before start of GPX i0.createTmp(); diff --git a/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java b/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java index 7fdf614174e..938df7f7b27 100644 --- a/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java +++ b/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java @@ -59,7 +59,7 @@ public void testTicket12312() throws FileNotFoundException, IOException, SAXExce */ @Test public void testNone() throws IOException, SAXException { - final List colors = calculateColors("data_nodist/2094047.gpx", ImmutableMap.of(), 10); + final List colors = calculateColors("nodist/data/2094047.gpx", ImmutableMap.of(), 10); assertEquals("[#000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000]", colors.toString()); } @@ -71,7 +71,7 @@ public void testNone() throws IOException, SAXException { */ @Test public void testVelocity() throws IOException, SAXException { - final List colors = calculateColors("data_nodist/2094047.gpx", + final List colors = calculateColors("nodist/data/2094047.gpx", ImmutableMap.of("colormode", Integer.toString(ColorMode.VELOCITY.toIndex())), 10); assertEquals("[#000000, #FFAD00, #FFA800, #FFA800, #FF9E00, #FF9400, #FF7000, #FF7000, #FF8000, #FF9400]", colors.toString()); } @@ -84,7 +84,7 @@ public void testVelocity() throws IOException, SAXException { */ @Test public void testVelocityDynamic() throws IOException, SAXException { - final List colors = calculateColors("data_nodist/2094047.gpx", + final List colors = calculateColors("nodist/data/2094047.gpx", ImmutableMap.of("colormode.dynamic-range", "true", "colormode", Integer.toString(ColorMode.VELOCITY.toIndex())), 10); @@ -99,7 +99,7 @@ public void testVelocityDynamic() throws IOException, SAXException { */ @Test public void testDirection() throws IOException, SAXException { - final List colors = calculateColors("data_nodist/2094047.gpx", + final List colors = calculateColors("nodist/data/2094047.gpx", ImmutableMap.of("colormode", Integer.toString(ColorMode.DIRECTION.toIndex())), 10); assertEquals("[#000000, #EAEC25, #EDEA26, #EDE525, #ECD322, #EBB81D, #E85A0D, #E73708, #E84D0B, #EA8A15]", colors.toString()); } @@ -112,7 +112,7 @@ public void testDirection() throws IOException, SAXException { */ @Test public void testTime() throws IOException, SAXException { - final List colors = calculateColors("data_nodist/2094047.gpx", + final List colors = calculateColors("nodist/data/2094047.gpx", ImmutableMap.of("colormode", Integer.toString(ColorMode.TIME.toIndex())), 10); assertEquals("[#000000, #FF0000, #FF0000, #FF0500, #FF0500, #FF0A00, #FF0A00, #FF1F00, #FF2E00, #FF3300]", colors.toString()); } diff --git a/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.java b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.java index 5eca7aa8d80..1bb24f06b47 100644 --- a/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.java +++ b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.java @@ -191,7 +191,7 @@ public void matches_6() { */ @Test public void testContains() throws Exception { - ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get("data_nodist/amenity-in-amenity.osm")), null); + ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get("nodist/data/amenity-in-amenity.osm")), null); ChildOrParentSelector css = parse("node[tag(\"amenity\") = parent_tag(\"amenity\")] ∈ *[amenity] {}"); assertFalse(css.matches(new Environment(ds.getPrimitiveById(123, OsmPrimitiveType.NODE)))); assertTrue(css.matches(new Environment(ds.getPrimitiveById(123, OsmPrimitiveType.WAY)))); diff --git a/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java b/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java index da5b16fe1f6..67762037c23 100644 --- a/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java +++ b/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java @@ -127,7 +127,7 @@ public void testMultipolygon() throws Exception { */ @Test public void testMultipolygonRobustness() throws Exception { - try (InputStream in = Files.newInputStream(Paths.get("data_nodist/multipolygon.osm"))) { + try (InputStream in = Files.newInputStream(Paths.get("nodist/data/multipolygon.osm"))) { DataSet ds = OsmReader.parseDataSet(in, null); final GeoJSONWriter writer = new GeoJSONWriter(ds); assertTrue(writer.write().contains("MultiPolygon")); diff --git a/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java b/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java index 1ce15750058..32462b8cd52 100644 --- a/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java +++ b/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java @@ -60,7 +60,7 @@ public static GpxData parseGpxData(String filename) throws IOException, SAXExcep */ @Test public void testMunich() throws Exception { - final GpxData result = parseGpxData("data_nodist/munich.gpx"); + final GpxData result = parseGpxData("nodist/data/munich.gpx"); assertEquals(2762, result.getTracks().size()); assertEquals(0, result.getRoutes().size()); assertEquals(903, result.getWaypoints().size()); diff --git a/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java b/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java index 1cf0d38b1f9..3d34c81bca5 100644 --- a/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java +++ b/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java @@ -61,7 +61,7 @@ public void setUp() { @Test public void testReader() throws Exception { TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin")); - final NmeaReader in = new NmeaReader(Files.newInputStream(Paths.get("data_nodist/btnmeatrack_2016-01-25.nmea"))); + final NmeaReader in = new NmeaReader(Files.newInputStream(Paths.get("nodist/data/btnmeatrack_2016-01-25.nmea"))); in.parse(true); assertEquals(30, in.getNumberOfCoordinates()); assertEquals(0, in.getParserMalformed()); diff --git a/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java b/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java index 08048ef9a44..71e7f8360bb 100644 --- a/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java +++ b/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java @@ -57,7 +57,7 @@ private static RtkLibPosReader read(String path) throws IOException, SAXExceptio */ @Test public void testReader() throws Exception { - RtkLibPosReader in = read("data_nodist/rtklib_example.pos"); + RtkLibPosReader in = read("nodist/data/rtklib_example.pos"); assertEquals(137, in.getNumberOfCoordinates()); List wayPoints = new ArrayList<>(in.getGpxData().tracks.iterator().next().getSegments().iterator().next().getWayPoints()); @@ -83,7 +83,7 @@ public void testReader() throws Exception { */ @Test public void testReader2() throws Exception { - RtkLibPosReader in = read("data_nodist/rtklib_example2.pos"); + RtkLibPosReader in = read("nodist/data/rtklib_example2.pos"); assertEquals(6, in.getNumberOfCoordinates()); } } diff --git a/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java b/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java index 38ae54a9fd9..15835605714 100644 --- a/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java +++ b/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java @@ -41,8 +41,8 @@ public class ExifReaderTest { */ @Before public void setUp() { - directionSampleFile = new File("data_nodist/exif-example_direction.jpg"); - orientationSampleFile = new File("data_nodist/exif-example_orientation=6.jpg"); + directionSampleFile = new File("nodist/data/exif-example_direction.jpg"); + orientationSampleFile = new File("nodist/data/exif-example_orientation=6.jpg"); } /** @@ -61,7 +61,7 @@ public void testReadTime() throws ParseException { */ @Test public void testReadTimeSubSecond1() throws ParseException { - Date date = ExifReader.readTime(new File("data_nodist/IMG_20150711_193419.jpg")); + Date date = ExifReader.readTime(new File("nodist/data/IMG_20150711_193419.jpg")); doTest("2015-07-11T19:34:19.100", date); } @@ -107,7 +107,7 @@ public void testReadDirection() { */ @Test public void testReadSpeed() { - assertEquals(Double.valueOf(12.3), ExifReader.readSpeed(new File("data_nodist/exif-example_speed_ele.jpg"))); + assertEquals(Double.valueOf(12.3), ExifReader.readSpeed(new File("nodist/data/exif-example_speed_ele.jpg"))); } /** @@ -115,7 +115,7 @@ public void testReadSpeed() { */ @Test public void testReadElevation() { - assertEquals(Double.valueOf(23.4), ExifReader.readElevation(new File("data_nodist/exif-example_speed_ele.jpg"))); + assertEquals(Double.valueOf(23.4), ExifReader.readElevation(new File("nodist/data/exif-example_speed_ele.jpg"))); } /** diff --git a/tools/checkstyle/josm_filters.xml b/tools/checkstyle/josm_filters.xml index 94fd9101778..d16114496ae 100644 --- a/tools/checkstyle/josm_filters.xml +++ b/tools/checkstyle/josm_filters.xml @@ -7,17 +7,12 @@ - - - - - - - + + + - @@ -27,7 +22,6 @@ -