diff --git a/gpxsee.qrc b/gpxsee.qrc index 2a8f3e9c..72f54c0e 100644 --- a/gpxsee.qrc +++ b/gpxsee.qrc @@ -14,83 +14,83 @@ - icons/map/POI/airfield-11.png - icons/map/POI/airport-11.png - icons/map/POI/amusement-park-11.png - icons/map/POI/bakery-11.png - icons/map/POI/bank-11.png - icons/map/POI/bar-11.png - icons/map/POI/bbq-11.png - icons/map/POI/beach-11.png - icons/map/POI/bowling-alley-11.png - icons/map/POI/building-alt1-11.png - icons/map/POI/bridge-11.png - icons/map/POI/bus-11.png - icons/map/POI/cafe-11.png - icons/map/POI/campsite-11.png - icons/map/POI/car-11.png - icons/map/POI/car-rental-11.png - icons/map/POI/car-repair-11.png - icons/map/POI/casino-11.png - icons/map/POI/cemetery-11.png - icons/map/POI/cinema-11.png - icons/map/POI/clothing-store-11.png - icons/map/POI/communications-tower-11.png - icons/map/POI/convenience-11.png - icons/map/POI/dam-11.png - icons/map/POI/danger-11.png - icons/map/POI/drinking-water-11.png - icons/map/POI/fast-food-11.png - icons/map/POI/entrance-alt1-11.png - icons/map/POI/fire-station-11.png - icons/map/POI/fitness-centre-11.png - icons/map/POI/fuel-11.png - icons/map/POI/furniture-11.png - icons/map/POI/garden-11.png - icons/map/POI/garden-centre-11.png - icons/map/POI/golf-11.png - icons/map/POI/grocery-11.png - icons/map/POI/hairdresser-11.png - icons/map/POI/harbor-11.png - icons/map/POI/hardware-11.png - icons/map/POI/heliport-11.png - icons/map/POI/hospital-11.png - icons/map/POI/information-11.png - icons/map/POI/landmark-11.png - icons/map/POI/library-11.png - icons/map/POI/lodging-11.png - icons/map/POI/mountain-11.png - icons/map/POI/museum-11.png - icons/map/POI/park-11.png - icons/map/POI/parking-11.png - icons/map/POI/pharmacy-11.png - icons/map/POI/picnic-site-11.png - icons/map/POI/place-of-worship-11.png - icons/map/POI/police-11.png - icons/map/POI/post-11.png - icons/map/POI/religious-christian-11.png - icons/map/POI/religious-jewish-11.png - icons/map/POI/religious-muslim-11.png - icons/map/POI/restaurant-11.png - icons/map/POI/restaurant-noodle-11.png - icons/map/POI/restaurant-pizza-11.png - icons/map/POI/restaurant-seafood-11.png - icons/map/POI/roadblock-11.png - icons/map/POI/school-11.png - icons/map/POI/shelter-11.png - icons/map/POI/shop-11.png - icons/map/POI/skiing-11.png - icons/map/POI/soccer-11.png - icons/map/POI/swimming-11.png - icons/map/POI/theatre-11.png - icons/map/POI/telephone-11.png - icons/map/POI/toilet-11.png - icons/map/POI/town-hall-11.png - icons/map/POI/viewpoint-11.png - icons/map/POI/village-11.png - icons/map/POI/waterfall-11.png - icons/map/POI/wetland-11.png - icons/map/POI/zoo-11.png + icons/map/POI/airfield-11.svg + icons/map/POI/airport-11.svg + icons/map/POI/amusement-park-11.svg + icons/map/POI/bakery-11.svg + icons/map/POI/bank-11.svg + icons/map/POI/bar-11.svg + icons/map/POI/bbq-11.svg + icons/map/POI/beach-11.svg + icons/map/POI/bowling-alley-11.svg + icons/map/POI/building-alt1-11.svg + icons/map/POI/bridge-11.svg + icons/map/POI/bus-11.svg + icons/map/POI/cafe-11.svg + icons/map/POI/campsite-11.svg + icons/map/POI/car-11.svg + icons/map/POI/car-rental-11.svg + icons/map/POI/car-repair-11.svg + icons/map/POI/casino-11.svg + icons/map/POI/cemetery-11.svg + icons/map/POI/cinema-11.svg + icons/map/POI/clothing-store-11.svg + icons/map/POI/communications-tower-11.svg + icons/map/POI/convenience-11.svg + icons/map/POI/dam-11.svg + icons/map/POI/danger-11.svg + icons/map/POI/drinking-water-11.svg + icons/map/POI/fast-food-11.svg + icons/map/POI/entrance-alt1-11.svg + icons/map/POI/fire-station-11.svg + icons/map/POI/fitness-centre-11.svg + icons/map/POI/fuel-11.svg + icons/map/POI/furniture-11.svg + icons/map/POI/garden-11.svg + icons/map/POI/garden-centre-11.svg + icons/map/POI/golf-11.svg + icons/map/POI/grocery-11.svg + icons/map/POI/hairdresser-11.svg + icons/map/POI/harbor-11.svg + icons/map/POI/hardware-11.svg + icons/map/POI/heliport-11.svg + icons/map/POI/hospital-11.svg + icons/map/POI/information-11.svg + icons/map/POI/landmark-11.svg + icons/map/POI/library-11.svg + icons/map/POI/lodging-11.svg + icons/map/POI/mountain-11.svg + icons/map/POI/museum-11.svg + icons/map/POI/park-11.svg + icons/map/POI/parking-11.svg + icons/map/POI/pharmacy-11.svg + icons/map/POI/picnic-site-11.svg + icons/map/POI/place-of-worship-11.svg + icons/map/POI/police-11.svg + icons/map/POI/post-11.svg + icons/map/POI/religious-christian-11.svg + icons/map/POI/religious-jewish-11.svg + icons/map/POI/religious-muslim-11.svg + icons/map/POI/restaurant-11.svg + icons/map/POI/restaurant-noodle-11.svg + icons/map/POI/restaurant-pizza-11.svg + icons/map/POI/restaurant-seafood-11.svg + icons/map/POI/roadblock-11.svg + icons/map/POI/school-11.svg + icons/map/POI/shelter-11.svg + icons/map/POI/shop-11.svg + icons/map/POI/skiing-11.svg + icons/map/POI/soccer-11.svg + icons/map/POI/swimming-11.svg + icons/map/POI/theatre-11.svg + icons/map/POI/telephone-11.svg + icons/map/POI/toilet-11.svg + icons/map/POI/town-hall-11.svg + icons/map/POI/viewpoint-11.svg + icons/map/POI/village-11.svg + icons/map/POI/waterfall-11.svg + icons/map/POI/wetland-11.svg + icons/map/POI/zoo-11.svg diff --git a/icons/map/POI/airfield-11.png b/icons/map/POI/airfield-11.png deleted file mode 100644 index c9d4da8d..00000000 Binary files a/icons/map/POI/airfield-11.png and /dev/null differ diff --git a/icons/map/POI/airfield-11.svg b/icons/map/POI/airfield-11.svg new file mode 100644 index 00000000..bf0b407f --- /dev/null +++ b/icons/map/POI/airfield-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/airport-11.png b/icons/map/POI/airport-11.png deleted file mode 100644 index 69ed65f1..00000000 Binary files a/icons/map/POI/airport-11.png and /dev/null differ diff --git a/icons/map/POI/airport-11.svg b/icons/map/POI/airport-11.svg new file mode 100644 index 00000000..8f9c43a2 --- /dev/null +++ b/icons/map/POI/airport-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/amusement-park-11.png b/icons/map/POI/amusement-park-11.png deleted file mode 100644 index 485fc601..00000000 Binary files a/icons/map/POI/amusement-park-11.png and /dev/null differ diff --git a/icons/map/POI/amusement-park-11.svg b/icons/map/POI/amusement-park-11.svg new file mode 100644 index 00000000..2caa208c --- /dev/null +++ b/icons/map/POI/amusement-park-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/bakery-11.png b/icons/map/POI/bakery-11.png deleted file mode 100644 index c9c3178b..00000000 Binary files a/icons/map/POI/bakery-11.png and /dev/null differ diff --git a/icons/map/POI/bakery-11.svg b/icons/map/POI/bakery-11.svg new file mode 100644 index 00000000..47f7ac98 --- /dev/null +++ b/icons/map/POI/bakery-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/bank-11.png b/icons/map/POI/bank-11.png deleted file mode 100644 index d40cd0ef..00000000 Binary files a/icons/map/POI/bank-11.png and /dev/null differ diff --git a/icons/map/POI/bank-11.svg b/icons/map/POI/bank-11.svg new file mode 100644 index 00000000..7cd0de20 --- /dev/null +++ b/icons/map/POI/bank-11.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/icons/map/POI/bar-11.png b/icons/map/POI/bar-11.png deleted file mode 100644 index b28300b0..00000000 Binary files a/icons/map/POI/bar-11.png and /dev/null differ diff --git a/icons/map/POI/bar-11.svg b/icons/map/POI/bar-11.svg new file mode 100644 index 00000000..10d6a6a2 --- /dev/null +++ b/icons/map/POI/bar-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/bbq-11.png b/icons/map/POI/bbq-11.png deleted file mode 100644 index f1f24b6c..00000000 Binary files a/icons/map/POI/bbq-11.png and /dev/null differ diff --git a/icons/map/POI/bbq-11.svg b/icons/map/POI/bbq-11.svg new file mode 100644 index 00000000..8bad5fe6 --- /dev/null +++ b/icons/map/POI/bbq-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/beach-11.png b/icons/map/POI/beach-11.png deleted file mode 100644 index 0a8cc59c..00000000 Binary files a/icons/map/POI/beach-11.png and /dev/null differ diff --git a/icons/map/POI/beach-11.svg b/icons/map/POI/beach-11.svg new file mode 100644 index 00000000..4174a07e --- /dev/null +++ b/icons/map/POI/beach-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/bowling-alley-11.png b/icons/map/POI/bowling-alley-11.png deleted file mode 100644 index efab183d..00000000 Binary files a/icons/map/POI/bowling-alley-11.png and /dev/null differ diff --git a/icons/map/POI/bowling-alley-11.svg b/icons/map/POI/bowling-alley-11.svg new file mode 100644 index 00000000..5735383b --- /dev/null +++ b/icons/map/POI/bowling-alley-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/bridge-11.png b/icons/map/POI/bridge-11.png deleted file mode 100644 index 0f811d63..00000000 Binary files a/icons/map/POI/bridge-11.png and /dev/null differ diff --git a/icons/map/POI/bridge-11.svg b/icons/map/POI/bridge-11.svg new file mode 100644 index 00000000..01ef5698 --- /dev/null +++ b/icons/map/POI/bridge-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/building-alt1-11.png b/icons/map/POI/building-alt1-11.png deleted file mode 100644 index bf64c08f..00000000 Binary files a/icons/map/POI/building-alt1-11.png and /dev/null differ diff --git a/icons/map/POI/building-alt1-11.svg b/icons/map/POI/building-alt1-11.svg new file mode 100644 index 00000000..f9ef2e70 --- /dev/null +++ b/icons/map/POI/building-alt1-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/bus-11.png b/icons/map/POI/bus-11.png deleted file mode 100644 index 7b024d81..00000000 Binary files a/icons/map/POI/bus-11.png and /dev/null differ diff --git a/icons/map/POI/bus-11.svg b/icons/map/POI/bus-11.svg new file mode 100644 index 00000000..bbbb1b7b --- /dev/null +++ b/icons/map/POI/bus-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/cafe-11.png b/icons/map/POI/cafe-11.png deleted file mode 100644 index 53dc4937..00000000 Binary files a/icons/map/POI/cafe-11.png and /dev/null differ diff --git a/icons/map/POI/cafe-11.svg b/icons/map/POI/cafe-11.svg new file mode 100644 index 00000000..f389a003 --- /dev/null +++ b/icons/map/POI/cafe-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/campsite-11.png b/icons/map/POI/campsite-11.png deleted file mode 100644 index 01ccf452..00000000 Binary files a/icons/map/POI/campsite-11.png and /dev/null differ diff --git a/icons/map/POI/campsite-11.svg b/icons/map/POI/campsite-11.svg new file mode 100644 index 00000000..6b411ac0 --- /dev/null +++ b/icons/map/POI/campsite-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/car-11.png b/icons/map/POI/car-11.png deleted file mode 100644 index bb318f1d..00000000 Binary files a/icons/map/POI/car-11.png and /dev/null differ diff --git a/icons/map/POI/car-11.svg b/icons/map/POI/car-11.svg new file mode 100644 index 00000000..8bfea5ce --- /dev/null +++ b/icons/map/POI/car-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/car-rental-11.png b/icons/map/POI/car-rental-11.png deleted file mode 100644 index e6f8cc3c..00000000 Binary files a/icons/map/POI/car-rental-11.png and /dev/null differ diff --git a/icons/map/POI/car-rental-11.svg b/icons/map/POI/car-rental-11.svg new file mode 100644 index 00000000..47cd8cb5 --- /dev/null +++ b/icons/map/POI/car-rental-11.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/icons/map/POI/car-repair-11.png b/icons/map/POI/car-repair-11.png deleted file mode 100644 index 728edb37..00000000 Binary files a/icons/map/POI/car-repair-11.png and /dev/null differ diff --git a/icons/map/POI/car-repair-11.svg b/icons/map/POI/car-repair-11.svg new file mode 100644 index 00000000..78cbb861 --- /dev/null +++ b/icons/map/POI/car-repair-11.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/icons/map/POI/casino-11.png b/icons/map/POI/casino-11.png deleted file mode 100644 index aa3a1d1b..00000000 Binary files a/icons/map/POI/casino-11.png and /dev/null differ diff --git a/icons/map/POI/casino-11.svg b/icons/map/POI/casino-11.svg new file mode 100644 index 00000000..93e1e225 --- /dev/null +++ b/icons/map/POI/casino-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/cemetery-11.png b/icons/map/POI/cemetery-11.png deleted file mode 100644 index b8d5128b..00000000 Binary files a/icons/map/POI/cemetery-11.png and /dev/null differ diff --git a/icons/map/POI/cemetery-11.svg b/icons/map/POI/cemetery-11.svg new file mode 100644 index 00000000..02f4de79 --- /dev/null +++ b/icons/map/POI/cemetery-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/cinema-11.png b/icons/map/POI/cinema-11.png deleted file mode 100644 index ce13da28..00000000 Binary files a/icons/map/POI/cinema-11.png and /dev/null differ diff --git a/icons/map/POI/cinema-11.svg b/icons/map/POI/cinema-11.svg new file mode 100644 index 00000000..1618c16a --- /dev/null +++ b/icons/map/POI/cinema-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/clothing-store-11.png b/icons/map/POI/clothing-store-11.png deleted file mode 100644 index 2e8032d1..00000000 Binary files a/icons/map/POI/clothing-store-11.png and /dev/null differ diff --git a/icons/map/POI/clothing-store-11.svg b/icons/map/POI/clothing-store-11.svg new file mode 100644 index 00000000..e0f3b401 --- /dev/null +++ b/icons/map/POI/clothing-store-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/communications-tower-11.png b/icons/map/POI/communications-tower-11.png deleted file mode 100644 index d0f24a28..00000000 Binary files a/icons/map/POI/communications-tower-11.png and /dev/null differ diff --git a/icons/map/POI/communications-tower-11.svg b/icons/map/POI/communications-tower-11.svg new file mode 100644 index 00000000..9747338f --- /dev/null +++ b/icons/map/POI/communications-tower-11.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/icons/map/POI/convenience-11.png b/icons/map/POI/convenience-11.png deleted file mode 100644 index 259b17bb..00000000 Binary files a/icons/map/POI/convenience-11.png and /dev/null differ diff --git a/icons/map/POI/convenience-11.svg b/icons/map/POI/convenience-11.svg new file mode 100644 index 00000000..bf72abbf --- /dev/null +++ b/icons/map/POI/convenience-11.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/icons/map/POI/dam-11.png b/icons/map/POI/dam-11.png deleted file mode 100644 index 4a85c69b..00000000 Binary files a/icons/map/POI/dam-11.png and /dev/null differ diff --git a/icons/map/POI/dam-11.svg b/icons/map/POI/dam-11.svg new file mode 100644 index 00000000..8f2f196e --- /dev/null +++ b/icons/map/POI/dam-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/danger-11.png b/icons/map/POI/danger-11.png deleted file mode 100644 index 18af2152..00000000 Binary files a/icons/map/POI/danger-11.png and /dev/null differ diff --git a/icons/map/POI/danger-11.svg b/icons/map/POI/danger-11.svg new file mode 100644 index 00000000..440ed42d --- /dev/null +++ b/icons/map/POI/danger-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/drinking-water-11.png b/icons/map/POI/drinking-water-11.png deleted file mode 100644 index ff78b6a0..00000000 Binary files a/icons/map/POI/drinking-water-11.png and /dev/null differ diff --git a/icons/map/POI/drinking-water-11.svg b/icons/map/POI/drinking-water-11.svg new file mode 100644 index 00000000..6e766bfb --- /dev/null +++ b/icons/map/POI/drinking-water-11.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/icons/map/POI/entrance-alt1-11.png b/icons/map/POI/entrance-alt1-11.png deleted file mode 100644 index 4a926f71..00000000 Binary files a/icons/map/POI/entrance-alt1-11.png and /dev/null differ diff --git a/icons/map/POI/entrance-alt1-11.svg b/icons/map/POI/entrance-alt1-11.svg new file mode 100644 index 00000000..8c1e2e82 --- /dev/null +++ b/icons/map/POI/entrance-alt1-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/fast-food-11.png b/icons/map/POI/fast-food-11.png deleted file mode 100644 index 9459dcf0..00000000 Binary files a/icons/map/POI/fast-food-11.png and /dev/null differ diff --git a/icons/map/POI/fast-food-11.svg b/icons/map/POI/fast-food-11.svg new file mode 100644 index 00000000..06a36721 --- /dev/null +++ b/icons/map/POI/fast-food-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/fire-station-11.png b/icons/map/POI/fire-station-11.png deleted file mode 100644 index b52d311a..00000000 Binary files a/icons/map/POI/fire-station-11.png and /dev/null differ diff --git a/icons/map/POI/fire-station-11.svg b/icons/map/POI/fire-station-11.svg new file mode 100644 index 00000000..79f0660b --- /dev/null +++ b/icons/map/POI/fire-station-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/fitness-centre-11.png b/icons/map/POI/fitness-centre-11.png deleted file mode 100644 index 5c7f00ca..00000000 Binary files a/icons/map/POI/fitness-centre-11.png and /dev/null differ diff --git a/icons/map/POI/fitness-centre-11.svg b/icons/map/POI/fitness-centre-11.svg new file mode 100644 index 00000000..967c2e6a --- /dev/null +++ b/icons/map/POI/fitness-centre-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/fuel-11.png b/icons/map/POI/fuel-11.png deleted file mode 100644 index 2b1aed56..00000000 Binary files a/icons/map/POI/fuel-11.png and /dev/null differ diff --git a/icons/map/POI/fuel-11.svg b/icons/map/POI/fuel-11.svg new file mode 100644 index 00000000..0114019c --- /dev/null +++ b/icons/map/POI/fuel-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/furniture-11.png b/icons/map/POI/furniture-11.png deleted file mode 100644 index 7960fa24..00000000 Binary files a/icons/map/POI/furniture-11.png and /dev/null differ diff --git a/icons/map/POI/furniture-11.svg b/icons/map/POI/furniture-11.svg new file mode 100644 index 00000000..7207c5e7 --- /dev/null +++ b/icons/map/POI/furniture-11.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/icons/map/POI/garden-11.png b/icons/map/POI/garden-11.png deleted file mode 100644 index ba931bc7..00000000 Binary files a/icons/map/POI/garden-11.png and /dev/null differ diff --git a/icons/map/POI/garden-11.svg b/icons/map/POI/garden-11.svg new file mode 100644 index 00000000..12be39a5 --- /dev/null +++ b/icons/map/POI/garden-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/garden-centre-11.png b/icons/map/POI/garden-centre-11.png deleted file mode 100644 index d1e061e5..00000000 Binary files a/icons/map/POI/garden-centre-11.png and /dev/null differ diff --git a/icons/map/POI/garden-centre-11.svg b/icons/map/POI/garden-centre-11.svg new file mode 100644 index 00000000..0570a0d2 --- /dev/null +++ b/icons/map/POI/garden-centre-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/golf-11.png b/icons/map/POI/golf-11.png deleted file mode 100644 index 2f710a4f..00000000 Binary files a/icons/map/POI/golf-11.png and /dev/null differ diff --git a/icons/map/POI/golf-11.svg b/icons/map/POI/golf-11.svg new file mode 100644 index 00000000..cc9e46a7 --- /dev/null +++ b/icons/map/POI/golf-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/grocery-11.png b/icons/map/POI/grocery-11.png deleted file mode 100644 index 49a3d912..00000000 Binary files a/icons/map/POI/grocery-11.png and /dev/null differ diff --git a/icons/map/POI/grocery-11.svg b/icons/map/POI/grocery-11.svg new file mode 100644 index 00000000..eee0dffd --- /dev/null +++ b/icons/map/POI/grocery-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/hairdresser-11.png b/icons/map/POI/hairdresser-11.png deleted file mode 100644 index a647aa0f..00000000 Binary files a/icons/map/POI/hairdresser-11.png and /dev/null differ diff --git a/icons/map/POI/hairdresser-11.svg b/icons/map/POI/hairdresser-11.svg new file mode 100644 index 00000000..c64b19d6 --- /dev/null +++ b/icons/map/POI/hairdresser-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/harbor-11.png b/icons/map/POI/harbor-11.png deleted file mode 100644 index c2bce4fa..00000000 Binary files a/icons/map/POI/harbor-11.png and /dev/null differ diff --git a/icons/map/POI/harbor-11.svg b/icons/map/POI/harbor-11.svg new file mode 100644 index 00000000..5a91bb3f --- /dev/null +++ b/icons/map/POI/harbor-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/hardware-11.png b/icons/map/POI/hardware-11.png deleted file mode 100644 index d24b4340..00000000 Binary files a/icons/map/POI/hardware-11.png and /dev/null differ diff --git a/icons/map/POI/hardware-11.svg b/icons/map/POI/hardware-11.svg new file mode 100644 index 00000000..1b3611b4 --- /dev/null +++ b/icons/map/POI/hardware-11.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/icons/map/POI/heliport-11.png b/icons/map/POI/heliport-11.png deleted file mode 100644 index 92fa1213..00000000 Binary files a/icons/map/POI/heliport-11.png and /dev/null differ diff --git a/icons/map/POI/heliport-11.svg b/icons/map/POI/heliport-11.svg new file mode 100644 index 00000000..cac64241 --- /dev/null +++ b/icons/map/POI/heliport-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/hospital-11.png b/icons/map/POI/hospital-11.png deleted file mode 100644 index e71694e3..00000000 Binary files a/icons/map/POI/hospital-11.png and /dev/null differ diff --git a/icons/map/POI/hospital-11.svg b/icons/map/POI/hospital-11.svg new file mode 100644 index 00000000..690392ad --- /dev/null +++ b/icons/map/POI/hospital-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/information-11.png b/icons/map/POI/information-11.png deleted file mode 100644 index c171967a..00000000 Binary files a/icons/map/POI/information-11.png and /dev/null differ diff --git a/icons/map/POI/information-11.svg b/icons/map/POI/information-11.svg new file mode 100644 index 00000000..ca2b08dc --- /dev/null +++ b/icons/map/POI/information-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/landmark-11.png b/icons/map/POI/landmark-11.png deleted file mode 100644 index e409faaf..00000000 Binary files a/icons/map/POI/landmark-11.png and /dev/null differ diff --git a/icons/map/POI/landmark-11.svg b/icons/map/POI/landmark-11.svg new file mode 100644 index 00000000..7cdd3405 --- /dev/null +++ b/icons/map/POI/landmark-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/library-11.png b/icons/map/POI/library-11.png deleted file mode 100644 index 7e1ac37b..00000000 Binary files a/icons/map/POI/library-11.png and /dev/null differ diff --git a/icons/map/POI/library-11.svg b/icons/map/POI/library-11.svg new file mode 100644 index 00000000..d358014d --- /dev/null +++ b/icons/map/POI/library-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/lodging-11.png b/icons/map/POI/lodging-11.png deleted file mode 100644 index a5603a0f..00000000 Binary files a/icons/map/POI/lodging-11.png and /dev/null differ diff --git a/icons/map/POI/lodging-11.svg b/icons/map/POI/lodging-11.svg new file mode 100644 index 00000000..58582ccb --- /dev/null +++ b/icons/map/POI/lodging-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/mountain-11.png b/icons/map/POI/mountain-11.png deleted file mode 100644 index 089094f3..00000000 Binary files a/icons/map/POI/mountain-11.png and /dev/null differ diff --git a/icons/map/POI/mountain-11.svg b/icons/map/POI/mountain-11.svg new file mode 100644 index 00000000..5c580210 --- /dev/null +++ b/icons/map/POI/mountain-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/museum-11.png b/icons/map/POI/museum-11.png deleted file mode 100644 index 736a3078..00000000 Binary files a/icons/map/POI/museum-11.png and /dev/null differ diff --git a/icons/map/POI/museum-11.svg b/icons/map/POI/museum-11.svg new file mode 100644 index 00000000..3a750793 --- /dev/null +++ b/icons/map/POI/museum-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/park-11.png b/icons/map/POI/park-11.png deleted file mode 100644 index bd719557..00000000 Binary files a/icons/map/POI/park-11.png and /dev/null differ diff --git a/icons/map/POI/park-11.svg b/icons/map/POI/park-11.svg new file mode 100644 index 00000000..47168347 --- /dev/null +++ b/icons/map/POI/park-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/parking-11.png b/icons/map/POI/parking-11.png deleted file mode 100644 index 457de25c..00000000 Binary files a/icons/map/POI/parking-11.png and /dev/null differ diff --git a/icons/map/POI/parking-11.svg b/icons/map/POI/parking-11.svg new file mode 100644 index 00000000..435b2611 --- /dev/null +++ b/icons/map/POI/parking-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/pharmacy-11.png b/icons/map/POI/pharmacy-11.png deleted file mode 100644 index 18346a54..00000000 Binary files a/icons/map/POI/pharmacy-11.png and /dev/null differ diff --git a/icons/map/POI/pharmacy-11.svg b/icons/map/POI/pharmacy-11.svg new file mode 100644 index 00000000..40dfee6d --- /dev/null +++ b/icons/map/POI/pharmacy-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/picnic-site-11.png b/icons/map/POI/picnic-site-11.png deleted file mode 100644 index 1729899e..00000000 Binary files a/icons/map/POI/picnic-site-11.png and /dev/null differ diff --git a/icons/map/POI/picnic-site-11.svg b/icons/map/POI/picnic-site-11.svg new file mode 100644 index 00000000..71ffe5f0 --- /dev/null +++ b/icons/map/POI/picnic-site-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/place-of-worship-11.png b/icons/map/POI/place-of-worship-11.png deleted file mode 100644 index cfabfebf..00000000 Binary files a/icons/map/POI/place-of-worship-11.png and /dev/null differ diff --git a/icons/map/POI/place-of-worship-11.svg b/icons/map/POI/place-of-worship-11.svg new file mode 100644 index 00000000..dd878e40 --- /dev/null +++ b/icons/map/POI/place-of-worship-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/police-11.png b/icons/map/POI/police-11.png deleted file mode 100644 index a39c936c..00000000 Binary files a/icons/map/POI/police-11.png and /dev/null differ diff --git a/icons/map/POI/police-11.svg b/icons/map/POI/police-11.svg new file mode 100644 index 00000000..ac40220a --- /dev/null +++ b/icons/map/POI/police-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/post-11.png b/icons/map/POI/post-11.png deleted file mode 100644 index 5a728a01..00000000 Binary files a/icons/map/POI/post-11.png and /dev/null differ diff --git a/icons/map/POI/post-11.svg b/icons/map/POI/post-11.svg new file mode 100644 index 00000000..de77e470 --- /dev/null +++ b/icons/map/POI/post-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/religious-christian-11.png b/icons/map/POI/religious-christian-11.png deleted file mode 100644 index 8a8d21eb..00000000 Binary files a/icons/map/POI/religious-christian-11.png and /dev/null differ diff --git a/icons/map/POI/religious-christian-11.svg b/icons/map/POI/religious-christian-11.svg new file mode 100644 index 00000000..0e8935e2 --- /dev/null +++ b/icons/map/POI/religious-christian-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/religious-jewish-11.png b/icons/map/POI/religious-jewish-11.png deleted file mode 100644 index 75621596..00000000 Binary files a/icons/map/POI/religious-jewish-11.png and /dev/null differ diff --git a/icons/map/POI/religious-jewish-11.svg b/icons/map/POI/religious-jewish-11.svg new file mode 100644 index 00000000..d3f5273e --- /dev/null +++ b/icons/map/POI/religious-jewish-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/religious-muslim-11.png b/icons/map/POI/religious-muslim-11.png deleted file mode 100644 index 6c17baf8..00000000 Binary files a/icons/map/POI/religious-muslim-11.png and /dev/null differ diff --git a/icons/map/POI/religious-muslim-11.svg b/icons/map/POI/religious-muslim-11.svg new file mode 100644 index 00000000..76094c6c --- /dev/null +++ b/icons/map/POI/religious-muslim-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/restaurant-11.png b/icons/map/POI/restaurant-11.png deleted file mode 100644 index e3ad0d64..00000000 Binary files a/icons/map/POI/restaurant-11.png and /dev/null differ diff --git a/icons/map/POI/restaurant-11.svg b/icons/map/POI/restaurant-11.svg new file mode 100644 index 00000000..1bff8377 --- /dev/null +++ b/icons/map/POI/restaurant-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/restaurant-noodle-11.png b/icons/map/POI/restaurant-noodle-11.png deleted file mode 100644 index 42cb11f2..00000000 Binary files a/icons/map/POI/restaurant-noodle-11.png and /dev/null differ diff --git a/icons/map/POI/restaurant-noodle-11.svg b/icons/map/POI/restaurant-noodle-11.svg new file mode 100644 index 00000000..82eb2aea --- /dev/null +++ b/icons/map/POI/restaurant-noodle-11.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/icons/map/POI/restaurant-pizza-11.png b/icons/map/POI/restaurant-pizza-11.png deleted file mode 100644 index b1471fa3..00000000 Binary files a/icons/map/POI/restaurant-pizza-11.png and /dev/null differ diff --git a/icons/map/POI/restaurant-pizza-11.svg b/icons/map/POI/restaurant-pizza-11.svg new file mode 100644 index 00000000..c5fdec40 --- /dev/null +++ b/icons/map/POI/restaurant-pizza-11.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/icons/map/POI/restaurant-seafood-11.png b/icons/map/POI/restaurant-seafood-11.png deleted file mode 100644 index f59d10ec..00000000 Binary files a/icons/map/POI/restaurant-seafood-11.png and /dev/null differ diff --git a/icons/map/POI/restaurant-seafood-11.svg b/icons/map/POI/restaurant-seafood-11.svg new file mode 100644 index 00000000..cc8087ef --- /dev/null +++ b/icons/map/POI/restaurant-seafood-11.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/icons/map/POI/roadblock-11.png b/icons/map/POI/roadblock-11.png deleted file mode 100644 index 931cd005..00000000 Binary files a/icons/map/POI/roadblock-11.png and /dev/null differ diff --git a/icons/map/POI/roadblock-11.svg b/icons/map/POI/roadblock-11.svg new file mode 100644 index 00000000..16af099c --- /dev/null +++ b/icons/map/POI/roadblock-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/school-11.png b/icons/map/POI/school-11.png deleted file mode 100644 index 757f8f15..00000000 Binary files a/icons/map/POI/school-11.png and /dev/null differ diff --git a/icons/map/POI/school-11.svg b/icons/map/POI/school-11.svg new file mode 100644 index 00000000..394dcc3c --- /dev/null +++ b/icons/map/POI/school-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/shelter-11.png b/icons/map/POI/shelter-11.png deleted file mode 100644 index 07205ee9..00000000 Binary files a/icons/map/POI/shelter-11.png and /dev/null differ diff --git a/icons/map/POI/shelter-11.svg b/icons/map/POI/shelter-11.svg new file mode 100644 index 00000000..83c1d435 --- /dev/null +++ b/icons/map/POI/shelter-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/shop-11.png b/icons/map/POI/shop-11.png deleted file mode 100644 index 3c1b14c8..00000000 Binary files a/icons/map/POI/shop-11.png and /dev/null differ diff --git a/icons/map/POI/shop-11.svg b/icons/map/POI/shop-11.svg new file mode 100644 index 00000000..2089be8c --- /dev/null +++ b/icons/map/POI/shop-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/skiing-11.png b/icons/map/POI/skiing-11.png deleted file mode 100644 index 8394a2bf..00000000 Binary files a/icons/map/POI/skiing-11.png and /dev/null differ diff --git a/icons/map/POI/skiing-11.svg b/icons/map/POI/skiing-11.svg new file mode 100644 index 00000000..dc5a9fb4 --- /dev/null +++ b/icons/map/POI/skiing-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/soccer-11.png b/icons/map/POI/soccer-11.png deleted file mode 100644 index 6d0f1eec..00000000 Binary files a/icons/map/POI/soccer-11.png and /dev/null differ diff --git a/icons/map/POI/soccer-11.svg b/icons/map/POI/soccer-11.svg new file mode 100644 index 00000000..29910de8 --- /dev/null +++ b/icons/map/POI/soccer-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/swimming-11.png b/icons/map/POI/swimming-11.png deleted file mode 100644 index 183af715..00000000 Binary files a/icons/map/POI/swimming-11.png and /dev/null differ diff --git a/icons/map/POI/swimming-11.svg b/icons/map/POI/swimming-11.svg new file mode 100644 index 00000000..5c51126b --- /dev/null +++ b/icons/map/POI/swimming-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/telephone-11.png b/icons/map/POI/telephone-11.png deleted file mode 100644 index 292d492f..00000000 Binary files a/icons/map/POI/telephone-11.png and /dev/null differ diff --git a/icons/map/POI/telephone-11.svg b/icons/map/POI/telephone-11.svg new file mode 100644 index 00000000..a5f4b2d1 --- /dev/null +++ b/icons/map/POI/telephone-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/theatre-11.png b/icons/map/POI/theatre-11.png deleted file mode 100644 index de4a10fa..00000000 Binary files a/icons/map/POI/theatre-11.png and /dev/null differ diff --git a/icons/map/POI/theatre-11.svg b/icons/map/POI/theatre-11.svg new file mode 100644 index 00000000..e6c8ba99 --- /dev/null +++ b/icons/map/POI/theatre-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/toilet-11.png b/icons/map/POI/toilet-11.png deleted file mode 100644 index 90dd8dc9..00000000 Binary files a/icons/map/POI/toilet-11.png and /dev/null differ diff --git a/icons/map/POI/toilet-11.svg b/icons/map/POI/toilet-11.svg new file mode 100644 index 00000000..a0646942 --- /dev/null +++ b/icons/map/POI/toilet-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/town-hall-11.png b/icons/map/POI/town-hall-11.png deleted file mode 100644 index 5e8207ac..00000000 Binary files a/icons/map/POI/town-hall-11.png and /dev/null differ diff --git a/icons/map/POI/town-hall-11.svg b/icons/map/POI/town-hall-11.svg new file mode 100644 index 00000000..7f2414a0 --- /dev/null +++ b/icons/map/POI/town-hall-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/viewpoint-11.png b/icons/map/POI/viewpoint-11.png deleted file mode 100644 index 4e0c948b..00000000 Binary files a/icons/map/POI/viewpoint-11.png and /dev/null differ diff --git a/icons/map/POI/viewpoint-11.svg b/icons/map/POI/viewpoint-11.svg new file mode 100644 index 00000000..2da876cb --- /dev/null +++ b/icons/map/POI/viewpoint-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/village-11.png b/icons/map/POI/village-11.png deleted file mode 100644 index ebb88fb9..00000000 Binary files a/icons/map/POI/village-11.png and /dev/null differ diff --git a/icons/map/POI/village-11.svg b/icons/map/POI/village-11.svg new file mode 100644 index 00000000..7541783b --- /dev/null +++ b/icons/map/POI/village-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/waterfall-11.png b/icons/map/POI/waterfall-11.png deleted file mode 100644 index 044909e0..00000000 Binary files a/icons/map/POI/waterfall-11.png and /dev/null differ diff --git a/icons/map/POI/waterfall-11.svg b/icons/map/POI/waterfall-11.svg new file mode 100644 index 00000000..63f8bc1e --- /dev/null +++ b/icons/map/POI/waterfall-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/wetland-11.png b/icons/map/POI/wetland-11.png deleted file mode 100644 index 06e7c3e7..00000000 Binary files a/icons/map/POI/wetland-11.png and /dev/null differ diff --git a/icons/map/POI/wetland-11.svg b/icons/map/POI/wetland-11.svg new file mode 100644 index 00000000..e11eb62d --- /dev/null +++ b/icons/map/POI/wetland-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/icons/map/POI/zoo-11.png b/icons/map/POI/zoo-11.png deleted file mode 100644 index 8dbda792..00000000 Binary files a/icons/map/POI/zoo-11.png and /dev/null differ diff --git a/icons/map/POI/zoo-11.svg b/icons/map/POI/zoo-11.svg new file mode 100644 index 00000000..06072727 --- /dev/null +++ b/icons/map/POI/zoo-11.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/common/util.cpp b/src/common/util.cpp index 4d4564b6..ee7929d9 100644 --- a/src/common/util.cpp +++ b/src/common/util.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #ifdef Q_OS_ANDROID #include #include @@ -175,3 +176,17 @@ bool Util::isSQLiteDB(const QString &path, QString &errorString) return true; } + +QImage Util::svg2img(const QString &path, qreal ratio) +{ + QImageReader ir(path, "svg"); + QSize s(ir.size()); + if (!s.isValid()) + return QImage(); + + ir.setScaledSize(QSize(s.width() * ratio, s.height() * ratio)); + QImage img(ir.read()); + img.setDevicePixelRatio(ratio); + + return img; +} diff --git a/src/common/util.h b/src/common/util.h index a9863fc4..37b4e3bf 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -2,6 +2,7 @@ #define UTIL_H #include +#include class QTemporaryDir; @@ -17,6 +18,7 @@ namespace Util QString displayName(const QString &path); const QTemporaryDir &tempDir(); bool isSQLiteDB(const QString &path, QString &errorString); + QImage svg2img(const QString &path, qreal ratio); } #endif // UTIL_H diff --git a/src/map/ENC/rastertile.cpp b/src/map/ENC/rastertile.cpp index 0f20b9d2..a269eee9 100644 --- a/src/map/ENC/rastertile.cpp +++ b/src/map/ENC/rastertile.cpp @@ -18,9 +18,9 @@ static const float C1 = 0.866025f; /* sqrt(3)/2 */ static const QColor tsslptPen = QColor("#eb49eb"); static const QColor tsslptBrush = QColor("#80eb49eb"); -static const Style *style() +static const Style *style(qreal ratio) { - static ENC::Style s; + static ENC::Style s(ratio); return &s; } @@ -412,7 +412,7 @@ RasterTile::RasterTile(const Projection &proj, const Transform &transform, _zoomRange(zoomRange), _rect(rect), _ratio(ratio), _pixmap(rect.width() * ratio, rect.height() * ratio), _valid(false) { - _style = style(); + _style = style(ratio); } RasterTile::RasterTile(const Projection &proj, const Transform &transform, @@ -422,5 +422,5 @@ RasterTile::RasterTile(const Projection &proj, const Transform &transform, _zoomRange(zoomRange), _rect(rect), _ratio(ratio), _pixmap(rect.width() * ratio, rect.height() * ratio), _valid(false) { - _style = style(); + _style = style(ratio); } diff --git a/src/map/ENC/style.cpp b/src/map/ENC/style.cpp index bb6b0f09..adcaba4e 100644 --- a/src/map/ENC/style.cpp +++ b/src/map/ENC/style.cpp @@ -1,12 +1,15 @@ #include +#include "common/util.h" #include "style.h" using namespace ENC; +using namespace Util; -static QImage railroad() +static QImage railroad(qreal ratio) { - QImage img(16, 4, QImage::Format_ARGB32_Premultiplied); - img.fill(Qt::black); + QImage img(16 * ratio, 4 * ratio, QImage::Format_ARGB32_Premultiplied); + img.setDevicePixelRatio(ratio); + img.fill(QColor("#717171")); QPainter p(&img); p.setPen(QPen(Qt::white, 2)); p.drawLine(9, 2, 15, 2); @@ -134,7 +137,7 @@ void Style::polygonStyle() << TYPE(PIPARE) << TYPE(PRCARE) << SUBTYPE(MARKUL, 3) << TYPE(CONZNE); } -void Style::lineStyle() +void Style::lineStyle(qreal ratio) { _lines[TYPE(BUISGL)] = Line(QPen(QColor("#966118"), 1.5)); _lines[TYPE(DEPCNT)] = Line(QPen(QColor("#659aef"), 1, Qt::SolidLine)); @@ -165,7 +168,7 @@ void Style::lineStyle() _lines[TYPE(FERYRT)].setTextFontSize(Small); _lines[TYPE(I_FERYRT)] = Line(QImage(":/marine/ferry-line.png")); _lines[TYPE(I_FERYRT)].setTextFontSize(Small); - _lines[TYPE(RAILWY)] = Line(railroad()); + _lines[TYPE(RAILWY)] = Line(railroad(ratio)); _lines[TYPE(ROADWY)] = Line(QPen(QColor("#000000"), 2, Qt::SolidLine)); _lines[TYPE(GATCON)] = Line(QPen(QColor("#000000"), 2, Qt::SolidLine)); _lines[TYPE(I_GATCON)] = Line(QPen(QColor("#000000"), 2, Qt::SolidLine)); @@ -185,7 +188,7 @@ void Style::lineStyle() _lines[TYPE(CANALS)] = Line(QPen(QColor("#9fc4e1"), 2)); } -void Style::pointStyle() +void Style::pointStyle(qreal ratio) { _points[SUBTYPE(BUAARE, 1)].setTextFontSize(Large); _points[SUBTYPE(BUAARE, 5)].setTextFontSize(Large); @@ -299,34 +302,49 @@ void Style::pointStyle() _points[TYPE(SLCONS)] = Point(QImage(":/marine/construction.png"), Small); _points[TYPE(CURENT)] = Point(QImage(":/marine/current.png")); - _points[SUBTYPE(SMCFAC, 7)] = Point(QImage(":/POI/restaurant-11.png"), Small); - _points[SUBTYPE(SMCFAC, 11)] = Point(QImage(":/POI/pharmacy-11.png"), Small); - _points[SUBTYPE(SMCFAC, 12)] = Point(QImage(":/POI/drinking-water-11.png"), + _points[SUBTYPE(SMCFAC, 7)] = Point(svg2img(":/POI/restaurant-11.svg", + ratio), Small); + _points[SUBTYPE(SMCFAC, 11)] = Point(svg2img(":/POI/pharmacy-11.svg", + ratio), Small); + _points[SUBTYPE(SMCFAC, 12)] = Point(svg2img(":/POI/drinking-water-11.svg", + ratio), Small); + _points[SUBTYPE(SMCFAC, 13)] = Point(svg2img(":/POI/fuel-11.svg", ratio), Small); - _points[SUBTYPE(SMCFAC, 13)] = Point(QImage(":/POI/fuel-11.png"), Small); - _points[SUBTYPE(SMCFAC, 18)] = Point(QImage(":/POI/toilet-11.png"), Small); - _points[SUBTYPE(SMCFAC, 20)] = Point(QImage(":/POI/telephone-11.png"), Small); - _points[SUBTYPE(SMCFAC, 22)] = Point(QImage(":/POI/parking-11.png"), Small); - _points[SUBTYPE(SMCFAC, 25)] = Point(QImage(":/POI/campsite-11.png"), Small); + _points[SUBTYPE(SMCFAC, 18)] = Point(svg2img(":/POI/toilet-11.svg", ratio), + Small); + _points[SUBTYPE(SMCFAC, 20)] = Point(svg2img(":/POI/telephone-11.svg", + ratio), Small); + _points[SUBTYPE(SMCFAC, 22)] = Point(svg2img(":/POI/parking-11.svg", ratio), + Small); + _points[SUBTYPE(SMCFAC, 25)] = Point(svg2img(":/POI/campsite-11.svg", + ratio), Small); _points[TYPE(BUISGL)] = Point(QImage(":/marine/building.png"), Small); - _points[SUBTYPE(BUISGL, 2)] = Point(QImage(":/POI/harbor-11.png"), Small); - _points[SUBTYPE(BUISGL, 5)] = Point(QImage(":/POI/hospital-11.png"), Small); - _points[SUBTYPE(BUISGL, 6)] = Point(QImage(":/POI/post-11.png"), Small); - _points[SUBTYPE(BUISGL, 7)] = Point(QImage(":/POI/lodging-11.png"), Small); - _points[SUBTYPE(BUISGL, 9)] = Point(QImage(":/POI/police-11.png"), Small); - _points[SUBTYPE(BUISGL, 13)] = Point(QImage(":/POI/bank-11.png"), Small); - _points[SUBTYPE(BUISGL, 19)] = Point(QImage(":/POI/school-11.png"), Small); - _points[SUBTYPE(BUISGL, 20)] = Point(QImage(":/POI/religious-christian-11.png"), + _points[SUBTYPE(BUISGL, 2)] = Point(svg2img(":/POI/harbor-11.svg", ratio), Small); - _points[SUBTYPE(BUISGL, 22)] = Point(QImage(":/POI/religious-jewish-11.png"), + _points[SUBTYPE(BUISGL, 5)] = Point(svg2img(":/POI/hospital-11.svg", ratio), Small); - _points[SUBTYPE(BUISGL, 26)] = Point(QImage(":/POI/religious-muslim-11.png"), + _points[SUBTYPE(BUISGL, 6)] = Point(svg2img(":/POI/post-11.svg", ratio), Small); + _points[SUBTYPE(BUISGL, 7)] = Point(svg2img(":/POI/lodging-11.svg", ratio), + Small); + _points[SUBTYPE(BUISGL, 9)] = Point(svg2img(":/POI/police-11.svg", ratio), + Small); + _points[SUBTYPE(BUISGL, 13)] = Point(svg2img(":/POI/bank-11.svg", ratio), + Small); + _points[SUBTYPE(BUISGL, 19)] = Point(svg2img(":/POI/school-11.svg", ratio), + Small); + _points[SUBTYPE(BUISGL, 20)] = Point(svg2img(":/POI/religious-christian-11.svg", + ratio), Small); + _points[SUBTYPE(BUISGL, 22)] = Point(svg2img(":/POI/religious-jewish-11.svg", + ratio), Small); + _points[SUBTYPE(BUISGL, 26)] = Point(svg2img(":/POI/religious-muslim-11.svg", + ratio), Small); _points[SUBTYPE(BUISGL, 33)] = Point(QImage(":/marine/pylon.png"), Small); - _points[SUBTYPE(BUISGL, 42)] = Point(QImage(":/POI/bus-11.png"), Small); + _points[SUBTYPE(BUISGL, 42)] = Point(svg2img(":/POI/bus-11.svg", ratio), + Small); } -Style::Style() +Style::Style(qreal ratio) { _light = QImage(":/marine/light.png"); _signal = QImage(":/marine/fog-signal.png"); @@ -336,8 +354,8 @@ Style::Style() _small = pixelSizeFont(10); polygonStyle(); - lineStyle(); - pointStyle(); + lineStyle(ratio); + pointStyle(ratio); } const Style::Line &Style::line(uint type) const diff --git a/src/map/ENC/style.h b/src/map/ENC/style.h index 065bfeac..8ad913d7 100644 --- a/src/map/ENC/style.h +++ b/src/map/ENC/style.h @@ -90,7 +90,7 @@ public: QImage _img; }; - Style(); + Style(qreal ratio); const Line &line(uint type) const; const Polygon &polygon(uint type) const; @@ -103,8 +103,8 @@ public: private: void polygonStyle(); - void lineStyle(); - void pointStyle(); + void lineStyle(qreal ratio); + void pointStyle(qreal ratio); QMap _lines; QMap _polygons; diff --git a/src/map/IMG/mapdata.cpp b/src/map/IMG/mapdata.cpp index a72cb818..e4dfe84c 100644 --- a/src/map/IMG/mapdata.cpp +++ b/src/map/IMG/mapdata.cpp @@ -69,19 +69,19 @@ void MapData::points(const RectC &rect, int bits, QList *points) _tileTree.Search(min, max, pointCb, &ctx); } -void MapData::load() +void MapData::load(qreal ratio) { Q_ASSERT(!_style); if (_typ) - _style = new Style(_typ); + _style = new Style(ratio, _typ); else { QString typFile(ProgramPaths::typFile()); if (QFileInfo::exists(typFile)) { SubFile typ(&typFile); - _style = new Style(&typ); + _style = new Style(ratio, &typ); } else - _style = new Style(); + _style = new Style(ratio); } } diff --git a/src/map/IMG/mapdata.h b/src/map/IMG/mapdata.h index 2d523f04..b850fe34 100644 --- a/src/map/IMG/mapdata.h +++ b/src/map/IMG/mapdata.h @@ -66,7 +66,7 @@ public: QList *lines); void points(const RectC &rect, int bits, QList *points); - void load(); + void load(qreal ratio); void clear(); const QString &fileName() const {return _fileName;} diff --git a/src/map/IMG/style.cpp b/src/map/IMG/style.cpp index 5f7b8129..5917426a 100644 --- a/src/map/IMG/style.cpp +++ b/src/map/IMG/style.cpp @@ -1,8 +1,11 @@ #include +#include #include +#include "common/util.h" #include "style.h" using namespace IMG; +using namespace Util; static QFont pixelSizeFont(int pixelSize) { @@ -146,9 +149,10 @@ static bool skipLabel(SubFile *file, SubFile::Handle &hdl) return true; } -static QImage railroad() +static QImage railroad(qreal ratio) { - QImage img(16, 4, QImage::Format_ARGB32_Premultiplied); + QImage img(16 * ratio, 4 * ratio, QImage::Format_ARGB32_Premultiplied); + img.setDevicePixelRatio(ratio); img.fill(QColor("#717171")); QPainter p(&img); p.setPen(QPen(Qt::white, 2)); @@ -157,7 +161,6 @@ static QImage railroad() return img; } - void Style::defaultPolygonStyle() { _polygons[TYPE(0x01)] = Polygon(QBrush("#dfd3b5")); @@ -307,7 +310,7 @@ void Style::defaultPolygonStyle() << TYPE(0x13) << 0x10900 << 0x10613 << 0x10409 << 0x10503 << 0x1060a; } -void Style::defaultLineStyle() +void Style::defaultLineStyle(qreal ratio) { _lines[TYPE(0x01)] = Line(QPen(QColor("#9bd772"), 2, Qt::SolidLine), QPen(QColor("#72a35a"), 6, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); @@ -332,7 +335,7 @@ void Style::defaultLineStyle() QPen(QColor("#e8a541"), 6, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); _lines[TYPE(0x0c)] = Line(QPen(QColor("#ffffff"), 3, Qt::SolidLine), QPen(QColor("#d5cdc0"), 5, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); - _lines[TYPE(0x14)] = Line(railroad()); + _lines[TYPE(0x14)] = Line(railroad(ratio)); _lines[TYPE(0x16)] = Line(QPen(QColor("#aba083"), 1, Qt::DotLine)); _lines[TYPE(0x18)] = Line(QPen(QColor("#9fc4e1"), 2, Qt::SolidLine)); _lines[TYPE(0x18)].setTextColor(QColor("#9fc4e1")); @@ -406,7 +409,7 @@ void Style::defaultLineStyle() _lines[0x10611] = Line(QPen(QColor("#eb49eb"), 1, Qt::DashLine)); } -void Style::defaultPointStyle() +void Style::defaultPointStyle(qreal ratio) { // Countries _points[TYPE(0x14)].setTextColor(QColor("#505145")); @@ -425,137 +428,137 @@ void Style::defaultPointStyle() _points[TYPE(0x03)].setTextFontSize(Large); // POI - _points[0x2a00] = Point(QImage(":/POI/restaurant-11.png")); - _points[0x2a01] = Point(QImage(":/POI/restaurant-11.png")); - _points[0x2a02] = Point(QImage(":/POI/restaurant-noodle-11.png")); - _points[0x2a03] = Point(QImage(":/POI/bbq-11.png")); - _points[0x2a04] = Point(QImage(":/POI/restaurant-noodle-11.png")); - _points[0x2a05] = Point(QImage(":/POI/bakery-11.png")); - _points[0x2a06] = Point(QImage(":/POI/restaurant-11.png")); - _points[0x2a07] = Point(QImage(":/POI/fast-food-11.png")); - _points[0x2a08] = Point(QImage(":/POI/restaurant-pizza-11.png")); - _points[0x2a09] = Point(QImage(":/POI/restaurant-11.png")); - _points[0x2a0a] = Point(QImage(":/POI/restaurant-pizza-11.png")); - _points[0x2a0b] = Point(QImage(":/POI/restaurant-seafood-11.png")); - _points[0x2a0c] = Point(QImage(":/POI/restaurant-11.png")); - _points[0x2a0d] = Point(QImage(":/POI/bakery-11.png")); - _points[0x2a0e] = Point(QImage(":/POI/cafe-11.png")); - _points[0x2a0f] = Point(QImage(":/POI/restaurant-11.png")); - _points[0x2a10] = Point(QImage(":/POI/restaurant-11.png")); - _points[0x2a11] = Point(QImage(":/POI/restaurant-11.png")); - _points[0x2a12] = Point(QImage(":/POI/restaurant-11.png")); - _points[0x2a13] = Point(QImage(":/POI/restaurant-11.png")); + _points[0x2a00] = Point(svg2img(":/POI/restaurant-11.svg", ratio)); + _points[0x2a01] = Point(svg2img(":/POI/restaurant-11.svg", ratio)); + _points[0x2a02] = Point(svg2img(":/POI/restaurant-noodle-11.svg", ratio)); + _points[0x2a03] = Point(svg2img(":/POI/bbq-11-11.svg", ratio)); + _points[0x2a04] = Point(svg2img(":/POI/restaurant-noodle-11.svg", ratio)); + _points[0x2a05] = Point(svg2img(":/POI/bakery-11.svg", ratio)); + _points[0x2a06] = Point(svg2img(":/POI/restaurant-11.svg", ratio)); + _points[0x2a07] = Point(svg2img(":/POI/fast-food-11.svg", ratio)); + _points[0x2a08] = Point(svg2img(":/POI/restaurant-pizza-11.svg", ratio)); + _points[0x2a09] = Point(svg2img(":/POI/restaurant-11.svg", ratio)); + _points[0x2a0a] = Point(svg2img(":/POI/restaurant-pizza-11.svg", ratio)); + _points[0x2a0b] = Point(svg2img(":/POI/restaurant-seafood-11.svg", ratio)); + _points[0x2a0c] = Point(svg2img(":/POI/restaurant-11.svg", ratio)); + _points[0x2a0d] = Point(svg2img(":/POI/bakery-11.svg", ratio)); + _points[0x2a0e] = Point(svg2img(":/POI/cafe-11.svg", ratio)); + _points[0x2a0f] = Point(svg2img(":/POI/restaurant-11.svg", ratio)); + _points[0x2a10] = Point(svg2img(":/POI/restaurant-11.svg", ratio)); + _points[0x2a11] = Point(svg2img(":/POI/restaurant-11.svg", ratio)); + _points[0x2a12] = Point(svg2img(":/POI/restaurant-11.svg", ratio)); + _points[0x2a13] = Point(svg2img(":/POI/restaurant-11.svg", ratio)); - _points[0x2b01] = Point(QImage(":/POI/lodging-11.png")); - _points[0x2b02] = Point(QImage(":/POI/lodging-11.png")); - _points[0x2b03] = Point(QImage(":/POI/campsite-11.png")); - _points[0x2b04] = Point(QImage(":/POI/village-11.png")); - _points[0x2b06] = Point(QImage(":/POI/shelter-11.png")); + _points[0x2b01] = Point(svg2img(":/POI/lodging-11.svg", ratio)); + _points[0x2b02] = Point(svg2img(":/POI/lodging-11.svg", ratio)); + _points[0x2b03] = Point(svg2img(":/POI/campsite-11.svg", ratio)); + _points[0x2b04] = Point(svg2img(":/POI/village-11.svg", ratio)); + _points[0x2b06] = Point(svg2img(":/POI/shelter-11.svg", ratio)); - _points[0x2c01] = Point(QImage(":/POI/amusement-park-11.png")); - _points[0x2c02] = Point(QImage(":/POI/museum-11.png")); - _points[0x2c03] = Point(QImage(":/POI/library-11.png")); - _points[0x2c04] = Point(QImage(":/POI/landmark-11.png")); - _points[0x2c05] = Point(QImage(":/POI/school-11.png")); - _points[0x2c06] = Point(QImage(":/POI/garden-11.png")); - _points[0x2c07] = Point(QImage(":/POI/zoo-11.png")); - _points[0x2c08] = Point(QImage(":/POI/soccer-11.png")); - _points[0x2c0a] = Point(QImage(":/POI/bar-11.png")); - _points[0x2c0b] = Point(QImage(":/POI/place-of-worship-11.png")); - _points[0x2c0d] = Point(QImage(":/POI/religious-muslim-11.png")); - _points[0x2c0e] = Point(QImage(":/POI/religious-christian-11.png")); - _points[0x2c10] = Point(QImage(":/POI/religious-jewish-11.png")); - _points[0x2d01] = Point(QImage(":/POI/theatre-11.png")); - _points[0x2d02] = Point(QImage(":/POI/bar-11.png")); - _points[0x2d03] = Point(QImage(":/POI/cinema-11.png")); - _points[0x2d04] = Point(QImage(":/POI/casino-11.png")); - _points[0x2d05] = Point(QImage(":/POI/golf-11.png")); - _points[0x2d06] = Point(QImage(":/POI/skiing-11.png")); - _points[0x2d07] = Point(QImage(":/POI/bowling-alley-11.png")); - _points[0x2d09] = Point(QImage(":/POI/swimming-11.png")); - _points[0x2d0a] = Point(QImage(":/POI/fitness-centre-11.png")); - _points[0x2d0b] = Point(QImage(":/POI/airfield-11.png")); + _points[0x2c01] = Point(svg2img(":/POI/amusement-park-11.svg", ratio)); + _points[0x2c02] = Point(svg2img(":/POI/museum-11.svg", ratio)); + _points[0x2c03] = Point(svg2img(":/POI/library-11-11.svg", ratio)); + _points[0x2c04] = Point(svg2img(":/POI/landmark-11.svg", ratio)); + _points[0x2c05] = Point(svg2img(":/POI/school-11.svg", ratio)); + _points[0x2c06] = Point(svg2img(":/POI/garden-11.svg", ratio)); + _points[0x2c07] = Point(svg2img(":/POI/zoo-11.svg", ratio)); + _points[0x2c08] = Point(svg2img(":/POI/soccer-11.svg", ratio)); + _points[0x2c0a] = Point(svg2img(":/POI/bar-11.svg", ratio)); + _points[0x2c0b] = Point(svg2img(":/POI/place-of-worship-11.svg", ratio)); + _points[0x2c0d] = Point(svg2img(":/POI/religious-muslim-11.svg", ratio)); + _points[0x2c0e] = Point(svg2img(":/POI/religious-christian-11.svg", ratio)); + _points[0x2c10] = Point(svg2img(":/POI/religious-jewish-11.svg", ratio)); + _points[0x2d01] = Point(svg2img(":/POI/theatre-11.svg", ratio)); + _points[0x2d02] = Point(svg2img(":/POI/bar-11.svg", ratio)); + _points[0x2d03] = Point(svg2img(":/POI/cinema-11.svg", ratio)); + _points[0x2d04] = Point(svg2img(":/POI/casino-11.svg", ratio)); + _points[0x2d05] = Point(svg2img(":/POI/golf-11.svg", ratio)); + _points[0x2d06] = Point(svg2img(":/POI/skiing-11.svg", ratio)); + _points[0x2d07] = Point(svg2img(":/POI/bowling-alley-11.svg", ratio)); + _points[0x2d09] = Point(svg2img(":/POI/swimming-11.svg", ratio)); + _points[0x2d0a] = Point(svg2img(":/POI/fitness-centre-11.svg", ratio)); + _points[0x2d0b] = Point(svg2img(":/POI/airfield-11-11.svg", ratio)); - _points[0x2e02] = Point(QImage(":/POI/grocery-11.png")); - _points[0x2e03] = Point(QImage(":/POI/shop-11.png")); - _points[0x2e05] = Point(QImage(":/POI/pharmacy-11.png")); - _points[0x2e06] = Point(QImage(":/POI/convenience-11.png")); - _points[0x2e07] = Point(QImage(":/POI/clothing-store-11.png")); - _points[0x2e08] = Point(QImage(":/POI/garden-centre-11.png")); - _points[0x2e09] = Point(QImage(":/POI/furniture-11.png")); - _points[0x2e0a] = Point(QImage(":/POI/shop-11.png")); - _points[0x2e0c] = Point(QImage(":/POI/shop-11.png")); + _points[0x2e02] = Point(svg2img(":/POI/grocery-11.svg", ratio)); + _points[0x2e03] = Point(svg2img(":/POI/shop-11.svg", ratio)); + _points[0x2e05] = Point(svg2img(":/POI/pharmacy-11.svg", ratio)); + _points[0x2e06] = Point(svg2img(":/POI/convenience-11.svg", ratio)); + _points[0x2e07] = Point(svg2img(":/POI/clothing-store-11.svg", ratio)); + _points[0x2e08] = Point(svg2img(":/POI/garden-centre-11.svg", ratio)); + _points[0x2e09] = Point(svg2img(":/POI/furniture-11.svg", ratio)); + _points[0x2e0a] = Point(svg2img(":/POI/shop-11.svg", ratio)); + _points[0x2e0c] = Point(svg2img(":/POI/shop-11.svg", ratio)); - _points[0x2f01] = Point(QImage(":/POI/fuel-11.png")); - _points[0x2f02] = Point(QImage(":/POI/car-rental-11.png")); - _points[0x2f03] = Point(QImage(":/POI/car-repair-11.png")); - _points[0x2f04] = Point(QImage(":/POI/airport-11.png")); - _points[0x2f05] = Point(QImage(":/POI/post-11.png")); - _points[0x2f06] = Point(QImage(":/POI/bank-11.png")); - _points[0x2f07] = Point(QImage(":/POI/car-11.png")); - _points[0x2f08] = Point(QImage(":/POI/bus-11.png")); - _points[0x2f09] = Point(QImage(":/POI/harbor-11.png")); - _points[0x2f0b] = Point(QImage(":/POI/parking-11.png")); + _points[0x2f01] = Point(svg2img(":/POI/fuel-11.svg", ratio)); + _points[0x2f02] = Point(svg2img(":/POI/car-rental-11.svg", ratio)); + _points[0x2f03] = Point(svg2img(":/POI/car-repair-11.svg", ratio)); + _points[0x2f04] = Point(svg2img(":/POI/airport-11.svg", ratio)); + _points[0x2f05] = Point(svg2img(":/POI/post-11.svg", ratio)); + _points[0x2f06] = Point(svg2img(":/POI/bank-11.svg", ratio)); + _points[0x2f07] = Point(svg2img(":/POI/car-11.svg", ratio)); + _points[0x2f08] = Point(svg2img(":/POI/bus-11.svg", ratio)); + _points[0x2f09] = Point(svg2img(":/POI/harbor-11.svg", ratio)); + _points[0x2f0b] = Point(svg2img(":/POI/parking-11.svg", ratio)); _points[0x2f0b].setTextFontSize(None); - _points[0x2f0c] = Point(QImage(":/POI/toilet-11.png")); + _points[0x2f0c] = Point(svg2img(":/POI/toilet-11.svg", ratio)); _points[0x2f0c].setTextFontSize(None); - _points[0x2f10] = Point(QImage(":/POI/hairdresser-11.png")); + _points[0x2f10] = Point(svg2img(":/POI/hairdresser-11.svg", ratio)); _points[0x2f12].setTextFontSize(None); - _points[0x2f13] = Point(QImage(":/POI/hardware-11.png")); - _points[0x2f17] = Point(QImage(":/POI/bus-11.png")); + _points[0x2f13] = Point(svg2img(":/POI/hardware-11.svg", ratio)); + _points[0x2f17] = Point(svg2img(":/POI/bus-11.svg", ratio)); - _points[0x3001] = Point(QImage(":/POI/police-11.png")); - _points[0x3002] = Point(QImage(":/POI/hospital-11.png")); - _points[0x3003] = Point(QImage(":/POI/town-hall-11.png")); - _points[0x3006] = Point(QImage(":/POI/entrance-alt1-11.png")); - _points[0x3007] = Point(QImage(":/POI/town-hall-11.png")); - _points[0x3008] = Point(QImage(":/POI/fire-station-11.png")); + _points[0x3001] = Point(svg2img(":/POI/police-11.svg", ratio)); + _points[0x3002] = Point(svg2img(":/POI/hospital-11.svg", ratio)); + _points[0x3003] = Point(svg2img(":/POI/town-hall-11.svg", ratio)); + _points[0x3006] = Point(svg2img(":/POI/entrance-alt1-11.svg", ratio)); + _points[0x3007] = Point(svg2img(":/POI/town-hall-11.svg", ratio)); + _points[0x3008] = Point(svg2img(":/POI/fire-station-11.svg", ratio)); - _points[0x4000] = Point(QImage(":/POI/golf-11.png")); - _points[0x4300] = Point(QImage(":/POI/harbor-11.png")); - _points[0x4400] = Point(QImage(":/POI/fuel-11.png")); - _points[0x4500] = Point(QImage(":/POI/restaurant-11.png")); - _points[0x4600] = Point(QImage(":/POI/bar-11.png")); - _points[0x4900] = Point(QImage(":/POI/park-11.png")); - _points[0x4a00] = Point(QImage(":/POI/picnic-site-11.png")); - _points[0x4c00] = Point(QImage(":/POI/information-11.png")); - _points[0x4800] = Point(QImage(":/POI/campsite-11.png")); - _points[0x4a00] = Point(QImage(":/POI/picnic-site-11.png")); - _points[0x4b00] = Point(QImage(":/POI/hospital-11.png")); - _points[0x4c00] = Point(QImage(":/POI/information-11.png")); - _points[0x4d00] = Point(QImage(":/POI/parking-11.png")); + _points[0x4000] = Point(svg2img(":/POI/golf-11.svg", ratio)); + _points[0x4300] = Point(svg2img(":/POI/harbor-11.svg", ratio)); + _points[0x4400] = Point(svg2img(":/POI/fuel-11.svg", ratio)); + _points[0x4500] = Point(svg2img(":/POI/restaurant-11.svg", ratio)); + _points[0x4600] = Point(svg2img(":/POI/bar-11.svg", ratio)); + _points[0x4900] = Point(svg2img(":/POI/park-11.svg", ratio)); + _points[0x4a00] = Point(svg2img(":/POI/picnic-site-11.svg", ratio)); + _points[0x4c00] = Point(svg2img(":/POI/information-11.svg", ratio)); + _points[0x4800] = Point(svg2img(":/POI/campsite-11.svg", ratio)); + _points[0x4a00] = Point(svg2img(":/POI/picnic-site-11.svg", ratio)); + _points[0x4b00] = Point(svg2img(":/POI/hospital-11.svg", ratio)); + _points[0x4c00] = Point(svg2img(":/POI/information-11.svg", ratio)); + _points[0x4d00] = Point(svg2img(":/POI/parking-11.svg", ratio)); _points[0x4d00].setTextFontSize(None); - _points[0x4e00] = Point(QImage(":/POI/toilet-11.png")); + _points[0x4e00] = Point(svg2img(":/POI/toilet-11.svg", ratio)); _points[0x4e00].setTextFontSize(None); - _points[0x5000] = Point(QImage(":/POI/drinking-water-11.png")); + _points[0x5000] = Point(svg2img(":/POI/drinking-water-11.svg", ratio)); _points[0x5000].setTextFontSize(None); - _points[0x5100] = Point(QImage(":/POI/telephone-11.png")); - _points[0x5200] = Point(QImage(":/POI/viewpoint-11.png")); - _points[0x5300] = Point(QImage(":/POI/skiing-11.png")); - _points[0x5400] = Point(QImage(":/POI/swimming-11.png")); - _points[0x5500] = Point(QImage(":/POI/dam-11.png")); - _points[0x5700] = Point(QImage(":/POI/danger-11.png")); - _points[0x5800] = Point(QImage(":/POI/roadblock-11.png")); - _points[0x5900] = Point(QImage(":/POI/airport-11.png")); - _points[0x5901] = Point(QImage(":/POI/airport-11.png")); - _points[0x5904] = Point(QImage(":/POI/heliport-11.png")); + _points[0x5100] = Point(svg2img(":/POI/telephone-11.svg", ratio)); + _points[0x5200] = Point(svg2img(":/POI/viewpoint-11.svg", ratio)); + _points[0x5300] = Point(svg2img(":/POI/skiing-11.svg", ratio)); + _points[0x5400] = Point(svg2img(":/POI/swimming-11.svg", ratio)); + _points[0x5500] = Point(svg2img(":/POI/dam-11.svg", ratio)); + _points[0x5700] = Point(svg2img(":/POI/danger-11.svg", ratio)); + _points[0x5800] = Point(svg2img(":/POI/roadblock-11.svg", ratio)); + _points[0x5900] = Point(svg2img(":/POI/airport-11.svg", ratio)); + _points[0x5901] = Point(svg2img(":/POI/airport-11.svg", ratio)); + _points[0x5904] = Point(svg2img(":/POI/heliport-11.svg", ratio)); - _points[0x6401] = Point(QImage(":/POI/bridge-11.png")); - _points[0x6402] = Point(QImage(":/POI/building-alt1-11.png")); - _points[0x6403] = Point(QImage(":/POI/cemetery-11.png")); - _points[0x6404] = Point(QImage(":/POI/religious-christian-11.png")); - _points[0x6407] = Point(QImage(":/POI/dam-11.png")); - _points[0x6408] = Point(QImage(":/POI/hospital-11.png")); - _points[0x6409] = Point(QImage(":/POI/dam-11.png")); - _points[0x640d] = Point(QImage(":/POI/communications-tower-11.png")); - _points[0x640e] = Point(QImage(":/POI/park-11.png")); - _points[0x640f] = Point(QImage(":/POI/post-11.png")); - _points[0x6411] = Point(QImage(":/POI/communications-tower-11.png")); + _points[0x6401] = Point(svg2img(":/POI/bridge-11.svg", ratio)); + _points[0x6402] = Point(svg2img(":/POI/building-alt1-11.svg", ratio)); + _points[0x6403] = Point(svg2img(":/POI/cemetery-11.svg", ratio)); + _points[0x6404] = Point(svg2img(":/POI/religious-christian-11.svg", ratio)); + _points[0x6407] = Point(svg2img(":/POI/dam-11.svg", ratio)); + _points[0x6408] = Point(svg2img(":/POI/hospital-11.svg", ratio)); + _points[0x6409] = Point(svg2img(":/POI/dam-11.svg", ratio)); + _points[0x640d] = Point(svg2img(":/POI/communications-tower-11.svg", ratio)); + _points[0x640e] = Point(svg2img(":/POI/park-11.svg", ratio)); + _points[0x640f] = Point(svg2img(":/POI/post-11.svg", ratio)); + _points[0x6411] = Point(svg2img(":/POI/communications-tower-11.svg", ratio)); - _points[0x6508] = Point(QImage(":/POI/waterfall-11.png")); - _points[0x6513] = Point(QImage(":/POI/wetland-11.png")); - _points[0x6604] = Point(QImage(":/POI/beach-11.png")); - _points[0x6616] = Point(QImage(":/POI/mountain-11.png")); + _points[0x6508] = Point(svg2img(":/POI/waterfall-11.svg", ratio)); + _points[0x6513] = Point(svg2img(":/POI/wetland-11.svg", ratio)); + _points[0x6604] = Point(svg2img(":/POI/beach-11.svg", ratio)); + _points[0x6616] = Point(svg2img(":/POI/mountain-11.svg", ratio)); // NT types @@ -1231,16 +1234,16 @@ bool Style::parseTYPFile(SubFile *file) return true; } -Style::Style(SubFile *typ) +Style::Style(qreal ratio, SubFile *typ) { _large = pixelSizeFont(16); _normal = pixelSizeFont(14); _small = pixelSizeFont(12); _extraSmall = pixelSizeFont(10); - defaultLineStyle(); + defaultLineStyle(ratio); defaultPolygonStyle(); - defaultPointStyle(); + defaultPointStyle(ratio); if (typ) parseTYPFile(typ); diff --git a/src/map/IMG/style.h b/src/map/IMG/style.h index 1e3775ea..11aa76e3 100644 --- a/src/map/IMG/style.h +++ b/src/map/IMG/style.h @@ -89,7 +89,7 @@ public: }; - Style(SubFile *typ = 0); + Style(qreal ratio, SubFile *typ = 0); const Line &line(quint32 type) const; const Polygon &polygon(quint32 type) const; @@ -165,8 +165,8 @@ private: bool parseDrawOrder(SubFile *file, SubFile::Handle &hdl, const Section §ion); void defaultPolygonStyle(); - void defaultLineStyle(); - void defaultPointStyle(); + void defaultLineStyle(qreal ratio); + void defaultPointStyle(qreal ratio); static bool itemInfo(SubFile *file, SubFile::Handle &hdl, const Section §ion, ItemInfo &info); diff --git a/src/map/imgmap.cpp b/src/map/imgmap.cpp index 305a98a4..a9475900 100644 --- a/src/map/imgmap.cpp +++ b/src/map/imgmap.cpp @@ -86,7 +86,7 @@ void IMGMap::load(const Projection &in, const Projection &out, _dataBounds = limitBounds(_data.first()->bounds(), _projection); for (int i = 0; i < _data.size(); i++) - _data.at(i)->load(); + _data.at(i)->load(devicelRatio); updateTransform();