From bd40236d470e7e42a6e885e22a38d8571677a45b Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sat, 18 Feb 2023 21:00:28 -0300
Subject: [PATCH] [styles] Regenerated.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 data/classificator.txt      |  11 ++-
 data/drules_proto.bin       | Bin 322392 -> 322888 bytes
 data/drules_proto.txt       | 159 ++++++++++++++++++++++++++++++++++++
 data/drules_proto_clear.bin | Bin 323019 -> 323515 bytes
 data/drules_proto_clear.txt | 159 ++++++++++++++++++++++++++++++++++++
 data/drules_proto_dark.bin  | Bin 321351 -> 321847 bytes
 data/drules_proto_dark.txt  | 159 ++++++++++++++++++++++++++++++++++++
 data/types.txt              |  10 +--
 data/visibility.txt         |  11 ++-
 9 files changed, 500 insertions(+), 9 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index 216f1168cf..880df61931 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -650,7 +650,9 @@ world  +
         storage_tank  -
         surveillance  -
         survey_point  -
-        tower  -
+        tower  +
+            communication  -
+            {}
         wastewater_plant  -
         water_tap  -
         water_tower  -
@@ -771,7 +773,12 @@ world  +
         village  -
         {}
     power  +
-        generator  -
+        generator  +
+            gas  -
+            hydro  -
+            solar  -
+            wind  -
+            {}
         line  -
         minor_line  -
         pole  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index d1d9c68abcadd4adef41128312f401e163f92827..1cb1dee6d5fe02f093e1fe8a88d7e02cdb54e909 100644
GIT binary patch
delta 487
zcmca{P58tu;f5B*DNMfdeq1uSiFxt4i7BbNCHdv4MY_rPxw)lznaPPInfZCsFKlKq
z-0I8JwyEBii@yM@AU!oNwJ5P9zeq@kLr{s2iyb1IE74G^AOaK<!XhS&F2)teC5&dA
zZhB%dZX@e4?7=iMm`fDh%#6yEqI}$@5^rdIkuKchy2bf9iIjOih)V?BspXk@DY#v#
UMA)hAmo_m0G4u9In^@W`03bw*qW}N^

delta 31
mcmX?cOZdh$;f5B*DNMdw=Q6czYCpV%35c1uAKt>!Y5@TAOb*)s

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 5cf8c1ad1b..907b4767f0 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -43107,6 +43107,30 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-tower-communication"
+  element {
+    scale: 17
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+  }
+}
 cont {
   name: "man_made-water_tap"
   element {
@@ -57079,6 +57103,141 @@ cont {
     }
   }
 }
