From 30c11fca721ef1e3fcc43c917e6a84e70011d1c9 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Wed, 15 Feb 2023 13:00:15 -0300 Subject: [PATCH] [styles] Regenerated. Signed-off-by: Viktor Govako --- data/classificator.txt | 16 +- data/drules_proto.bin | Bin 321069 -> 322392 bytes data/drules_proto.txt | 410 +++++++++++++++++++++++++++++++++++- data/drules_proto_clear.bin | Bin 321696 -> 323019 bytes data/drules_proto_clear.txt | 410 +++++++++++++++++++++++++++++++++++- data/drules_proto_dark.bin | Bin 320028 -> 321351 bytes data/drules_proto_dark.txt | 410 +++++++++++++++++++++++++++++++++++- data/types.txt | 16 +- data/visibility.txt | 8 + 9 files changed, 1236 insertions(+), 34 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index b37ae55af6..216f1168cf 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -342,16 +342,16 @@ world + main - {} healthcare + + alternative - + audiologist - + blood_donation - laboratory - + optometrist - physiotherapist - - alternative - - audiologist - - blood_donation - - optometrist - - podiatrist - - psychotherapist - - sample_collection - - speech_therapist - + podiatrist - + psychotherapist - + sample_collection - + speech_therapist - {} highway + bridleway + diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 503109dcb91298fd310abe75123aba65df4e4f9b..d1d9c68abcadd4adef41128312f401e163f92827 100644 GIT binary patch delta 922 zcmcJMyH3L}7=;x;qB57Zc5hKLF+fW%l&K75=PfEXu}Gw}4v9hPT&X-j1|EQ+5eUJ? zOE4n_-hoGe-|8i9nw7y)^qu(p|2cm7AYY&4?P}I~&``-{)D^Z#eb#~x=8vdw?ifDF zPtM^=9xSXO zOrc58o`ixct%Q#Wt|xv>?FH73DY@V$7}g7`5G zH!Ql`egMZ{v>OqzJlldRA}V(0a0}wcm{^@xy_s%u-()UzL|P5@l~BPEIH-q5>EF*q zsI5NDQ}n8!npAC~$bV?Khh7w<%2J0h-5f^2+Yr2ru(#wvBdlk;(1L^pVG|IEqsHw# Syqkv#ycE2h_j#C3o&Nw=9~I{S delta 44 ycmX?oTX?}m;SGsP87EG*SuQ!b&!TE_!-`eSr&hP0TFnT=OhC-M{nTm}MkfIFw-vGg diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 598ea5d634..6ff00151d0 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -13788,20 +13788,18 @@ cont { } } cont { - name: "healthcare-laboratory" + name: "healthcare-alternative" element { scale: 17 symbol { - name: "hospital-m" + name: "alternative-m" priority: 16657 - min_distance: 4 } caption { primary { height: 10 color: 4473924 offset_y: 1 - is_optional: true } priority: 15657 } @@ -13809,7 +13807,7 @@ cont { element { scale: 18 symbol { - name: "hospital-m" + name: "alternative-m" priority: 16657 } caption { @@ -13825,7 +13823,207 @@ cont { element { scale: 19 symbol { - name: "hospital-m" + name: "alternative-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} +cont { + name: "healthcare-audiologist" + element { + scale: 17 + symbol { + name: "audiologist-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "audiologist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "audiologist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} +cont { + name: "healthcare-blood_donation" + element { + scale: 17 + symbol { + name: "blood_donation-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "blood_donation-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "blood_donation-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} +cont { + name: "healthcare-laboratory" + element { + scale: 17 + symbol { + name: "sample_collection-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "sample_collection-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "sample_collection-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} +cont { + name: "healthcare-optometrist" + element { + scale: 17 + symbol { + name: "optometrist-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "optometrist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "optometrist-m" priority: 16657 } caption { @@ -13889,6 +14087,206 @@ cont { } } } +cont { + name: "healthcare-podiatrist" + element { + scale: 17 + symbol { + name: "podiatrist-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "podiatrist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "podiatrist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} +cont { + name: "healthcare-psychotherapist" + element { + scale: 17 + symbol { + name: "psychotherapist-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "psychotherapist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "psychotherapist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} +cont { + name: "healthcare-sample_collection" + element { + scale: 17 + symbol { + name: "sample_collection-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "sample_collection-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "sample_collection-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} +cont { + name: "healthcare-speech_therapist" + element { + scale: 17 + symbol { + name: "speech_therapist-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "speech_therapist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "speech_therapist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 4473924 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} cont { name: "highway-bridleway" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 8b9d9d2115b63aeef82c4882889630c4e0c0bef2..78eaaea5db01091a655255e572b250f7c52f6444 100644 GIT binary patch delta 905 zcmcJMKTpCy7{*g&AQyzvhCdA~VpOygags#73molfn-s3LrwOxzAE1Mao1rl}=*Hq` z;^tS;Z=mmq&}(6Jxa9JCF3jj z4Haz(D7?@s%0X61OD5S<4Jm4rzy9#S7O>Q58{ zrf5hF@W^vX-=wZfOy=-G)gu_RD$QqssIC{+bVfZ!M}+x8X95yCTi`@z0<4F#>7yPd z(|FW!@Z5b5(kLhw6K^pcpH<_s`h zNMRw;GyDx)8eQ}(p}Np^s$2Nl|0wux$ Zx1pc}+P)q{H-kumvjJywHi$B>r#~rYB-Q`` delta 44 ycmX?pPI%4{;SI`587EHuw@h+!pGDPVrxmN3dsesitY!paCLm_s-m{uzw>1FlbQMwn diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 1cef385648..b1a36850f3 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -13788,20 +13788,18 @@ cont { } } cont { - name: "healthcare-laboratory" + name: "healthcare-alternative" element { scale: 17 symbol { - name: "hospital-m" + name: "alternative-m" priority: 16657 - min_distance: 4 } caption { primary { height: 10 color: 5592405 offset_y: 1 - is_optional: true } priority: 15657 } @@ -13809,7 +13807,7 @@ cont { element { scale: 18 symbol { - name: "hospital-m" + name: "alternative-m" priority: 16657 } caption { @@ -13825,7 +13823,207 @@ cont { element { scale: 19 symbol { - name: "hospital-m" + name: "alternative-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} +cont { + name: "healthcare-audiologist" + element { + scale: 17 + symbol { + name: "audiologist-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "audiologist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "audiologist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} +cont { + name: "healthcare-blood_donation" + element { + scale: 17 + symbol { + name: "blood_donation-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "blood_donation-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "blood_donation-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} +cont { + name: "healthcare-laboratory" + element { + scale: 17 + symbol { + name: "sample_collection-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "sample_collection-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "sample_collection-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} +cont { + name: "healthcare-optometrist" + element { + scale: 17 + symbol { + name: "optometrist-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "optometrist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "optometrist-m" priority: 16657 } caption { @@ -13889,6 +14087,206 @@ cont { } } } +cont { + name: "healthcare-podiatrist" + element { + scale: 17 + symbol { + name: "podiatrist-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "podiatrist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "podiatrist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} +cont { + name: "healthcare-psychotherapist" + element { + scale: 17 + symbol { + name: "psychotherapist-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "psychotherapist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "psychotherapist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} +cont { + name: "healthcare-sample_collection" + element { + scale: 17 + symbol { + name: "sample_collection-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "sample_collection-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "sample_collection-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} +cont { + name: "healthcare-speech_therapist" + element { + scale: 17 + symbol { + name: "speech_therapist-m" + priority: 16657 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15657 + } + } + element { + scale: 18 + symbol { + name: "speech_therapist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } + element { + scale: 19 + symbol { + name: "speech_therapist-m" + priority: 16657 + } + caption { + primary { + height: 11 + color: 5592405 + offset_y: 1 + is_optional: true + } + priority: 15657 + } + } +} cont { name: "highway-bridleway" element { diff --git a/data/types.txt b/data/types.txt index 527c091977..4d06f72ea2 100644 --- a/data/types.txt +++ b/data/types.txt @@ -416,14 +416,14 @@ mapswithme *highway|motorway|tunnel *railway|light_rail|tunnel *area:highway|service -mapswithme -mapswithme -mapswithme -mapswithme +*healthcare|alternative +*healthcare|audiologist +*healthcare|blood_donation +*healthcare|optometrist *highway|road|tunnel *sport|archery -mapswithme -mapswithme +*healthcare|podiatrist +*healthcare|psychotherapist *highway|ford *area:highway|path *railway|siding @@ -432,10 +432,10 @@ mapswithme *railway|funicular *amenity|waste_transfer_station *historic|battlefield -mapswithme +*healthcare|sample_collection *sport|australian_football *leisure|bowling_alley -mapswithme +*healthcare|speech_therapist mapswithme mapswithme *aerialway|t-bar diff --git a/data/visibility.txt b/data/visibility.txt index 20fa7e9c84..8107c6050d 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -342,8 +342,16 @@ world 00000000000000000000 + main 00000000000000000000 - {} healthcare 00000000000000000000 + + alternative 00000000000000000000 - + audiologist 00000000000000000000 - + blood_donation 00000000000000000000 - laboratory 00000000000000000000 - + optometrist 00000000000000000000 - physiotherapist 00000000000000000000 - + podiatrist 00000000000000000000 - + psychotherapist 00000000000000000000 - + sample_collection 00000000000000000000 - + speech_therapist 00000000000000000000 - {} highway 00000000000000000000 + bridleway 00000000000000000000 +