From 850fcfdad555723dccdf92d65a69c4995264c3f6 Mon Sep 17 00:00:00 2001
From: Harry Bond <endim8@pm.me>
Date: Tue, 16 Aug 2022 01:44:20 +0100
Subject: [PATCH] [strings] regenerate for residential garden subtype

Signed-off-by: Harry Bond <endim8@pm.me>
---
 data/classificator.txt              |   4 +-
 data/drules_proto.bin               | Bin 224359 -> 224642 bytes
 data/drules_proto.txt               |  87 ++++++++++++++++++++++++++++
 data/drules_proto_clear.bin         | Bin 224999 -> 225282 bytes
 data/drules_proto_clear.txt         |  87 ++++++++++++++++++++++++++++
 data/drules_proto_dark.bin          | Bin 223380 -> 223655 bytes
 data/drules_proto_dark.txt          |  87 ++++++++++++++++++++++++++++
 data/drules_proto_vehicle_clear.bin | Bin 148349 -> 148556 bytes
 data/drules_proto_vehicle_clear.txt |  59 +++++++++++++++++++
 data/drules_proto_vehicle_dark.bin  | Bin 147218 -> 147417 bytes
 data/drules_proto_vehicle_dark.txt  |  59 +++++++++++++++++++
 data/types.txt                      |   2 +-
 data/visibility.txt                 |   4 +-
 13 files changed, 386 insertions(+), 3 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index 8abc864446..54b0bffc9b 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -562,7 +562,9 @@ world  +
         dog_park  -
         fitness_centre  -
         fitness_station  -
-        garden  -
+        garden  +
+            residential  -
+            {}
         golf_course  -
         ice_rink  -
         landscape_reserve  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 178d49b690931b5e3e8a2cfa542481bc4a5134c7..d40b8325bd5e86c46edc0e42ef21a0b0218256d0 100644