+cont {
+  name: "power-generator"
+  element {
+    scale: 17
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+}
+cont {
+  name: "power-generator-gas"
+  element {
+    scale: 17
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+}
+cont {
+  name: "power-generator-hydro"
+  element {
+    scale: 17
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+}
+cont {
+  name: "power-generator-solar"
+  element {
+    scale: 17
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+}
+cont {
+  name: "power-generator-wind"
+  element {
+    scale: 17
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+}
 cont {
   name: "power-line"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index b820147384b6c2012c06817f6ebb99af182e31e0..adb57455840fc77a1abf06719f8b4787a53ff626 100644
GIT binary patch
delta 487
zcmX?oTX^?<;f5`YcmK%yamnN+=EdhGrljhY<d>%w=_cpr=9cDVCMT9;=I2dM*uZ4C
z{q7&ewoUcET>J%K73ryYsYQt;`9(rP9D+)GT<j3xT#1HS1reZ_5Ee0EbTO_#E@3p|
zbkh@yaT{5WVGpL6!Ca!~W@c2T6y@VKm3Twzi*(^0*DcP^Nu<pCL0lr}PA$*OOTq0@
VCBjZ^Pg>6e#LU~1*0W^V0RRajjAH-*

delta 31
mcmdmeU-<NG;f5`YcmHhH{ma<4sXcfj6A&|R58lX<VFv&SR1XgT

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 6ff00151d0..1f0e1ef5cf 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -42745,6 +42745,30 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-tower-communication"
+  element {
+    scale: 17
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+  }
+}
 cont {
   name: "man_made-water_tap"
   element {
@@ -56717,6 +56741,141 @@ cont {
     }
   }
 }
+cont {
+  name: "power-generator"
+  element {
+    scale: 17
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+}
+cont {
+  name: "power-generator-gas"
+  element {
+    scale: 17
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+}
+cont {
+  name: "power-generator-hydro"
+  element {
+    scale: 17
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+}
+cont {
+  name: "power-generator-solar"
+  element {
+    scale: 17
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+}
+cont {
+  name: "power-generator-wind"
+  element {
+    scale: 17
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+}
 cont {
   name: "power-line"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 78eaaea5db01091a655255e572b250f7c52f6444..0e167508252c59b99b5dc5cc7798940fd91aa82c 100644
GIT binary patch
delta 487
zcmX?pPI&tz;f5`YC;rI$amnN+=EdhGrljhY<d>%w=_cpr=9cDVCMT9;=I2enu!_lW
z`-wk{+-vK7x%dmfD$-N)Qi~Ex@{5FoI0TjWxY!}Wxe^Vv3L-!;AuM9T=we)fT*7F^
z>82+Z<2JG$!yZgCgSkY}&CIAwDayxfD)ENa7wN)1u3Ma+lSrBOgSbS{om!rmmx9}+
VN`#%-erY8W5HoMTw34ON764}7jY<Fj

delta 31
mcmdmfN%;6V;f5`YC;n`g_{+$>w*ByGCLm_set0!Yi7fyHf)9)U

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index b1a36850f3..bba9c959d7 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -42860,6 +42860,30 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-tower-communication"
+  element {
+    scale: 17
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+  }
+}
 cont {
   name: "man_made-water_tap"
   element {
@@ -56802,6 +56826,141 @@ cont {
     }
   }
 }
+cont {
+  name: "power-generator"
+  element {
+    scale: 17
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+}
+cont {
+  name: "power-generator-gas"
+  element {
+    scale: 17
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+}
+cont {
+  name: "power-generator-hydro"
+  element {
+    scale: 17
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+}
+cont {
+  name: "power-generator-solar"
+  element {
+    scale: 17
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+}
+cont {
+  name: "power-generator-wind"
+  element {
+    scale: 17
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "power-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+}
 cont {
   name: "power-line"
   element {
diff --git a/data/types.txt b/data/types.txt
index 4d06f72ea2..1938596acb 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -279,16 +279,16 @@ mapswithme
 *boundary|administrative|county
 *highway|road|bridge
 *boundary|administrative|3
-mapswithme
+*power|generator|solar
 *boundary|administrative
-mapswithme
-mapswithme
+*power|generator|wind
+*power|generator|gas
 *sport|athletics
 *landuse|railway
 *leisure|slipway
 *tourism|caravan_site
 *place|state
-mapswithme
+*power|generator|hydro
 *railway|subway|tunnel
 *barrier|city_wall
 *place|farm
@@ -308,7 +308,7 @@ man_made|pipeline
 *highway|raceway
 *highway|primary|tunnel
 *highway|primary_link|bridge
-mapswithme
+*man_made|tower|communication
 *sport|equestrian
 *tourism|information|office
 *highway|footway|hiking
diff --git a/data/visibility.txt b/data/visibility.txt
index 8107c6050d..c4bd6a513b 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -650,7 +650,9 @@ world  00000000000000000000  +
         storage_tank  00000000000000000000  -
         surveillance  00000000000000000000  -
         survey_point  00000000000000000000  -
-        tower  00000000000000000000  -
+        tower  00000000000000000000  +
+            communication  00000000000000000000  -
+            {}
         wastewater_plant  00000000000000000000  -
         water_tap  00000000000000000000  -
         water_tower  00000000000000000000  -
@@ -771,7 +773,12 @@ world  00000000000000000000  +
         village  00000000000111111111  -
         {}
     power  00000000000000000000  +
-        generator  00000000000000000000  -
+        generator  00000000000000000000  +
+            gas  00000000000000000000  -
+            hydro  00000000000000000000  -
+            solar  00000000000000000000  -
+            wind  00000000000000000000  -
+            {}
         line  00000000000000000000  -
         minor_line  00000000000000000000  -
         pole  00000000000000000000  -