[types] Adding prep, sailing and flight school

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
This commit is contained in:
Yannik Bloscheck
2025-11-08 14:05:48 +01:00
committed by Yannik Bloscheck
parent 8db1dd55b5
commit dce50b2ca6
22 changed files with 60 additions and 57 deletions

View File

@@ -74,6 +74,9 @@
<string name="type.amenity.exhibition_centre">Exhibition Center</string> <string name="type.amenity.exhibition_centre">Exhibition Center</string>
<string name="type.amenity.money_transfer">Money Transfer</string> <string name="type.amenity.money_transfer">Money Transfer</string>
<string name="type.amenity.music_school">Music School</string> <string name="type.amenity.music_school">Music School</string>
<string name="type.amenity.sailing_school">Sailing School</string>
<string name="type.amenity.flight_school">Flight School</string>
<string name="type.amenity.prep_school">Tutorial School</string>
<string name="type.amenity.language_school">Language School</string> <string name="type.amenity.language_school">Language School</string>
<string name="type.office.diplomatic">Embassy</string> <string name="type.office.diplomatic">Embassy</string>
<string name="type.office.security">Security Guards Office</string> <string name="type.office.security">Security Guards Office</string>

View File

@@ -415,6 +415,9 @@
"leisure-resort|@category_hotel": "Resort", "leisure-resort|@category_hotel": "Resort",
"amenity-biergarten|@category_eat|@category_nightlife": "5Biergarten", "amenity-biergarten|@category_eat|@category_nightlife": "5Biergarten",
"amenity-driving_school": "4Driving school", "amenity-driving_school": "4Driving school",
"amenity-sailing_school": "4Sailing school|4Boating school",
"amenity-flight_school": "5Flight school|Flying school",
"amenity-prep_school": "3Tutorial school|Prep school|Test prep center|Cram school",
"amenity-music_school": "4Music school", "amenity-music_school": "4Music school",
"amenity-language_school": "4Language school", "amenity-language_school": "4Language school",
"amenity-ice_cream": "3Ice cream|Gelato", "amenity-ice_cream": "3Ice cream|Gelato",

View File

@@ -1255,6 +1255,15 @@
<type id="amenity-music_school" group="education"> <type id="amenity-music_school" group="education">
<include group="poi_internet" /> <include group="poi_internet" />
</type> </type>
<type id="amenity-flight_school" group="education">
<include group="poi_internet" />
</type>
<type id="amenity-sailing_school" group="education">
<include group="poi_internet" />
</type>
<type id="amenity-prep_school" group="education">
<include group="poi_internet" />
</type>
<type id="amenity-ice_cream" group="shop"> <type id="amenity-ice_cream" group="shop">
<include group="poi_internet" /> <include group="poi_internet" />
<include field="website_menu" /> <include field="website_menu" />

View File

@@ -625,9 +625,9 @@ toilets|yes;502;
highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503; highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503;
drinking_water|yes;[drinking_water=yes],[drinking_water=treated],[drinking_water:refill=yes];;;;504; drinking_water|yes;[drinking_water=yes],[drinking_water=treated],[drinking_water:refill=yes];;;;504;
drinking_water|no;505; drinking_water|no;505;
deprecated|deprecated;506;x amenity|sailing_school;[amenity=sailing_school],[education=sailing_school];;name;int_name;506;
deprecated|deprecated;507;x amenity|flight_school;[amenity=sailing_school],[education=flight_school];;name;int_name;507;
deprecated|deprecated;508;x amenity|prep_school;[amenity=prep_school],[education=prep_school];;name;int_name;508;
amenity|car_pooling;509; amenity|car_pooling;509;
social_facility|soup_kitchen;510; social_facility|soup_kitchen;510;
social_facility|food_bank;511; social_facility|food_bank;511;
Can't render this file because it contains an unexpected character in line 7 and column 16.

View File

