From 8d3784e142b80c39141dc9a6965c4d0fd53f178f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Mon, 18 Nov 2024 10:59:37 +0100
Subject: [PATCH] Make the patterns work with Qt5

---
 data/style/style.xml                  | 12 ++++++------
 icons/map/patterns/cemetery.svg       | 11 ++---------
 icons/map/patterns/military-area.svg  | 10 ++--------
 icons/map/patterns/nature-reserve.svg | 10 ++--------
 icons/map/patterns/orchard.svg        | 10 ++--------
 icons/map/patterns/vineyard.svg       | 10 ++--------
 icons/map/patterns/wetland.svg        | 10 ++--------
 7 files changed, 18 insertions(+), 55 deletions(-)

diff --git a/data/style/style.xml b/data/style/style.xml
index 01784f46..98a0ea4e 100644
--- a/data/style/style.xml
+++ b/data/style/style.xml
@@ -49,10 +49,10 @@
         <area fill="#e4efcf"/>
     </rule>
     <rule e="way" closed="yes" k="landuse" v="orchard" zoom-min="10">
-        <area src=":/patterns/orchard.svg" symbol-width="28"/>
+        <area src=":/patterns/orchard.svg" symbol-width="7"/>
     </rule>
     <rule e="way" closed="yes" k="landuse" v="vineyard" zoom-min="10">
-        <area src=":/patterns/vineyard.svg" symbol-width="28" symbol-height="32"/>
+        <area src=":/patterns/vineyard.svg" symbol-width="7" symbol-height="8"/>
     </rule>
 
     <!-- Hillshading -->
@@ -90,7 +90,7 @@
         </rule>
     </rule>
     <rule e="way" closed="yes" k="natural" v="marsh|wetland|mud" zoom-min="13">
-        <area src=":/patterns/wetland.svg" symbol-height="32"/>
+        <area src=":/patterns/wetland.svg" symbol-height="4"/>
     </rule>
 
     <rule e="way" k="waterway" v="river" zoom-min="8">
@@ -152,7 +152,7 @@
 
     <!-- City areas -->
     <rule e="way" closed="yes" k="landuse" v="cemetery">
-        <area src=":/patterns/cemetery.svg" symbol-width="30" symbol-height="28"/>
+        <area src=":/patterns/cemetery.svg" symbol-width="6" symbol-height="7"/>
         <rule e="way" k="*" v="*" zoom-min="15">
             <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="1"/>
         </rule>
@@ -184,12 +184,12 @@
 
     <!-- Area overlays -->
     <rule e="way" k="landuse" v="military" zoom-min="10">
-        <area src=":/patterns/military-area.svg" symbol-height="32"/>
+        <area src=":/patterns/military-area.svg" symbol-height="4"/>
         <caption fill="#ff4040" font-size="10" font-style="italic" text-transform="uppercase" k="name" stroke="#ffffff" stroke-width="1"/>
     </rule>
     <rule e="way" k="boundary" v="protected_area|national_park" zoom-min="10" zoom-max="14">
         <rule e="way" k="protect_class" v="pr_2">
-            <area src=":/patterns/nature-reserve.svg" symbol-height="32"/>
+            <area src=":/patterns/nature-reserve.svg" symbol-height="4"/>
             <rule e="way" k="*" v="*" zoom-max="12">
                 <caption fill="#9ac269" font-size="10" font-style="italic" text-transform="uppercase" k="name" stroke="#ffffff" stroke-width="1"/>
             </rule>
diff --git a/icons/map/patterns/cemetery.svg b/icons/map/patterns/cemetery.svg
index 8d26b679..9aa3ce90 100644
--- a/icons/map/patterns/cemetery.svg
+++ b/icons/map/patterns/cemetery.svg
@@ -1,11 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="30" height="28" version="1.1" viewBox="0 0 30 28">
-	<defs>
-		<pattern id="crosses" patternUnits="userSpaceOnUse" width="6" height="7">
-			<path d="M 1.5,0.5 L 1.5,3.5" stroke="#444444" stroke-width="1"/>
-			<path d="M 0.5,1.5 L 2.5,1.5" stroke="#444444" stroke-width="1"/>
-		</pattern>
-	</defs>
-
-	<rect x="0" y="0" width="100%" height="100%" fill="url(#crosses)"/>
+<svg width="6" height="7" version="1.1" viewBox="0 0 6 7">
+	<path d="M 1.5,0.5 L 1.5,3.5 M 0.5,1.5 L 2.5,1.5" stroke="#444444" stroke-width="1"/>
 </svg>
