[generator] Add a suffix to the output dir

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
[core] Add language data to world files
2025-12-29 01:03:46 +00:00 · 2025-11-11 22:44:39 -08:00 · 2025-11-11 22:44:39 -08:00 · 2025-11-11 22:44:39 -08:00 · 2025-11-11 22:44:39 -08:00 · 2025-11-11 22:44:39 -08:00
79 changed files with 273 additions and 145 deletions
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -349,7 +349,12 @@
    <string name="type.entrance">Eingang</string>
    <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
    <string name="type.entrance.main">Haupteingang</string>
-    <string name="type.entrance.exit">Ausgang</string>
+    <string name="type.entrance.house">Hauseingang</string>
+    <string name="type.entrance.garage">Garageneingang</string>
+    <string name="type.entrance.service">Serviceeingang</string>
+    <string name="type.entrance.entry">(Nur) Eingang</string>
+    <string name="type.entrance.exit">(Nur) Ausgang</string>
+    <string name="type.entrance.emergency">Notausgang</string>
    <string name="type.fee.no">Kostenlos</string>
    <string name="type.healthcare.laboratory">Medizinisches Labor</string>
    <string name="type.healthcare.physiotherapist">Physiotherapie</string>
@@ -748,6 +753,7 @@
    <string name="type.natural.spring">Quelle</string>
    <string name="type.natural.spring.drinking_water_no">Quelle</string>
    <string name="type.natural.strait">Meerenge</string>
+    <string name="type.natural.tree">Baum</string>
    <string name="type.natural.tree_row">Baumreihe</string>
    <string name="type.natural.vineyard">Weinberg</string>
    <string name="type.natural.volcano">Vulkan</string>
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -383,7 +383,12 @@
    <string name="type.entrance">Entrance</string>
    <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
    <string name="type.entrance.main">Main Entrance</string>
-    <string name="type.entrance.exit">Exit</string>
+    <string name="type.entrance.house">House Entrance</string>
+    <string name="type.entrance.garage">Garage Entrance</string>
+    <string name="type.entrance.service">Service Entrance</string>
+    <string name="type.entrance.entry">Entry (Only)</string>
+    <string name="type.entrance.exit">Exit (Only)</string>
+    <string name="type.entrance.emergency">Emergency Exit</string>
    <string name="type.fee.yes">$</string>
    <string name="type.fee.no">Free</string>
    <string name="type.healthcare.laboratory">Medical Laboratory</string>
@@ -776,6 +781,7 @@
    <string name="type.man_made.embankment">Embankment</string>
    <string name="type.natural.coastline">Coastline</string>
    <string name="type.natural.desert">Desert</string>
+    <string name="type.natural.sand">Sand</string>
    <string name="type.natural.geyser">Geyser</string>
    <string name="type.natural.glacier">Glacier</string>
    <string name="type.natural.grassland">Grassland</string>
@@ -797,6 +803,7 @@
    <string name="type.natural.spring">Natural Spring</string>
    <string name="type.natural.spring.drinking_water_no">Natural Spring</string>
    <string name="type.natural.strait">Strait</string>
+    <string name="type.natural.tree">Tree</string>
    <string name="type.natural.tree_row">Tree Row</string>
    <string name="type.natural.vineyard">Vineyard</string>
    <string name="type.natural.volcano">Volcano</string>