@@ -0,0 +1 @@
<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51585e" r="8.25"/><path d="m4.55 4.75h5.9c.1656854 0 .3.13431458.3.3v7.9c0 .1656854-.1343146.3-.3.3h-5.9c-.16568542 0-.3-.1343146-.3-.3v-7.9c0-.16568542.13431458-.3.3-.3zm.2 5.6232607h5.5c-.2423109.7837509-.76661176 1.1756264-1.57290244 1.1756264h-2.72808995c-.56021615 0-1.04260671-.3952991-1.15270115-.9445907zm2.4982045-3.91875476.3589162.38847336c.50360233.557123.85073087.99910438 1.0413856 1.32594414.23302246.39947082.50380319 1.00362473.8123422 1.81246174h-2.0573269c.09664789-.66029437.14497184-1.2056974.14497184-1.63620908s-.10009631-1.06073507-.30028894-1.89067016zm-.13860882.78766812-1.661552 2.73921112h1.661552zm5.34040432-2.49047756h1.1c.1104569 0 .2.08954305.2.2v6.3h-1.5v-6.3c0-.11045695.0895431-.2.2-.2zm.6394427 8.3211146.6605573-1.3211146h-1.5l.6605573 1.3211146c.0246989.0493978.0847662.0694202.1341641.0447213.0193527-.0096763.0350449-.0253686.0447213-.0447213z" fill="#000" fill-rule="evenodd"/></g></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -1,8 +1 @@
<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"> <svg height="18" viewBox="0 0 19 18" width="19" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.0181)"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51585e" r="8.25"/><path d="m10.45 4.75c.1656854 0 .3.13431458.3.3v7.9c0 .1656854-.1343146.3-.3.3h-5.9c-.16568542 0-.3-.1343146-.3-.3v-7.9c0-.16568542.13431458-.3.3-.3zm-1.57502388 2.25170338h-2.74998749c-.165 0-.30250125.105-.35500126.25249875l-.49248749 1.4175c-.01750013.0525-.02749988.10750125-.02749988.165v1.78998747c0 .2074988.16750125.375.375.375s.375-.1675012.375-.375v-.1249987h3v.1249987c0 .2050013.16750125.375.375.375.20500125 0 .375-.1675012.375-.375v-1.78998747c0-.05500125-.01000012-.1125-.02749987-.165l-.4924875-1.4175c-.05003401-.14749875-.1900365-.25249875-.35503651-.25249875zm-2.74999874 1.99999875c.20749874 0 .375.16750125.375.375s-.16750126.375-.375.375c-.20749875 0-.375-.16750125-.375-.375s.16750125-.375.375-.375zm2.74998749 0c.20749875 0 .375.16750125.375.375s-.16750125.375-.375.375-.375-.16750125-.375-.375.16750125-.375.375-.375zm-.17999999-1.62499875c.10750125 0 .2025.07000125.23749875.16999875l.31750124.9550125h-3.49998749l.31750124-.9550125c.03499988-.10000125.13000125-.16999875.23749876-.16999875zm3.75503512-2.62500688h1.1c.1104569 0 .2.08954305.2.2v6.3h-1.5v-6.3c0-.11045695.0895431-.2.2-.2zm.6394427 8.3211146.6605573-1.3211146h-1.5l.6605573 1.3211146c.0246989.0493978.0847662.0694202.1341641.0447213.0193527-.0096763.0350449-.0253686.0447213-.0447213z" fill="#000" fill-rule="evenodd"/></g></svg>
<g opacity="1">
<circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
<circle cx="12" cy="12" r="11" fill="#51585E"/>
<path d="m17.158 6.5565c-0.14906-0.43974-0.56644-0.75278-1.0584-0.75278h-8.1985c-0.49191 0-0.90184 0.31304-1.0584 0.75278l-1.4683 4.226c-0.052172 0.15652-0.081986 0.32049-0.081986 0.49191v5.3365c0 0.61862 0.49937 1.118 1.118 1.118 0.61862 0 1.118-0.49936 1.118-1.118v-0.37266h8.9439v0.37266c0 0.61116 0.49936 1.118 1.118 1.118 0.61117 0 1.118-0.49936 1.118-1.118v-5.3365c0-0.16397-0.02981-0.3354-0.08198-0.49191z" fill="#000"/>
<path d="m10.269 7.8739h1.284v5.0402h3.0433v1.1048h-4.3273z" fill="#51585E" stroke="#51585E" stroke-width=".5"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 804 B

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -0,0 +1 @@
<svg height="18" viewBox="0 0 19 18" width="19" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.6)"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51585e" r="8.25"/><path d="m10.45 4.75c.1656854 0 .3.13431458.3.3v7.9c0 .1656854-.1343146.3-.3.3h-5.9c-.16568542 0-.3-.1343146-.3-.3v-7.9c0-.16568542.13431458-.3.3-.3zm2 .0016965h1.1c.1104569 0 .2.08954305.2.2v6.3h-1.5v-6.3c0-.11045695.0895431-.2.2-.2zm1.3 7-.6605573 1.3211146c-.0096764.0193527-.0253686.035045-.0447213.0447213-.0493979.0246989-.1094652.0046765-.1341641-.0447213l-.6605573-1.3211146zm-6.25-5.0016965c.19657385 0 .35525769.15075.35525769.3375v1.2375l1.89474231 1.125v.45l-1.89474231-.5625v1.2375l.47367693.3375v.3375l-.82893462-.225-.82893462.225v-.3375l.47367693-.3375v-1.2375l-1.89474231.5625v-.45l1.89474231-1.125v-1.2375c0-.18675.15868384-.3375.35525769-.3375z" fill="#000" fill-rule="evenodd"/></g></svg>

After

Width:  |  Height:  |  Size: 933 B

View File

