[DebianGIS-dev] r1401 - in packages/josm/trunk/debian: . patches
nd-guest at alioth.debian.org
nd-guest at alioth.debian.org
Tue Mar 11 23:40:50 UTC 2008
Author: nd-guest
Date: 2008-03-11 23:40:49 +0000 (Tue, 11 Mar 2008)
New Revision: 1401
Added:
packages/josm/trunk/debian/patches/40_elemstyles.dpatch
Modified:
packages/josm/trunk/debian/control
packages/josm/trunk/debian/patches/00list
packages/josm/trunk/debian/patches/10_build.dpatch
packages/josm/trunk/debian/rules
Log:
Use icons from openstreetmap-map-icons package.
Modified: packages/josm/trunk/debian/control
===================================================================
--- packages/josm/trunk/debian/control 2008-03-11 22:24:26 UTC (rev 1400)
+++ packages/josm/trunk/debian/control 2008-03-11 23:40:49 UTC (rev 1401)
@@ -9,7 +9,7 @@
Package: josm
Architecture: all
-Depends: java-gcj-compat | java2-runtime, libgettext-commons-java, libmetadata-extractor-java
+Depends: java-gcj-compat | java2-runtime, libgettext-commons-java, libmetadata-extractor-java, openstreetmap-map-icons-classic
Description: Editor for OpenStreetMap
JOSM is an editor for OpenStreetMap (OSM) written in Java.
The current version supports stand alone GPX tracks, GPX track data
Modified: packages/josm/trunk/debian/patches/00list
===================================================================
--- packages/josm/trunk/debian/patches/00list 2008-03-11 22:24:26 UTC (rev 1400)
+++ packages/josm/trunk/debian/patches/00list 2008-03-11 23:40:49 UTC (rev 1401)
@@ -1,3 +1,4 @@
10_build
20_bts
30_graphics
+40_elemstyles
Modified: packages/josm/trunk/debian/patches/10_build.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/10_build.dpatch 2008-03-11 22:24:26 UTC (rev 1400)
+++ packages/josm/trunk/debian/patches/10_build.dpatch 2008-03-11 23:40:49 UTC (rev 1401)
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad josm-0.0.0.20080311~/build.xml josm-0.0.0.20080311/build.xml
--- josm-0.0.0.20080311~/build.xml 2008-01-30 17:02:38.000000000 +0000
-+++ josm-0.0.0.20080311/build.xml 2008-03-11 20:47:24.000000000 +0000
++++ josm-0.0.0.20080311/build.xml 2008-03-11 22:51:40.000000000 +0000
@@ -1,23 +1,14 @@
<project name="josm" default="dist" basedir=".">
@@ -35,8 +35,14 @@
<!-- images -->
<copy todir="build/images">
-@@ -34,11 +25,17 @@
- <fileset dir="styles" />
+@@ -31,14 +22,22 @@
+
+ <!-- styles -->
+ <copy todir="build/styles">
+- <fileset dir="styles" />
++ <fileset dir="styles">
++ <include name="standard/elemstyles.xml"/>
++ </fileset>
</copy>
+ <!-- revision -->
Added: packages/josm/trunk/debian/patches/40_elemstyles.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/40_elemstyles.dpatch (rev 0)
+++ packages/josm/trunk/debian/patches/40_elemstyles.dpatch 2008-03-11 23:40:49 UTC (rev 1401)
@@ -0,0 +1,2140 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_elemstyles.dpatch by Andreas Putzo <andreas at putzo.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad josm-0.0.0.20080311~/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java josm-0.0.0.20080311/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java
+--- josm-0.0.0.20080311~/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java 2007-12-14 01:00:43.000000000 +0000
++++ josm-0.0.0.20080311/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java 2008-03-11 23:32:47.000000000 +0000
+@@ -86,21 +86,18 @@
+ //open icon from user directory
+ curIcon = new ImageIcon(imageFile);
+ } else {
+- try {
+- URL path = getClass().getResource("/styles/standard/icons/"+atts.getValue(count));
+- if (path == null) {
+- /* icon not found, using default */
+- System.out.println("Mappaint: Icon " + atts.getValue(count) + " not found, using default icon");
+- path = getClass().getResource("/styles/standard/icons/misc/no_icon.png");
+- curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+- } else {
+- curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+- }
+- }
+- catch (Exception e){
+- URL path = getClass().getResource("/styles/standard/icons/amenity.png");
+- curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+- }
++ imageFile = atts.getValue(count);
++ f = new File(imageFile);
++ if (f.exists()) {
++ // open icon from system directory
++ curIcon = new ImageIcon(imageFile);
++ }
++ else {
++ /* icon not found, using default */
++ System.out.println("Mappaint: Icon " + atts.getValue(count) + " not found, using default icon");
++ imageFile = "/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png";
++ curIcon = new ImageIcon(imageFile);
++ }
+ }
+ } else if (atts.getQName(count).equals("annotate")) {
+ curIconAnnotate = Boolean.parseBoolean (atts.getValue(count));
+diff -urNad josm-0.0.0.20080311~/styles/standard/elemstyles.xml josm-0.0.0.20080311/styles/standard/elemstyles.xml
+--- josm-0.0.0.20080311~/styles/standard/elemstyles.xml 2008-02-23 15:26:32.000000000 +0000
++++ josm-0.0.0.20080311/styles/standard/elemstyles.xml 2008-03-11 23:31:23.000000000 +0000
+@@ -158,112 +158,112 @@
+
+ <rule>
+ <condition k="highway" v="mini_roundabout" />
+- <icon annotate="true" src="vehicle/restrictions/roundabout_left.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/restrictions/roundabout_left.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="highway" v="stop" />
+- <icon annotate="true" src="vehicle/restrictions/stop.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/restrictions/stop.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="highway" v="traffic_signals" />
+- <icon annotate="true" src="vehicle/restrictions/traffic-light.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/restrictions/traffic-light.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="highway" v="crossing" />
+- <icon annotate="true" src="vehicle/zebra_crossing.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/zebra_crossing.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="highway" v="gate" />
+- <icon annotate="true" src="vehicle/gate.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/gate.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="highway" v="stile" />
+- <icon annotate="true" src="vehicle/stile.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/stile.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="highway" v="cattle_grid" />
+- <icon annotate="true" src="vehicle/cattle_grid.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/cattle_grid.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="highway" v="toll_booth" />
+- <icon annotate="true" src="vehicle/toll_station.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/toll_station.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="highway" v="incline" />
+- <icon annotate="true" src="vehicle/restrictions/incline.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/restrictions/incline.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="highway" v="incline_steep" />
+- <icon annotate="true" src="vehicle/restrictions/incline.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/restrictions/incline.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="highway" v="viaduct" />
+- <icon annotate="true" src="vehicle/viaduct.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/viaduct.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="highway" v="motorway_junction" />
+- <icon annotate="true" src="vehicle/exit.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/exit.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="highway" v="services" />
+- <icon annotate="true" src="vehicle/services.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/services.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="highway" v="ford" />
+- <icon annotate="true" src="vehicle/ford.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/ford.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="highway" v="bus_stop" />
+- <icon annotate="true" src="transport/bus_small.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/transport/bus_small.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="highway" v="turning_circle" />
+- <icon annotate="true" src="vehicle/turning_circle.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/turning_circle.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -373,56 +373,56 @@
+
+ <rule>
+ <condition k="waterway" v="lock_gate" />
+- <icon annotate="true" src="nautical/lock_gate.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/nautical/lock_gate.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="waterway" v="turning_point" />
+- <icon annotate="true" src="nautical/turning.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/nautical/turning.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="waterway" v="aqueduct" />
+- <icon annotate="true" src="nautical/aqueduct.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/nautical/aqueduct.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="waterway" v="boatyard" />
+- <icon annotate="true" src="nautical/boatyard.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/nautical/boatyard.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="waterway" v="water_point" />
+- <icon annotate="true" src="accommodation/camping/water.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/accommodation/camping/water.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="waterway" v="waste_disposal" />
+- <icon annotate="true" src="accommodation/camping/wastewater.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/accommodation/camping/wastewater.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="waterway" v="mooring" />
+- <icon annotate="true" src="nautical/marina.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/nautical/marina.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="waterway" v="weir" />
+- <icon annotate="true" src="nautical/weir.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/nautical/weir.png" />
+ <line width="2" colour="#D8D8D8" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -439,42 +439,42 @@
+ <!-- railway tags -->
+ <rule>
+ <condition k="railway" v="station" />
+- <icon annotate="true" src="transport/railway.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/transport/railway.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="railway" v="halt" />
+- <icon annotate="true" src="transport/railway_small.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/transport/railway_small.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="railway" v="tram_stop" />
+- <icon annotate="true" src="transport/railway_small.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/transport/railway_small.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="railway" v="viaduct" />
+- <icon annotate="true" src="vehicle/viaduct.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/viaduct.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="railway" v="crossing" />
+- <icon annotate="true" src="vehicle/crossing_small.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/crossing_small.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="railway" v="level_crossing" />
+- <icon annotate="true" src="vehicle/crossing.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/crossing.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -509,7 +509,7 @@
+
+ <rule>
+ <condition k="railway" v="subway_entrance"/>
+- <icon annotate="true" src="transport/underground.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/transport/underground.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -551,7 +551,7 @@
+
+ <rule>
+ <condition k="railway" v="turntable"/>
+- <icon annotate="true" src="transport/turntable.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/transport/turntable.png" />
+ <area colour="#202020" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -561,21 +561,21 @@
+
+ <rule>
+ <condition k="aeroway" v="aerodrome"/>
+- <icon annotate="true" src="transport/airport.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/transport/airport.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="aeroway" v="terminal"/>
+- <icon annotate="true" src="transport/airport/terminal.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/transport/airport/terminal.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="aeroway" v="helipad"/>
+- <icon annotate="true" src="transport/airport/helipad.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/transport/airport/helipad.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -607,7 +607,7 @@
+
+ <rule>
+ <condition k="power" v="tower" />
+- <icon annotate="true" src="misc/landmark/power/tower.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/power/tower.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -621,7 +621,7 @@
+
+ <rule>
+ <condition k="power" v="sub_station" />
+- <icon annotate="true" src="misc/landmark/power.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/power.png" />
+ <area width="1" colour="#eeeeee" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -630,91 +630,91 @@
+ <!--man_made tags -->
+ <rule>
+ <condition k="man_made" v="works" />
+- <icon annotate="true" src="misc/landmark/works.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/works.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="man_made" v="beacon" />
+- <icon annotate="true" src="misc/landmark/beacon.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/beacon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="man_made" v="survey_point" />
+- <icon annotate="true" src="misc/landmark/survey_point.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/survey_point.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="man_made" v="power_wind" />
+- <icon annotate="true" src="misc/landmark/power/wind.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/power/wind.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="man_made" v="power_hydro" />
+- <icon annotate="true" src="misc/landmark/power/hydro.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/power/hydro.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="man_made" v="power_fossil" />
+- <icon annotate="true" src="misc/landmark/power/fossil.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/power/fossil.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="man_made" v="power_nuclear" />
+- <icon annotate="true" src="misc/landmark/power/nuclear.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/power/nuclear.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="man_made" v="tower" />
+- <icon annotate="true" src="misc/landmark/tower.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/tower.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="man_made" v="water_tower" />
+- <icon annotate="true" src="misc/landmark/water_tower.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/water_tower.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="man_made" v="gasometer" />
+- <icon annotate="true" src="misc/landmark/gasometer.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/gasometer.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="man_made" v="reservoir_covered" />
+- <icon annotate="true" src="misc/landmark/reservoir_covered.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/reservoir_covered.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="man_made" v="lighthouse" />
+- <icon annotate="true" src="misc/landmark/lighthouse.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/lighthouse.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="man_made" v="windmill" />
+- <icon annotate="true" src="misc/landmark/windmill.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/windmill.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -722,7 +722,7 @@
+ <rule>
+ <condition k="man_made" v="pier" />
+ <line width="2" colour="#660000" />
+- <icon annotate="true" src="misc/landmark/pier.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/pier.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -737,7 +737,7 @@
+ <rule>
+ <condition k="man_made" v="wastewater_plant" />
+ <area colour="#D8D8D8" />
+- <icon annotate="true" src="misc/landmark/wastewater_plant.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/wastewater_plant.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -745,7 +745,7 @@
+ <rule>
+ <condition k="man_made" v="crane" />
+ <area colour="#D8D8D8" />
+- <icon annotate="true" src="misc/landmark/crane.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/crane.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -753,35 +753,35 @@
+ <!--leisure tags -->
+ <rule>
+ <condition k="leisure" v="sports_centre" />
+- <icon annotate="true" src="sports/centre.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sports/centre.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="leisure" v="golf_course" />
+- <icon annotate="true" src="sports/golf.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sports/golf.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="leisure" v="stadium" />
+- <icon annotate="true" src="sports/stadium.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sports/stadium.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="leisure" v="track" />
+- <icon annotate="true" src="sports/track.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sports/track.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="leisure" v="pitch" />
+- <icon annotate="true" src="sports/pitch.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sports/pitch.png" />
+ <area colour="#c7f1a3" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -789,42 +789,42 @@
+
+ <rule>
+ <condition k="leisure" v="water_park" />
+- <icon annotate="true" src="recreation/water_park.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/recreation/water_park.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="leisure" v="marina" />
+- <icon annotate="true" src="nautical/marina.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/nautical/marina.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="leisure" v="slipway" />
+- <icon annotate="true" src="nautical/slipway.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/nautical/slipway.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="leisure" v="fishing" />
+- <icon annotate="true" src="sports/fishing.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sports/fishing.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="leisure" v="nature_reserve" />
+- <icon annotate="true" src="recreation/nature_reserve.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/recreation/nature_reserve.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="leisure" v="park"/>
+- <icon annotate="true" src="recreation/park.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/recreation/park.png" />
+ <area colour="#c7f1a3"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -832,7 +832,7 @@
+
+ <rule>
+ <condition k="leisure" v="playground"/>
+- <icon annotate="true" src="recreation/playground.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/recreation/playground.png" />
+ <area colour="#c7f1a3"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -840,14 +840,14 @@
+
+ <rule>
+ <condition k="leisure" v="garden" />
+- <icon annotate="true" src="recreation/garden.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/recreation/garden.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="leisure" v="common" />
+- <icon annotate="true" src="recreation/common.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/recreation/common.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -855,49 +855,49 @@
+ <!--amenity tags -->
+ <rule>
+ <condition k="amenity" v="pub" />
+- <icon annotate="true" src="food/pub.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/food/pub.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="biergarten" />
+- <icon annotate="true" src="food/biergarten.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/food/biergarten.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="nightclub" />
+- <icon annotate="true" src="recreation/nightclub.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/recreation/nightclub.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="cafe" />
+- <icon annotate="true" src="food/cafe.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/food/cafe.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="restaurant" />
+- <icon annotate="true" src="food/restaurant.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/food/restaurant.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="fast_food" />
+- <icon annotate="true" src="food/fastfood.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/food/fastfood.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="parking" />
+- <icon annotate="true" src="vehicle/parking.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/parking.png" />
+ <area colour="#f7efb7"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -905,7 +905,7 @@
+
+ <rule>
+ <condition k="amenity" v="bicycle_parking" />
+- <icon annotate="true" src="vehicle/parking/bike.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/parking/bike.png" />
+ <area colour="#f7efb7"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -913,14 +913,14 @@
+
+ <rule>
+ <condition k="amenity" v="bicycle_rental" />
+- <icon annotate="true" src="vehicle/bicycle_rental.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/bicycle_rental.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="car_rental" />
+- <icon annotate="true" src="vehicle/car_rental.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/car_rental.png" />
+ <area colour="#f7efb7"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -928,7 +928,7 @@
+
+ <rule>
+ <condition k="amenity" v="car_sharing" />
+- <icon annotate="true" src="vehicle/car_sharing.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/car_sharing.png" />
+ <area colour="#f7efb7"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -936,7 +936,7 @@
+
+ <rule>
+ <condition k="amenity" v="taxi" />
+- <icon annotate="true" src="transport/taxi.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/transport/taxi.png" />
+ <area colour="#f7efb7"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -944,35 +944,35 @@
+
+ <rule>
+ <condition k="amenity" v="fuel" />
+- <icon annotate="true" src="vehicle/fuel_station.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/vehicle/fuel_station.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="telephone" />
+- <icon annotate="true" src="public/telephone.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/public/telephone.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="toilets" />
+- <icon annotate="true" src="public/toilets.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/public/toilets.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="recycling" />
+- <icon annotate="true" src="public/recycling.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/public/recycling.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="public_building" />
+- <icon annotate="true" src="public.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/public.png" />
+ <area colour="#f7efb7"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -980,7 +980,7 @@
+
+ <rule>
+ <condition k="amenity" v="townhall" />
+- <icon annotate="true" src="public.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/public.png" />
+ <area colour="#00005f"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -989,84 +989,84 @@
+ <!--the religion rules must be placed before the place_of_worship rule! -->
+ <rule>
+ <condition k="religion" v="bahai" />
+- <icon annotate="true" src="religion/church/bahai.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/religion/church/bahai.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="religion" v="buddhist" />
+- <icon annotate="true" src="religion/church/buddhism.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/religion/church/buddhism.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="religion" v="christian" />
+- <icon annotate="true" src="religion/church.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/religion/church.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="religion" v="hindu" />
+- <icon annotate="true" src="religion/church/hinduism.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/religion/church/hinduism.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="religion" v="jain" />
+- <icon annotate="true" src="religion/church/jainism.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/religion/church/jainism.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="religion" v="jewish" />
+- <icon annotate="true" src="religion/church/synagogue.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/religion/church/synagogue.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="religion" v="muslim" />
+- <icon annotate="true" src="religion/church/mosque.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/religion/church/mosque.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="religion" v="sikh" />
+- <icon annotate="true" src="religion/church/sikhism.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/religion/church/sikhism.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="religion" v="shinto" />
+- <icon annotate="true" src="religion/church/shinto.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/religion/church/shinto.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="religion" v="taoist" />
+- <icon annotate="true" src="religion/church/taoism.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/religion/church/taoism.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="place_of_worship" />
+- <icon annotate="true" src="religion.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/religion.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="grave_yard" />
+- <icon annotate="true" src="religion/cemetery.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/religion/cemetery.png" />
+ <area colour="#f7efb7"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1074,21 +1074,21 @@
+
+ <rule>
+ <condition k="amenity" v="post_office" />
+- <icon annotate="true" src="public/post_office.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/public/post_office.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="post_box" />
+- <icon annotate="true" src="public/post_box.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/public/post_box.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="school" />
+- <icon annotate="true" src="education/school.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/education/school.png" />
+ <area colour="#f7efb7"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1096,7 +1096,7 @@
+
+ <rule>
+ <condition k="amenity" v="university" />
+- <icon annotate="true" src="education/university.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/education/university.png" />
+ <area colour="#f7efb7"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1104,7 +1104,7 @@
+
+ <rule>
+ <condition k="amenity" v="college" />
+- <icon annotate="true" src="education/college.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/education/college.png" />
+ <area colour="#f7efb7"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1112,7 +1112,7 @@
+
+ <rule>
+ <condition k="amenity" v="pharmacy" />
+- <icon annotate="true" src="health/pharmacy.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/health/pharmacy.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1120,98 +1120,98 @@
+ <rule>
+ <condition k="amenity" v="hospital" />
+ <area colour="#eeeeee" />
+- <icon annotate="true" src="health/hospital.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/health/hospital.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="library" />
+- <icon annotate="true" src="shopping/rental/library.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/shopping/rental/library.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="police" />
+- <icon annotate="true" src="public/police.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/public/police.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="fire_station" />
+- <icon annotate="true" src="public/firebrigade.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/public/firebrigade.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="bus_station" />
+- <icon annotate="true" src="transport/bus.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/transport/bus.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="theatre" />
+- <icon annotate="true" src="recreation/theater.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/recreation/theater.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="cinema" />
+- <icon annotate="true" src="recreation/cinema.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/recreation/cinema.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="arts_centre" />
+- <icon annotate="true" src="public/arts_centre.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/public/arts_centre.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="courthouse" />
+- <icon annotate="true" src="public/administration/court_of_law.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/public/administration/court_of_law.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="prison" />
+- <icon annotate="true" src="public/administration/prison.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/public/administration/prison.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="bank" />
+- <icon annotate="true" src="money/bank.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/money/bank.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="bureau_de_change" />
+- <icon annotate="true" src="money/exchange.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/money/exchange.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="atm" />
+- <icon annotate="true" src="money/atm.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/money/atm.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="fountain"/>
+- <icon annotate="true" src="misc/landmark/spring.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/spring.png" />
+ <area colour="#00005f"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1221,7 +1221,7 @@
+
+ <rule>
+ <condition k="shop" v="supermarket" />
+- <icon annotate="true" src="shopping/supermarket.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/shopping/supermarket.png" />
+ <area colour="#00005f"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1229,56 +1229,56 @@
+
+ <rule>
+ <condition k="shop" v="convenience" />
+- <icon annotate="true" src="shopping/supermarket.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/shopping/supermarket.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="shop" v="butcher" />
+- <icon annotate="true" src="shopping/groceries/butcher.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/shopping/groceries/butcher.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="shop" v="bicycle" />
+- <icon annotate="true" src="sports/bicycle.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sports/bicycle.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="shop" v="doityourself" />
+- <icon annotate="true" src="shopping/diy_store.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/shopping/diy_store.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="shop" v="dry_cleaning" />
+- <icon annotate="true" src="misc/no_icon.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="shop" v="laundry" />
+- <icon annotate="true" src="shopping/laundry.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/shopping/laundry.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="shop" v="outdoor" />
+- <icon annotate="true" src="shopping/sports/outdoor.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/shopping/sports/outdoor.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="shop" v="kiosk" />
+- <icon annotate="true" src="shopping/kiosk.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/shopping/kiosk.png" />
+ <area colour="#00005f"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1287,98 +1287,98 @@
+ <!--tourism tags -->
+ <rule>
+ <condition k="tourism" v="information" />
+- <icon annotate="true" src="misc/information.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/information.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="tourism" v="hotel" />
+- <icon annotate="true" src="accommodation.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/accommodation.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="tourism" v="motel" />
+- <icon annotate="true" src="accommodation/motel.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/accommodation/motel.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="tourism" v="guest_house" />
+- <icon annotate="true" src="accommodation/guest_house.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/accommodation/guest_house.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="tourism" v="hostel" />
+- <icon annotate="true" src="accommodation/hostel.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/accommodation/hostel.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="tourism" v="camp_site" />
+- <icon annotate="true" src="accommodation/camping.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/accommodation/camping.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="tourism" v="caravan_site" />
+- <icon annotate="true" src="accommodation/camping/caravan.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/accommodation/camping/caravan.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="tourism" v="picnic_site" />
+- <icon annotate="true" src="recreation/picnic.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/recreation/picnic.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="tourism" v="viewpoint" />
+- <icon annotate="true" src="sightseeing/viewpoint.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sightseeing/viewpoint.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="tourism" v="theme_park" />
+- <icon annotate="true" src="recreation/theme_park.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/recreation/theme_park.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="tourism" v="attraction"/>
+- <icon annotate="true" src="sightseeing.png"/>
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sightseeing.png"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="tourism" v="zoo"/>
+- <icon annotate="true" src="recreation/zoo.png"/>
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/recreation/zoo.png"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="tourism" v="artwork"/>
+- <icon annotate="true" src="public/arts_centre.png"/>
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/public/arts_centre.png"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="tourism" v="museum" />
+- <icon annotate="true" src="sightseeing/museum.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sightseeing/museum.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1386,42 +1386,42 @@
+ <!--historic tags -->
+ <rule>
+ <condition k="historic" v="castle" />
+- <icon annotate="true" src="sightseeing/castle.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sightseeing/castle.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="historic" v="monument" />
+- <icon annotate="true" src="sightseeing/monument.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sightseeing/monument.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="historic" v="memorial" />
+- <icon annotate="true" src="sightseeing/memorial.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sightseeing/memorial.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="historic" v="archaeological_site" />
+- <icon annotate="true" src="sightseeing/archaeological.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sightseeing/archaeological.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="historic" v="ruins" />
+- <icon annotate="true" src="sightseeing/ruins.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sightseeing/ruins.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="historic" v="battlefield" />
+- <icon annotate="true" src="sightseeing/battlefield.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/sightseeing/battlefield.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1429,7 +1429,7 @@
+ <!--landuse tags -->
+ <rule>
+ <condition k="landuse" v="farm" />
+- <icon annotate="true" src="misc/landmark/farm.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/farm.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1437,7 +1437,7 @@
+ <rule>
+ <condition k="landuse" v="quarry"/>
+ <area colour="#cccccc" />
+- <icon src="misc/landmark/mine.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/mine.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1445,7 +1445,7 @@
+ <rule>
+ <condition k="landuse" v="landfill"/>
+ <area colour="#663300" />
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1453,7 +1453,7 @@
+ <rule>
+ <condition k="landuse" v="basin"/>
+ <area colour="#0000bf" />
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1461,7 +1461,7 @@
+ <rule>
+ <condition k="landuse" v="reservoir"/>
+ <area colour="#0000bf" />
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1469,7 +1469,7 @@
+ <rule>
+ <condition k="landuse" v="forest"/>
+ <area colour="#b1efc8" />
+- <icon src="misc/landmark/trees.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/trees.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1477,7 +1477,7 @@
+ <rule>
+ <condition k="landuse" v="allotments"/>
+ <area colour="#b1e0c2" />
+- <icon src="misc/landmark/plant.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/plant.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1485,7 +1485,7 @@
+ <rule>
+ <condition k="landuse" v="residential"/>
+ <area colour="#f0f0f0"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1493,7 +1493,7 @@
+ <rule>
+ <condition k="landuse" v="retail"/>
+ <area colour="#dbdbdb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1501,7 +1501,7 @@
+ <rule>
+ <condition k="landuse" v="commercial"/>
+ <area colour="#dbdbdb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1509,7 +1509,7 @@
+ <rule>
+ <condition k="landuse" v="industrial"/>
+ <area colour="#ecd8ff"/>
+- <icon src="misc/landmark/works.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/works.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1517,7 +1517,7 @@
+ <rule>
+ <condition k="landuse" v="brownfield"/>
+ <area colour="#ecba32"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1525,7 +1525,7 @@
+ <rule>
+ <condition k="landuse" v="greenfield"/>
+ <area colour="#b1ec5c"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1533,7 +1533,7 @@
+ <rule>
+ <condition k="landuse" v="railway"/>
+ <area colour="#b1ec5c"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1541,7 +1541,7 @@
+ <rule>
+ <condition k="landuse" v="construction"/>
+ <area colour="#b1ec5c"/>
+- <icon src="misc/construction.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/construction.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1549,7 +1549,7 @@
+ <rule>
+ <condition k="landuse" v="military"/>
+ <area colour="#b1ec5c"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1557,7 +1557,7 @@
+ <rule>
+ <condition k="landuse" v="cemetery"/>
+ <area colour="#bde3cb"/>
+- <icon src="religion/cemetery.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/religion/cemetery.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1565,7 +1565,7 @@
+ <rule>
+ <condition k="landuse" v="village_green"/>
+ <area colour="#b1e0c2" />
+- <icon src="recreation/common.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/recreation/common.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1573,7 +1573,7 @@
+ <rule>
+ <condition k="landuse" v="recreation_ground"/>
+ <area colour="#b1e0c2" />
+- <icon src="recreation/common.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/recreation/common.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1581,7 +1581,7 @@
+ <!--military tags -->
+ <rule>
+ <condition k="military" v="airfield" />
+- <icon src="transport/airport/airfield.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/transport/airport/airfield.png" />
+ <area colour="#b62c2c"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1589,7 +1589,7 @@
+
+ <rule>
+ <condition k="military" v="bunker" />
+- <icon src="misc/landmark/bunker.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/bunker.png" />
+ <area colour="#b62c2c"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1597,7 +1597,7 @@
+
+ <rule>
+ <condition k="military" v="barracks" />
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <area colour="#b62c2c"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1605,7 +1605,7 @@
+
+ <rule>
+ <condition k="military" v="danger_area" />
+- <icon src="misc/danger.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/danger.png" />
+ <area colour="#b62c2c"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1613,7 +1613,7 @@
+
+ <rule>
+ <condition k="military" v="range" />
+- <icon src="misc/landmark/range.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/range.png" />
+ <area colour="#b62c2c"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1622,21 +1622,21 @@
+ <!--natural tags -->
+ <rule>
+ <condition k="natural" v="spring"/>
+- <icon annotate="true" src="misc/landmark/spring.png"/>
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/spring.png"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="natural" v="peak"/>
+- <icon annotate="true" src="misc/landmark/peak_small.png"/>
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/peak_small.png"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="natural" v="glacier"/>
+- <icon annotate="true" src="misc/no_icon.png"/>
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png"/>
+ <area colour="#ffffff"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1644,14 +1644,14 @@
+
+ <rule>
+ <condition k="natural" v="volcano"/>
+- <icon annotate="true" src="misc/no_icon.png"/>
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="natural" v="cliff"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <area colour="#002f00"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1659,7 +1659,7 @@
+
+ <rule>
+ <condition k="natural" v="scree"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <area colour="#002f00"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1667,7 +1667,7 @@
+
+ <rule>
+ <condition k="natural" v="scrub" />
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <area colour="#007000" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1675,7 +1675,7 @@
+
+ <rule>
+ <condition k="natural" v="fell"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <area colour="#002f00"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1683,7 +1683,7 @@
+
+ <rule>
+ <condition k="natural" v="heath"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <area colour="#ffffc0"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1691,7 +1691,7 @@
+
+ <rule>
+ <condition k="natural" v="wood"/>
+- <icon src="misc/landmark/trees.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/trees.png" />
+ <area colour="#008000" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1699,7 +1699,7 @@
+
+ <rule>
+ <condition k="natural" v="marsh"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <area colour="#4f4ff3"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1707,7 +1707,7 @@
+
+ <rule>
+ <condition k="natural" v="water"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <area colour="#0000ff"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1715,7 +1715,7 @@
+
+ <rule>
+ <condition k="natural" v="coastline"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <line width="1" colour="#0000ff"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1723,7 +1723,7 @@
+
+ <rule>
+ <condition k="natural" v="mud"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <area colour="#cba762"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1731,7 +1731,7 @@
+
+ <rule>
+ <condition k="natural" v="beach"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <area colour="#f8dba2"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1739,7 +1739,7 @@
+
+ <rule>
+ <condition k="natural" v="bay"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <area colour="#002f00"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1747,7 +1747,7 @@
+
+ <rule>
+ <condition k="natural" v="land"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <area colour="#002f00"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1755,7 +1755,7 @@
+
+ <rule>
+ <condition k="natural" v="cave_entrance"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <area colour="#002f00"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+@@ -1860,7 +1860,7 @@
+ <rule>
+ <condition k="sport" v="10pin" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1868,7 +1868,7 @@
+ <rule>
+ <condition k="sport" v="athletics" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1876,7 +1876,7 @@
+ <rule>
+ <condition k="sport" v="australian_football" />
+ <area colour="#bde3cb"/>
+- <icon src="sports/football.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/sports/football.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1884,7 +1884,7 @@
+ <rule>
+ <condition k="sport" v="baseball" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1892,7 +1892,7 @@
+ <rule>
+ <condition k="sport" v="basketball" />
+ <area colour="#bde3cb"/>
+- <icon src="sports/basketball.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/sports/basketball.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1900,7 +1900,7 @@
+ <rule>
+ <condition k="sport" v="boules" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1908,7 +1908,7 @@
+ <rule>
+ <condition k="sport" v="bowls" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1916,7 +1916,7 @@
+ <rule>
+ <condition k="sport" v="climbing" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1924,7 +1924,7 @@
+ <rule>
+ <condition k="sport" v="cricket" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1932,7 +1932,7 @@
+ <rule>
+ <condition k="sport" v="cricket_nets" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1940,7 +1940,7 @@
+ <rule>
+ <condition k="sport" v="croquet" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1948,7 +1948,7 @@
+ <rule>
+ <condition k="sport" v="cycling" />
+ <area colour="#bde3cb"/>
+- <icon src="sports/cycling.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/sports/cycling.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1956,7 +1956,7 @@
+ <rule>
+ <condition k="sport" v="dog_racing" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1964,7 +1964,7 @@
+ <rule>
+ <condition k="sport" v="equestrian" />
+ <area colour="#bde3cb"/>
+- <icon src="sports/riding.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/sports/riding.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1972,7 +1972,7 @@
+ <rule>
+ <condition k="sport" v="football" />
+ <area colour="#bde3cb"/>
+- <icon src="sports/football.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/sports/football.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1980,7 +1980,7 @@
+ <rule>
+ <condition k="sport" v="golf" />
+ <area colour="#bde3cb"/>
+- <icon src="sports/golf.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/sports/golf.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1988,7 +1988,7 @@
+ <rule>
+ <condition k="sport" v="gymnastics" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -1996,7 +1996,7 @@
+ <rule>
+ <condition k="sport" v="hockey" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2004,7 +2004,7 @@
+ <rule>
+ <condition k="sport" v="horse_racing" />
+ <area colour="#bde3cb"/>
+- <icon src="sports/riding.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/sports/riding.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2012,7 +2012,7 @@
+ <rule>
+ <condition k="sport" v="motor" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2020,7 +2020,7 @@
+ <rule>
+ <condition k="sport" v="multi" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2028,7 +2028,7 @@
+ <rule>
+ <condition k="sport" v="pelota" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2036,7 +2036,7 @@
+ <rule>
+ <condition k="sport" v="racquet" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2044,7 +2044,7 @@
+ <rule>
+ <condition k="sport" v="rugby" />
+ <area colour="#bde3cb"/>
+- <icon src="sports/football.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/sports/football.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2052,7 +2052,7 @@
+ <rule>
+ <condition k="sport" v="skating" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2060,7 +2060,7 @@
+ <rule>
+ <condition k="sport" v="skateboard" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2068,7 +2068,7 @@
+ <rule>
+ <condition k="sport" v="soccer" />
+ <area colour="#bde3cb"/>
+- <icon src="sports/soccer.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/sports/soccer.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2076,7 +2076,7 @@
+ <rule>
+ <condition k="sport" v="swimming" />
+ <area colour="#bde3cb"/>
+- <icon src="sports/pool.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/sports/pool.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2084,7 +2084,7 @@
+ <rule>
+ <condition k="sport" v="skiing" />
+ <area colour="#bde3cb"/>
+- <icon src="sports/skiing.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/sports/skiing.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2092,7 +2092,7 @@
+ <rule>
+ <condition k="sport" v="table_tennis" />
+ <area colour="#bde3cb"/>
+- <icon src="misc/no_icon.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2100,7 +2100,7 @@
+ <rule>
+ <condition k="sport" v="tennis" />
+ <area colour="#bde3cb"/>
+- <icon src="sports/tennis.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/sports/tennis.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2113,7 +2113,7 @@
+
+ <rule>
+ <condition k="mountain_pass" v="yes" />
+- <icon src="misc/landmark/mountain_pass.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/misc/landmark/mountain_pass.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2122,7 +2122,7 @@
+
+ <rule>
+ <condition k="motorcycle" v="no" />
+- <icon src="vehicle/restrictions/motorbike.png" />
++ <icon src="/usr/share/icons/openstreetmap/classic.small/vehicle/restrictions/motorbike.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2134,84 +2134,84 @@
+ <!--place tags -->
+ <rule>
+ <condition k="place" v="continent" />
+- <icon annotate="true" src="misc/no_icon.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="place" v="country" />
+- <icon annotate="true" src="misc/no_icon.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="place" v="state" />
+- <icon annotate="true" src="misc/no_icon.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="place" v="region" />
+- <icon annotate="true" src="misc/no_icon.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="place" v="county" />
+- <icon annotate="true" src="misc/no_icon.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/no_icon.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="place" v="city" />
+- <icon annotate="true" src="places/settlement/city.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/places/settlement/city.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="place" v="town" />
+- <icon annotate="true" src="places/settlement/town.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/places/settlement/town.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="place" v="village" />
+- <icon annotate="true" src="places/settlement/town.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/places/settlement/town.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="place" v="hamlet" />
+- <icon annotate="true" src="places/settlement/town.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/places/settlement/town.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="place" v="suburb" />
+- <icon annotate="true" src="places/settlement/town.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/places/settlement/town.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="place" v="locality" />
+- <icon annotate="true" src="places/locality.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/places/locality.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="place" v="island" />
+- <icon annotate="true" src="places/island.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/places/island.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2221,7 +2221,7 @@
+ <!--"deprecated" tags -->
+ <rule>
+ <condition k="historic" v="museum" />
+- <icon annotate="true" src="misc/deprecated.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/deprecated.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2229,7 +2229,7 @@
+ <!-- was never approved anyway, shop=laundry was approved instead -->
+ <rule>
+ <condition k="shop" v="laundromat" />
+- <icon annotate="true" src="misc/deprecated.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/deprecated.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2244,7 +2244,7 @@
+ <!-- there's a bit confusion about this tag, the proposal says leisure, map features say tourism ?!? -->
+ <rule>
+ <condition k="leisure" v="zoo" />
+- <icon annotate="true" src="misc/deprecated.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/deprecated.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+@@ -2252,83 +2252,83 @@
+ <!--"work in progress" tags -->
+ <rule>
+ <condition k="amenity" v="sheltered_housing" />
+- <icon annotate="true" src="misc/proposed.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/proposed.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="nursery" />
+- <icon annotate="true" src="misc/proposed.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/proposed.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="amenity" v="shelter" />
+- <icon annotate="true" src="misc/proposed.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/proposed.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="shop" v="beverages" />
+- <icon annotate="true" src="misc/proposed.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/proposed.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="shop" v="bakery" />
+- <icon annotate="true" src="misc/proposed.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/proposed.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="shop" v="chemist" />
+- <icon annotate="true" src="misc/proposed.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/proposed.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="shop" v="motorcycle" />
+- <icon annotate="true" src="misc/proposed.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/proposed.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="shop" v="car_repair" />
+- <icon annotate="true" src="misc/proposed.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/proposed.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="shop" v="mall" />
+- <icon annotate="true" src="misc/proposed.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/proposed.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="historic" v="church" />
+- <icon annotate="true" src="misc/proposed.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/proposed.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+
+ <rule>
+ <condition k="barrier" v="bollard" />
+- <icon annotate="true" src="misc/proposed.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/proposed.png" />
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
+ </rule>
+ <rule>
+ <condition k="building" v="yes"/>
+- <icon annotate="true" src="misc/proposed.png" />
++ <icon annotate="true" src="/usr/share/icons/openstreetmap/classic.small/misc/proposed.png" />
+ <area colour="#bde3cb"/>
+ <scale_min>1</scale_min>
+ <scale_max>50000</scale_max>
Property changes on: packages/josm/trunk/debian/patches/40_elemstyles.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/josm/trunk/debian/rules
===================================================================
--- packages/josm/trunk/debian/rules 2008-03-11 22:24:26 UTC (rev 1400)
+++ packages/josm/trunk/debian/rules 2008-03-11 23:40:49 UTC (rev 1401)
@@ -39,6 +39,8 @@
@echo Removing jar files and test data
find ../tarballs/josm-0.0.0.${DATE} -name "*.jar" -exec rm -v {} \;
rm -f ../tarballs/josm-0.0.0.${DATE}/data/*
+ @echo Removing icons
+ rm -f ../tarballs/josm-0.0.0.${DATE}/styles/standard/icons/
@echo Building snapshot tarball
tar czf ../tarballs/josm_0.0.0.${DATE}.orig.tar.gz -C ../tarballs josm-0.0.0.${DATE}
@echo Cleaning up
More information about the Pkg-grass-devel
mailing list