--- a/data/countries_meta.txt
+++ b/data/countries_meta.txt
@@ -1,4 +1,10 @@
 {
+"World": {
+ "languages": ["int_name", "en", "default"]
+},
+"WorldCoasts": {
+ "languages": ["int_name", "en", "default"]
+},
 "Abkhazia": {
 "languages": ["ab", "ru"]
 },
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -95,7 +95,7 @@ railway|rail;28;
 highway|service|parking_aisle;[highway=service][service=parking_aisle];;name;int_name;29;
 place|hamlet;30;
 moved:highway|road:05.2024;31;highway|road
-deprecated:highway|track|grade2:04.2024;[highway=track][tracktype=grade2];x;name;int_name;32;highway|track
+natural|tree;32;
 # ~1.5M usages w/o a more specific wetland=*
 natural|wetland;33;
 deprecated:highway|track|grade3:04.4024;[highway=track][tracktype=grade3];x;name;int_name;34;highway|track
@@ -113,7 +113,7 @@ highway|service|driveway;[highway=service][service=driveway];;name;int_name;42;
 addr:interpolation|even;43;
 highway|motorway_link;44;
 waterway|stream|intermittent;[waterway=stream][intermittent=yes];;name;int_name;45;
-deprecated:highway|track|grade4:04.2024;[highway=track][tracktype=grade4];x;name;int_name;46;highway|track
+natural|sand;46;
 natural|water|pond;[natural=water][water=pond];;name;int_name;47;
 landuse|farmland;48;
 barrier|fence;49;
@@ -462,7 +462,7 @@ place|country;349;
 deprecated:highway|path|alpine_hiking:04.2024;[highway=path][sac_scale=alpine_hiking];x;name;int_name;350;highway|path|expert
 tourism|zoo|petting;[tourism=zoo][zoo=petting_zoo];;name;int_name;351;
 sport|scuba_diving;352;
-deprecated:highway|cycleway|permissive:12.2023;[highway=cycleway][access=permissive];x;name;int_name;353;highway|cycleway
+entrance|emergency;[entrance=emergency],[exit=emergency];;name;int_name;353;
 highway|unclassified|area;[highway=unclassified][area?];;name;int_name;354;
 natural|volcano;355;
 amenity|parking|underground|fee;[amenity=parking][location=underground][fee],[amenity=parking][parking=underground][fee];;name;int_name;356;
@@ -564,8 +564,8 @@ deprecated:railway|yard:06.2023;447;x
 natural|water|ditch;[natural=water][water=ditch];;name;int_name;448;
 natural|water|moat;[natural=water][water=moat];;name;int_name;449;
 natural|water|wastewater;[natural=water][water=wastewater];;name;int_name;450;
-deprecated:railway|razed:06.2023;451;x
-deprecated:highway|footway|demanding_mountain_hiking:04.2024;[highway=footway][sac_scale=demanding_mountain_hiking];x;name;int_name;452;highway|path|difficult
+entrance|service;451;
+entrance|entry;[entrance=entrance];;ref;addr:flats;452;
 amenity|shelter|basic_hut;[amenity=shelter][shelter_type=basic_hut];;name;int_name;453;
 amenity|shelter|lean_to;[amenity=shelter][shelter_type=lean_to];;name;int_name;454;
 landuse|orchard;455;
@@ -1117,8 +1117,8 @@ junction|roundabout;990;
 highway|speed_camera;991;
 shop|beauty;992;
 shop|sports;993;
-deprecated:route|ferry|motor_vehicle:09.2021;[route=ferry][motor_vehicle];x;name;int_name;994;route|ferry
-deprecated:railway|rail|motor_vehicle:06.2023;[railway=rail][motor_vehicle],[railway=rail][motorcar];x;name;int_name;995;railway|rail
+entrance|house;[entrance=home],[entrance=staircase];;ref;addr:flats;994;
+entrance|garage;[entrance=garage];;ref;addr:flats;995;
 hwtag|nofoot;996;
 place|city|capital|2;[place=city][capital=2],[place=city][capital?][admin_level=2];;name;int_name;997;
 place|city|capital|3;[place=city][capital=3],[place=city][capital?][admin_level=3];;name;int_name;998;
@@ -1348,7 +1348,7 @@ railway|subway_entrance|warszawa;[railway=subway_entrance][city=warszawa];;name;
 shop|bed;1221;
 shop|outpost;1222;
 shop|gas;1223;
-natural|desert;[natural=desert],[natural=sand][desert=erg];;name;int_name;1224;
+natural|desert;1224;
 natural|water|tunnel;[natural=water][tunnel?];;name;int_name;1225;
 place|square;1226;
 tourism|artwork|architecture;[tourism=artwork][artwork_type=architecture],[tourism=artwork][type=architecture];;name;int_name;1227;
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -91,11 +91,6 @@ natural=forest    : natural=wood
 natural=shrubbery : natural=scrub
 cliff=yes         : natural=cliff

-desert=sand : desert=erg
-desert=yes : desert=erg
-desert=semi_arid : desert=erg
-desert=dune : desert=erg
-
 office=notary : office=lawyer
 office=administrative : office=government

--- a/data/styles/default/dark/symbols/bus-sm.svg
+++ b/data/styles/default/dark/symbols/bus-sm.svg
@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.5" rx="1.5" width="13.5" x=".75" y=".75"/><path d="m4.30833333 11.4713297c.21052121.0559605.43455474.0861305.66692134.0861305h.66552345l.00088855.3790098c0 .311229-.29836282.56353-.666412.56353-.3680492 0-.666412-.252301-.666412-.56353zm6.38295947.0002346.0003739.4649057c0 .311229-.298278.56353-.6662225.56353-.36794462 0-.66622253-.252301-.66622253-.56353l-.00088834-.3790098h.66711087c.2319755 0 .4556437-.0300857.6658486-.0858959zm-.561486-8.55489763c.829944 0 1.5027466.67280261 1.5027466 1.50274669v5.25961347c0 .82994407-.6728026 1.50274667-1.5027466 1.50274667h-5.25961352c-.82994407 0-1.50274669-.6728026-1.50274669-1.50274667v-5.25961347c0-.82994408.67280262-1.50274669 1.50274669-1.50274669zm-5.24127678 6.38667341c-.31122904 0-.56353002.252301-.56353002.56353 0 .31122912.25230098.56353012.56353002.56353012.31122902 0 .56353001-.252301.56353001-.56353012 0-.311229-.25230099-.56353-.56353001-.56353zm5.21666668 0c-.31122903 0-.56353003.252301-.56353003.56353 0 .31122912.252301.56353012.56353003.56353012.311229 0 .56353-.252301.56353-.56353012 0-.311229-.252301-.56353-.56353-.56353zm.56147-3.84500675h-6.3416667v2.42105266c0 .3565628.31547343.64561401.70462963.64561401h4.93240737c.3891563 0 .7046297-.28905121.7046297-.64561401zm-.7046297-1.58333333h-4.93240737c-.3891562 0-.70462963.3364013-.70462963.75137335v.37568667h6.3416667v-.37568667c0-.41497205-.3154734-.75137335-.7046297-.75137335z" fill="#000" fill-rule="evenodd"/></g></svg>
--- a/data/styles/default/dark/symbols/bus-xs.svg
+++ b/data/styles/default/dark/symbols/bus-xs.svg
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 6 6" width="6" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m5 0c.55228475 0 1 .44771525 1 1v4c0 .55228475-.44771525 1-1 1h-4c-.55228475 0-1-.44771525-1-1v-4c0-.55228475.44771525-1 1-1z" fill="#000" fill-opacity=".6"/><path d="m1 .5h4c.27614237 0 .5.22385763.5.5v4c0 .27614237-.22385763.5-.5.5h-4c-.27614237 0-.5-.22385763-.5-.5v-4c0-.27614237.22385763-.5.5-.5z" fill="#2f6499" fill-rule="evenodd"/></g></svg>
--- a/data/styles/default/dark/symbols/bus-xxs.svg
+++ b/data/styles/default/dark/symbols/bus-xxs.svg
@@ -0,0 +1 @@
+<svg height="5" viewBox="0 0 5 5" width="5" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m4 0c.55228475 0 1 .44771525 1 1v3c0 .55228475-.44771525 1-1 1h-3c-.55228475 0-1-.44771525-1-1v-3c0-.55228475.44771525-1 1-1z" fill="#000" fill-opacity=".6"/><path d="m1 .5h3c.27614237 0 .5.22385763.5.5v3c0 .27614237-.22385763.5-.5.5h-3c-.27614237 0-.5-.22385763-.5-.5v-3c0-.27614237.22385763-.5.5-.5z" fill="#2f6499" fill-rule="evenodd"/></g></svg>
--- a/data/styles/default/dark/symbols/bus-xxxs.svg
+++ b/data/styles/default/dark/symbols/bus-xxxs.svg
@@ -0,0 +1 @@
+<svg height="4" viewBox="0 0 4 4" width="4" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m3 0c.55228475 0 1 .44771525 1 1v2c0 .55228475-.44771525 1-1 1h-2c-.55228475 0-1-.44771525-1-1v-2c0-.55228475.44771525-1 1-1z" fill="#000" fill-opacity=".6"/><path d="m1 .5h2c.27614237 0 .5.22385763.5.5v2c0 .27614237-.22385763.5-.5.5h-2c-.27614237 0-.5-.22385763-.5-.5v-2c0-.27614237.22385763-.5.5-.5z" fill="#2f6499" fill-rule="evenodd"/></g></svg>
--- a/data/styles/default/dark/symbols/emergency-exit-m.svg
+++ b/data/styles/default/dark/symbols/emergency-exit-m.svg
@@ -0,0 +1 @@
+<svg height="10" viewBox="0 0 8 10" width="8" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.45638209 0c.37609148 0 .72425864.1747833.96936352.49369282l.06615442.10027904c.10687134.18244079.16414241.39064697.16414241.60600579l.00033965 7.60002235c0 .08452163-.00881715.16822686-.03378359.28090951l-.0458696.14760544-.06668844.14497209-.07146019.1153718-.06179076.08041635-.07556165.08214374-.10781751.09508139-.10964934.07580657-.12987138.06948085-.07954583.03314166c-.04905188.01754418-.04905188.01754418-.1303233.03957053l-.15920996.02799023-.1287681.00750984h-4.22425693c-.10907652 0-.21669708-.01468463-.35383951-.05390448l-.14047138-.05265064-.10280855-.05337186-.14765925-.09957233-.10159134-.09041744-.10489342-.11895698-.0784479-.11480897-.05509066-.10505725-.06607418-.17129918-.02223491-.08669691c-.01814821-.0826435-.02722855-.16749219-.02722706-.25204115l-.00144536-.591-.00199757-.28322281-.02893303.00146741c-.51942228.01887315-.91865829-.24714738-.98830514-.67658602l-.01042408-.11069391c-.01253177-.43076054.32054599-.82795908.77223753-.84441048l.25542472-.030777c.00229529-.08066906.00229529-.18987309 0-.32761211-.03371432-.00977655-.08956256-.02247896-.1233309-.03714759-.45095098-.19588858-.51469301-.68984012-.30519389-1.15166694l.43196772-.89919451c.00947774-.02096777.00947724-.90442739-.00000149-2.65037885 0-.6627417.5372583-1.2 1.2-1.2z" fill="#000" opacity=".6"/><path d="m6.45638209.5c.22551627 0 .42612467.10664329.55414621.27225087l.04994362.07444573c.06074822.1037037.09557052.22443696.09557052.3533034l.00033965 7.6c0 .05011473-.00526633.09899944-.01527578.1461309l-.02384038.085169-.03771531.08786746-.0419297.07097489-.03740085.05020216-.03821292.04374726-.06347463.05861778-.06028924.04402764-.07874284.044385-.06117341.02581362c-.01766844.00664526-.03607223.01258439-.05479097.01776541l-.09216812.01890871-.0953255.00639017h-4.22425693c-.06480353 0-.12755032-.00880593-.18710905-.02528645l-.09162788-.0324093-.04872236-.02328158-.09538019-.0610859-.05713707-.04808259-.06450448-.06946502-.04937574-.06908366-.02934081-.05219473-.04389022-.10543844-.01765973-.06765121c-.01032579-.04702168-.01559212-.09590639-.01559212-.14602112l-.00144537-.591.66089153-.02540436.09415983-.01277867-.00300941.57818303h4.12374307v-7.499h-4.12374307l-.00049701.60518552c-.30277731.25714038-.49010086.63138619-.49010086 1.05120766l.00555985.11160682-.07728011.00485305c-.0660555.00624911-.12924699.01672474-.18947556.03124346l.00119711-1.85409651c0-.38659932.31340067-.7.7-.7zm-2.256326 3.31599576c.25595671 0 .43735449.1230815.49018767.54084433l.02877808.57142067.62174436.19704693c.31792476.09362657.4520938.24201607.40250712.44516851-.03257321.13344966-.16664108.18318709-.40220364.14921229-.11574123-.01797477-.23380508-.05174093-.31880324-.0684414l-.60646039-.16066363c-.26277038-.06961813-.29780643-.22302452-.30247791-.41885973l-.07592051-.64933479-.16065403.0000192c-.19078646.30319659-.10110927.79611708-.16066363 1.25944922h.29120123c.32132726 0 .83343457.3031966.51210731.90960578l-.48199088.90963778c-.32132726.60639318-.80328614.15159989-.64265452-.1515999l.48199089-.90963778c.0648808-.12244607-.03044986-.14599339-.10942109-.15052172l-.84425517-.00107817-.15426327.28432918-.14131385.24161291c-.14333507.22167486-.22812622.57718916-.61780982.57718916l-1.02876487.03740254c-.68581553.02491902-.53293243-.61986625-.19003789-.63235508l1.0908756-.03994917c.05913462-.0063629.08251176-.03738214.18447811-.22729991.13109959-.24417998.20388236-.45229962.20388236-.59080509 0-.35265986.06565766-1.09536109.16065723-1.51599895h-.48199088l-.09191427.16896043-.3097352.59819487c-.14617965.27634582-.31140187.31036692-.44324586.25309522-.13184399-.05727171-.15972216-.24295654-.05677328-.47029852l.50001914-1.00474529c.02972597-.06576327.08142637-.15159989.32132725-.15159989zm-.965957-1.51599576c.3549322 0 .64265451.27147032.64265451.60639318 0 .33492926-.28771911.60639318-.64265451.60639318-.3549322 0-.64265452-.27147032-.64265452-.60639318 0-.31522754.25486538-.57423664.58076149-.60361755z" fill="#019b41"/></g></svg>
--- a/data/styles/default/dark/symbols/entrance-barrier-m.svg
+++ b/data/styles/default/dark/symbols/entrance-barrier-m.svg
@@ -0,0 +1 @@
+<svg height="9" viewBox="0 0 6 9" width="6" xmlns="http://www.w3.org/2000/svg"><path d="m5.05357504.00381365c.38659933 0 .7.31340068.7.7v7.6c0 .38659933-.31340067.7-.7.7h-4.22459658c-.38659933 0-.7-.31340067-.7-.7v-7.6c0-.38659932.31340067-.7.7-.7zm-.05059658.749-4.125.001v7.499h4.125z" fill="#777"/></svg>
--- a/data/styles/default/dark/symbols/entrance-barrier-s.svg
+++ b/data/styles/default/dark/symbols/entrance-barrier-s.svg
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="6" height="9" version="1.1" viewBox="0 0 6 9" xmlns="http://www.w3.org/2000/svg">
- <path d="m0.5 0.5h5v8h-5z" fill="none" stroke="#777777" stroke-width=".75"/>
-</svg>
--- a/data/styles/default/dark/symbols/entrance-barrier-xs.svg
+++ b/data/styles/default/dark/symbols/entrance-barrier-xs.svg
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 4 6" width="4" xmlns="http://www.w3.org/2000/svg"><path d="m3.37632615.00381365c.27614238 0 .5.22385763.5.5v4.99618635c0 .27614237-.22385762.5-.5.5h-2.74734769c-.27614238 0-.5-.22385763-.5-.5v-4.99618635c0-.27614237.22385762-.5.5-.5zm-.25034769.75h-2.247v4.496h2.247z" fill="#777" transform="translate(.0041)"/></svg>
--- a/data/styles/default/dark/symbols/entrance-emergency-m.svg
+++ b/data/styles/default/dark/symbols/entrance-emergency-m.svg
@@ -0,0 +1 @@
+<svg height="9" viewBox="0 0 11 9" width="11" xmlns="http://www.w3.org/2000/svg"><path d="m10.0493285 0c.3869702 0 .7006715.31340068.7006715.7v7.59309317c0 .38659933-.3137013.7-.7006715.7l-4.17193572-.00009317-.75042427.007-4.17629705-.00690683c-.38697016 0-.70067146-.31340067-.70067146-.7v-7.59309317c0-.38659932.3137013-.7.70067146-.7zm-4.92265514.749-4.12595394.001-.00100096 7.493 4.1269549-.001v-1.748l-.62530437.00082255-.00029515-1.00082255-1.00066408.00082255v-2l1.00066408-.00082255.00029515-.99917745.62530437-.00082255zm4.87166855.001-4.12094913-.001v1.745l.62589466.00082255-.00029515.99917745 1.00125438.00082255v2l-1.00125438-.00082255.00029515 1.00082255-.62589466-.00082255v1.748l4.12094913.001z" fill="#983E44"/></svg>
--- a/data/styles/default/dark/symbols/entrance-emergency-s.svg
+++ b/data/styles/default/dark/symbols/entrance-emergency-s.svg
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="11" height="9" version="1.1" viewBox="0 0 11 9" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <path d="m0.5 0.5v8h10v-8z" fill="none" stroke="#983E44" opacity=".6" stroke-width=".75"/>
- <path d="m5.5 0.5v8" fill="none" stroke="#983E44" opacity=".6" stroke-width=".75"/>
- <path d="m7.5834 5.3334h-1.25v1.25c0 0.22916-0.18749 0.41667-0.41667 0.41667h-0.83337c-0.22916 0-0.41667-0.18749-0.41667-0.41667v-1.25h-1.25c-0.22916 0-0.41667-0.18749-0.41667-0.41667v-0.83337c0-0.22917 0.18749-0.41667 0.41667-0.41667h1.25v-1.25c0-0.22916 0.18749-0.41667 0.41667-0.41667h0.83337c0.22917 0 0.41667 0.18749 0.41667 0.41667v1.25h1.25c0.22916 0 0.41667 0.1875 0.41667 0.41667v0.83337c0 0.22916-0.18749 0.41667-0.41667 0.41667z" fill="#983E44" opacity=".6"/>
-</svg>
--- a/data/styles/default/dark/symbols/entrance-emergency-xs.svg
+++ b/data/styles/default/dark/symbols/entrance-emergency-xs.svg
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 7 6" width="7" xmlns="http://www.w3.org/2000/svg"><path d="m6.49689709-.00309317c.27614237 0 .5.22385762.5.5v4.99618634c0 .27614238-.22385763.5-.5.5l-2.62189709-.00018634-.75.00709317-2.625-.00690683c-.27614237 0-.5-.22385762-.5-.5v-4.99618634c0-.27614238.22385763-.5.5-.5zm-3.37189709.749-2.375.001v4.496h2.375v-.748l-.375.00009317-.001-.75009317-.749.00009317v-1.5l.749-.00009317.001-.74990683.375-.00009317zm3.121 0-2.371-.001v.75l.375.00009317-.001.74990683.751.00009317v1.5l-.751-.00009317.001.75009317-.375-.00009317v.748h2.371z" fill="#983E44"/></svg>
--- a/data/styles/default/dark/symbols/entrance-entry-m.svg
+++ b/data/styles/default/dark/symbols/entrance-entry-m.svg
@@ -0,0 +1 @@
+<svg height="9" viewBox="0 0 12 9" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m4.50016351 0c-.38659932 0-.7.31340068-.7.7l.00059659 2.55h.751l-.001-2.501 4.125.001v7.499h-4.125l.001-2.499h-.751l-.00059659 2.55c0 .38659932.31340068.7.7.7h4.22459659c.38659932 0 .7-.31340068.7-.7v-7.6c0-.38659932-.31340068-.7-.7-.7zm1.758459 2.50813059 1.99137749 1.99137749-1.99137749 1.99236133-.53033009-.53033009 1.11942967-1.11953932-5.09772209.00011809v-.75l5.03172209-.00011809-1.05342967-1.05353932z" fill="#777"/></svg>
--- a/data/styles/default/dark/symbols/entrance-entry-xs.svg
+++ b/data/styles/default/dark/symbols/entrance-entry-xs.svg
@@ -0,0 +1 @@
+<svg height="7" viewBox="0 0 9 7" width="9" xmlns="http://www.w3.org/2000/svg"><path d="m3.27575522.00381365c-.27614238 0-.5.22385763-.5.5l.00034769 1.24618635h.751l-.001-.99618635h2.247v4.496h-2.247l.001-.99981365h-.751l-.00034769 1.25c0 .27614237.22385762.5.5.5h2.74734769c.27614238 0 .5-.22385763.5-.5v-4.99618635c0-.27614237-.22385762-.5-.5-.5zm.93313413 1.6162696 1.41421356 1.41421356-1.41421356 1.4151974-.53033009-.53033008.54264244-.54235048-3.1012017.00009318v-.75l3.0352017-.00009318-.47664244-.47640031z" fill="#777" transform="translate(.1946 .4987)"/></svg>
--- a/data/styles/default/dark/symbols/entrance-exit-m.svg
+++ b/data/styles/default/dark/symbols/entrance-exit-m.svg
@@ -0,0 +1 @@
+<svg height="9" viewBox="0 0 12 9" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m7.49983649 0c.38659932 0 .7.31340068.7.7l-.00059659 2.55h-.751l.001-2.501-4.125.001v7.499h4.125l-.001-2.499h.751l.00059659 2.55c0 .38659932-.31340068.7-.7.7h-4.22459659c-.38659932 0-.7-.31340068-.7-.7v-7.6c0-.38659932.31340068-.7.7-.7zm2.50878601 2.50813059 1.9913775 1.99137749-1.9913775 1.99236133-.53033008-.53033009 1.11942968-1.11953932-5.0977221.00011809v-.75l5.0317221-.00011809-1.05342968-1.05353932z" fill="#777"/></svg>
--- a/data/styles/default/dark/symbols/entrance-exit-s.svg
+++ b/data/styles/default/dark/symbols/entrance-exit-s.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="9" height="9" version="1.1" viewBox="0 0 9 9" xmlns="http://www.w3.org/2000/svg">
- <path d="m6.5704 0.1875v1.8427l1.0591 2.0948h-4.6294v0.75h4.6294l-1.0591 2.0948v1.8428l2.1796-4.3125z" fill="#777777"/>
- <path d="m0.5 0.5h5v8h-5z" fill="none" stroke="#777777" stroke-width=".75"/>
-</svg>
--- a/data/styles/default/dark/symbols/entrance-exit-xs.svg
+++ b/data/styles/default/dark/symbols/entrance-exit-xs.svg
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 8 6" width="8" xmlns="http://www.w3.org/2000/svg"><path d="m4.74424478.00381365c.27614238 0 .5.22385763.5.5l-.00034769 1.24618635h-.751l.001-.99618635h-2.247v4.496h2.247l-.001-.99981365h.751l.00034769 1.25c0 .27614237-.22385762.5-.5.5h-2.74734769c-.27614238 0-.5-.22385763-.5-.5v-4.99618635c0-.27614237.22385762-.5.5-.5zm1.84154166 1.6162696 1.41421356 1.41421356-1.41421356 1.4151974-.53033009-.53033008.54264244-.54235048-3.1012017.00009318v-.75l3.0352017-.00009318-.47664244-.47640031z" fill="#777" transform="translate(.0081)"/></svg>
--- a/data/styles/default/dark/symbols/entrance-m.svg
+++ b/data/styles/default/dark/symbols/entrance-m.svg
@@ -0,0 +1 @@
+<svg height="9" viewBox="0 0 6 9" width="6" xmlns="http://www.w3.org/2000/svg"><path d="m5.05092274-.01381365c.38659932 0 .7.31340067.7.7v7.6c0 .38659932-.31340068.7-.7.7h-4.22459659c-.38659932 0-.7-.31340068-.7-.7v-7.6c0-.38659933.31340068-.7.7-.7zm-.05059659.749-4.125.001v7.499h4.125zm-2.75032615 3.01481365c.41421356 0 .75.33578644.75.75s-.33578644.75-.75.75-.75-.33578644-.75-.75.33578644-.75.75-.75z" fill="#777"/></svg>
--- a/data/styles/default/dark/symbols/entrance-main-m.svg
+++ b/data/styles/default/dark/symbols/entrance-main-m.svg
@@ -0,0 +1 @@
+<svg height="9" viewBox="0 0 11 9" width="11" xmlns="http://www.w3.org/2000/svg"><path d="m10.0510104 0c.3865993 0 .7.31340068.7.7v7.6c0 .38659932-.3134007.7-.7.7h-9.1020208c-.38659933 0-.7-.31340068-.7-.7v-7.6c0-.38659932.31340067-.7.7-.7zm-4.9240208.75h-4.128v7.5h4.128zm4.874 0h-4.124v7.5h4.124zm-2.7509896 3c.41421356 0 .75.33578644.75.75s-.33578644.75-.75.75-.75-.33578644-.75-.75.33578644-.75.75-.75zm-3.5 0c.41421356 0 .75.33578644.75.75s-.33578644.75-.75.75-.75-.33578644-.75-.75.33578644-.75.75-.75z" fill="#777"/></svg>
--- a/data/styles/default/dark/symbols/entrance-main-s.svg
+++ b/data/styles/default/dark/symbols/entrance-main-s.svg
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="11" height="9" version="1.1" viewBox="0 0 11 9" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <path d="m0.5 0.5v8h10v-8z" fill="none" stroke="#777777" stroke-width=".75"/>
- <path d="m5.5 0.5v8" fill="none" stroke="#777777" stroke-width=".75"/>
- <circle cx="4" cy="4.5" r=".75" fill="#777777"/>
- <circle cx="7" cy="4.5" r=".75" fill="#777777"/>
-</svg>
--- a/data/styles/default/dark/symbols/entrance-main-xs.svg
+++ b/data/styles/default/dark/symbols/entrance-main-xs.svg
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 7 6" width="7" xmlns="http://www.w3.org/2000/svg"><path d="m6.5.00381365c.27614237 0 .5.22385763.5.5v4.99618635c0 .27614237-.22385763.5-.5.5h-5.99689709c-.27614237 0-.5-.22385763-.5-.5v-4.99618635c0-.27614237.22385763-.5.5-.5zm-3.37189709.749-2.375.001v4.496h2.375zm3.121 0-2.371-.001v4.498h2.371zm-1.62410291 1.77843635c.25888348 0 .46875.20986652.46875.46875s-.20986652.46875-.46875.46875-.46875-.20986652-.46875-.46875.20986652-.46875.46875-.46875zm-2.25 0c.25888348 0 .46875.20986652.46875.46875s-.20986652.46875-.46875.46875-.46875-.20986652-.46875-.46875.20986652-.46875.46875-.46875z" fill="#777" transform="translate(.0041)"/></svg>
--- a/data/styles/default/dark/symbols/entrance-s.svg
+++ b/data/styles/default/dark/symbols/entrance-s.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="6" height="9" version="1.1" viewBox="0 0 6 9" xmlns="http://www.w3.org/2000/svg">
- <path d="m0.5 0.5h5v8h-5z" fill="none" stroke="#777777" stroke-width=".75"/>
- <circle cx="2" cy="4.5" r=".75" fill="#777777"/>
-</svg>
--- a/data/styles/default/dark/symbols/entrance-service-m.svg
+++ b/data/styles/default/dark/symbols/entrance-service-m.svg
@@ -0,0 +1 @@
+<svg height="9" viewBox="0 0 6 9" width="6" xmlns="http://www.w3.org/2000/svg"><path d="m5.05357504.00381365c.38659933 0 .7.31340068.7.7v7.6c0 .38659933-.31340067.7-.7.7h-4.22459658c-.38659933 0-.7-.31340067-.7-.7v-7.6c0-.38659932.31340067-.7.7-.7zm-.05059658.749-4.125.001v7.499h4.125zm-2.06170171 1.99718635c.96649831 0 1.75.78350169 1.75 1.75s-.78350169 1.75-1.75 1.75-1.75-.78350169-1.75-1.75.78350169-1.75 1.75-1.75zm1.16666667 1.3125h-2.33333334v.875h2.33333334z" fill="#777"/></svg>
--- a/data/styles/default/dark/symbols/entrance-service-xs.svg
+++ b/data/styles/default/dark/symbols/entrance-service-xs.svg
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 4 6" width="4" xmlns="http://www.w3.org/2000/svg"><path d="m3.37632615.00381365c.27614238 0 .5.22385763.5.5v4.99618635c0 .27614237-.22385762.5-.5.5h-2.74734769c-.27614238 0-.5-.22385763-.5-.5v-4.99618635c0-.27614237.22385762-.5.5-.5zm-.25034769.75h-2.247v4.496h2.247zm-1.1300447 1.24618635c.55228475 0 1 .44771525 1 1s-.44771525 1-1 1-1-.44771525-1-1 .44771525-1 1-1zm.75671854.75190683h-1.5v.5h1.5z" fill="#777" transform="translate(.0041)"/></svg>
--- a/data/styles/default/dark/symbols/entrance-xs.svg
+++ b/data/styles/default/dark/symbols/entrance-xs.svg
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 4 6" width="4" xmlns="http://www.w3.org/2000/svg"><path d="m3.37367385 0c.27614237 0 .5.22385763.5.5v4.99618635c0 .27614237-.22385763.5-.5.5h-2.7473477c-.27614237 0-.5-.22385763-.5-.5v-4.99618635c0-.27614237.22385763-.5.5-.5zm-.2503477.75h-2.247v4.496h2.247zm-1.49832615 1.78125c.25888348 0 .46875.20986652.46875.46875s-.20986652.46875-.46875.46875-.46875-.20986652-.46875-.46875.20986652-.46875.46875-.46875z" fill="#777"/></svg>
--- a/data/styles/default/dark/symbols/square-m.svg
+++ b/data/styles/default/dark/symbols/square-m.svg
@@ -1 +0,0 @@
-<svg height="4" viewBox="0 0 4 4" width="4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h4v4h-4z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m0 0h4v4h-4z" fill="#000"/><path d="m.67.67h2.67v2.67h-2.67z" fill="#747474"/></g></svg>
--- a/data/styles/default/dark/symbols/tree-m.svg
+++ b/data/styles/default/dark/symbols/tree-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9.76536686 3.31703659 2.71190694 1.12330864c.4900562.20298791.8794043.59233602 1.0823922 1.0823922l1.1233087 2.71190696c.2029879.49005617.2029879 1.04067755 0 1.53073372l-1.1233087 2.71190699c-.2029879.4900561-.592336.8794043-1.0823922 1.0823922l-2.71190694 1.1233086c-.49005617.2029879-1.04067755.2029879-1.53073372 0l-2.71190696-1.1233086c-.49005618-.2029879-.87940429-.5923361-1.0823922-1.0823922l-1.12330864-2.71190699c-.20298792-.49005617-.20298792-1.04067755 0-1.53073372l1.12330864-2.71190696c.20298791-.49005618.59233602-.87940429 1.0823922-1.0823922l2.71190696-1.12330864c.43560548-.18043371.91906496-.20048189 1.36530467-.06014457z" fill="#202510" fill-rule="evenodd"/></svg>
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -254,6 +254,7 @@ area|z11-[natural=bare_rock],
 /* 5.BEACH, GLACIER, DESERT, etc. */

 area|z0-[natural=glacier],
+area|z0-[natural=sand],
 area|z10-[natural=beach],
 area|z0-[natural=desert],
 area|z10-[leisure=beach_resort],
@@ -262,6 +263,7 @@ area|z10-[leisure=beach_resort],
 area|z0-[natural=glacier]
 {fill-color: @glacier;}

+area|z0-[natural=sand],
 area|z10-[natural=beach],
 area|z10-[leisure=beach_resort],
 {fill-color: @beach;}
--- a/data/styles/default/include/Basemap_label.mapcss
+++ b/data/styles/default/include/Basemap_label.mapcss
@@ -468,6 +468,7 @@ area|z17-[landuse=plant_nursery],
 /* 5.2 Beach, Glacier, Desert, etc. */

 area|z14-[natural=desert],
+area|z15-[natural=sand],
 node|z15-[natural=beach],
 {text: name;font-size: 10;text-color: @poi_label;}

@@ -665,12 +666,17 @@ node|z16-[addr:housenumber][addr:street]::int_name,

 node|z18-[entrance=main],
 node|z18-[emergency=emergency_ward_entrance],
-node|z19-[entrance],
+node|z19-[entrance!=emergency],
+node|z19-[entrance=entry],
 node|z19-[entrance=exit],
+node|z19-[entrance=house],
+node|z19-[entrance=service],
 node|z19-[amenity=loading_dock],
+node|z20-[entrance=emergency],
 {text: name; text-color: @building_label;}
 node|z18-[entrance=main]::flats,
-node|z19-[entrance]::flats,
+node|z19-[entrance!=emergency]::flats,
+node|z19-[entrance=entry]::flats,
 node|z19-[entrance=exit]::flats,
 {text: int_name; text-color: @building_label; font-size: 8; text-offset: 1;}

@@ -705,21 +711,39 @@ node|z18-[addr:housenumber][addr:street],
 node|z16-[addr:housenumber][addr:street]::int_name,
 {font-size: 8;}

-node|z17[entrance],
-node|z18[amenity=loading_dock],
-node|z16[entrance=main],
-node|z16[emergency=emergency_ward_entrance],
-{icon-image: square-m.svg;}
+node|z17-[entrance],
+{icon-image: entrance-xs.svg;}
+node|z17[entrance=entrance],
+{icon-image: entrance-entry-xs.svg;}
+node|z17[entrance=exit],
+{icon-image: entrance-exit-xs.svg;}
+node|z17-[entrance=main],
+{icon-image: entrance-main-xs.svg;}
+node|z16-[emergency=emergency_ward_entrance],
+{icon-image: entrance-emergency-xs.svg;}

 node|z18-[entrance],
-node|z19-[amenity=loading_dock],
-{icon-image: entrance-s.svg; font-size: 10; text-offset: 1;}
+{icon-image: entrance-m.svg; font-size: 10; text-offset: 1;}
+node|z18-[entrance=entrance],
+{icon-image: entrance-entry-m.svg; font-size: 10; text-offset: 1;}
 node|z18-[entrance=exit],
-{icon-image: entrance-exit-s.svg; font-size: 10; text-offset: 1;}
-node|z17-[entrance=main],
-{icon-image: entrance-main-s.svg; font-size: 10; text-offset: 1;}
-node|z17-[emergency=emergency_ward_entrance],
-{icon-image: entrance-emergency-s.svg; font-size: 10; text-offset: 1;}
+{icon-image: entrance-exit-m.svg; font-size: 10; text-offset: 1;}
+node|z18-[entrance=main],
+{icon-image: entrance-main-m.svg; font-size: 10; text-offset: 1;}
+node|z18-[emergency=emergency_ward_entrance],
+{icon-image: entrance-emergency-m.svg; font-size: 10; text-offset: 1;}
+node|z19-[entrance=service],
+node|z19-[amenity=loading_dock],
+{icon-image: entrance-service-m.svg; font-size: 10; text-offset: 1;}
+node|z20-[entrance=emergency],
+{icon-image: emergency-exit-m.svg; font-size: 10; text-offset: 1;}
+
+node|z17[entrance=home],
+node|z17[entrance=staircase],
+node|z17-18[entrance=garage],
+node|z17-18[entrance=service],
+node|z17-19[entrance=emergency],
+{icon-image: none;}

 /* 8.3 Airports */
 area|z14-[aeroway=terminal]
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -206,6 +206,9 @@ node|z19-[man_made=water_well][drinking_water=not],
 node|z19-[amenity=water_point][drinking_water=not],
 {icon-image: drinking-water-no-m.svg;}

+node|z18-[natural=tree],
+{icon-image: tree-m.svg;}
+
 /* 3. TRANSPORT */

 node|z12-[railway=station],
@@ -323,12 +326,14 @@ node|z19-[amenity=bus_station],
 node|z19-[amenity=bus_station]::int_name,
 {text-offset: 1;font-size: 10;}

+node|z15[highway=bus_stop],
+{icon-image: bus-xxs.svg;icon-min-distance: 1;}
 node|z16[highway=bus_stop],
-{icon-image: bus-m.svg;}
+{icon-image: bus-xs.svg;icon-min-distance: 1;}
 node|z17-[highway=bus_stop],
-{icon-image: bus-m.svg;text-offset: 1;font-size: 11;}
+{icon-image: bus-sm.svg;text-offset: 1;font-size: 11;}
 node|z18-19[highway=bus_stop]::int_name,
-{icon-image: bus-m.svg;text-offset: 1;font-size: 9;}
+{icon-image: bus-sm.svg;text-offset: 1;font-size: 9;}

 /* 3.5 Ferry terminal */

@@ -1361,7 +1366,7 @@ node|z17-[barrier=wicket_gate],
 {icon-image: dot-m.svg;font-size: 11;}

 node|z16-[barrier=entrance],
-{icon-image: entrance-barrier-s.svg; font-size: 11;}
+{icon-image: entrance-barrier-xs.svg; font-size: 11;}

 node|z17-[highway=ladder],
 {icon-image: ladder-m.svg;font-size: 11;}
@@ -1542,7 +1547,7 @@ node|z17-[amenity=telephone]
 {icon-image: phone-m.svg;}

 node|z17-[emergency=phone]
-{icon-image: emergency-phone-m.svg;}
+{icon-image: emergency-phone-m.svg; text-offset: 1;}


 node|z16-[amenity=recycling][recycling_type=centre],
--- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -242,6 +242,7 @@ natural-beach-gravel                                # area z10- (also has captio
 natural-beach-sand                                  # area z10- (also has caption z15-)
 natural-desert                                      # area z1- (also has caption z14-)
 natural-glacier                                     # area z1-
+natural-sand                                        # area z1- (also has caption z15-)
 === 30

 natural-land                                        # area z1-
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -550,7 +550,7 @@ railway-subway_entrance-yokohama                    # icon z16- (also has captio
 railway-tram_stop                                   # icon z14- (also has caption(optional) z17-)
 === 3650

-highway-bus_stop                                    # icon z16- (also has caption(optional) z17-)
+highway-bus_stop                                    # icon z14- (also has caption(optional) z17-)
 === 3600

 amenity-drinking_water                              # icon z17- (also has caption(optional) z18-)
@@ -574,6 +574,7 @@ natural-beach-gravel                                # caption z15- (also has are
 natural-beach-sand                                  # caption z15- (also has area z10-)
 natural-cape                                        # caption z14-
 natural-desert                                      # caption z14- (also has area z1-)
+natural-sand                                        # caption z15- (also has area z1-)
 === 3250

 shop-supermarket                                    # icon z16- (also has caption(optional) z16-)
@@ -1295,9 +1296,15 @@ power-plant-wind                                    # icon z15- (also has captio
 === 230

 barrier-entrance                                    # icon z16- (also has caption(optional) z16-)
-entrance-main                                       # icon z16- (also has caption(optional) z18-)
+entrance-main                                       # icon z17- (also has caption(optional) z18-)
+=== 225
+
+entrance                                            # icon z17- (also has caption(optional) z19-)
+entrance-entry                                      # icon z17- (also has caption(optional) z19-)
+entrance-exit                                       # icon z17- (also has caption(optional) z19-)
 === 220

+entrance-emergency                                  # icon z20- (also has caption(optional) z20-)
 highway-traffic_signals                             # icon z19-
 === 215

@@ -1775,7 +1782,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-tram_stop                                 # caption(optional) z17- (also has icon z14-)
 # === -6350

-# highway-bus_stop                                  # caption(optional) z17- (also has icon z16-)
+# highway-bus_stop                                  # caption(optional) z17- (also has icon z14-)
 # === -6400

 # amenity-drinking_water                            # caption(optional) z18- (also has icon z17-)
@@ -2285,9 +2292,17 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -9770

 # barrier-entrance                                  # caption(optional) z16- (also has icon z16-)
-# entrance-main                                     # caption(optional) z18- (also has icon z16-)
+# entrance-main                                     # caption(optional) z18- (also has icon z17-)
+# === -9775
+
+# entrance                                          # caption(optional) z19- (also has icon z17-)
+# entrance-entry                                    # caption(optional) z19- (also has icon z17-)
+# entrance-exit                                     # caption(optional) z19- (also has icon z17-)
 # === -9780

+# entrance-emergency                                # caption(optional) z20- (also has icon z20-)
+# === -9785
+
 # historic-anchor                                   # caption(optional) z18- (also has icon z18-)
 # historic-cannon                                   # caption(optional) z18- (also has icon z18-)
 # historic-memorial-plaque                          # caption(optional) z18- (also has icon z18-)
@@ -2329,11 +2344,14 @@ tourism-information                                 # icon z16- (also has captio
 tourism-information-board                           # icon z16- (also has caption(optional) z16-)
 tourism-information-guidepost                       # icon z16- (also has caption(optional) z16-)
 tourism-information-map                             # icon z16- (also has caption(optional) z16-)
-=== -9950
+=== -9940

 amenity                                             # caption z19-
 amenity-telephone                                   # icon z17- (also has caption(optional) z19-)
-entrance                                            # icon z17- (also has caption(optional) z19-)
+entrance-house                                      # icon z19- (also has caption(optional) z19-)
+=== -9950
+
+entrance-garage                                     # icon z19- (also has caption(optional) z19-)
 === -9960

 amenity-food_sharing                                # icon z18- (also has caption(optional) z18-)
@@ -2362,7 +2380,7 @@ amenity-lounger                                     # icon z18- (also has captio
 amenity-waste_disposal                              # icon z18- (also has caption(optional) z18-)
 emergency-assembly_point                            # icon z18- (also has caption(optional) z18-)
 emergency-defibrillator                             # icon z18- (also has caption(optional) z18-)
-emergency-phone                                     # icon z17-
+emergency-phone                                     # icon z17- (also has caption(optional) z19-)
 man_made-telescope                                  # icon z18- (also has caption(optional) z18-)
 === -9980

@@ -2371,12 +2389,15 @@ emergency-fire_hydrant                              # icon z19- (also has captio
 power-substation                                    # icon z17- (also has caption(optional) z18-, area z13-)
 === -9990

+natural-tree                                        # icon z18-
+=== -9991
+
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
 # amenity-bench-backless                            # caption(optional) z19- (also has icon z18-)
 # amenity-food_sharing                              # caption(optional) z18- (also has icon z18-)
 # amenity-give_box                                  # caption(optional) z18- (also has icon z18-)
-amenity-loading_dock                                # icon z18- (also has caption(optional) z19-)
-# amenity-loading_dock                              # caption(optional) z19- (also has icon z18-)
+amenity-loading_dock                                # icon z19- (also has caption(optional) z19-)
+# amenity-loading_dock                              # caption(optional) z19- (also has icon z19-)
 # amenity-lounger                                   # caption(optional) z19- (also has icon z18-)
 # amenity-parking_space-disabled                    # caption(optional) z19- (also has icon z18-)
 # amenity-telephone                                 # caption(optional) z19- (also has icon z17-)
@@ -2394,9 +2415,11 @@ amenity-loading_dock                                # icon z18- (also has captio
 # emergency-assembly_point                          # caption(optional) z18- (also has icon z18-)
 # emergency-defibrillator                           # caption(optional) z18- (also has icon z18-)
 # emergency-fire_hydrant                            # caption(optional) z19- (also has icon z19-)
-# entrance                                          # caption(optional) z19- (also has icon z17-)
-entrance-exit                                       # icon z17- (also has caption(optional) z19-)
-# entrance-exit                                     # caption(optional) z19- (also has icon z17-)
+# emergency-phone                                   # caption(optional) z19- (also has icon z17-)
+# entrance-garage                                   # caption(optional) z19- (also has icon z19-)
+# entrance-house                                    # caption(optional) z19- (also has icon z19-)
+entrance-service                                    # icon z19- (also has caption(optional) z19-)
+# entrance-service                                  # caption(optional) z19- (also has icon z19-)
 # man_made-cairn                                    # caption(optional) z19- (also has icon z19-)
 # man_made-survey_point                             # caption(optional) z18- (also has icon z18-)
 # man_made-telescope                                # caption(optional) z18- (also has icon z18-)
--- a/data/styles/default/light/symbols/bus-sm.svg
+++ b/data/styles/default/light/symbols/bus-sm.svg
@@ -0,0 +1 @@
+<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#fff" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.5" rx="1.5" width="13.5" x=".75" y=".75"/><path d="m4.30833333 11.4713297c.21052121.0559605.43455474.0861305.66692134.0861305h.66552345l.00088855.3790098c0 .311229-.29836282.56353-.666412.56353-.3680492 0-.666412-.252301-.666412-.56353zm6.38295947.0002346.0003739.4649057c0 .311229-.298278.56353-.6662225.56353-.36794462 0-.66622253-.252301-.66622253-.56353l-.00088834-.3790098h.66711087c.2319755 0 .4556437-.0300857.6658486-.0858959zm-.561486-8.55489763c.829944 0 1.5027466.67280261 1.5027466 1.50274669v5.25961347c0 .82994407-.6728026 1.50274667-1.5027466 1.50274667h-5.25961352c-.82994407 0-1.50274669-.6728026-1.50274669-1.50274667v-5.25961347c0-.82994408.67280262-1.50274669 1.50274669-1.50274669zm-5.24127678 6.38667341c-.31122904 0-.56353002.252301-.56353002.56353 0 .31122912.25230098.56353012.56353002.56353012.31122902 0 .56353001-.252301.56353001-.56353012 0-.311229-.25230099-.56353-.56353001-.56353zm5.21666668 0c-.31122903 0-.56353003.252301-.56353003.56353 0 .31122912.252301.56353012.56353003.56353012.311229 0 .56353-.252301.56353-.56353012 0-.311229-.252301-.56353-.56353-.56353zm.56147-3.84500675h-6.3416667v2.42105266c0 .3565628.31547343.64561401.70462963.64561401h4.93240737c.3891563 0 .7046297-.28905121.7046297-.64561401zm-.7046297-1.58333333h-4.93240737c-.3891562 0-.70462963.3364013-.70462963.75137335v.37568667h6.3416667v-.37568667c0-.41497205-.3154734-.75137335-.7046297-.75137335z" fill="#fff" fill-rule="evenodd"/></g></svg>
--- a/data/styles/default/light/symbols/bus-xs.svg
+++ b/data/styles/default/light/symbols/bus-xs.svg
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 6 6" width="6" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m5 0c.55228475 0 1 .44771525 1 1v4c0 .55228475-.44771525 1-1 1h-4c-.55228475 0-1-.44771525-1-1v-4c0-.55228475.44771525-1 1-1z" fill="#fff" fill-opacity=".6"/><path d="m1 .5h4c.27614237 0 .5.22385763.5.5v4c0 .27614237-.22385763.5-.5.5h-4c-.27614237 0-.5-.22385763-.5-.5v-4c0-.27614237.22385763-.5.5-.5z" fill="#2f6499" fill-rule="evenodd"/></g></svg>
--- a/data/styles/default/light/symbols/bus-xxs.svg
+++ b/data/styles/default/light/symbols/bus-xxs.svg
@@ -0,0 +1 @@
+<svg height="5" viewBox="0 0 5 5" width="5" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m4 0c.55228475 0 1 .44771525 1 1v3c0 .55228475-.44771525 1-1 1h-3c-.55228475 0-1-.44771525-1-1v-3c0-.55228475.44771525-1 1-1z" fill="#fff" fill-opacity=".6"/><path d="m1 .5h3c.27614237 0 .5.22385763.5.5v3c0 .27614237-.22385763.5-.5.5h-3c-.27614237 0-.5-.22385763-.5-.5v-3c0-.27614237.22385763-.5.5-.5z" fill="#2f6499" fill-rule="evenodd"/></g></svg>
--- a/data/styles/default/light/symbols/bus-xxxs.svg
+++ b/data/styles/default/light/symbols/bus-xxxs.svg
@@ -0,0 +1 @@
+<svg height="4" viewBox="0 0 4 4" width="4" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m3 0c.55228475 0 1 .44771525 1 1v2c0 .55228475-.44771525 1-1 1h-2c-.55228475 0-1-.44771525-1-1v-2c0-.55228475.44771525-1 1-1z" fill="#fff" fill-opacity=".6"/><path d="m1 .5h2c.27614237 0 .5.22385763.5.5v2c0 .27614237-.22385763.5-.5.5h-2c-.27614237 0-.5-.22385763-.5-.5v-2c0-.27614237.22385763-.5.5-.5z" fill="#2f6499" fill-rule="evenodd"/></g></svg>
--- a/data/styles/default/light/symbols/emergency-exit-m.svg
+++ b/data/styles/default/light/symbols/emergency-exit-m.svg
@@ -0,0 +1 @@
+<svg height="10" viewBox="0 0 8 10" width="8" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.45638209 0c.37609148 0 .72425864.1747833.96936352.49369282l.06615442.10027904c.10687134.18244079.16414241.39064697.16414241.60600579l.00033965 7.60002235c0 .08452163-.00881715.16822686-.03378359.28090951l-.0458696.14760544-.06668844.14497209-.07146019.1153718-.06179076.08041635-.07556165.08214374-.10781751.09508139-.10964934.07580657-.12987138.06948085-.07954583.03314166c-.04905188.01754418-.04905188.01754418-.1303233.03957053l-.15920996.02799023-.1287681.00750984h-4.22425693c-.10907652 0-.21669708-.01468463-.35383951-.05390448l-.14047138-.05265064-.10280855-.05337186-.14765925-.09957233-.10159134-.09041744-.10489342-.11895698-.0784479-.11480897-.05509066-.10505725-.06607418-.17129918-.02223491-.08669691c-.01814821-.0826435-.02722855-.16749219-.02722706-.25204115l-.00144536-.591-.00199757-.28322281-.02893303.00146741c-.51942228.01887315-.91865829-.24714738-.98830514-.67658602l-.01042408-.11069391c-.01253177-.43076054.32054599-.82795908.77223753-.84441048l.25542472-.030777c.00229529-.08066906.00229529-.18987309 0-.32761211-.03371432-.00977655-.08956256-.02247896-.1233309-.03714759-.45095098-.19588858-.51469301-.68984012-.30519389-1.15166694l.43196772-.89919451c.00947774-.02096777.00947724-.90442739-.00000149-2.65037885 0-.6627417.5372583-1.2 1.2-1.2z" fill="#fff" opacity=".6"/><path d="m6.45638209.5c.22551627 0 .42612467.10664329.55414621.27225087l.04994362.07444573c.06074822.1037037.09557052.22443696.09557052.3533034l.00033965 7.6c0 .05011473-.00526633.09899944-.01527578.1461309l-.02384038.085169-.03771531.08786746-.0419297.07097489-.03740085.05020216-.03821292.04374726-.06347463.05861778-.06028924.04402764-.07874284.044385-.06117341.02581362c-.01766844.00664526-.03607223.01258439-.05479097.01776541l-.09216812.01890871-.0953255.00639017h-4.22425693c-.06480353 0-.12755032-.00880593-.18710905-.02528645l-.09162788-.0324093-.04872236-.02328158-.09538019-.0610859-.05713707-.04808259-.06450448-.06946502-.04937574-.06908366-.02934081-.05219473-.04389022-.10543844-.01765973-.06765121c-.01032579-.04702168-.01559212-.09590639-.01559212-.14602112l-.00144537-.591.66089153-.02540436.09415983-.01277867-.00300941.57818303h4.12374307v-7.499h-4.12374307l-.00049701.60518552c-.30277731.25714038-.49010086.63138619-.49010086 1.05120766l.00555985.11160682-.07728011.00485305c-.0660555.00624911-.12924699.01672474-.18947556.03124346l.00119711-1.85409651c0-.38659932.31340067-.7.7-.7zm-2.256326 3.31599576c.25595671 0 .43735449.1230815.49018767.54084433l.02877808.57142067.62174436.19704693c.31792476.09362657.4520938.24201607.40250712.44516851-.03257321.13344966-.16664108.18318709-.40220364.14921229-.11574123-.01797477-.23380508-.05174093-.31880324-.0684414l-.60646039-.16066363c-.26277038-.06961813-.29780643-.22302452-.30247791-.41885973l-.07592051-.64933479-.16065403.0000192c-.19078646.30319659-.10110927.79611708-.16066363 1.25944922h.29120123c.32132726 0 .83343457.3031966.51210731.90960578l-.48199088.90963778c-.32132726.60639318-.80328614.15159989-.64265452-.1515999l.48199089-.90963778c.0648808-.12244607-.03044986-.14599339-.10942109-.15052172l-.84425517-.00107817-.15426327.28432918-.14131385.24161291c-.14333507.22167486-.22812622.57718916-.61780982.57718916l-1.02876487.03740254c-.68581553.02491902-.53293243-.61986625-.19003789-.63235508l1.0908756-.03994917c.05913462-.0063629.08251176-.03738214.18447811-.22729991.13109959-.24417998.20388236-.45229962.20388236-.59080509 0-.35265986.06565766-1.09536109.16065723-1.51599895h-.48199088l-.09191427.16896043-.3097352.59819487c-.14617965.27634582-.31140187.31036692-.44324586.25309522-.13184399-.05727171-.15972216-.24295654-.05677328-.47029852l.50001914-1.00474529c.02972597-.06576327.08142637-.15159989.32132725-.15159989zm-.965957-1.51599576c.3549322 0 .64265451.27147032.64265451.60639318 0 .33492926-.28771911.60639318-.64265451.60639318-.3549322 0-.64265452-.27147032-.64265452-.60639318 0-.31522754.25486538-.57423664.58076149-.60361755z" fill="#019b41"/></g></svg>
--- a/data/styles/default/light/symbols/entrance-barrier-m.svg
+++ b/data/styles/default/light/symbols/entrance-barrier-m.svg
@@ -0,0 +1 @@
+<svg height="9" viewBox="0 0 6 9" width="6" xmlns="http://www.w3.org/2000/svg"><path d="m5.05357504.00381365c.38659933 0 .7.31340068.7.7v7.6c0 .38659933-.31340067.7-.7.7h-4.22459658c-.38659933 0-.7-.31340067-.7-.7v-7.6c0-.38659932.31340067-.7.7-.7zm-.05059658.749-4.125.001v7.499h4.125z" fill="#747e86"/></svg>
--- a/data/styles/default/light/symbols/entrance-barrier-s.svg
+++ b/data/styles/default/light/symbols/entrance-barrier-s.svg
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="6" height="9" version="1.1" viewBox="0 0 6 9" xmlns="http://www.w3.org/2000/svg">
- <path d="m0.5 0.5h5v8h-5z" fill="none" stroke="#747E86" stroke-width=".75"/>
-</svg>
--- a/data/styles/default/light/symbols/entrance-barrier-xs.svg
+++ b/data/styles/default/light/symbols/entrance-barrier-xs.svg
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 4 6" width="4" xmlns="http://www.w3.org/2000/svg"><path d="m3.37632615.00381365c.27614238 0 .5.22385763.5.5v4.99618635c0 .27614237-.22385762.5-.5.5h-2.74734769c-.27614238 0-.5-.22385763-.5-.5v-4.99618635c0-.27614237.22385762-.5.5-.5zm-.25034769.75h-2.247v4.496h2.247z" fill="#747e86" transform="translate(.0041)"/></svg>
--- a/data/styles/default/light/symbols/entrance-emergency-m.svg
+++ b/data/styles/default/light/symbols/entrance-emergency-m.svg
@@ -0,0 +1 @@
+<svg height="9" viewBox="0 0 11 9" width="11" xmlns="http://www.w3.org/2000/svg"><path d="m10.0493285 0c.3869702 0 .7006715.31340068.7006715.7v7.59309317c0 .38659933-.3137013.7-.7006715.7l-4.17193572-.00009317-.75042427.007-4.17629705-.00690683c-.38697016 0-.70067146-.31340067-.70067146-.7v-7.59309317c0-.38659932.3137013-.7.70067146-.7zm-4.92265514.749-4.12595394.001-.00100096 7.493 4.1269549-.001v-1.748l-.62530437.00082255-.00029515-1.00082255-1.00066408.00082255v-2l1.00066408-.00082255.00029515-.99917745.62530437-.00082255zm4.87166855.001-4.12094913-.001v1.745l.62589466.00082255-.00029515.99917745 1.00125438.00082255v2l-1.00125438-.00082255.00029515 1.00082255-.62589466-.00082255v1.748l4.12094913.001z" fill="#d85961"/></svg>
--- a/data/styles/default/light/symbols/entrance-emergency-s.svg
+++ b/data/styles/default/light/symbols/entrance-emergency-s.svg
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="11" height="9" version="1.1" viewBox="0 0 11 9" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <path d="m0.5 0.5v8h10v-8z" fill="none" stroke="#D85961" stroke-width=".75"/>
- <path d="m5.5 0.5v8" fill="none" stroke="#D85961" stroke-width=".75"/>
- <path d="m7.5834 5.3334h-1.25v1.25c0 0.22916-0.18749 0.41667-0.41667 0.41667h-0.83337c-0.22916 0-0.41667-0.18749-0.41667-0.41667v-1.25h-1.25c-0.22916 0-0.41667-0.18749-0.41667-0.41667v-0.83337c0-0.22917 0.18749-0.41667 0.41667-0.41667h1.25v-1.25c0-0.22916 0.18749-0.41667 0.41667-0.41667h0.83337c0.22917 0 0.41667 0.18749 0.41667 0.41667v1.25h1.25c0.22916 0 0.41667 0.1875 0.41667 0.41667v0.83337c0 0.22916-0.18749 0.41667-0.41667 0.41667z" fill="#D85961"/>
-</svg>
--- a/data/styles/default/light/symbols/entrance-emergency-xs.svg
+++ b/data/styles/default/light/symbols/entrance-emergency-xs.svg
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 7 6" width="7" xmlns="http://www.w3.org/2000/svg"><path d="m6.49689709-.00309317c.27614237 0 .5.22385762.5.5v4.99618634c0 .27614238-.22385763.5-.5.5l-2.62189709-.00018634-.75.00709317-2.625-.00690683c-.27614237 0-.5-.22385762-.5-.5v-4.99618634c0-.27614238.22385763-.5.5-.5zm-3.37189709.749-2.375.001v4.496h2.375v-.748l-.375.00009317-.001-.75009317-.749.00009317v-1.5l.749-.00009317.001-.74990683.375-.00009317zm3.121 0-2.371-.001v.75l.375.00009317-.001.74990683.751.00009317v1.5l-.751-.00009317.001.75009317-.375-.00009317v.748h2.371z" fill="#d85961"/></svg>
--- a/data/styles/default/light/symbols/entrance-entry-m.svg
+++ b/data/styles/default/light/symbols/entrance-entry-m.svg
@@ -0,0 +1 @@
+<svg height="9" viewBox="0 0 12 9" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m4.50016351 0c-.38659932 0-.7.31340068-.7.7l.00059659 2.55h.751l-.001-2.501 4.125.001v7.499h-4.125l.001-2.499h-.751l-.00059659 2.55c0 .38659932.31340068.7.7.7h4.22459659c.38659932 0 .7-.31340068.7-.7v-7.6c0-.38659932-.31340068-.7-.7-.7zm1.758459 2.50813059 1.99137749 1.99137749-1.99137749 1.99236133-.53033009-.53033009 1.11942967-1.11953932-5.09772209.00011809v-.75l5.03172209-.00011809-1.05342967-1.05353932z" fill="#747e86"/></svg>
--- a/data/styles/default/light/symbols/entrance-entry-xs.svg
+++ b/data/styles/default/light/symbols/entrance-entry-xs.svg
@@ -0,0 +1 @@
+<svg height="7" viewBox="0 0 9 7" width="9" xmlns="http://www.w3.org/2000/svg"><path d="m3.27575522.00381365c-.27614238 0-.5.22385763-.5.5l.00034769 1.24618635h.751l-.001-.99618635h2.247v4.496h-2.247l.001-.99981365h-.751l-.00034769 1.25c0 .27614237.22385762.5.5.5h2.74734769c.27614238 0 .5-.22385763.5-.5v-4.99618635c0-.27614237-.22385762-.5-.5-.5zm.93313413 1.6162696 1.41421356 1.41421356-1.41421356 1.4151974-.53033009-.53033008.54264244-.54235048-3.1012017.00009318v-.75l3.0352017-.00009318-.47664244-.47640031z" fill="#747e86" transform="translate(.1946 .4987)"/></svg>
--- a/data/styles/default/light/symbols/entrance-exit-m.svg
+++ b/data/styles/default/light/symbols/entrance-exit-m.svg
@@ -0,0 +1 @@
+<svg height="9" viewBox="0 0 12 9" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m7.49983649 0c.38659932 0 .7.31340068.7.7l-.00059659 2.55h-.751l.001-2.501-4.125.001v7.499h4.125l-.001-2.499h.751l.00059659 2.55c0 .38659932-.31340068.7-.7.7h-4.22459659c-.38659932 0-.7-.31340068-.7-.7v-7.6c0-.38659932.31340068-.7.7-.7zm2.50878601 2.50813059 1.9913775 1.99137749-1.9913775 1.99236133-.53033008-.53033009 1.11942968-1.11953932-5.0977221.00011809v-.75l5.0317221-.00011809-1.05342968-1.05353932z" fill="#747e86"/></svg>
--- a/data/styles/default/light/symbols/entrance-exit-s.svg
+++ b/data/styles/default/light/symbols/entrance-exit-s.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="9" height="9" version="1.1" viewBox="0 0 9 9" xmlns="http://www.w3.org/2000/svg">
- <path d="m6.5704 0.1875v1.8427l1.0591 2.0948h-4.6294v0.75h4.6294l-1.0591 2.0948v1.8428l2.1796-4.3125z" fill="#747E86"/>
- <path d="m0.5 0.5h5v8h-5z" fill="none" stroke="#747E86" stroke-width=".75"/>
-</svg>
--- a/data/styles/default/light/symbols/entrance-exit-xs.svg
+++ b/data/styles/default/light/symbols/entrance-exit-xs.svg
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 8 6" width="8" xmlns="http://www.w3.org/2000/svg"><path d="m4.74424478.00381365c.27614238 0 .5.22385763.5.5l-.00034769 1.24618635h-.751l.001-.99618635h-2.247v4.496h2.247l-.001-.99981365h.751l.00034769 1.25c0 .27614237-.22385762.5-.5.5h-2.74734769c-.27614238 0-.5-.22385763-.5-.5v-4.99618635c0-.27614237.22385762-.5.5-.5zm1.84154166 1.6162696 1.41421356 1.41421356-1.41421356 1.4151974-.53033009-.53033008.54264244-.54235048-3.1012017.00009318v-.75l3.0352017-.00009318-.47664244-.47640031z" fill="#747e86" transform="translate(.0081)"/></svg>
--- a/data/styles/default/light/symbols/entrance-m.svg
+++ b/data/styles/default/light/symbols/entrance-m.svg
@@ -0,0 +1 @@
+<svg height="9" viewBox="0 0 6 9" width="6" xmlns="http://www.w3.org/2000/svg"><path d="m5.05092274-.01381365c.38659932 0 .7.31340067.7.7v7.6c0 .38659932-.31340068.7-.7.7h-4.22459659c-.38659932 0-.7-.31340068-.7-.7v-7.6c0-.38659933.31340068-.7.7-.7zm-.05059659.749-4.125.001v7.499h4.125zm-2.75032615 3.01481365c.41421356 0 .75.33578644.75.75s-.33578644.75-.75.75-.75-.33578644-.75-.75.33578644-.75.75-.75z" fill="#747e86"/></svg>
--- a/data/styles/default/light/symbols/entrance-main-m.svg
+++ b/data/styles/default/light/symbols/entrance-main-m.svg
@@ -0,0 +1 @@
+<svg height="9" viewBox="0 0 11 9" width="11" xmlns="http://www.w3.org/2000/svg"><path d="m10.0510104 0c.3865993 0 .7.31340068.7.7v7.6c0 .38659932-.3134007.7-.7.7h-9.1020208c-.38659933 0-.7-.31340068-.7-.7v-7.6c0-.38659932.31340067-.7.7-.7zm-4.9240208.75h-4.128v7.5h4.128zm4.874 0h-4.124v7.5h4.124zm-2.7509896 3c.41421356 0 .75.33578644.75.75s-.33578644.75-.75.75-.75-.33578644-.75-.75.33578644-.75.75-.75zm-3.5 0c.41421356 0 .75.33578644.75.75s-.33578644.75-.75.75-.75-.33578644-.75-.75.33578644-.75.75-.75z" fill="#747e86"/></svg>
--- a/data/styles/default/light/symbols/entrance-main-s.svg
+++ b/data/styles/default/light/symbols/entrance-main-s.svg
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="11" height="9" version="1.1" viewBox="0 0 11 9" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <path d="m0.5 0.5v8h10v-8z" fill="none" stroke="#747E86" stroke-width=".75"/>
- <path d="m5.5 0.5v8" fill="none" stroke="#747E86" stroke-width=".75"/>
- <circle cx="4" cy="4.5" r=".75" fill="#747E86"/>
- <circle cx="7" cy="4.5" r=".75" fill="#747E86"/>
-</svg>
--- a/data/styles/default/light/symbols/entrance-main-xs.svg
+++ b/data/styles/default/light/symbols/entrance-main-xs.svg
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 7 6" width="7" xmlns="http://www.w3.org/2000/svg"><path d="m6.5.00381365c.27614237 0 .5.22385763.5.5v4.99618635c0 .27614237-.22385763.5-.5.5h-5.99689709c-.27614237 0-.5-.22385763-.5-.5v-4.99618635c0-.27614237.22385763-.5.5-.5zm-3.37189709.749-2.375.001v4.496h2.375zm3.121 0-2.371-.001v4.498h2.371zm-1.62410291 1.77843635c.25888348 0 .46875.20986652.46875.46875s-.20986652.46875-.46875.46875-.46875-.20986652-.46875-.46875.20986652-.46875.46875-.46875zm-2.25 0c.25888348 0 .46875.20986652.46875.46875s-.20986652.46875-.46875.46875-.46875-.20986652-.46875-.46875.20986652-.46875.46875-.46875z" fill="#747e86" transform="translate(.0041)"/></svg>
--- a/data/styles/default/light/symbols/entrance-s.svg
+++ b/data/styles/default/light/symbols/entrance-s.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="6" height="9" version="1.1" viewBox="0 0 6 9" xmlns="http://www.w3.org/2000/svg">
- <path d="m0.5 0.5h5v8h-5z" fill="none" stroke="#747E86" stroke-width=".75"/>
- <circle cx="2" cy="4.5" r=".75" fill="#747E86"/>
-</svg>
--- a/data/styles/default/light/symbols/entrance-service-m.svg
+++ b/data/styles/default/light/symbols/entrance-service-m.svg
@@ -0,0 +1 @@
+<svg height="9" viewBox="0 0 6 9" width="6" xmlns="http://www.w3.org/2000/svg"><path d="m5.05357504.00381365c.38659933 0 .7.31340068.7.7v7.6c0 .38659933-.31340067.7-.7.7h-4.22459658c-.38659933 0-.7-.31340067-.7-.7v-7.6c0-.38659932.31340067-.7.7-.7zm-.05059658.749-4.125.001v7.499h4.125zm-2.06170171 1.99718635c.96649831 0 1.75.78350169 1.75 1.75s-.78350169 1.75-1.75 1.75-1.75-.78350169-1.75-1.75.78350169-1.75 1.75-1.75zm1.16666667 1.3125h-2.33333334v.875h2.33333334z" fill="#747e86"/></svg>
--- a/data/styles/default/light/symbols/entrance-service-xs.svg
+++ b/data/styles/default/light/symbols/entrance-service-xs.svg
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 4 6" width="4" xmlns="http://www.w3.org/2000/svg"><path d="m3.37632615.00381365c.27614238 0 .5.22385763.5.5v4.99618635c0 .27614237-.22385762.5-.5.5h-2.74734769c-.27614238 0-.5-.22385763-.5-.5v-4.99618635c0-.27614237.22385762-.5.5-.5zm-.25034769.75h-2.247v4.496h2.247zm-1.1300447 1.24618635c.55228475 0 1 .44771525 1 1s-.44771525 1-1 1-1-.44771525-1-1 .44771525-1 1-1zm.75671854.75190683h-1.5v.5h1.5z" fill="#747e86" transform="translate(.0041)"/></svg>
--- a/data/styles/default/light/symbols/entrance-xs.svg
+++ b/data/styles/default/light/symbols/entrance-xs.svg
@@ -0,0 +1 @@
+<svg height="6" viewBox="0 0 4 6" width="4" xmlns="http://www.w3.org/2000/svg"><path d="m3.37367385 0c.27614237 0 .5.22385763.5.5v4.99618635c0 .27614237-.22385763.5-.5.5h-2.7473477c-.27614237 0-.5-.22385763-.5-.5v-4.99618635c0-.27614237.22385763-.5.5-.5zm-.2503477.75h-2.247v4.496h2.247zm-1.49832615 1.78125c.25888348 0 .46875.20986652.46875.46875s-.20986652.46875-.46875.46875-.46875-.20986652-.46875-.46875.20986652-.46875.46875-.46875z" fill="#747e86"/></svg>
--- a/data/styles/default/light/symbols/square-m.svg
+++ b/data/styles/default/light/symbols/square-m.svg
@@ -1 +0,0 @@
-<svg height="4" viewBox="0 0 4 4" width="4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h4v4h-4z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m0 0h4v4h-4z" fill="#eed"/><path d="m.67.67h2.67v2.67h-2.67z" fill="#65655E"/></g></svg>
--- a/data/styles/default/light/symbols/tree-m.svg
+++ b/data/styles/default/light/symbols/tree-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m9.76536686 3.31703659 2.71190694 1.12330864c.4900562.20298791.8794043.59233602 1.0823922 1.0823922l1.1233087 2.71190696c.2029879.49005617.2029879 1.04067755 0 1.53073372l-1.1233087 2.71190699c-.2029879.4900561-.592336.8794043-1.0823922 1.0823922l-2.71190694 1.1233086c-.49005617.2029879-1.04067755.2029879-1.53073372 0l-2.71190696-1.1233086c-.49005618-.2029879-.87940429-.5923361-1.0823922-1.0823922l-1.12330864-2.71190699c-.20298792-.49005617-.20298792-1.04067755 0-1.53073372l1.12330864-2.71190696c.20298791-.49005618.59233602-.87940429 1.0823922-1.0823922l2.71190696-1.12330864c.43560548-.18043371.91906496-.20048189 1.36530467-.06014457z" fill="#a2ba4e" fill-rule="evenodd"/></svg>
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -242,6 +242,7 @@ natural-beach-gravel                                # area z10- (also has captio
 natural-beach-sand                                  # area z10- (also has caption z14-)
 natural-desert                                      # area z1- (also has caption z14-)
 natural-glacier                                     # area z1-
+natural-sand                                        # area z1- (also has caption z15-)
 === 30

 natural-land                                        # area z1-
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -550,7 +550,7 @@ railway-subway_entrance-yokohama                    # icon z16- (also has captio
 railway-tram_stop                                   # icon z14- (also has caption(optional) z17-)
 === 3650

-highway-bus_stop                                    # icon z16- (also has caption(optional) z17-)
+highway-bus_stop                                    # icon z14- (also has caption(optional) z17-)
 === 3600

 amenity-drinking_water                              # icon z12- (also has caption(optional) z14-)
@@ -574,6 +574,7 @@ natural-beach-gravel                                # caption z14- (also has are
 natural-beach-sand                                  # caption z14- (also has area z10-)
 natural-cape                                        # caption z14-
 natural-desert                                      # caption z14- (also has area z1-)
+natural-sand                                        # caption z15- (also has area z1-)
 === 3250

 shop-supermarket                                    # icon z16- (also has caption(optional) z16-)
@@ -1298,9 +1299,15 @@ power-pole                                          # icon z15-
 === 230

 barrier-entrance                                    # icon z16- (also has caption(optional) z16-)
-entrance-main                                       # icon z16- (also has caption(optional) z18-)
+entrance-main                                       # icon z17- (also has caption(optional) z18-)
+=== 225
+
+entrance                                            # icon z17- (also has caption(optional) z19-)
+entrance-entry                                      # icon z17- (also has caption(optional) z19-)
+entrance-exit                                       # icon z17- (also has caption(optional) z19-)
 === 220

+entrance-emergency                                  # icon z20- (also has caption(optional) z20-)
 highway-traffic_signals                             # icon z19-
 === 215

@@ -1778,7 +1785,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-tram_stop                                 # caption(optional) z17- (also has icon z14-)
 # === -6350

-# highway-bus_stop                                  # caption(optional) z17- (also has icon z16-)
+# highway-bus_stop                                  # caption(optional) z17- (also has icon z14-)
 # === -6400

 # amenity-drinking_water                            # caption(optional) z14- (also has icon z12-)
@@ -2291,9 +2298,17 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -9770

 # barrier-entrance                                  # caption(optional) z16- (also has icon z16-)
-# entrance-main                                     # caption(optional) z18- (also has icon z16-)
+# entrance-main                                     # caption(optional) z18- (also has icon z17-)
+# === -9775
+
+# entrance                                          # caption(optional) z19- (also has icon z17-)
+# entrance-entry                                    # caption(optional) z19- (also has icon z17-)
+# entrance-exit                                     # caption(optional) z19- (also has icon z17-)
 # === -9780

+# entrance-emergency                                # caption(optional) z20- (also has icon z20-)
+# === -9785
+
 # historic-anchor                                   # caption(optional) z18- (also has icon z18-)
 # historic-cannon                                   # caption(optional) z18- (also has icon z18-)
 # historic-memorial-plaque                          # caption(optional) z18- (also has icon z18-)
@@ -2335,11 +2350,14 @@ tourism-information                                 # icon z15- (also has captio
 tourism-information-board                           # icon z15- (also has caption(optional) z15-)
 tourism-information-guidepost                       # icon z15- (also has caption(optional) z15-)
 tourism-information-map                             # icon z15- (also has caption(optional) z15-)
-=== -9950
+=== -9940

 amenity                                             # caption z19-
 amenity-telephone                                   # icon z17- (also has caption(optional) z19-)
-entrance                                            # icon z17- (also has caption(optional) z19-)
+entrance-house                                      # icon z19- (also has caption(optional) z19-)
+=== -9950
+
+entrance-garage                                     # icon z19- (also has caption(optional) z19-)
 === -9960

 amenity-food_sharing                                # icon z18- (also has caption(optional) z18-)
@@ -2368,7 +2386,7 @@ amenity-lounger                                     # icon z18- (also has captio
 amenity-waste_disposal                              # icon z18- (also has caption(optional) z18-)
 emergency-assembly_point                            # icon z18- (also has caption(optional) z18-)
 emergency-defibrillator                             # icon z18- (also has caption(optional) z18-)
-emergency-phone                                     # icon z17-
+emergency-phone                                     # icon z17- (also has caption(optional) z19-)
 man_made-telescope                                  # icon z18- (also has caption(optional) z18-)
 === -9980

@@ -2377,12 +2395,15 @@ emergency-fire_hydrant                              # icon z19- (also has captio
 power-substation                                    # icon z17- (also has caption(optional) z18-, area z13-)
 === -9990

+natural-tree                                        # icon z18-
+=== -9991
+
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
 # amenity-bench-backless                            # caption(optional) z19- (also has icon z18-)
 # amenity-food_sharing                              # caption(optional) z18- (also has icon z18-)
 # amenity-give_box                                  # caption(optional) z18- (also has icon z18-)
-amenity-loading_dock                                # icon z18- (also has caption(optional) z19-)
-# amenity-loading_dock                              # caption(optional) z19- (also has icon z18-)
+amenity-loading_dock                                # icon z19- (also has caption(optional) z19-)
+# amenity-loading_dock                              # caption(optional) z19- (also has icon z19-)
 # amenity-lounger                                   # caption(optional) z19- (also has icon z18-)
 # amenity-parking_space-disabled                    # caption(optional) z19- (also has icon z18-)
 # amenity-telephone                                 # caption(optional) z19- (also has icon z17-)
@@ -2400,9 +2421,11 @@ amenity-loading_dock                                # icon z18- (also has captio
 # emergency-assembly_point                          # caption(optional) z18- (also has icon z18-)
 # emergency-defibrillator                           # caption(optional) z18- (also has icon z18-)
 # emergency-fire_hydrant                            # caption(optional) z19- (also has icon z19-)
-# entrance                                          # caption(optional) z19- (also has icon z17-)
-entrance-exit                                       # icon z17- (also has caption(optional) z19-)
-# entrance-exit                                     # caption(optional) z19- (also has icon z17-)
+# emergency-phone                                   # caption(optional) z19- (also has icon z17-)
+# entrance-garage                                   # caption(optional) z19- (also has icon z19-)
+# entrance-house                                    # caption(optional) z19- (also has icon z19-)
+entrance-service                                    # icon z19- (also has caption(optional) z19-)
+# entrance-service                                  # caption(optional) z19- (also has icon z19-)
 # man_made-cairn                                    # caption(optional) z17- (also has icon z17-)
 # man_made-survey_point                             # caption(optional) z15- (also has icon z14-)
 # man_made-telescope                                # caption(optional) z18- (also has icon z18-)
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -178,6 +178,7 @@ area|z12-[amenity=prison]
 /* 5.BEACH, GLACIER, DESERT, etc. */

 area|z0-[natural=glacier],
+area|z0-[natural=sand],
 area|z10-[natural=beach],
 area|z0-[natural=desert],
 area|z10-[leisure=beach_resort],
@@ -186,6 +187,7 @@ area|z10-[leisure=beach_resort],
 area|z0-[natural=glacier]
 {fill-color: @glacier;}

+area|z0-[natural=sand],
 area|z10-[natural=beach],
 area|z10-[leisure=beach_resort],
 {fill-color: @beach;fill-opacity: 0.35;}
--- a/data/styles/vehicle/include/Basemap_label.mapcss
+++ b/data/styles/vehicle/include/Basemap_label.mapcss
@@ -363,6 +363,7 @@ area|z18-[leisure=park][!name]

 area|z14-[natural=desert],
 area|z15-[leisure=beach_resort],
+area|z15-[natural=sand],
 area|z15-[natural=beach],
 node|z17-[leisure=beach_resort],
 node|z17-[natural=beach]
--- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt
@@ -133,6 +133,7 @@ natural-beach-gravel                                # area z10- (also has captio
 natural-beach-sand                                  # area z10- (also has caption z15-)
 natural-desert                                      # area z1- (also has caption z14-)
 natural-glacier                                     # area z1-
+natural-sand                                        # area z1- (also has caption z15-)
 === 30

 natural-land                                        # area z1-
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -473,6 +473,7 @@ shop-mall                                           # icon z14- (also has captio
 === 1500

 natural-desert                                      # caption z14- (also has area z1-)
+natural-sand                                        # caption z15- (also has area z1-)
 === 1450

 natural-bay                                         # caption z14-
@@ -756,11 +757,19 @@ building-has_parts                                  # caption z18- (also has are

 building-garage                                     # caption z18- (also has area z15-)
 building-guardhouse                                 # icon z18- (also has area z15-)
-=== 30
+=== 40

 entrance-main                                       # icon z18- (also has caption(optional) z18-)
+=== 30
+
+entrance                                            # icon z19- (also has caption(optional) z19-)
+entrance-entry                                      # icon z19- (also has caption(optional) z19-)
+entrance-exit                                       # icon z19- (also has caption(optional) z19-)
 === 20

+entrance-emergency                                  # icon z19- (also has caption(optional) z19-)
+=== 10
+
 #
 # All automatic optional captions priorities are below 0.
 # They follow the order of their correspoding icons.
@@ -1231,13 +1240,27 @@ entrance-main                                       # icon z18- (also has captio
 # leisure-park-private                              # caption(optional) z14- (also has icon z14-, area z10-)
 # === -9900

+entrance-garage                                     # icon z19- (also has caption(optional) z19-)
+=== -9910
+
+entrance-house                                      # icon z19- (also has caption(optional) z19-)
+=== -9920
+
 # entrance-main                                     # caption(optional) z18- (also has icon z18-)
+# === -9970
+
+# entrance                                          # caption(optional) z19- (also has icon z19-)
+# entrance-entry                                    # caption(optional) z19- (also has icon z19-)
+# entrance-exit                                     # caption(optional) z19- (also has icon z19-)
 # === -9980

+# entrance-emergency                                # caption(optional) z19- (also has icon z19-)
+# === -9990
+
 amenity-loading_dock                                # icon z19- (also has caption(optional) z19-)
 # amenity-loading_dock                              # caption(optional) z19- (also has icon z19-)
-entrance                                            # icon z19- (also has caption(optional) z19-)
-# entrance                                          # caption(optional) z19- (also has icon z19-)
-entrance-exit                                       # icon z19- (also has caption(optional) z19-)
-# entrance-exit                                     # caption(optional) z19- (also has icon z19-)
+# entrance-garage                                   # caption(optional) z19- (also has icon z19-)
+# entrance-house                                    # caption(optional) z19- (also has icon z19-)
+entrance-service                                    # icon z19- (also has caption(optional) z19-)
+# entrance-service                                  # caption(optional) z19- (also has icon z19-)
 === -10000
--- a/generator/search_index_builder.cpp
+++ b/generator/search_index_builder.cpp
@@ -495,7 +495,7 @@ void BuildAddressTable(FilesContainerR & container, std::string const & addressD

      if (!street.empty())
      {
-        auto const streets = search::ReverseGeocoder::GetNearbyStreets(*contexts[threadIdx], center, kStreetRadiusM);
+        auto const streets = search::ReverseGeocoder::GetNearbyStreets(*contexts[threadIdx], center, kStreetRadiusM, true);
        streetId = MatchObjectByName(street, streets, [](std::string_view name)
        { return search::GetStreetNameAsKey(name, false /* ignoreStreetSynonyms */); });

@@ -508,7 +508,7 @@ void BuildAddressTable(FilesContainerR & container, std::string const & addressD

      if (!place.empty())
      {
-        auto const places = search::ReverseGeocoder::GetNearbyPlaces(*contexts[threadIdx], center, kPlaceRadiusM);
+        auto const places = search::ReverseGeocoder::GetNearbyPlaces(*contexts[threadIdx], center, kPlaceRadiusM, true);
        placeId = MatchObjectByName(place, places, [](std::string_view name) { return strings::MakeUniString(name); });
      }

--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -375,7 +375,12 @@

 /* This is for main/primary entrances, for secondary entrances see type.entrance */
 "type.entrance.main" = "Haupteingang";
-"type.entrance.exit" = "Ausgang";
+"type.entrance.house" = "Hauseingang";
+"type.entrance.garage" = "Garageneingang";
+"type.entrance.service" = "Serviceeingang";
+"type.entrance.entry" = "(Nur) Eingang";
+"type.entrance.exit" = "(Nur) Ausgang";
+"type.entrance.emergency" = "Notausgang";
 "type.fee.yes" = "$";
 "type.fee.no" = "Kostenlos";
 "type.healthcare.laboratory" = "Medizinisches Labor";
@@ -841,6 +846,7 @@
 "type.natural.spring" = "Quelle";
 "type.natural.spring.drinking_water_no" = "Quelle";
 "type.natural.strait" = "Meerenge";
+"type.natural.tree" = "Baum";
 "type.natural.tree_row" = "Baumreihe";
 "type.natural.vineyard" = "Weinberg";
 "type.natural.volcano" = "Vulkan";
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
@@ -383,7 +383,12 @@

 /* This is for main/primary entrances, for secondary entrances see type.entrance */
 "type.entrance.main" = "Main Entrance";
-"type.entrance.exit" = "Exit";
+"type.entrance.house" = "House Entrance";
+"type.entrance.garage" = "Garage Entrance";
+"type.entrance.service" = "Service Entrance";
+"type.entrance.entry" = "Entry (Only)";
+"type.entrance.exit" = "Exit (Only)";
+"type.entrance.emergency" = "Emergency Exit";
 "type.fee.yes" = "$";
 "type.fee.no" = "Free";
 "type.healthcare.laboratory" = "Medical Laboratory";
@@ -851,6 +856,7 @@
 "type.natural.spring" = "Natural Spring";
 "type.natural.spring.drinking_water_no" = "Natural Spring";
 "type.natural.strait" = "Strait";
+"type.natural.tree" = "Tree";
 "type.natural.tree_row" = "Tree Row";
 "type.natural.vineyard" = "Vineyard";
 "type.natural.volcano" = "Volcano";
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -402,7 +402,12 @@

 /* This is for main/primary entrances, for secondary entrances see type.entrance */
 "type.entrance.main" = "Main Entrance";
-"type.entrance.exit" = "Exit";
+"type.entrance.house" = "House Entrance";
+"type.entrance.garage" = "Garage Entrance";
+"type.entrance.service" = "Service Entrance";
+"type.entrance.entry" = "Entry (Only)";
+"type.entrance.exit" = "Exit (Only)";
+"type.entrance.emergency" = "Emergency Exit";
 "type.fee.yes" = "$";
 "type.fee.no" = "Free";
 "type.healthcare.laboratory" = "Medical Laboratory";
@@ -862,6 +867,7 @@
 "type.man_made.embankment" = "Embankment";
 "type.natural.coastline" = "Coastline";
 "type.natural.desert" = "Desert";
+"type.natural.sand" = "Sand";
 "type.natural.geyser" = "Geyser";
 "type.natural.glacier" = "Glacier";
 "type.natural.grassland" = "Grassland";
@@ -883,6 +889,7 @@
 "type.natural.spring" = "Natural Spring";
 "type.natural.spring.drinking_water_no" = "Natural Spring";
 "type.natural.strait" = "Strait";
+"type.natural.tree" = "Tree";
 "type.natural.tree_row" = "Tree Row";
 "type.natural.vineyard" = "Vineyard";
 "type.natural.volcano" = "Volcano";
--- a/libs/search/mwm_context.cpp
+++ b/libs/search/mwm_context.cpp
@@ -29,8 +29,15 @@ MwmContext::MwmContext(MwmSet::MwmHandle handle, MwmType type) : MwmContext(std:
  m_type = type;
 }

-std::unique_ptr<FeatureType> MwmContext::GetFeature(uint32_t index) const
+std::unique_ptr<FeatureType> MwmContext::GetFeature(uint32_t index, bool ignoreEditedStatus) const
 {
+  if (ignoreEditedStatus) {
+    auto ft = m_vector.GetByIndex(index);
+    CHECK(ft, ());
+    ft->SetID(FeatureID(GetId(), index));
+    return ft;
+  }
+  
  std::unique_ptr<FeatureType> ft;
  switch (GetEditedStatus(index))
  {
--- a/libs/search/mwm_context.hpp
+++ b/libs/search/mwm_context.hpp
@@ -85,7 +85,7 @@ public:
  }

  template <typename Fn>
-  void ForEachFeature(m2::RectD const & rect, Fn && fn) const
+  void ForEachFeature(m2::RectD const & rect, Fn && fn, bool ignoreEditedStatus = false) const
  {
    uint32_t const scale = m_value.GetHeader().GetLastScale();
    covering::Intervals intervals;
@@ -93,14 +93,12 @@ public:

    ForEachIndexImpl(intervals, scale, [&](uint32_t index)
    {
-      auto ft = GetFeature(index);
-      if (ft)
-        fn(*ft);
+      fn(*GetFeature(index, ignoreEditedStatus));
    });
  }

  // Returns false if feature was deleted by user.
-  std::unique_ptr<FeatureType> GetFeature(uint32_t index) const;
+  std::unique_ptr<FeatureType> GetFeature(uint32_t index, bool ignoreEditedStatus = false) const;

  [[nodiscard]] inline bool GetCenter(uint32_t index, m2::PointD & center) { return m_centers.Get(index, center); }

--- a/libs/search/reverse_geocoder.cpp
+++ b/libs/search/reverse_geocoder.cpp
@@ -77,7 +77,7 @@ ReverseGeocoder::ReverseGeocoder(DataSource const & dataSource) : m_dataSource(d

 template <class ObjT, class FilterT>
 vector<ObjT> GetNearbyObjects(search::MwmContext & context, m2::PointD const & center, double radiusM,
-                              FilterT && filter)
+                              FilterT && filter, bool ignoreEditedStatus = false)
 {
  vector<ObjT> objs;

@@ -90,17 +90,17 @@ vector<ObjT> GetNearbyObjects(search::MwmContext & context, m2::PointD const & c
      if (!name.empty())
        objs.emplace_back(ft.GetID(), feature::GetMinDistanceMeters(ft, center), name, ft.GetNames());
    }
-  });
+  }, ignoreEditedStatus);

  sort(objs.begin(), objs.end(), base::LessBy(&ObjT::m_distanceMeters));
  return objs;
 }

 vector<ReverseGeocoder::Street> ReverseGeocoder::GetNearbyStreets(search::MwmContext & context,
-                                                                  m2::PointD const & center, double radiusM)
+                                                                  m2::PointD const & center, double radiusM, bool ignoreEditedStatus)
 {
  return GetNearbyObjects<Street>(context, center, radiusM,
-                                  [](FeatureType & ft) { return StreetVicinityLoader::IsStreet(ft); });
+                                  [](FeatureType & ft) { return StreetVicinityLoader::IsStreet(ft); }, ignoreEditedStatus);
 }

 vector<ReverseGeocoder::Street> ReverseGeocoder::GetNearbyStreets(MwmSet::MwmId const & id,
@@ -122,13 +122,13 @@ vector<ReverseGeocoder::Street> ReverseGeocoder::GetNearbyStreets(FeatureType &
 }

 std::vector<ReverseGeocoder::Place> ReverseGeocoder::GetNearbyPlaces(search::MwmContext & context,
-                                                                     m2::PointD const & center, double radiusM)
+                                                                     m2::PointD const & center, double radiusM, bool ignoreEditedStatus)
 {
  return GetNearbyObjects<Place>(context, center, radiusM, [](FeatureType & ft)
  {
    return (ftypes::IsLocalityChecker::Instance().GetType(ft) >= ftypes::LocalityType::City ||
            ftypes::IsSuburbChecker::Instance()(ft));
-  });
+  }, ignoreEditedStatus);
 }

 string ReverseGeocoder::GetFeatureStreetName(FeatureType & ft) const