@@ -1,12 +1 @@
<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"> <svg height="18" viewBox="0 0 19 18" width="19" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.8)"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51585e" r="8.25"/><path d="m10.45 4.75c.1656854 0 .3.13431458.3.3v7.9c0 .1656854-.1343146.3-.3.3h-5.9c-.16568542 0-.3-.1343146-.3-.3v-7.9c0-.16568542.13431458-.3.3-.3zm2 .0016965h1.1c.1104569 0 .2.08954305.2.2v6.3h-1.5v-6.3c0-.11045695.0895431-.2.2-.2zm1.3 7-.6605573 1.3211146c-.0096764.0193527-.0253686.035045-.0447213.0447213-.0493979.0246989-.1094652.0046765-.1341641-.0447213l-.6605573-1.3211146zm-4.45-5.00521079c.2475 0 .45.20279572.45.45068572v2.70424286c0 .24786861-.2025.45068571-.45.45068571h-3.15l-.9.9014143v-4.05634287c0-.24786857.26894919-.45068572.4243761-.45068572zm-1.83372857 1.93071429h-1.20484286c-.11834673 0-.21428571.09593898-.21428571.21428571 0 .11834674.09593898.21428572.21428571.21428572h1.20484286c.11834673 0 .21428571-.09593898.21428571-.21428572 0-.11834673-.09593898-.21428571-.21428571-.21428571zm1.09868571-.92314286h-2.30352857c-.11834673 0-.21428571.09593899-.21428571.21428572s.09593898.21428571.21428571.21428571h2.30352857c.11834673 0 .21428572-.09593898.21428572-.21428571s-.09593899-.21428572-.21428572-.21428572z" fill="#000" fill-rule="evenodd"/></g></svg>
<g opacity="1">
<circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
<circle cx="12" cy="12" r="11" fill="#51585E"/>
<path d="m9.571 8.8354h8c0.55 0 1 0.45 1 1v9l-2-2h-7c-0.55 0-1-0.45-1-1v-6c0-0.55 0.45-1 1-1zm0 7h7l1 1v-7h-8z" fill="#000" stroke-width=".50055"/>
<g fill="#000" stroke="#51585E">
<path d="m14.877 5.889h-8.4c-0.5775 0-1.05 0.47324-1.05 1.0516v9.4648l2.1-2.1033h7.35c0.5775 0 1.05-0.47324 1.05-1.0516v-6.3099c0-0.57841-0.4725-1.0516-1.05-1.0516z" stroke-width=".5"/>
<path d="m7.787 8.74h5.3749" stroke-linecap="round"/>
<path d="m7.787 10.894h2.8113" stroke-linecap="round" stroke-linejoin="round"/>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 783 B

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1,7 +1 @@
<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"> <svg height="18" viewBox="0 0 19 18" width="19" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.2)"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51585e" r="8.25"/><path d="m10.45 4.75c.1656854 0 .3.13431458.3.3v7.9c0 .1656854-.1343146.3-.3.3h-5.9c-.16568542 0-.3-.1343146-.3-.3v-7.9c0-.16568542.13431458-.3.3-.3zm2 .0016965h1.1c.1104569 0 .2.08954305.2.2v6.3h-1.5v-6.3c0-.11045695.0895431-.2.2-.2zm1.3 7-.6605573 1.3211146c-.0096764.0193527-.0253686.035045-.0447213.0447213-.0493979.0246989-.1094652.0046765-.1341641-.0447213l-.6605573-1.3211146zm-4.16339422-4.94606524c.07120813.05276149.11339422.13713366.11339422.22590518v2.9530941c0 .38846666-.37793544.70311276-.84375573.70311276-.4658203 0-.84375574-.3146461-.84375574-.70311276 0-.38846667.37793544-.70311279.84375574-.70311279.09843647 0 .19335686.01405071.28124851.04042975v-1.2796809l-2.24998131.6749842v1.829853c0 .3884667-.37793544.7031128-.84375574.7031128-.46582029 0-.84375573-.3146461-.84375573-.7031128s.37793544-.7031128.84375573-.7031128c.09843647 0 .19335687.01405071.28124852.04042975v-2.00915576c0-.12392545.08173597-.23378661.20038901-.26982382l2.81248514-.84375573c.08525204-.02548865.17753623-.00967515.24872738.04394582z" fill="#000" fill-rule="evenodd"/></g></svg>
<g opacity="1">
<circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
<circle cx="12" cy="12" r="11" fill="#51585E"/>
<path d="m18.289 5.5406c0.20956 0.15523 0.33374 0.40359 0.33374 0.6649v8.6928c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-3.7669l-6.6231 1.9869v5.3864c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-5.9142c0-0.36479 0.2406-0.68818 0.58987-0.79426l8.2789-2.4837c0.25095-0.075029 0.5226-0.02848 0.73216 0.12936z" fill="#000"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 768 B

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -0,0 +1 @@
<svg height="18" viewBox="0 0 19 18" width="19" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.4181)"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51585e" r="8.25"/><path d="m10.45 4.75c.1656854 0 .3.13431458.3.3v7.9c0 .1656854-.1343146.3-.3.3h-5.9c-.16568542 0-.3-.1343146-.3-.3v-7.9c0-.16568542.13431458-.3.3-.3zm3.3 7.0016965-.6605573 1.3211146c-.0096764.0193527-.0253686.035045-.0447213.0447213-.0493979.0246989-.1094652.0046765-.1341641-.0447213l-.6605573-1.3211146zm-4.00000021-.0016965h-4.5v.5h4.5zm3.80000021-6.9983035c.1104569 0 .2.08954305.2.2v6.3h-1.5v-6.3c0-.11045695.0895431-.2.2-.2zm-3.80000021 5.4983035h-4.5v.5h4.5zm0-1.5h-4.5v.5h4.5zm0-1.5h-4.5v.5h4.5zm0-1.5h-4.5v.5h4.5z" fill="#000" fill-rule="evenodd"/></g></svg>