diff --git a/icons/map/patterns/military-area.svg b/icons/map/patterns/military-area.svg
index c3b26938..62b54719 100644
--- a/icons/map/patterns/military-area.svg
+++ b/icons/map/patterns/military-area.svg
@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="32" height="32" version="1.1" viewBox="0 0 32 32">
-	<defs>
-		<pattern id="diagonalHatch" patternUnits="userSpaceOnUse" width="4" height="4">
-			<path d="M-1,1 l2,-2 M0,4 l4,-4 M3,5 l2,-2" stroke="red" stroke-width="1"/>
-		</pattern>
-	</defs>
-
-	<rect x="0" y="0" width="100%" height="100%" fill="url(#diagonalHatch)"/>
+<svg width="4" height="4" version="1.1" viewBox="0 0 4 4">
+	<path d="M-1,1 l2,-2 M0,4 l4,-4 M3,5 l2,-2" stroke="red" stroke-width="1"/>
 </svg>
diff --git a/icons/map/patterns/nature-reserve.svg b/icons/map/patterns/nature-reserve.svg
index 5ab95462..75abd694 100644
--- a/icons/map/patterns/nature-reserve.svg
+++ b/icons/map/patterns/nature-reserve.svg
@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="32" height="32" version="1.1" viewBox="0 0 32 32">
-	<defs>
-		<pattern id="diagonalHatch" patternUnits="userSpaceOnUse" width="4" height="4">
-			<path d="M-1,1 l2,-2 M0,4 l4,-4 M3,5 l2,-2" stroke="#9ac269" stroke-width="1"/>
-		</pattern>
-	</defs>
-
-	<rect x="0" y="0" width="100%" height="100%" fill="url(#diagonalHatch)"/>
+<svg width="4" height="4" version="1.1" viewBox="0 0 4 4">
+	<path d="M-1,1 l2,-2 M0,4 l4,-4 M3,5 l2,-2" stroke="#9ac269" stroke-width="1"/>
 </svg>
diff --git a/icons/map/patterns/orchard.svg b/icons/map/patterns/orchard.svg
index 2f6bb402..00ed2ea8 100644
--- a/icons/map/patterns/orchard.svg
+++ b/icons/map/patterns/orchard.svg
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="28" height="28" version="1.1" viewBox="0 0 28 28">
-	<defs>
-		<pattern id="circles" patternUnits="userSpaceOnUse" width="7" height="7">
-			<circle cx="3" cy="3" r="1.5" stroke="#c9d69c" stroke-width="1" fill="none"/>
-		</pattern>
-	</defs>
-
+<svg width="7" height="7" version="1.1" viewBox="0 0 7 7">
 	<rect x="0" y="0" width="100%" height="100%" fill="#dee9bc"/>
-	<rect x="0" y="0" width="100%" height="100%" fill="url(#circles)"/>
+	<circle cx="3" cy="3" r="1.5" stroke="#c9d69c" stroke-width="1" fill="none"/>
 </svg>
diff --git a/icons/map/patterns/vineyard.svg b/icons/map/patterns/vineyard.svg
index cd4ecc45..507957f9 100644
--- a/icons/map/patterns/vineyard.svg
+++ b/icons/map/patterns/vineyard.svg
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="28" height="32" version="1.1" viewBox="0 0 28 32">
-	<defs>
-		<pattern id="circles" patternUnits="userSpaceOnUse" width="7" height="8">
-			<path d="M 3,2 L 3,6" stroke="#c9d69c" stroke-width="1"/>
-		</pattern>
-	</defs>
-
+<svg width="7" height="8" version="1.1" viewBox="0 0 7 8">
 	<rect x="0" y="0" width="100%" height="100%" fill="#dee9bc"/>
-	<rect x="0" y="0" width="100%" height="100%" fill="url(#circles)"/>
+	<path d="M 3,2 L 3,6" stroke="#c9d69c" stroke-width="1"/>
 </svg>
diff --git a/icons/map/patterns/wetland.svg b/icons/map/patterns/wetland.svg
index 4cca5a92..c0823cec 100644
--- a/icons/map/patterns/wetland.svg
+++ b/icons/map/patterns/wetland.svg
@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="32" height="32" version="1.1" viewBox="0 0 32 32">
-	<defs>
-		<pattern id="diagonalHatch" patternUnits="userSpaceOnUse" width="4" height="4">
-			<path d="M-1,1 l2,-2 M0,4 l4,-4 M3,5 l2,-2" stroke="#9fc4e1" stroke-width="1"/>
-		</pattern>
-	</defs>
-
-	<rect x="0" y="0" width="100%" height="100%" fill="url(#diagonalHatch)"/>
+<svg width="4" height="4" version="1.1" viewBox="0 0 4 4">
+	<path d="M-1,1 l2,-2 M0,4 l4,-4 M3,5 l2,-2" stroke="#9fc4e1" stroke-width="1"/>
 </svg>