--- a/libs/search/reverse_geocoder.hpp
+++ b/libs/search/reverse_geocoder.hpp
@@ -114,11 +114,11 @@ public:
  /// Parameter |includeSquaresAndSuburbs| needed for backward compatibility:
  /// existing mwms operate on streets without squares and suburbs.
  static std::vector<Street> GetNearbyStreets(search::MwmContext & context, m2::PointD const & center,
-                                              double radiusM = kLookupRadiusM);
+                                              double radiusM = kLookupRadiusM, bool ignoreEditedStatus = false);
  std::vector<Street> GetNearbyStreets(MwmSet::MwmId const & id, m2::PointD const & center) const;
  std::vector<Street> GetNearbyStreets(FeatureType & ft) const;

-  static std::vector<Place> GetNearbyPlaces(search::MwmContext & context, m2::PointD const & center, double radiusM);
+  static std::vector<Place> GetNearbyPlaces(search::MwmContext & context, m2::PointD const & center, double radiusM, bool ignoreEditedStatus = false);

  /// @return feature street name.
  /// Returns empty string when there is no street the feature belongs to.
--- a/libs/search/street_vicinity_loader.cpp
+++ b/libs/search/street_vicinity_loader.cpp
@@ -35,13 +35,13 @@ void StreetVicinityLoader::OnQueryFinished()
  m_cache.ClearIfNeeded();
 }