After

Width:  |  Height:  |  Size: 796 B

View File

@@ -857,6 +857,9 @@ node|z16-[amenity=school],
node|z17-[amenity=driving_school], node|z17-[amenity=driving_school],
node|z17-[amenity=language_school], node|z17-[amenity=language_school],
node|z17-[amenity=music_school], node|z17-[amenity=music_school],
node|z17-[amenity=sailing_school],
node|z17-[amenity=flight_school],
node|z17-[amenity=prep_school],
node|z17-[amenity=cinema], node|z17-[amenity=cinema],
node|z17-[amenity=ice_cream], node|z17-[amenity=ice_cream],
node|z17-[leisure=bowling_alley], node|z17-[leisure=bowling_alley],
@@ -1089,6 +1092,12 @@ node|z17-[amenity=driving_school],
{icon-image: driving_school-m.svg;} {icon-image: driving_school-m.svg;}
node|z17-[amenity=language_school], node|z17-[amenity=language_school],
{icon-image: language_school-m.svg;} {icon-image: language_school-m.svg;}
node|z17-[amenity=sailing_school],
{icon-image: boating_school-m.svg;}
node|z17-[amenity=flight_school],
{icon-image: flying_school-m.svg;}
node|z17-[amenity=prep_school],
{icon-image: prep_school-m.svg;}
node|z17-[leisure=hackerspace], node|z17-[leisure=hackerspace],
{icon-image: hackerspace-m.svg;} {icon-image: hackerspace-m.svg;}
node|z17-[leisure=escape_game] node|z17-[leisure=escape_game]

View File

@@ -120,6 +120,7 @@ node[amenity=college],
node[amenity=courthouse], node[amenity=courthouse],
node[amenity=driving_school], node[amenity=driving_school],
node[amenity=fire_station], node[amenity=fire_station],
node[amenity=flight_school],
node[amenity=kindergarten], node[amenity=kindergarten],
node[amenity=language_school], node[amenity=language_school],
node[amenity=library], node[amenity=library],
@@ -130,7 +131,9 @@ node[amenity=nursing_home],
node[amenity=payment_centre], node[amenity=payment_centre],
node[amenity=police], node[amenity=police],
node[amenity=post_office], node[amenity=post_office],
node[amenity=prep_school],
node[amenity=prison], node[amenity=prison],
node[amenity=sailing_school],
node[amenity=school], node[amenity=school],
node[amenity=townhall], node[amenity=townhall],
node[amenity=university][name], node[amenity=university][name],

View File