GIT binary patch
delta 96
zcmaEUgSY86Z^IVG<tyc8FmXxcq-GYE7NzQ@Cl;lo=IIut7H0zKlFY=M=?~U1>P~lD
v&ZslJX*;9rbhj0Zx{TV>KW<?ZnJ%z{Q3A*g*aKmUw=Y}CxP945rh|t7GIAwC

delta 21
dcmZp=&HMZYZ^IVG<ty6{tzz7MXcg0eLjZdx3s(RD

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index fde1bfc4a5..7225bd8fd6 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -36077,6 +36077,93 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "leisure-garden-residential"
+  element {
+    scale: 12
+    area {
+      color: 12372094
+      priority: -15916
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 11781233
+      priority: -15916
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 11453035
+      priority: -15916
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 11584112
+      priority: -15916
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 11190117
+      priority: -15916
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 11190117
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 18
+    area {
+      color: 11190117
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 19
+    area {
+      color: 11190117
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+}
 cont {
   name: "leisure-golf_course"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index c3c8140c5d04c0b727edb4c03019152d50eb990f..1970aca40cf2558e242eb487d2557b5fb20bbfe7 100644
GIT binary patch
delta 91
zcmaEUm$&HwZ^ITwmt}G@n7E{JQZtK7i&Ayd6N^$(^K^?+i!*_ANoHcs^o@%dBd2fJ
q&L}&bWh0|5qxN*crHmre?RGFq0NE4QLD=H$&dV6LJ1=8easmKJyCL2H

delta 21
dcmZpA!2A3zZ^ITwmu2no%Ne)FFK1eO0swJY3K#$Y

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index a142d4f929..f6407bf7e7 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -35718,6 +35718,93 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "leisure-garden-residential"
+  element {
+    scale: 12
+    area {
+      color: 12372094
+      priority: -15916
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 11781233
+      priority: -15916
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 11453035
+      priority: -15916
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 11584112
+      priority: -15916
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 11190117
+      priority: -15916
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 11190117
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 18
+    area {
+      color: 11190117
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 19
+    area {
+      color: 11190117
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+}
 cont {
   name: "leisure-golf_course"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 11a47586962210bca8fc5d0a4e7a3644aab0a0ee..97a2595f89263badbf27df182132e374cc0a29b0 100644
GIT binary patch
delta 93
zcmbPok$3rJ-i9rVcFW}^FmXxcq-GYE7NzQ@Cl;lo=IIut7H0zKlFY=M=^xfJYEOT(
xgi&ky!?lbu(;qEm)M3`*5So5(BcmozaN$ly;py);GK#m`E@#|syPPTfAOOgtB(4Ae

delta 21
dcmZ2}nRm)X-i9rVcFWrXS1@i5T)`A}5CCf?30?pI

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index e49639ba21..b3f854f71e 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -35861,6 +35861,93 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "leisure-garden-residential"
+  element {
+    scale: 12
+    area {
+      color: 1317888
+      priority: -15916
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 1317888
+      priority: -15916
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 1317888
+      priority: -15916
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 1317888
+      priority: -15916
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1317888
+      priority: -15916
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 1317888
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 18
+    area {
+      color: 1317888
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 19
+    area {
+      color: 1317888
+      priority: -15953
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15047
+    }
+    apply_if: "!name"
+  }
+}
 cont {
   name: "leisure-golf_course"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 7213ed9607f1666cc9abc13b851eb6bf658a392b..1a498ea9d08a6d68eaac5393c274bc5e20fdaad1 100644
GIT binary patch
delta 57
zcmey{#(AcLvtbLPHkaHPMlPwG)Xd`2qEy}V#G;hcJl&$y;!Gf2l9`w@eWMVgZu@dh
M#_h{FnXXv^0B773^8f$<

delta 21
ccmX@p!TGn1vtbLPHdp&EF2?P@xR`=00b|h!C;$Ke

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 66a6d0589e..772c75d85b 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -22325,6 +22325,65 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-garden-residential"
+  element {
+    scale: 12
+    area {
+      color: 13031851
+      priority: -15896
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 13031851
+      priority: -15896
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 13031851
+      priority: -15896
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 13031851
+      priority: -15896
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 13163437
+      priority: -15896
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 13163437
+      priority: -15896
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 13163437
+      priority: -15896
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13163437
+      priority: -15896
+    }
+  }
+}
 cont {
   name: "leisure-golf_course"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 27e889033d2d9c310e83dfa5d607f2226a6f4998..09c2032e5584639df037a0f781b1dfbbb499158d 100644
GIT binary patch
delta 52
zcmbRAkK^Wlj)pCa6})ms7`dc!QZtK7i&Ayd6N^$(^K^?+i!*_ANoHbB`*|M5?dN%z
GoQ(i0wG;jT

delta 21
dcmcclpJUQLj)pCa6};{Ce2m-e`Iu%I0sv^Z2iX7s

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 3077c11e7b..d0ad47da64 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -22649,6 +22649,65 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-garden-residential"
+  element {
+    scale: 12
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 593674
+      priority: -15896
+    }
+  }
+}
 cont {
   name: "leisure-golf_course"
   element {
diff --git a/data/types.txt b/data/types.txt
index 5a3fd054af..89344855ee 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -134,7 +134,7 @@ landuse|forest|mixed
 *landuse|vineyard
 *aeroway|taxiway
 *aeroway|aerodrome
-mapswithme
+*leisure|garden|residential
 *amenity|fire_station
 *landuse|retail
 *leisure|nature_reserve
diff --git a/data/visibility.txt b/data/visibility.txt
index dbe835f9fa..d431407a3a 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -562,7 +562,9 @@ world  00000000000000000000  +
         dog_park  00000000000000000000  -
         fitness_centre  00000000000000000000  -
         fitness_station  00000000000000000000  -
-        garden  00000000000011111111  -
+        garden  00000000000011111111  +
+            residential  00000000000011111111  -
+            {}
         golf_course  00000000000000111111  -
         ice_rink  00000000000000000000  -
         landscape_reserve  00000000000000000000  -