From b7f023a99be8d24929c18178f78aa0455b3984cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Fri, 15 Nov 2024 23:21:38 +0100
Subject: [PATCH] Refactoring

---
 data/style/style.xml                            | 6 +++---
 gpxsee.qrc                                      | 4 ++--
 icons/map/symbols/{water-arrow.svg => flow.svg} | 0
 icons/map/symbols/{arrow.svg => oneway.svg}     | 0
 src/map/IMG/rastertile.cpp                      | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename icons/map/symbols/{water-arrow.svg => flow.svg} (100%)
 rename icons/map/symbols/{arrow.svg => oneway.svg} (100%)

diff --git a/data/style/style.xml b/data/style/style.xml
index 52f466cc..e240f8d4 100644
--- a/data/style/style.xml
+++ b/data/style/style.xml
@@ -93,7 +93,7 @@
         <line stroke="#9fc4e1" stroke-width="1.2"/>
         <pathText fill="#9fc4e1" font-size="12" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1"/>
         <rule e="way" k="*" v="*" zoom-min="12">
-            <lineSymbol src=":/symbols/water-arrow.svg" symbol-width="16" symbol-height="8"/>
+            <lineSymbol src=":/symbols/flow.svg" symbol-width="16" symbol-height="8"/>
         </rule>
     </rule>
     <rule e="way" k="waterway" v="stream|drain|ditch">
@@ -106,7 +106,7 @@
                 <line stroke="#9fc4e1" stroke-width="0.6"/>
                 <pathText fill="#9fc4e1" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1"/>
                 <rule e="way" k="name" v="*">
-                    <lineSymbol src=":/symbols/water-arrow.svg" symbol-width="16" symbol-height="8"/>
+                    <lineSymbol src=":/symbols/flow.svg" symbol-width="16" symbol-height="8"/>
                 </rule>
             </rule>
         </rule>
@@ -293,7 +293,7 @@
         <rule e="way" k="*" v="*" zoom-min="15">
             <pathText fill="#000000" font-size="10" k="name" priority="-7" stroke="#FFFFFF" stroke-width="1"/>
             <rule e="way" k="oneway" v="yes|true|1" zoom-min="16">
-                <lineSymbol priority="-50" src=":/symbols/arrow.svg" symbol-width="16" symbol-height="8"/>
+                <lineSymbol priority="-50" src=":/symbols/oneway.svg" symbol-width="16" symbol-height="8"/>
             </rule>
         </rule>
     </rule>
diff --git a/gpxsee.qrc b/gpxsee.qrc
index 40b31c64..e818c8a5 100644
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@@ -6,10 +6,10 @@
 
 	<!-- Common map stuff -->
 	<qresource prefix="/symbols">
-		<file alias="arrow.svg">icons/map/symbols/arrow.svg</file>
 		<file alias="cliff.svg">icons/map/symbols/cliff.svg</file>
 		<file alias="exit.svg">icons/map/symbols/exit.svg</file>
-		<file alias="water-arrow.svg">icons/map/symbols/water-arrow.svg</file>
+		<file alias="flow.svg">icons/map/symbols/flow.svg</file>
+		<file alias="oneway.svg">icons/map/symbols/oneway.svg</file>
 	</qresource>
 
 	<!-- POIs (IMG, Mapsforge & ENC style) -->
diff --git a/icons/map/symbols/water-arrow.svg b/icons/map/symbols/flow.svg
similarity index 100%
rename from icons/map/symbols/water-arrow.svg
rename to icons/map/symbols/flow.svg
diff --git a/icons/map/symbols/arrow.svg b/icons/map/symbols/oneway.svg
similarity index 100%
rename from icons/map/symbols/arrow.svg
rename to icons/map/symbols/oneway.svg
diff --git a/src/map/IMG/rastertile.cpp b/src/map/IMG/rastertile.cpp
index 52dd76ad..634aaea1 100644
--- a/src/map/IMG/rastertile.cpp
+++ b/src/map/IMG/rastertile.cpp
@@ -513,8 +513,8 @@ void RasterTile::render()
 	QList<TextItem*> textItems;
 	QImage arrows[2];
 
-	arrows[ROAD] = Util::svg2img(":/symbols/arrow.svg", _ratio);
-	arrows[WATER] = Util::svg2img(":/symbols/water-arrow.svg", _ratio);
+	arrows[ROAD] = Util::svg2img(":/symbols/oneway.svg", _ratio);
+	arrows[WATER] = Util::svg2img(":/symbols/flow.svg", _ratio);
 
 	fetchData(polygons, lines, points);
 	ll2xy(polygons);