@@ -968,12 +968,15 @@ amenity-car_wash # icon z17- (also has captio
amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-)
amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-)
amenity-driving_school # icon z17- (also has caption(optional) z17-) amenity-driving_school # icon z17- (also has caption(optional) z17-)
amenity-flight_school # icon z17- (also has caption(optional) z17-)
amenity-language_school # icon z17- (also has caption(optional) z17-) amenity-language_school # icon z17- (also has caption(optional) z17-)
amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-) amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-)
amenity-money_transfer # icon z17- (also has caption(optional) z18-) amenity-money_transfer # icon z17- (also has caption(optional) z18-)
amenity-music_school # icon z17- (also has caption(optional) z17-) amenity-music_school # icon z17- (also has caption(optional) z17-)
amenity-payment_centre # icon z17- (also has caption(optional) z18-) amenity-payment_centre # icon z17- (also has caption(optional) z18-)
amenity-prep_school # icon z17- (also has caption(optional) z17-)
amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-) amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-)
amenity-sailing_school # icon z17- (also has caption(optional) z17-)
amenity-veterinary # icon z16- (also has caption(optional) z16-) amenity-veterinary # icon z16- (also has caption(optional) z16-)
craft-electrician # icon z17- (also has caption(optional) z18-) craft-electrician # icon z17- (also has caption(optional) z18-)
craft-electronics_repair # icon z17- (also has caption(optional) z18-) craft-electronics_repair # icon z17- (also has caption(optional) z18-)
@@ -1996,12 +1999,15 @@ leisure-swimming_pool-private # icon z17- (also has captio
# amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-) # amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-)
# amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) # amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-)
# amenity-driving_school # caption(optional) z17- (also has icon z17-) # amenity-driving_school # caption(optional) z17- (also has icon z17-)
# amenity-flight_school # caption(optional) z17- (also has icon z17-)
# amenity-language_school # caption(optional) z17- (also has icon z17-) # amenity-language_school # caption(optional) z17- (also has icon z17-)
# amenity-mobile_money_agent # caption(optional) z18- (also has icon z17-) # amenity-mobile_money_agent # caption(optional) z18- (also has icon z17-)
# amenity-money_transfer # caption(optional) z18- (also has icon z17-) # amenity-money_transfer # caption(optional) z18- (also has icon z17-)
# amenity-music_school # caption(optional) z17- (also has icon z17-) # amenity-music_school # caption(optional) z17- (also has icon z17-)
# amenity-payment_centre # caption(optional) z18- (also has icon z17-) # amenity-payment_centre # caption(optional) z18- (also has icon z17-)
# amenity-prep_school # caption(optional) z17- (also has icon z17-)
# amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-) # amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-)
# amenity-sailing_school # caption(optional) z17- (also has icon z17-)
# amenity-veterinary # caption(optional) z16- (also has icon z16-) # amenity-veterinary # caption(optional) z16- (also has icon z16-)
# craft-electrician # caption(optional) z18- (also has icon z17-) # craft-electrician # caption(optional) z18- (also has icon z17-)
# craft-electronics_repair # caption(optional) z18- (also has icon z17-) # craft-electronics_repair # caption(optional) z18- (also has icon z17-)

View File

@@ -0,0 +1 @@
<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#747e86" r="8.25"/><path d="m4.55 4.75h5.9c.1656854 0 .3.13431458.3.3v7.9c0 .1656854-.1343146.3-.3.3h-5.9c-.16568542 0-.3-.1343146-.3-.3v-7.9c0-.16568542.13431458-.3.3-.3zm.2 5.6232607h5.5c-.2423109.7837509-.76661176 1.1756264-1.57290244 1.1756264h-2.72808995c-.56021615 0-1.04260671-.3952991-1.15270115-.9445907zm2.4982045-3.91875476.3589162.38847336c.50360233.557123.85073087.99910438 1.0413856 1.32594414.23302246.39947082.50380319 1.00362473.8123422 1.81246174h-2.0573269c.09664789-.66029437.14497184-1.2056974.14497184-1.63620908s-.10009631-1.06073507-.30028894-1.89067016zm-.13860882.78766812-1.661552 2.73921112h1.661552zm5.34040432-2.49047756h1.1c.1104569 0 .2.08954305.2.2v6.3h-1.5v-6.3c0-.11045695.0895431-.2.2-.2zm.6394427 8.3211146.6605573-1.3211146h-1.5l.6605573 1.3211146c.0246989.0493978.0847662.0694202.1341641.0447213.0193527-.0096763.0350449-.0253686.0447213-.0447213z" fill="#fff" fill-rule="evenodd"/></g></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -1,8 +1 @@
<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"> <svg height="18" viewBox="0 0 19 18" width="19" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.0181)"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#747e86" r="8.25"/><path d="m10.45 4.75c.1656854 0 .3.13431458.3.3v7.9c0 .1656854-.1343146.3-.3.3h-5.9c-.16568542 0-.3-.1343146-.3-.3v-7.9c0-.16568542.13431458-.3.3-.3zm-1.57502388 2.25170338h-2.74998749c-.165 0-.30250125.105-.35500126.25249875l-.49248749 1.4175c-.01750013.0525-.02749988.10750125-.02749988.165v1.78998747c0 .2074988.16750125.375.375.375s.375-.1675012.375-.375v-.1249987h3v.1249987c0 .2050013.16750125.375.375.375.20500125 0 .375-.1675012.375-.375v-1.78998747c0-.05500125-.01000012-.1125-.02749987-.165l-.4924875-1.4175c-.05003401-.14749875-.1900365-.25249875-.35503651-.25249875zm-2.74999874 1.99999875c.20749874 0 .375.16750125.375.375s-.16750126.375-.375.375c-.20749875 0-.375-.16750125-.375-.375s.16750125-.375.375-.375zm2.74998749 0c.20749875 0 .375.16750125.375.375s-.16750125.375-.375.375-.375-.16750125-.375-.375.16750125-.375.375-.375zm-.17999999-1.62499875c.10750125 0 .2025.07000125.23749875.16999875l.31750124.9550125h-3.49998749l.31750124-.9550125c.03499988-.10000125.13000125-.16999875.23749876-.16999875zm3.75503512-2.62500688h1.1c.1104569 0 .2.08954305.2.2v6.3h-1.5v-6.3c0-.11045695.0895431-.2.2-.2zm.6394427 8.3211146.6605573-1.3211146h-1.5l.6605573 1.3211146c.0246989.0493978.0847662.0694202.1341641.0447213.0193527-.0096763.0350449-.0253686.0447213-.0447213z" fill="#fff" fill-rule="evenodd"/></g></svg>
<circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
<circle cx="12" cy="12" r="11" fill="#747E86"/>
<path d="m17.158 6.5565c-0.14906-0.43974-0.56644-0.75278-1.0584-0.75278h-8.1985c-0.49191 0-0.90184 0.31304-1.0584 0.75278l-1.4683 4.226c-0.052172 0.15652-0.081986 0.32049-0.081986 0.49191v5.3365c0 0.61862 0.49937 1.118 1.118 1.118 0.61862 0 1.118-0.49936 1.118-1.118v-0.37266h8.9439v0.37266c0 0.61116 0.49936 1.118 1.118 1.118 0.61117 0 1.118-0.49936 1.118-1.118v-5.3365c0-0.16397-0.02981-0.3354-0.08198-0.49191z" fill="#fff"/>
<path d="m10.269 7.8739h1.284v5.0402h3.0433v1.1048h-4.3273z" fill="#747E86" stroke="#747E86" stroke-width=".5"/>
</svg>