-StreetVicinityLoader::Street const & StreetVicinityLoader::GetStreet(uint32_t featureId)
+StreetVicinityLoader::Street const & StreetVicinityLoader::GetStreet(uint32_t featureId, bool ignoreEditedStatus)
 {
  auto r = m_cache.Get(featureId);
  if (!r.second)
    return r.first;

-  LoadStreet(featureId, r.first);
+  LoadStreet(featureId, r.first, ignoreEditedStatus);
  return r.first;
 }

@@ -54,9 +54,9 @@ bool StreetVicinityLoader::IsStreet(FeatureType & ft)
  return ((isLineOrArea && ftypes::IsWayChecker::Instance()(ft)) || ftypes::IsSquareChecker::Instance()(ft));
 }

-void StreetVicinityLoader::LoadStreet(uint32_t featureId, Street & street)
+void StreetVicinityLoader::LoadStreet(uint32_t featureId, Street & street, bool ignoreEditedStatus)
 {
-  auto feature = m_context->GetFeature(featureId);
+  auto feature = m_context->GetFeature(featureId, ignoreEditedStatus);
  if (!feature || !IsStreet(*feature))
    return;

--- a/libs/search/street_vicinity_loader.hpp
+++ b/libs/search/street_vicinity_loader.hpp
@@ -73,10 +73,10 @@ public:

  void OnQueryFinished();

-  Street const & GetStreet(uint32_t featureId);
+  Street const & GetStreet(uint32_t featureId, bool ignoreEditedStatus = false);

 private:
-  void LoadStreet(uint32_t featureId, Street & street);
+  void LoadStreet(uint32_t featureId, Street & street, bool ignoreEditedStatus = false);

  MwmContext * m_context;
  int m_scale;
--- a/tools/unix/maps/docker_maps_generator.sh
+++ b/tools/unix/maps/docker_maps_generator.sh
@@ -48,7 +48,7 @@ echo "<$(date +%T)> Generating only specific maps [$MWMCOUNTRIES]..."
 else

 echo "<$(date +%T)> Generating maps..."
-/tmp/venv/bin/python -m maps_generator --skip="MwmDiffs"
+/tmp/venv/bin/python -m maps_generator --skip="MwmDiffs" -s="test"

 fi
 fi
Author	SHA1	Message	Date
Konstantin Pastbin	ce39d6d3f6	[generator] Add a suffix to the output dir Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2025-11-11 22:44:39 -08:00
Yannik Bloscheck	90e79e323d	[core] Add language data to world files Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-11 22:44:39 -08:00
Yannik Bloscheck	6bbd9cf68c	[styles] Adding trees Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-11 22:44:39 -08:00
Yannik Bloscheck	238b63acef	[styles] Differentiate between different entrances Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-11 22:44:39 -08:00
Yannik Bloscheck	73df73ba0c	[styles] Added smaller bus stop icons Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-11 22:44:39 -08:00
map-per	eb15739389	[styles] Add natural=sand Signed-off-by: map-per <map-per@gmx.de>	2025-11-11 22:44:39 -08:00
Yannik Bloscheck	2cba290561	[generator] Name method parameter more clearly Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-11 22:44:39 -08:00
Yannik Bloscheck	1153cceceb	[generator] Shorten code to avoid unnecessary `if` condition Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-11 22:44:39 -08:00
Yannik Bloscheck	01a198a866	[generator] Ignore edited status for nearby places during map generation Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-11 22:44:36 -08:00
				`@@ -0,0 +1 @@`
				<svg height="15" viewBox="0 0 15 15" width="15" xmlns="http://www.w3.org/2000/svg"><g fill="none"><rect fill="#000" height="15" opacity=".6" rx="1.875" width="15"/><rect fill="#2f6499" height="13.5" rx="1.5" width="13.5" x=".75" y=".75"/><path d="m4.30833333 11.4713297c.21052121.0559605.43455474.0861305.66692134.0861305h.66552345l.00088855.3790098c0 .311229-.29836282.56353-.666412.56353-.3680492 0-.666412-.252301-.666412-.56353zm6.38295947.0002346.0003739.4649057c0 .311229-.298278.56353-.6662225.56353-.36794462 0-.66622253-.252301-.66622253-.56353l-.00088834-.3790098h.66711087c.2319755 0 .4556437-.0300857.6658486-.0858959zm-.561486-8.55489763c.829944 0 1.5027466.67280261 1.5027466 1.50274669v5.25961347c0 .82994407-.6728026 1.50274667-1.5027466 1.50274667h-5.25961352c-.82994407 0-1.50274669-.6728026-1.50274669-1.50274667v-5.25961347c0-.82994408.67280262-1.50274669 1.50274669-1.50274669zm-5.24127678 6.38667341c-.31122904 0-.56353002.252301-.56353002.56353 0 .31122912.25230098.56353012.56353002.56353012.31122902 0 .56353001-.252301.56353001-.56353012 0-.311229-.25230099-.56353-.56353001-.56353zm5.21666668 0c-.31122903 0-.56353003.252301-.56353003.56353 0 .31122912.252301.56353012.56353003.56353012.311229 0 .56353-.252301.56353-.56353012 0-.311229-.252301-.56353-.56353-.56353zm.56147-3.84500675h-6.3416667v2.42105266c0 .3565628.31547343.64561401.70462963.64561401h4.93240737c.3891563 0 .7046297-.28905121.7046297-.64561401zm-.7046297-1.58333333h-4.93240737c-.3891562 0-.70462963.3364013-.70462963.75137335v.37568667h6.3416667v-.37568667c0-.41497205-.3154734-.75137335-.7046297-.75137335z" fill="#000" fill-rule="evenodd"/></g></svg>
				`@@ -0,0 +1 @@`
				`<svg height="6" viewBox="0 0 6 6" width="6" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m5 0c.55228475 0 1 .44771525 1 1v4c0 .55228475-.44771525 1-1 1h-4c-.55228475 0-1-.44771525-1-1v-4c0-.55228475.44771525-1 1-1z" fill="#000" fill-opacity=".6"/><path d="m1 .5h4c.27614237 0 .5.22385763.5.5v4c0 .27614237-.22385763.5-.5.5h-4c-.27614237 0-.5-.22385763-.5-.5v-4c0-.27614237.22385763-.5.5-.5z" fill="#2f6499" fill-rule="evenodd"/></g></svg>`
				`@@ -0,0 +1 @@`
				`<svg height="5" viewBox="0 0 5 5" width="5" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m4 0c.55228475 0 1 .44771525 1 1v3c0 .55228475-.44771525 1-1 1h-3c-.55228475 0-1-.44771525-1-1v-3c0-.55228475.44771525-1 1-1z" fill="#000" fill-opacity=".6"/><path d="m1 .5h3c.27614237 0 .5.22385763.5.5v3c0 .27614237-.22385763.5-.5.5h-3c-.27614237 0-.5-.22385763-.5-.5v-3c0-.27614237.22385763-.5.5-.5z" fill="#2f6499" fill-rule="evenodd"/></g></svg>`
				`@@ -0,0 +1 @@`
				`<svg height="4" viewBox="0 0 4 4" width="4" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m3 0c.55228475 0 1 .44771525 1 1v2c0 .55228475-.44771525 1-1 1h-2c-.55228475 0-1-.44771525-1-1v-2c0-.55228475.44771525-1 1-1z" fill="#000" fill-opacity=".6"/><path d="m1 .5h2c.27614237 0 .5.22385763.5.5v2c0 .27614237-.22385763.5-.5.5h-2c-.27614237 0-.5-.22385763-.5-.5v-2c0-.27614237.22385763-.5.5-.5z" fill="#2f6499" fill-rule="evenodd"/></g></svg>`
				`@@ -0,0 +1 @@`
				<svg height="10" viewBox="0 0 8 10" width="8" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.45638209 0c.37609148 0 .72425864.1747833.96936352.49369282l.06615442.10027904c.10687134.18244079.16414241.39064697.16414241.60600579l.00033965 7.60002235c0 .08452163-.00881715.16822686-.03378359.28090951l-.0458696.14760544-.06668844.14497209-.07146019.1153718-.06179076.08041635-.07556165.08214374-.10781751.09508139-.10964934.07580657-.12987138.06948085-.07954583.03314166c-.04905188.01754418-.04905188.01754418-.1303233.03957053l-.15920996.02799023-.1287681.00750984h-4.22425693c-.10907652 0-.21669708-.01468463-.35383951-.05390448l-.14047138-.05265064-.10280855-.05337186-.14765925-.09957233-.10159134-.09041744-.10489342-.11895698-.0784479-.11480897-.05509066-.10505725-.06607418-.17129918-.02223491-.08669691c-.01814821-.0826435-.02722855-.16749219-.02722706-.25204115l-.00144536-.591-.00199757-.28322281-.02893303.00146741c-.51942228.01887315-.91865829-.24714738-.98830514-.67658602l-.01042408-.11069391c-.01253177-.43076054.32054599-.82795908.77223753-.84441048l.25542472-.030777c.00229529-.08066906.00229529-.18987309 0-.32761211-.03371432-.00977655-.08956256-.02247896-.1233309-.03714759-.45095098-.19588858-.51469301-.68984012-.30519389-1.15166694l.43196772-.89919451c.00947774-.02096777.00947724-.90442739-.00000149-2.65037885 0-.6627417.5372583-1.2 1.2-1.2z" fill="#000" opacity=".6"/><path d="m6.45638209.5c.22551627 0 .42612467.10664329.55414621.27225087l.04994362.07444573c.06074822.1037037.09557052.22443696.09557052.3533034l.00033965 7.6c0 .05011473-.00526633.09899944-.01527578.1461309l-.02384038.085169-.03771531.08786746-.0419297.07097489-.03740085.05020216-.03821292.04374726-.06347463.05861778-.06028924.04402764-.07874284.044385-.06117341.02581362c-.01766844.00664526-.03607223.01258439-.05479097.01776541l-.09216812.01890871-.0953255.00639017h-4.22425693c-.06480353 0-.12755032-.00880593-.18710905-.02528645l-.09162788-.0324093-.04872236-.02328158-.09538019-.0610859-.05713707-.04808259-.06450448-.06946502-.04937574-.06908366-.02934081-.05219473-.04389022-.10543844-.01765973-.06765121c-.01032579-.04702168-.01559212-.09590639-.01559212-.14602112l-.00144537-.591.66089153-.02540436.09415983-.01277867-.00300941.57818303h4.12374307v-7.499h-4.12374307l-.00049701.60518552c-.30277731.25714038-.49010086.63138619-.49010086 1.05120766l.00555985.11160682-.07728011.00485305c-.0660555.00624911-.12924699.01672474-.18947556.03124346l.00119711-1.85409651c0-.38659932.31340067-.7.7-.7zm-2.256326 3.31599576c.25595671 0 .43735449.1230815.49018767.54084433l.02877808.57142067.62174436.19704693c.31792476.09362657.4520938.24201607.40250712.44516851-.03257321.13344966-.16664108.18318709-.40220364.14921229-.11574123-.01797477-.23380508-.05174093-.31880324-.0684414l-.60646039-.16066363c-.26277038-.06961813-.29780643-.22302452-.30247791-.41885973l-.07592051-.64933479-.16065403.0000192c-.19078646.30319659-.10110927.79611708-.16066363 1.25944922h.29120123c.32132726 0 .83343457.3031966.51210731.90960578l-.48199088.90963778c-.32132726.60639318-.80328614.15159989-.64265452-.1515999l.48199089-.90963778c.0648808-.12244607-.03044986-.14599339-.10942109-.15052172l-.84425517-.00107817-.15426327.28432918-.14131385.24161291c-.14333507.22167486-.22812622.57718916-.61780982.57718916l-1.02876487.03740254c-.68581553.02491902-.53293243-.61986625-.19003789-.63235508l1.0908756-.03994917c.05913462-.0063629.08251176-.03738214.18447811-.22729991.13109959-.24417998.20388236-.45229962.20388236-.59080509 0-.35265986.06565766-1.09536109.16065723-1.51599895h-.48199088l-.09191427.16896043-.3097352.59819487c-.14617965.27634582-.31140187.31036692-.44324586.25309522-.13184399-.05727171-.15972216-.24295654-.05677328-.47029852l.50001914-1.00474529c.02972597-.06576327.08142637-.15159989.32132725-.15159989zm-.965957-1.51599576c.3549322 0 .64265451.27147032.64265451.60639318 0 .33492926-.28771911.60639318-.64265451.60639318-.3549322 0-.64265452-.27147032-.64265452-.60639318 0-.31522754.25486538-.57423664.58076149-.60361755z" fill="#019b41"/></g></svg>
				`@@ -0,0 +1 @@`
				`<svg height="9" viewBox="0 0 6 9" width="6" xmlns="http://www.w3.org/2000/svg"><path d="m5.05357504.00381365c.38659933 0 .7.31340068.7.7v7.6c0 .38659933-.31340067.7-.7.7h-4.22459658c-.38659933 0-.7-.31340067-.7-.7v-7.6c0-.38659932.31340067-.7.7-.7zm-.05059658.749-4.125.001v7.499h4.125z" fill="#777"/></svg>`
				`@@ -0,0 +1 @@`
				`<svg height="6" viewBox="0 0 4 6" width="4" xmlns="http://www.w3.org/2000/svg"><path d="m3.37632615.00381365c.27614238 0 .5.22385763.5.5v4.99618635c0 .27614237-.22385762.5-.5.5h-2.74734769c-.27614238 0-.5-.22385763-.5-.5v-4.99618635c0-.27614237.22385762-.5.5-.5zm-.25034769.75h-2.247v4.496h2.247z" fill="#777" transform="translate(.0041)"/></svg>`
				`@@ -0,0 +1 @@`
				<svg height="9" viewBox="0 0 11 9" width="11" xmlns="http://www.w3.org/2000/svg"><path d="m10.0493285 0c.3869702 0 .7006715.31340068.7006715.7v7.59309317c0 .38659933-.3137013.7-.7006715.7l-4.17193572-.00009317-.75042427.007-4.17629705-.00690683c-.38697016 0-.70067146-.31340067-.70067146-.7v-7.59309317c0-.38659932.3137013-.7.70067146-.7zm-4.92265514.749-4.12595394.001-.00100096 7.493 4.1269549-.001v-1.748l-.62530437.00082255-.00029515-1.00082255-1.00066408.00082255v-2l1.00066408-.00082255.00029515-.99917745.62530437-.00082255zm4.87166855.001-4.12094913-.001v1.745l.62589466.00082255-.00029515.99917745 1.00125438.00082255v2l-1.00125438-.00082255.00029515 1.00082255-.62589466-.00082255v1.748l4.12094913.001z" fill="#983E44"/></svg>
				`@@ -0,0 +1 @@`
				<svg height="6" viewBox="0 0 7 6" width="7" xmlns="http://www.w3.org/2000/svg"><path d="m6.49689709-.00309317c.27614237 0 .5.22385762.5.5v4.99618634c0 .27614238-.22385763.5-.5.5l-2.62189709-.00018634-.75.00709317-2.625-.00690683c-.27614237 0-.5-.22385762-.5-.5v-4.99618634c0-.27614238.22385763-.5.5-.5zm-3.37189709.749-2.375.001v4.496h2.375v-.748l-.375.00009317-.001-.75009317-.749.00009317v-1.5l.749-.00009317.001-.74990683.375-.00009317zm3.121 0-2.371-.001v.75l.375.00009317-.001.74990683.751.00009317v1.5l-.751-.00009317.001.75009317-.375-.00009317v.748h2.371z" fill="#983E44"/></svg>