diff --git a/README.md b/README.md
index 97bab085..fa883cb9 100644
--- a/README.md
+++ b/README.md
@@ -73,5 +73,3 @@ different, GPL compatible, licenses:
[Transverse Mercator](src/map/proj/transversemercator.cpp) projections - NIMA
Source Code Disclaimer
* [Projection parameters CSV files](data/CRS) - BSD/EPSG/Public domain
-* [Mapsforge render theme](data/mapsforge/default.xml) and its
- [icons](icons/map/mapsforge) - LGPLv3
diff --git a/data/mapsforge/default.xml b/data/mapsforge/default.xml
deleted file mode 100644
index a31f14c0..00000000
--- a/data/mapsforge/default.xml
+++ /dev/null
@@ -1,1513 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/data/style/style.xml b/data/style/style.xml
new file mode 100644
index 00000000..52f466cc
--- /dev/null
+++ b/data/style/style.xml
@@ -0,0 +1,673 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gpxsee.qrc b/gpxsee.qrc
index 7c044188..40b31c64 100644
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@@ -5,12 +5,14 @@
-
- icons/map/arrow.svg
- icons/map/water-arrow.svg
+
+ icons/map/symbols/arrow.svg
+ icons/map/symbols/cliff.svg
+ icons/map/symbols/exit.svg
+ icons/map/symbols/water-arrow.svg
-
+
icons/map/POI/airfield-11.svg
icons/map/POI/airport-11.svg
@@ -22,6 +24,7 @@
icons/map/POI/barrier-11.svg
icons/map/POI/bbq-11.svg
icons/map/POI/beach-11.svg
+ icons/map/POI/beer-11.svg
icons/map/POI/bowling-alley-11.svg
icons/map/POI/building-alt1-11.svg
icons/map/POI/bridge-11.svg
@@ -42,6 +45,7 @@
icons/map/POI/drinking-water-11.svg
icons/map/POI/fast-food-11.svg
icons/map/POI/entrance-alt1-11.svg
+ icons/map/POI/ferry-11.svg
icons/map/POI/fire-station-11.svg
icons/map/POI/fitness-centre-11.svg
icons/map/POI/fuel-11.svg
@@ -58,7 +62,9 @@
icons/map/POI/information-11.svg
icons/map/POI/landmark-11.svg
icons/map/POI/library-11.svg
+ icons/map/POI/lighthouse-11.svg
icons/map/POI/lodging-11.svg
+ icons/map/POI/monument-11.svg
icons/map/POI/mountain-11.svg
icons/map/POI/museum-11.svg
icons/map/POI/park-11.svg
@@ -69,6 +75,8 @@
icons/map/POI/police-11.svg
icons/map/POI/post-11.svg
icons/map/POI/rail-11.svg
+ icons/map/POI/rail-light-11.svg
+ icons/map/POI/rail-metro-11.svg
icons/map/POI/religious-christian-11.svg
icons/map/POI/religious-jewish-11.svg
icons/map/POI/religious-muslim-11.svg
@@ -90,12 +98,13 @@
icons/map/POI/viewpoint-11.svg
icons/map/POI/village-11.svg
icons/map/POI/volcano-11.svg
+ icons/map/POI/water-11.svg
icons/map/POI/waterfall-11.svg
icons/map/POI/wetland-11.svg
icons/map/POI/zoo-11.svg
-
+
icons/map/marine/light-major.png
icons/map/marine/buoy.png
@@ -169,140 +178,18 @@
icons/map/marine/dome.png
-
-
- data/mapsforge/default.xml
+
+
+ icons/map/patterns/cemetery.svg
+ icons/map/patterns/military-area.svg
+ icons/map/patterns/nature-reserve.svg
+ icons/map/patterns/orchard.svg
+ icons/map/patterns/vineyard.svg
+ icons/map/patterns/wetland.svg
+
- icons/map/mapsforge/patterns/hills.svg
- icons/map/mapsforge/patterns/farmland.svg
- icons/map/mapsforge/patterns/coniferous.svg
- icons/map/mapsforge/patterns/marsh.png
- icons/map/mapsforge/patterns/dot.png
- icons/map/mapsforge/patterns/cemetery.png
- icons/map/mapsforge/patterns/rail.png
- icons/map/mapsforge/patterns/access-destination.png
- icons/map/mapsforge/patterns/deciduous.svg
- icons/map/mapsforge/patterns/grass.svg
- icons/map/mapsforge/patterns/wood-mixed.png
- icons/map/mapsforge/patterns/wood-deciduous.png
- icons/map/mapsforge/patterns/pike.png
- icons/map/mapsforge/patterns/wood-coniferous.png
- icons/map/mapsforge/patterns/coniferous_and_deciduous.svg
- icons/map/mapsforge/patterns/arrow.png
- icons/map/mapsforge/patterns/military.png
- icons/map/mapsforge/patterns/scrub.svg
- icons/map/mapsforge/patterns/nature-reserve.png
- icons/map/mapsforge/patterns/swamp.svg
- icons/map/mapsforge/patterns/quarry.svg
- icons/map/mapsforge/patterns/access-private.png
- icons/map/mapsforge/symbols/barrier/blocks.svg
- icons/map/mapsforge/symbols/barrier/stile.svg
- icons/map/mapsforge/symbols/barrier/cycle_barrier.svg
- icons/map/mapsforge/symbols/barrier/lift_gate.svg
- icons/map/mapsforge/symbols/barrier/bollard.svg
- icons/map/mapsforge/symbols/barrier/gate.svg
- icons/map/mapsforge/symbols/dot_blue.svg
- icons/map/mapsforge/symbols/dot_blue_dark.svg
- icons/map/mapsforge/symbols/peak.svg
- icons/map/mapsforge/symbols/traffic_signal.svg
- icons/map/mapsforge/symbols/place_of_worship/hindu.svg
- icons/map/mapsforge/symbols/place_of_worship/unknown.svg
- icons/map/mapsforge/symbols/place_of_worship/islamic.svg
- icons/map/mapsforge/symbols/place_of_worship/jewish.svg
- icons/map/mapsforge/symbols/place_of_worship/shinto.svg
- icons/map/mapsforge/symbols/place_of_worship/buddhist.svg
- icons/map/mapsforge/symbols/place_of_worship/christian.svg
- icons/map/mapsforge/symbols/volcano.svg
- icons/map/mapsforge/symbols/bench.svg
- icons/map/mapsforge/symbols/transport/parking_private.svg
- icons/map/mapsforge/symbols/transport/helicopter.svg
- icons/map/mapsforge/symbols/transport/rental_bicycle.svg
- icons/map/mapsforge/symbols/transport/train_station2.svg
- icons/map/mapsforge/symbols/transport/parking.svg
- icons/map/mapsforge/symbols/transport/slipway.svg
- icons/map/mapsforge/symbols/transport/bus_stop.svg
- icons/map/mapsforge/symbols/transport/bus_station.svg
- icons/map/mapsforge/symbols/transport/airport2.svg
- icons/map/mapsforge/symbols/transport/fuel.svg
- icons/map/mapsforge/symbols/transport/lighthouse.svg
- icons/map/mapsforge/symbols/transport/traffic_lights.svg
- icons/map/mapsforge/symbols/transport/tram_stop.svg
- icons/map/mapsforge/symbols/food/bar.svg
- icons/map/mapsforge/symbols/food/cafe.svg
- icons/map/mapsforge/symbols/food/drinkingtap.svg
- icons/map/mapsforge/symbols/food/pub.svg
- icons/map/mapsforge/symbols/food/fastfood.svg
- icons/map/mapsforge/symbols/food/biergarten.svg
- icons/map/mapsforge/symbols/food/restaurant.svg
- icons/map/mapsforge/symbols/railway-crossing.svg
- icons/map/mapsforge/symbols/accommodation/hotel2.svg
- icons/map/mapsforge/symbols/accommodation/camping.svg
- icons/map/mapsforge/symbols/accommodation/chalet.svg
- icons/map/mapsforge/symbols/accommodation/alpinehut.svg
- icons/map/mapsforge/symbols/accommodation/shelter2.svg
- icons/map/mapsforge/symbols/accommodation/caravan_park.svg
- icons/map/mapsforge/symbols/accommodation/hostel.svg
- icons/map/mapsforge/symbols/health/doctors2.svg
- icons/map/mapsforge/symbols/health/hospital.svg
- icons/map/mapsforge/symbols/health/pharmacy.svg
- icons/map/mapsforge/symbols/chair_lift.svg
- icons/map/mapsforge/symbols/education/school.svg
- icons/map/mapsforge/symbols/education/nursery3.svg
- icons/map/mapsforge/symbols/education/university.svg
- icons/map/mapsforge/symbols/money/atm2.svg
- icons/map/mapsforge/symbols/money/bank2.svg
- icons/map/mapsforge/symbols/shopping/marketplace.svg
- icons/map/mapsforge/symbols/shopping/bicycle.svg
- icons/map/mapsforge/symbols/shopping/alcohol.svg
- icons/map/mapsforge/symbols/shopping/diy.svg
- icons/map/mapsforge/symbols/shopping/bakery.svg
- icons/map/mapsforge/symbols/shopping/greengrocer.svg
- icons/map/mapsforge/symbols/shopping/laundrette.svg
- icons/map/mapsforge/symbols/shopping/car_repair.svg
- icons/map/mapsforge/symbols/shopping/butcher.svg
- icons/map/mapsforge/symbols/shopping/book.svg
- icons/map/mapsforge/symbols/shopping/convenience.svg
- icons/map/mapsforge/symbols/shopping/supermarket.svg
- icons/map/mapsforge/symbols/poi/mountain_pass.svg
- icons/map/mapsforge/symbols/poi/embassy2.svg
- icons/map/mapsforge/symbols/poi/cave.svg
- icons/map/mapsforge/symbols/cable_car.svg
- icons/map/mapsforge/symbols/railway-crossing-small.svg
- icons/map/mapsforge/symbols/dot_magenta.svg
- icons/map/mapsforge/symbols/dot_black.svg
- icons/map/mapsforge/symbols/gondola.svg
- icons/map/mapsforge/symbols/dot_white.svg
- icons/map/mapsforge/symbols/amenity/recycling.svg
- icons/map/mapsforge/symbols/amenity/firestation3.svg
- icons/map/mapsforge/symbols/amenity/telephone.svg
- icons/map/mapsforge/symbols/amenity/post_box.svg
- icons/map/mapsforge/symbols/amenity/fountain2.svg
- icons/map/mapsforge/symbols/amenity/playground.svg
- icons/map/mapsforge/symbols/amenity/library.svg
- icons/map/mapsforge/symbols/amenity/post_office.svg
- icons/map/mapsforge/symbols/amenity/police2.svg
- icons/map/mapsforge/symbols/amenity/toilets.svg
- icons/map/mapsforge/symbols/tourist/picnic.svg
- icons/map/mapsforge/symbols/tourist/monument.svg
- icons/map/mapsforge/symbols/tourist/archaeological2.svg
- icons/map/mapsforge/symbols/tourist/museum.svg
- icons/map/mapsforge/symbols/tourist/attraction.svg
- icons/map/mapsforge/symbols/tourist/information.svg
- icons/map/mapsforge/symbols/tourist/theatre.svg
- icons/map/mapsforge/symbols/tourist/zoo.svg
- icons/map/mapsforge/symbols/tourist/cinema2.svg
- icons/map/mapsforge/symbols/tourist/castle2.svg
- icons/map/mapsforge/symbols/tourist/ruin.svg
- icons/map/mapsforge/symbols/tourist/memorial.svg
- icons/map/mapsforge/symbols/tourist/view_point.svg
- icons/map/mapsforge/symbols/tourist/windmill.svg
- icons/map/mapsforge/symbols/water/weir.svg
- icons/map/mapsforge/symbols/sport/swimming_outdoor.svg
- icons/map/mapsforge/symbols/sport/tennis.svg
- icons/map/mapsforge/symbols/sport/shooting.svg
- icons/map/mapsforge/symbols/sport/stadium.svg
- icons/map/mapsforge/symbols/sport/soccer.svg
- icons/map/mapsforge/symbols/sport/golf.svg
- icons/map/mapsforge/symbols/oneway.svg
+
+
+ data/style/style.xml
diff --git a/icons/map/POI/beer-11.svg b/icons/map/POI/beer-11.svg
new file mode 100644
index 00000000..c98f82e4
--- /dev/null
+++ b/icons/map/POI/beer-11.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/icons/map/POI/ferry-11.svg b/icons/map/POI/ferry-11.svg
new file mode 100644
index 00000000..47c41fdd
--- /dev/null
+++ b/icons/map/POI/ferry-11.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/icons/map/POI/lighthouse-11.svg b/icons/map/POI/lighthouse-11.svg
new file mode 100644
index 00000000..645c84bf
--- /dev/null
+++ b/icons/map/POI/lighthouse-11.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/icons/map/POI/monument-11.svg b/icons/map/POI/monument-11.svg
new file mode 100644
index 00000000..45c2a319
--- /dev/null
+++ b/icons/map/POI/monument-11.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/icons/map/POI/rail-light-11.svg b/icons/map/POI/rail-light-11.svg
new file mode 100644
index 00000000..db95460b
--- /dev/null
+++ b/icons/map/POI/rail-light-11.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/icons/map/POI/rail-metro-11.svg b/icons/map/POI/rail-metro-11.svg
new file mode 100644
index 00000000..bd916d15
--- /dev/null
+++ b/icons/map/POI/rail-metro-11.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/icons/map/POI/water-11.svg b/icons/map/POI/water-11.svg
new file mode 100644
index 00000000..08eeeaba
--- /dev/null
+++ b/icons/map/POI/water-11.svg
@@ -0,0 +1,4 @@
+
+
\ No newline at end of file
diff --git a/icons/map/mapsforge/licence.txt b/icons/map/mapsforge/licence.txt
deleted file mode 100644
index ed87b62f..00000000
--- a/icons/map/mapsforge/licence.txt
+++ /dev/null
@@ -1,169 +0,0 @@
-Mapsforge render theme icons as provided by the Mapsforge project
-(https://github.com/mapsforge). Licensed under LGPLv3.
-
------
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/icons/map/mapsforge/patterns/access-destination.png b/icons/map/mapsforge/patterns/access-destination.png
deleted file mode 100644
index c0fe592e..00000000
Binary files a/icons/map/mapsforge/patterns/access-destination.png and /dev/null differ
diff --git a/icons/map/mapsforge/patterns/access-private.png b/icons/map/mapsforge/patterns/access-private.png
deleted file mode 100644
index 40fe13ff..00000000
Binary files a/icons/map/mapsforge/patterns/access-private.png and /dev/null differ
diff --git a/icons/map/mapsforge/patterns/arrow.png b/icons/map/mapsforge/patterns/arrow.png
deleted file mode 100644
index d348a190..00000000
Binary files a/icons/map/mapsforge/patterns/arrow.png and /dev/null differ
diff --git a/icons/map/mapsforge/patterns/cemetery.png b/icons/map/mapsforge/patterns/cemetery.png
deleted file mode 100644
index d9921b41..00000000
Binary files a/icons/map/mapsforge/patterns/cemetery.png and /dev/null differ
diff --git a/icons/map/mapsforge/patterns/coniferous.svg b/icons/map/mapsforge/patterns/coniferous.svg
deleted file mode 100644
index da256c96..00000000
--- a/icons/map/mapsforge/patterns/coniferous.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/patterns/coniferous_and_deciduous.svg b/icons/map/mapsforge/patterns/coniferous_and_deciduous.svg
deleted file mode 100644
index 55e8cd12..00000000
--- a/icons/map/mapsforge/patterns/coniferous_and_deciduous.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/patterns/deciduous.svg b/icons/map/mapsforge/patterns/deciduous.svg
deleted file mode 100644
index 016a340c..00000000
--- a/icons/map/mapsforge/patterns/deciduous.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/patterns/dot.png b/icons/map/mapsforge/patterns/dot.png
deleted file mode 100644
index 76c55e71..00000000
Binary files a/icons/map/mapsforge/patterns/dot.png and /dev/null differ
diff --git a/icons/map/mapsforge/patterns/farmland.svg b/icons/map/mapsforge/patterns/farmland.svg
deleted file mode 100644
index 02b62fe7..00000000
--- a/icons/map/mapsforge/patterns/farmland.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
diff --git a/icons/map/mapsforge/patterns/grass.svg b/icons/map/mapsforge/patterns/grass.svg
deleted file mode 100644
index 223e5490..00000000
--- a/icons/map/mapsforge/patterns/grass.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/patterns/hills.svg b/icons/map/mapsforge/patterns/hills.svg
deleted file mode 100644
index 055310cb..00000000
--- a/icons/map/mapsforge/patterns/hills.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/patterns/marsh.png b/icons/map/mapsforge/patterns/marsh.png
deleted file mode 100644
index 2251189e..00000000
Binary files a/icons/map/mapsforge/patterns/marsh.png and /dev/null differ
diff --git a/icons/map/mapsforge/patterns/military.png b/icons/map/mapsforge/patterns/military.png
deleted file mode 100644
index 2cecbdab..00000000
Binary files a/icons/map/mapsforge/patterns/military.png and /dev/null differ
diff --git a/icons/map/mapsforge/patterns/nature-reserve.png b/icons/map/mapsforge/patterns/nature-reserve.png
deleted file mode 100644
index 1ab788ee..00000000
Binary files a/icons/map/mapsforge/patterns/nature-reserve.png and /dev/null differ
diff --git a/icons/map/mapsforge/patterns/pike.png b/icons/map/mapsforge/patterns/pike.png
deleted file mode 100644
index 54c72ed9..00000000
Binary files a/icons/map/mapsforge/patterns/pike.png and /dev/null differ
diff --git a/icons/map/mapsforge/patterns/quarry.svg b/icons/map/mapsforge/patterns/quarry.svg
deleted file mode 100644
index f2f4d134..00000000
--- a/icons/map/mapsforge/patterns/quarry.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/patterns/rail.png b/icons/map/mapsforge/patterns/rail.png
deleted file mode 100644
index 1eca19a6..00000000
Binary files a/icons/map/mapsforge/patterns/rail.png and /dev/null differ
diff --git a/icons/map/mapsforge/patterns/scrub.svg b/icons/map/mapsforge/patterns/scrub.svg
deleted file mode 100644
index 97222920..00000000
--- a/icons/map/mapsforge/patterns/scrub.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/patterns/swamp.svg b/icons/map/mapsforge/patterns/swamp.svg
deleted file mode 100644
index 92ea81d1..00000000
--- a/icons/map/mapsforge/patterns/swamp.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/patterns/wood-coniferous.png b/icons/map/mapsforge/patterns/wood-coniferous.png
deleted file mode 100644
index 2c432ecf..00000000
Binary files a/icons/map/mapsforge/patterns/wood-coniferous.png and /dev/null differ
diff --git a/icons/map/mapsforge/patterns/wood-deciduous.png b/icons/map/mapsforge/patterns/wood-deciduous.png
deleted file mode 100644
index d7f1f173..00000000
Binary files a/icons/map/mapsforge/patterns/wood-deciduous.png and /dev/null differ
diff --git a/icons/map/mapsforge/patterns/wood-mixed.png b/icons/map/mapsforge/patterns/wood-mixed.png
deleted file mode 100644
index 09499d16..00000000
Binary files a/icons/map/mapsforge/patterns/wood-mixed.png and /dev/null differ
diff --git a/icons/map/mapsforge/symbols/accommodation/alpinehut.svg b/icons/map/mapsforge/symbols/accommodation/alpinehut.svg
deleted file mode 100644
index c6d92f51..00000000
--- a/icons/map/mapsforge/symbols/accommodation/alpinehut.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/accommodation/camping.svg b/icons/map/mapsforge/symbols/accommodation/camping.svg
deleted file mode 100644
index ff9b2e1d..00000000
--- a/icons/map/mapsforge/symbols/accommodation/camping.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/accommodation/caravan_park.svg b/icons/map/mapsforge/symbols/accommodation/caravan_park.svg
deleted file mode 100644
index 2b3c2001..00000000
--- a/icons/map/mapsforge/symbols/accommodation/caravan_park.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/accommodation/chalet.svg b/icons/map/mapsforge/symbols/accommodation/chalet.svg
deleted file mode 100644
index 0d17e535..00000000
--- a/icons/map/mapsforge/symbols/accommodation/chalet.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/accommodation/hostel.svg b/icons/map/mapsforge/symbols/accommodation/hostel.svg
deleted file mode 100644
index fafe4c84..00000000
--- a/icons/map/mapsforge/symbols/accommodation/hostel.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/accommodation/hotel2.svg b/icons/map/mapsforge/symbols/accommodation/hotel2.svg
deleted file mode 100644
index 4b08130d..00000000
--- a/icons/map/mapsforge/symbols/accommodation/hotel2.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/accommodation/shelter2.svg b/icons/map/mapsforge/symbols/accommodation/shelter2.svg
deleted file mode 100644
index fc27d1ce..00000000
--- a/icons/map/mapsforge/symbols/accommodation/shelter2.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/amenity/firestation3.svg b/icons/map/mapsforge/symbols/amenity/firestation3.svg
deleted file mode 100644
index 4964cd80..00000000
--- a/icons/map/mapsforge/symbols/amenity/firestation3.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/amenity/fountain2.svg b/icons/map/mapsforge/symbols/amenity/fountain2.svg
deleted file mode 100644
index ad77c989..00000000
--- a/icons/map/mapsforge/symbols/amenity/fountain2.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/amenity/library.svg b/icons/map/mapsforge/symbols/amenity/library.svg
deleted file mode 100644
index 21514a9c..00000000
--- a/icons/map/mapsforge/symbols/amenity/library.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/amenity/playground.svg b/icons/map/mapsforge/symbols/amenity/playground.svg
deleted file mode 100644
index 60670baf..00000000
--- a/icons/map/mapsforge/symbols/amenity/playground.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/amenity/police2.svg b/icons/map/mapsforge/symbols/amenity/police2.svg
deleted file mode 100644
index a19573ff..00000000
--- a/icons/map/mapsforge/symbols/amenity/police2.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/amenity/post_box.svg b/icons/map/mapsforge/symbols/amenity/post_box.svg
deleted file mode 100644
index 80a73ce1..00000000
--- a/icons/map/mapsforge/symbols/amenity/post_box.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/amenity/post_office.svg b/icons/map/mapsforge/symbols/amenity/post_office.svg
deleted file mode 100644
index 98597bc5..00000000
--- a/icons/map/mapsforge/symbols/amenity/post_office.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/amenity/recycling.svg b/icons/map/mapsforge/symbols/amenity/recycling.svg
deleted file mode 100644
index 707767c0..00000000
--- a/icons/map/mapsforge/symbols/amenity/recycling.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/amenity/telephone.svg b/icons/map/mapsforge/symbols/amenity/telephone.svg
deleted file mode 100644
index f50d1f7e..00000000
--- a/icons/map/mapsforge/symbols/amenity/telephone.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/amenity/toilets.svg b/icons/map/mapsforge/symbols/amenity/toilets.svg
deleted file mode 100644
index 92bfefcd..00000000
--- a/icons/map/mapsforge/symbols/amenity/toilets.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/barrier/blocks.svg b/icons/map/mapsforge/symbols/barrier/blocks.svg
deleted file mode 100644
index 5277545a..00000000
--- a/icons/map/mapsforge/symbols/barrier/blocks.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/barrier/bollard.svg b/icons/map/mapsforge/symbols/barrier/bollard.svg
deleted file mode 100644
index 65b7f2e3..00000000
--- a/icons/map/mapsforge/symbols/barrier/bollard.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/barrier/cycle_barrier.svg b/icons/map/mapsforge/symbols/barrier/cycle_barrier.svg
deleted file mode 100644
index 5e208d4a..00000000
--- a/icons/map/mapsforge/symbols/barrier/cycle_barrier.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/barrier/gate.svg b/icons/map/mapsforge/symbols/barrier/gate.svg
deleted file mode 100644
index 96cc9587..00000000
--- a/icons/map/mapsforge/symbols/barrier/gate.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/barrier/lift_gate.svg b/icons/map/mapsforge/symbols/barrier/lift_gate.svg
deleted file mode 100644
index 42c87b99..00000000
--- a/icons/map/mapsforge/symbols/barrier/lift_gate.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/barrier/stile.svg b/icons/map/mapsforge/symbols/barrier/stile.svg
deleted file mode 100644
index 97350903..00000000
--- a/icons/map/mapsforge/symbols/barrier/stile.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/bench.svg b/icons/map/mapsforge/symbols/bench.svg
deleted file mode 100644
index 38162eaa..00000000
--- a/icons/map/mapsforge/symbols/bench.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/cable_car.svg b/icons/map/mapsforge/symbols/cable_car.svg
deleted file mode 100644
index 424dfef9..00000000
--- a/icons/map/mapsforge/symbols/cable_car.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/chair_lift.svg b/icons/map/mapsforge/symbols/chair_lift.svg
deleted file mode 100644
index bb1292a0..00000000
--- a/icons/map/mapsforge/symbols/chair_lift.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/dot_black.svg b/icons/map/mapsforge/symbols/dot_black.svg
deleted file mode 100644
index 5d0a287d..00000000
--- a/icons/map/mapsforge/symbols/dot_black.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/dot_blue.svg b/icons/map/mapsforge/symbols/dot_blue.svg
deleted file mode 100644
index bca149b5..00000000
--- a/icons/map/mapsforge/symbols/dot_blue.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/dot_blue_dark.svg b/icons/map/mapsforge/symbols/dot_blue_dark.svg
deleted file mode 100644
index 45c83154..00000000
--- a/icons/map/mapsforge/symbols/dot_blue_dark.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/dot_magenta.svg b/icons/map/mapsforge/symbols/dot_magenta.svg
deleted file mode 100644
index 4056c947..00000000
--- a/icons/map/mapsforge/symbols/dot_magenta.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/dot_white.svg b/icons/map/mapsforge/symbols/dot_white.svg
deleted file mode 100644
index af547354..00000000
--- a/icons/map/mapsforge/symbols/dot_white.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/education/nursery3.svg b/icons/map/mapsforge/symbols/education/nursery3.svg
deleted file mode 100644
index 210b608f..00000000
--- a/icons/map/mapsforge/symbols/education/nursery3.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/education/school.svg b/icons/map/mapsforge/symbols/education/school.svg
deleted file mode 100644
index 55ba5996..00000000
--- a/icons/map/mapsforge/symbols/education/school.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/education/university.svg b/icons/map/mapsforge/symbols/education/university.svg
deleted file mode 100644
index 1a7531e2..00000000
--- a/icons/map/mapsforge/symbols/education/university.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/food/bar.svg b/icons/map/mapsforge/symbols/food/bar.svg
deleted file mode 100644
index 6de1c99b..00000000
--- a/icons/map/mapsforge/symbols/food/bar.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/food/biergarten.svg b/icons/map/mapsforge/symbols/food/biergarten.svg
deleted file mode 100644
index 36b3947a..00000000
--- a/icons/map/mapsforge/symbols/food/biergarten.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/food/cafe.svg b/icons/map/mapsforge/symbols/food/cafe.svg
deleted file mode 100644
index b42e37ac..00000000
--- a/icons/map/mapsforge/symbols/food/cafe.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/food/drinkingtap.svg b/icons/map/mapsforge/symbols/food/drinkingtap.svg
deleted file mode 100644
index 3322373a..00000000
--- a/icons/map/mapsforge/symbols/food/drinkingtap.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/food/fastfood.svg b/icons/map/mapsforge/symbols/food/fastfood.svg
deleted file mode 100644
index 270e7a76..00000000
--- a/icons/map/mapsforge/symbols/food/fastfood.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/food/pub.svg b/icons/map/mapsforge/symbols/food/pub.svg
deleted file mode 100644
index 05677fdf..00000000
--- a/icons/map/mapsforge/symbols/food/pub.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/food/restaurant.svg b/icons/map/mapsforge/symbols/food/restaurant.svg
deleted file mode 100644
index 7b3a8bca..00000000
--- a/icons/map/mapsforge/symbols/food/restaurant.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/gondola.svg b/icons/map/mapsforge/symbols/gondola.svg
deleted file mode 100644
index 2a40d634..00000000
--- a/icons/map/mapsforge/symbols/gondola.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/health/doctors2.svg b/icons/map/mapsforge/symbols/health/doctors2.svg
deleted file mode 100644
index 1f9bcf16..00000000
--- a/icons/map/mapsforge/symbols/health/doctors2.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/health/hospital.svg b/icons/map/mapsforge/symbols/health/hospital.svg
deleted file mode 100644
index 91d66540..00000000
--- a/icons/map/mapsforge/symbols/health/hospital.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/health/pharmacy.svg b/icons/map/mapsforge/symbols/health/pharmacy.svg
deleted file mode 100644
index a5520551..00000000
--- a/icons/map/mapsforge/symbols/health/pharmacy.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/money/atm2.svg b/icons/map/mapsforge/symbols/money/atm2.svg
deleted file mode 100644
index 8aeba1de..00000000
--- a/icons/map/mapsforge/symbols/money/atm2.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/money/bank2.svg b/icons/map/mapsforge/symbols/money/bank2.svg
deleted file mode 100644
index 35d76550..00000000
--- a/icons/map/mapsforge/symbols/money/bank2.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/oneway.svg b/icons/map/mapsforge/symbols/oneway.svg
deleted file mode 100644
index 68dcf823..00000000
--- a/icons/map/mapsforge/symbols/oneway.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/peak.svg b/icons/map/mapsforge/symbols/peak.svg
deleted file mode 100644
index bcae1683..00000000
--- a/icons/map/mapsforge/symbols/peak.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/place_of_worship/buddhist.svg b/icons/map/mapsforge/symbols/place_of_worship/buddhist.svg
deleted file mode 100644
index 2f5bb832..00000000
--- a/icons/map/mapsforge/symbols/place_of_worship/buddhist.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/place_of_worship/christian.svg b/icons/map/mapsforge/symbols/place_of_worship/christian.svg
deleted file mode 100644
index a7308642..00000000
--- a/icons/map/mapsforge/symbols/place_of_worship/christian.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/place_of_worship/hindu.svg b/icons/map/mapsforge/symbols/place_of_worship/hindu.svg
deleted file mode 100644
index c4a2a998..00000000
--- a/icons/map/mapsforge/symbols/place_of_worship/hindu.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/place_of_worship/islamic.svg b/icons/map/mapsforge/symbols/place_of_worship/islamic.svg
deleted file mode 100644
index 1d3ab7b0..00000000
--- a/icons/map/mapsforge/symbols/place_of_worship/islamic.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/place_of_worship/jewish.svg b/icons/map/mapsforge/symbols/place_of_worship/jewish.svg
deleted file mode 100644
index 5a205a1b..00000000
--- a/icons/map/mapsforge/symbols/place_of_worship/jewish.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/place_of_worship/shinto.svg b/icons/map/mapsforge/symbols/place_of_worship/shinto.svg
deleted file mode 100644
index a8df18a2..00000000
--- a/icons/map/mapsforge/symbols/place_of_worship/shinto.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/place_of_worship/unknown.svg b/icons/map/mapsforge/symbols/place_of_worship/unknown.svg
deleted file mode 100644
index 81df3539..00000000
--- a/icons/map/mapsforge/symbols/place_of_worship/unknown.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/poi/cave.svg b/icons/map/mapsforge/symbols/poi/cave.svg
deleted file mode 100644
index 3860e28b..00000000
--- a/icons/map/mapsforge/symbols/poi/cave.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/poi/embassy2.svg b/icons/map/mapsforge/symbols/poi/embassy2.svg
deleted file mode 100644
index 0c4b85fe..00000000
--- a/icons/map/mapsforge/symbols/poi/embassy2.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/poi/mountain_pass.svg b/icons/map/mapsforge/symbols/poi/mountain_pass.svg
deleted file mode 100644
index 5214d0fa..00000000
--- a/icons/map/mapsforge/symbols/poi/mountain_pass.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/railway-crossing-small.svg b/icons/map/mapsforge/symbols/railway-crossing-small.svg
deleted file mode 100644
index f017f3ee..00000000
--- a/icons/map/mapsforge/symbols/railway-crossing-small.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/railway-crossing.svg b/icons/map/mapsforge/symbols/railway-crossing.svg
deleted file mode 100644
index 108eb252..00000000
--- a/icons/map/mapsforge/symbols/railway-crossing.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/shopping/alcohol.svg b/icons/map/mapsforge/symbols/shopping/alcohol.svg
deleted file mode 100644
index 6e6126ec..00000000
--- a/icons/map/mapsforge/symbols/shopping/alcohol.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/shopping/bakery.svg b/icons/map/mapsforge/symbols/shopping/bakery.svg
deleted file mode 100644
index 6f363fc0..00000000
--- a/icons/map/mapsforge/symbols/shopping/bakery.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/shopping/bicycle.svg b/icons/map/mapsforge/symbols/shopping/bicycle.svg
deleted file mode 100644
index 538d2aad..00000000
--- a/icons/map/mapsforge/symbols/shopping/bicycle.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/shopping/book.svg b/icons/map/mapsforge/symbols/shopping/book.svg
deleted file mode 100644
index 81c7ca6a..00000000
--- a/icons/map/mapsforge/symbols/shopping/book.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/shopping/butcher.svg b/icons/map/mapsforge/symbols/shopping/butcher.svg
deleted file mode 100644
index b25bd009..00000000
--- a/icons/map/mapsforge/symbols/shopping/butcher.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/shopping/car_repair.svg b/icons/map/mapsforge/symbols/shopping/car_repair.svg
deleted file mode 100644
index 36cdf6ea..00000000
--- a/icons/map/mapsforge/symbols/shopping/car_repair.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/shopping/convenience.svg b/icons/map/mapsforge/symbols/shopping/convenience.svg
deleted file mode 100644
index 56ffedc0..00000000
--- a/icons/map/mapsforge/symbols/shopping/convenience.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/shopping/diy.svg b/icons/map/mapsforge/symbols/shopping/diy.svg
deleted file mode 100644
index bdc0cfe9..00000000
--- a/icons/map/mapsforge/symbols/shopping/diy.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/shopping/greengrocer.svg b/icons/map/mapsforge/symbols/shopping/greengrocer.svg
deleted file mode 100644
index e2e06a32..00000000
--- a/icons/map/mapsforge/symbols/shopping/greengrocer.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/shopping/laundrette.svg b/icons/map/mapsforge/symbols/shopping/laundrette.svg
deleted file mode 100644
index e4cf7319..00000000
--- a/icons/map/mapsforge/symbols/shopping/laundrette.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/shopping/marketplace.svg b/icons/map/mapsforge/symbols/shopping/marketplace.svg
deleted file mode 100644
index d3c932db..00000000
--- a/icons/map/mapsforge/symbols/shopping/marketplace.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/shopping/supermarket.svg b/icons/map/mapsforge/symbols/shopping/supermarket.svg
deleted file mode 100644
index e49fe7a9..00000000
--- a/icons/map/mapsforge/symbols/shopping/supermarket.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/sport/golf.svg b/icons/map/mapsforge/symbols/sport/golf.svg
deleted file mode 100644
index 0f095624..00000000
--- a/icons/map/mapsforge/symbols/sport/golf.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/sport/shooting.svg b/icons/map/mapsforge/symbols/sport/shooting.svg
deleted file mode 100644
index cb2b4f16..00000000
--- a/icons/map/mapsforge/symbols/sport/shooting.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/sport/soccer.svg b/icons/map/mapsforge/symbols/sport/soccer.svg
deleted file mode 100644
index b01eb704..00000000
--- a/icons/map/mapsforge/symbols/sport/soccer.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/sport/stadium.svg b/icons/map/mapsforge/symbols/sport/stadium.svg
deleted file mode 100644
index e89caa8e..00000000
--- a/icons/map/mapsforge/symbols/sport/stadium.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/sport/swimming_outdoor.svg b/icons/map/mapsforge/symbols/sport/swimming_outdoor.svg
deleted file mode 100644
index bb2ad43c..00000000
--- a/icons/map/mapsforge/symbols/sport/swimming_outdoor.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/sport/tennis.svg b/icons/map/mapsforge/symbols/sport/tennis.svg
deleted file mode 100644
index 793d0484..00000000
--- a/icons/map/mapsforge/symbols/sport/tennis.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/tourist/archaeological2.svg b/icons/map/mapsforge/symbols/tourist/archaeological2.svg
deleted file mode 100644
index b5c15b43..00000000
--- a/icons/map/mapsforge/symbols/tourist/archaeological2.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/tourist/attraction.svg b/icons/map/mapsforge/symbols/tourist/attraction.svg
deleted file mode 100644
index d6dd9699..00000000
--- a/icons/map/mapsforge/symbols/tourist/attraction.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/tourist/castle2.svg b/icons/map/mapsforge/symbols/tourist/castle2.svg
deleted file mode 100644
index 2d60f741..00000000
--- a/icons/map/mapsforge/symbols/tourist/castle2.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/tourist/cinema2.svg b/icons/map/mapsforge/symbols/tourist/cinema2.svg
deleted file mode 100644
index ac2d4916..00000000
--- a/icons/map/mapsforge/symbols/tourist/cinema2.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/tourist/information.svg b/icons/map/mapsforge/symbols/tourist/information.svg
deleted file mode 100644
index 3e2d119b..00000000
--- a/icons/map/mapsforge/symbols/tourist/information.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/tourist/memorial.svg b/icons/map/mapsforge/symbols/tourist/memorial.svg
deleted file mode 100644
index c7255729..00000000
--- a/icons/map/mapsforge/symbols/tourist/memorial.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/tourist/monument.svg b/icons/map/mapsforge/symbols/tourist/monument.svg
deleted file mode 100644
index fc25d36f..00000000
--- a/icons/map/mapsforge/symbols/tourist/monument.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/tourist/museum.svg b/icons/map/mapsforge/symbols/tourist/museum.svg
deleted file mode 100644
index 5f43bedc..00000000
--- a/icons/map/mapsforge/symbols/tourist/museum.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/tourist/picnic.svg b/icons/map/mapsforge/symbols/tourist/picnic.svg
deleted file mode 100644
index a366ff40..00000000
--- a/icons/map/mapsforge/symbols/tourist/picnic.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/tourist/ruin.svg b/icons/map/mapsforge/symbols/tourist/ruin.svg
deleted file mode 100644
index f319f171..00000000
--- a/icons/map/mapsforge/symbols/tourist/ruin.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/tourist/theatre.svg b/icons/map/mapsforge/symbols/tourist/theatre.svg
deleted file mode 100644
index 24ab2ea7..00000000
--- a/icons/map/mapsforge/symbols/tourist/theatre.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/tourist/view_point.svg b/icons/map/mapsforge/symbols/tourist/view_point.svg
deleted file mode 100644
index b73327a8..00000000
--- a/icons/map/mapsforge/symbols/tourist/view_point.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/tourist/windmill.svg b/icons/map/mapsforge/symbols/tourist/windmill.svg
deleted file mode 100644
index 51417601..00000000
--- a/icons/map/mapsforge/symbols/tourist/windmill.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/tourist/zoo.svg b/icons/map/mapsforge/symbols/tourist/zoo.svg
deleted file mode 100644
index 20148186..00000000
--- a/icons/map/mapsforge/symbols/tourist/zoo.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/traffic_signal.svg b/icons/map/mapsforge/symbols/traffic_signal.svg
deleted file mode 100644
index 73e93602..00000000
--- a/icons/map/mapsforge/symbols/traffic_signal.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/transport/airport2.svg b/icons/map/mapsforge/symbols/transport/airport2.svg
deleted file mode 100644
index 10a05366..00000000
--- a/icons/map/mapsforge/symbols/transport/airport2.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/transport/bus_station.svg b/icons/map/mapsforge/symbols/transport/bus_station.svg
deleted file mode 100644
index d2455261..00000000
--- a/icons/map/mapsforge/symbols/transport/bus_station.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/transport/bus_stop.svg b/icons/map/mapsforge/symbols/transport/bus_stop.svg
deleted file mode 100644
index ff340dbc..00000000
--- a/icons/map/mapsforge/symbols/transport/bus_stop.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/transport/fuel.svg b/icons/map/mapsforge/symbols/transport/fuel.svg
deleted file mode 100644
index 987453b2..00000000
--- a/icons/map/mapsforge/symbols/transport/fuel.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/transport/helicopter.svg b/icons/map/mapsforge/symbols/transport/helicopter.svg
deleted file mode 100644
index 1c81a047..00000000
--- a/icons/map/mapsforge/symbols/transport/helicopter.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/transport/lighthouse.svg b/icons/map/mapsforge/symbols/transport/lighthouse.svg
deleted file mode 100644
index 40917860..00000000
--- a/icons/map/mapsforge/symbols/transport/lighthouse.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/transport/parking.svg b/icons/map/mapsforge/symbols/transport/parking.svg
deleted file mode 100644
index e290e60a..00000000
--- a/icons/map/mapsforge/symbols/transport/parking.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/transport/parking_private.svg b/icons/map/mapsforge/symbols/transport/parking_private.svg
deleted file mode 100644
index ac02d096..00000000
--- a/icons/map/mapsforge/symbols/transport/parking_private.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/transport/rental_bicycle.svg b/icons/map/mapsforge/symbols/transport/rental_bicycle.svg
deleted file mode 100644
index 7e12e6f0..00000000
--- a/icons/map/mapsforge/symbols/transport/rental_bicycle.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/transport/slipway.svg b/icons/map/mapsforge/symbols/transport/slipway.svg
deleted file mode 100644
index a3307bba..00000000
--- a/icons/map/mapsforge/symbols/transport/slipway.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/transport/traffic_lights.svg b/icons/map/mapsforge/symbols/transport/traffic_lights.svg
deleted file mode 100644
index ed7fbe31..00000000
--- a/icons/map/mapsforge/symbols/transport/traffic_lights.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/transport/train_station2.svg b/icons/map/mapsforge/symbols/transport/train_station2.svg
deleted file mode 100644
index a34e76fb..00000000
--- a/icons/map/mapsforge/symbols/transport/train_station2.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/transport/tram_stop.svg b/icons/map/mapsforge/symbols/transport/tram_stop.svg
deleted file mode 100644
index 33a165cf..00000000
--- a/icons/map/mapsforge/symbols/transport/tram_stop.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/volcano.svg b/icons/map/mapsforge/symbols/volcano.svg
deleted file mode 100644
index 0838a636..00000000
--- a/icons/map/mapsforge/symbols/volcano.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/icons/map/mapsforge/symbols/water/weir.svg b/icons/map/mapsforge/symbols/water/weir.svg
deleted file mode 100644
index 11a8ab3b..00000000
--- a/icons/map/mapsforge/symbols/water/weir.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/icons/map/patterns/cemetery.svg b/icons/map/patterns/cemetery.svg
new file mode 100644
index 00000000..8d26b679
--- /dev/null
+++ b/icons/map/patterns/cemetery.svg
@@ -0,0 +1,11 @@
+
+
diff --git a/icons/map/patterns/military-area.svg b/icons/map/patterns/military-area.svg
new file mode 100644
index 00000000..c3b26938
--- /dev/null
+++ b/icons/map/patterns/military-area.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/icons/map/patterns/nature-reserve.svg b/icons/map/patterns/nature-reserve.svg
new file mode 100644
index 00000000..5ab95462
--- /dev/null
+++ b/icons/map/patterns/nature-reserve.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/icons/map/patterns/orchard.svg b/icons/map/patterns/orchard.svg
new file mode 100644
index 00000000..2f6bb402
--- /dev/null
+++ b/icons/map/patterns/orchard.svg
@@ -0,0 +1,11 @@
+
+
diff --git a/icons/map/patterns/vineyard.svg b/icons/map/patterns/vineyard.svg
new file mode 100644
index 00000000..cd4ecc45
--- /dev/null
+++ b/icons/map/patterns/vineyard.svg
@@ -0,0 +1,11 @@
+
+
diff --git a/icons/map/patterns/wetland.svg b/icons/map/patterns/wetland.svg
new file mode 100644
index 00000000..4cca5a92
--- /dev/null
+++ b/icons/map/patterns/wetland.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/icons/map/arrow.svg b/icons/map/symbols/arrow.svg
similarity index 100%
rename from icons/map/arrow.svg
rename to icons/map/symbols/arrow.svg
diff --git a/icons/map/symbols/cliff.svg b/icons/map/symbols/cliff.svg
new file mode 100644
index 00000000..2fb46d30
--- /dev/null
+++ b/icons/map/symbols/cliff.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/icons/map/symbols/exit.svg b/icons/map/symbols/exit.svg
new file mode 100644
index 00000000..bbda02eb
--- /dev/null
+++ b/icons/map/symbols/exit.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/icons/map/water-arrow.svg b/icons/map/symbols/water-arrow.svg
similarity index 100%
rename from icons/map/water-arrow.svg
rename to icons/map/symbols/water-arrow.svg
diff --git a/src/map/IMG/rastertile.cpp b/src/map/IMG/rastertile.cpp
index 931f50fd..52dd76ad 100644
--- a/src/map/IMG/rastertile.cpp
+++ b/src/map/IMG/rastertile.cpp
@@ -513,8 +513,8 @@ void RasterTile::render()
QList textItems;
QImage arrows[2];
- arrows[ROAD] = Util::svg2img(":/map/arrow.svg", _ratio);
- arrows[WATER] = Util::svg2img(":/map/water-arrow.svg", _ratio);
+ arrows[ROAD] = Util::svg2img(":/symbols/arrow.svg", _ratio);
+ arrows[WATER] = Util::svg2img(":/symbols/water-arrow.svg", _ratio);
fetchData(polygons, lines, points);
ll2xy(polygons);
diff --git a/src/map/mapsforge/rastertile.cpp b/src/map/mapsforge/rastertile.cpp
index 604a1014..2427e4ec 100644
--- a/src/map/mapsforge/rastertile.cpp
+++ b/src/map/mapsforge/rastertile.cpp
@@ -275,27 +275,47 @@ void RasterTile::processLineLabels(const QVector &paths,
bool limit = false;
if (p.ti) {
- limit = (p.ti->key() == ID_ELE || p.ti->key() == ID_REF);
+ limit = (p.ti->key() == ID_ELE || p.ti->key() == ID_REF
+ || (!p.si && p.ti->shield()));
if (limit && set.contains(*p.lbl))
continue;
}
- PathItem *item = new PathItem(p.p->pp, p.lbl, img, _rect, font, color,
- hColor, rotate);
- if (item->isValid() && !item->collides(textItems)) {
- textItems.append(item);
- if (limit)
- set.insert(*p.lbl);
- } else {
- delete item;
+ if (!p.si && p.ti && p.ti->shield()) {
+ if (p.ti && p.lbl && set.contains(*p.lbl))
+ continue;
+ if (p.p->pp.length() < _rect.width() / 3.0)
+ continue;
- if (img && p.lbl) {
- PathItem *item = new PathItem(p.p->pp, 0, img, _rect, 0, 0, 0,
- rotate);
- if (item->isValid() && !item->collides(textItems))
- textItems.append(item);
- else
- delete item;
+ QPointF pos = p.p->pp.pointAtPercent(0.5);
+
+ PointItem *item = new PointItem(pos.toPoint(), p.lbl, font, color,
+ hColor);
+ if (item->isValid() && _rect.contains(item->boundingRect().toRect())
+ && !item->collides(textItems)) {
+ textItems.append(item);
+ if (p.ti && p.lbl)
+ set.insert(*p.lbl);
+ } else
+ delete item;
+ } else {
+ PathItem *item = new PathItem(p.p->pp, p.lbl, img, _rect, font,
+ color, hColor, rotate);
+ if (item->isValid() && !item->collides(textItems)) {
+ textItems.append(item);
+ if (limit)
+ set.insert(*p.lbl);
+ } else {
+ delete item;
+
+ if (img && p.lbl) {
+ PathItem *item = new PathItem(p.p->pp, 0, img, _rect, 0, 0,
+ 0, rotate);
+ if (item->isValid() && !item->collides(textItems))
+ textItems.append(item);
+ else
+ delete item;
+ }
}
}
}
diff --git a/src/map/mapsforge/rastertile.h b/src/map/mapsforge/rastertile.h
index ff3ae4ea..71f9cf7b 100644
--- a/src/map/mapsforge/rastertile.h
+++ b/src/map/mapsforge/rastertile.h
@@ -174,6 +174,10 @@ private:
const QFont *font, const QImage *img, const QColor *color,
const QColor *haloColor) : TextPointItem(point,
label ? new QString(*label) : 0, font, img, color, haloColor, 0) {}
+ PointItem(const QPoint &point, const QByteArray *label,
+ const QFont *font, const QColor *color, const QColor *bgColor)
+ : TextPointItem(point, label ? new QString(*label) : 0, font, 0,
+ color, 0, bgColor) {}
~PointItem() {delete _text;}
};
diff --git a/src/map/mapsforge/style.cpp b/src/map/mapsforge/style.cpp
index 47f34faa..c2147b75 100644
--- a/src/map/mapsforge/style.cpp
+++ b/src/map/mapsforge/style.cpp
@@ -457,6 +457,10 @@ void Style::text(QXmlStreamReader &reader, const MapData &data,
}
if (attr.hasAttribute("symbol-id"))
ri._symbolId = attr.value("symbol-id").toString();
+ if (line && attr.hasAttribute("text-orientation")) {
+ if (attr.value("text-orientation").toString() == "auto_down")
+ ri._shield = true;
+ }
ri._font.setFamily(fontFamily);
ri._font.setPixelSize(fontSize);
@@ -798,7 +802,7 @@ void Style::load(const MapData &data, qreal ratio)
QString path(ProgramPaths::renderthemeFile());
if (!QFileInfo::exists(path) || !loadXml(path, data, ratio))
- loadXml(":/mapsforge/default.xml", data, ratio);
+ loadXml(":/style/style.xml", data, ratio);
std::sort(_symbols.begin(), _symbols.end());
std::sort(_lineSymbols.begin(), _lineSymbols.end());
diff --git a/src/map/mapsforge/style.h b/src/map/mapsforge/style.h
index 6270e397..c47a20de 100644
--- a/src/map/mapsforge/style.h
+++ b/src/map/mapsforge/style.h
@@ -209,7 +209,7 @@ public:
public:
TextRender(const Rule &rule)
: Render(rule), _priority(0), _fillColor(Qt::black),
- _strokeColor(Qt::black), _strokeWidth(0) {}
+ _strokeColor(Qt::black), _strokeWidth(0), _shield(false) {}
const QString &symbolId() const {return _symbolId;}
const QFont &font() const {return _font;}
@@ -218,6 +218,7 @@ public:
qreal strokeWidth() const {return _strokeWidth;}
unsigned key() const {return _key;}
int priority() const {return _priority;}
+ bool shield() const {return _shield;}
bool operator<(const TextRender &other) const
{return _priority > other._priority;}
@@ -230,6 +231,7 @@ public:
QColor _fillColor, _strokeColor;
qreal _strokeWidth;
QFont _font;
+ bool _shield;
unsigned _key;
};