Before

Width:  |  Height:  |  Size: 785 B

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -0,0 +1 @@
<svg height="18" viewBox="0 0 19 18" width="19" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.6)"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#747e86" r="8.25"/><path d="m10.45 4.75c.1656854 0 .3.13431458.3.3v7.9c0 .1656854-.1343146.3-.3.3h-5.9c-.16568542 0-.3-.1343146-.3-.3v-7.9c0-.16568542.13431458-.3.3-.3zm2 .0016965h1.1c.1104569 0 .2.08954305.2.2v6.3h-1.5v-6.3c0-.11045695.0895431-.2.2-.2zm1.3 7-.6605573 1.3211146c-.0096764.0193527-.0253686.035045-.0447213.0447213-.0493979.0246989-.1094652.0046765-.1341641-.0447213l-.6605573-1.3211146zm-6.25-5.0016965c.19657385 0 .35525769.15075.35525769.3375v1.2375l1.89474231 1.125v.45l-1.89474231-.5625v1.2375l.47367693.3375v.3375l-.82893462-.225-.82893462.225v-.3375l.47367693-.3375v-1.2375l-1.89474231.5625v-.45l1.89474231-1.125v-1.2375c0-.18675.15868384-.3375.35525769-.3375z" fill="#fff" fill-rule="evenodd"/></g></svg>

After

Width:  |  Height:  |  Size: 933 B

View File

@@ -1,12 +1 @@
<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"> <svg height="18" viewBox="0 0 19 18" width="19" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.8)"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#747e86" r="8.25"/><path d="m10.45 4.75c.1656854 0 .3.13431458.3.3v7.9c0 .1656854-.1343146.3-.3.3h-5.9c-.16568542 0-.3-.1343146-.3-.3v-7.9c0-.16568542.13431458-.3.3-.3zm2 .0016965h1.1c.1104569 0 .2.08954305.2.2v6.3h-1.5v-6.3c0-.11045695.0895431-.2.2-.2zm1.3 7-.6605573 1.3211146c-.0096764.0193527-.0253686.035045-.0447213.0447213-.0493979.0246989-.1094652.0046765-.1341641-.0447213l-.6605573-1.3211146zm-4.45-5.00521079c.2475 0 .45.20279572.45.45068572v2.70424286c0 .24786861-.2025.45068571-.45.45068571h-3.15l-.9.9014143v-4.05634287c0-.24786857.26894919-.45068572.4243761-.45068572zm-1.83372857 1.93071429h-1.20484286c-.11834673 0-.21428571.09593898-.21428571.21428571 0 .11834674.09593898.21428572.21428571.21428572h1.20484286c.11834673 0 .21428571-.09593898.21428571-.21428572 0-.11834673-.09593898-.21428571-.21428571-.21428571zm1.09868571-.92314286h-2.30352857c-.11834673 0-.21428571.09593899-.21428571.21428572s.09593898.21428571.21428571.21428571h2.30352857c.11834673 0 .21428572-.09593898.21428572-.21428571s-.09593899-.21428572-.21428572-.21428572z" fill="#fff" fill-rule="evenodd"/></g></svg>
<circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
<circle cx="12" cy="12" r="11" fill="#747E86"/>
<path d="m9.571 8.8354h8c0.55 0 1 0.45 1 1v9l-2-2h-7c-0.55 0-1-0.45-1-1v-6c0-0.55 0.45-1 1-1zm0 7h7l1 1v-7h-8z" fill="#fff" stroke-width=".50055"/>
<g fill="#fff" stroke="#747E86">
<path d="m14.877 5.889h-8.4c-0.5775 0-1.05 0.47324-1.05 1.0516v9.4648l2.1-2.1033h7.35c0.5775 0 1.05-0.47324 1.05-1.0516v-6.3099c0-0.57841-0.4725-1.0516-1.05-1.0516z" stroke-width=".5"/>
<path d="m7.787 8.74h5.3749" stroke-linecap="round"/>
<path d="m7.787 10.894h2.8113" stroke-linecap="round" stroke-linejoin="round"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 764 B

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1,7 +1 @@
<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"> <svg height="18" viewBox="0 0 19 18" width="19" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.2)"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#747e86" r="8.25"/><path d="m10.45 4.75c.1656854 0 .3.13431458.3.3v7.9c0 .1656854-.1343146.3-.3.3h-5.9c-.16568542 0-.3-.1343146-.3-.3v-7.9c0-.16568542.13431458-.3.3-.3zm2 .0016965h1.1c.1104569 0 .2.08954305.2.2v6.3h-1.5v-6.3c0-.11045695.0895431-.2.2-.2zm1.3 7-.6605573 1.3211146c-.0096764.0193527-.0253686.035045-.0447213.0447213-.0493979.0246989-.1094652.0046765-.1341641-.0447213l-.6605573-1.3211146zm-4.16339422-4.94606524c.07120813.05276149.11339422.13713366.11339422.22590518v2.9530941c0 .38846666-.37793544.70311276-.84375573.70311276-.4658203 0-.84375574-.3146461-.84375574-.70311276 0-.38846667.37793544-.70311279.84375574-.70311279.09843647 0 .19335686.01405071.28124851.04042975v-1.2796809l-2.24998131.6749842v1.829853c0 .3884667-.37793544.7031128-.84375574.7031128-.46582029 0-.84375573-.3146461-.84375573-.7031128s.37793544-.7031128.84375573-.7031128c.09843647 0 .19335687.01405071.28124852.04042975v-2.00915576c0-.12392545.08173597-.23378661.20038901-.26982382l2.81248514-.84375573c.08525204-.02548865.17753623-.00967515.24872738.04394582z" fill="#fff" fill-rule="evenodd"/></g></svg>
<circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/>
<circle cx="12" cy="12" r="11" fill="#747E86"/>
<path d="m18.289 5.5406c0.20956 0.15523 0.33374 0.40359 0.33374 0.6649v8.6928c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-3.7669l-6.6231 1.9869v5.3864c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-5.9142c0-0.36479 0.2406-0.68818 0.58987-0.79426l8.2789-2.4837c0.25095-0.075029 0.5226-0.02848 0.73216 0.12936z" fill="#fff"/>
</svg>

Before

Width:  |  Height:  |  Size: 749 B

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -0,0 +1 @@
<svg height="18" viewBox="0 0 19 18" width="19" xmlns="http://www.w3.org/2000/svg"><g fill="none" transform="translate(.4181)"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#747e86" r="8.25"/><path d="m10.45 4.75c.1656854 0 .3.13431458.3.3v7.9c0 .1656854-.1343146.3-.3.3h-5.9c-.16568542 0-.3-.1343146-.3-.3v-7.9c0-.16568542.13431458-.3.3-.3zm3.3 7.0016965-.6605573 1.3211146c-.0096764.0193527-.0253686.035045-.0447213.0447213-.0493979.0246989-.1094652.0046765-.1341641-.0447213l-.6605573-1.3211146zm-4.00000021-.0016965h-4.5v.5h4.5zm3.80000021-6.9983035c.1104569 0 .2.08954305.2.2v6.3h-1.5v-6.3c0-.11045695.0895431-.2.2-.2zm-3.80000021 5.4983035h-4.5v.5h4.5zm0-1.5h-4.5v.5h4.5zm0-1.5h-4.5v.5h4.5zm0-1.5h-4.5v.5h4.5z" fill="#fff" fill-rule="evenodd"/></g></svg>

After

Width:  |  Height:  |  Size: 796 B

View File

@@ -968,12 +968,15 @@ amenity-car_wash # icon z17- (also has captio
amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-) amenity-childcare # icon z17- (also has caption(optional) z17-, area z13-)
amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-) amenity-doctors # icon z17- (also has caption(optional) z17-, area z15-)
amenity-driving_school # icon z17- (also has caption(optional) z17-) amenity-driving_school # icon z17- (also has caption(optional) z17-)
amenity-flight_school # icon z17- (also has caption(optional) z17-)
amenity-language_school # icon z17- (also has caption(optional) z17-) amenity-language_school # icon z17- (also has caption(optional) z17-)
amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-) amenity-mobile_money_agent # icon z17- (also has caption(optional) z18-)
amenity-money_transfer # icon z17- (also has caption(optional) z18-) amenity-money_transfer # icon z17- (also has caption(optional) z18-)
amenity-music_school # icon z17- (also has caption(optional) z17-) amenity-music_school # icon z17- (also has caption(optional) z17-)
amenity-payment_centre # icon z17- (also has caption(optional) z18-) amenity-payment_centre # icon z17- (also has caption(optional) z18-)
amenity-prep_school # icon z17- (also has caption(optional) z17-)
amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-) amenity-recycling-centre # icon z16- (also has caption(optional) z16-, area z15-)
amenity-sailing_school # icon z17- (also has caption(optional) z17-)
amenity-veterinary # icon z16- (also has caption(optional) z16-) amenity-veterinary # icon z16- (also has caption(optional) z16-)
craft-electrician # icon z17- (also has caption(optional) z18-) craft-electrician # icon z17- (also has caption(optional) z18-)
craft-electronics_repair # icon z17- (also has caption(optional) z18-) craft-electronics_repair # icon z17- (also has caption(optional) z18-)
@@ -1999,12 +2002,15 @@ leisure-swimming_pool-private # icon z17- (also has captio
# amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-) # amenity-childcare # caption(optional) z17- (also has icon z17-, area z13-)
# amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-) # amenity-doctors # caption(optional) z17- (also has icon z17-, area z15-)
# amenity-driving_school # caption(optional) z17- (also has icon z17-) # amenity-driving_school # caption(optional) z17- (also has icon z17-)
# amenity-flight_school # caption(optional) z17- (also has icon z17-)
# amenity-language_school # caption(optional) z17- (also has icon z17-) # amenity-language_school # caption(optional) z17- (also has icon z17-)
# amenity-mobile_money_agent # caption(optional) z18- (also has icon z17-) # amenity-mobile_money_agent # caption(optional) z18- (also has icon z17-)
# amenity-money_transfer # caption(optional) z18- (also has icon z17-) # amenity-money_transfer # caption(optional) z18- (also has icon z17-)
# amenity-music_school # caption(optional) z17- (also has icon z17-) # amenity-music_school # caption(optional) z17- (also has icon z17-)
# amenity-payment_centre # caption(optional) z18- (also has icon z17-) # amenity-payment_centre # caption(optional) z18- (also has icon z17-)
# amenity-prep_school # caption(optional) z17- (also has icon z17-)
# amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-) # amenity-recycling-centre # caption(optional) z16- (also has icon z16-, area z15-)
# amenity-sailing_school # caption(optional) z17- (also has icon z17-)
# amenity-veterinary # caption(optional) z16- (also has icon z16-) # amenity-veterinary # caption(optional) z16- (also has icon z16-)
# craft-electrician # caption(optional) z18- (also has icon z17-) # craft-electrician # caption(optional) z18- (also has icon z17-)
# craft-electronics_repair # caption(optional) z18- (also has icon z17-) # craft-electronics_repair # caption(optional) z18- (also has icon z17-)

View File

@@ -68,6 +68,9 @@
"type.amenity.exhibition_centre" = "Exhibition Centre"; "type.amenity.exhibition_centre" = "Exhibition Centre";
"type.amenity.money_transfer" = "Money Transfer"; "type.amenity.money_transfer" = "Money Transfer";
"type.amenity.music_school" = "Music School"; "type.amenity.music_school" = "Music School";
"type.amenity.sailing_school" = "Sailing School";
"type.amenity.flight_school" = "Flight School";
"type.amenity.prep_school" = "Tutorial School";
"type.amenity.language_school" = "Language School"; "type.amenity.language_school" = "Language School";
"type.office.diplomatic" = "Embassy"; "type.office.diplomatic" = "Embassy";
"type.amenity.fast_food" = "Fast Food"; "type.amenity.fast_food" = "Fast Food";

View File

@@ -75,6 +75,9 @@
"type.amenity.exhibition_centre" = "Exhibition Center"; "type.amenity.exhibition_centre" = "Exhibition Center";
"type.amenity.money_transfer" = "Money Transfer"; "type.amenity.money_transfer" = "Money Transfer";
"type.amenity.music_school" = "Music School"; "type.amenity.music_school" = "Music School";
"type.amenity.sailing_school" = "Sailing School";
"type.amenity.flight_school" = "Flight School";
"type.amenity.prep_school" = "Tutorial School";
"type.amenity.language_school" = "Language School"; "type.amenity.language_school" = "Language School";
"type.office.diplomatic" = "Embassy"; "type.office.diplomatic" = "Embassy";
"type.office.security" = "Security Guards Office"; "type.office.security" = "Security Guards Office";