Compare commits

..

2 Commits

Author SHA1 Message Date
Yannik Bloscheck
f5b68183c9 [ios] Support geo-navigation URL
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2025-11-07 21:12:13 +01:00
x7z4w
74122e2fae [core] Support geo-navigation URL
Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
2025-11-07 21:12:12 +01:00
197 changed files with 974 additions and 4000 deletions

View File

@@ -175,10 +175,10 @@ if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID)
find_package(Qt6 COMPONENTS REQUIRED ${qt_components} PATHS $ENV{QT_PATH} /opt/homebrew/opt/qt@6 /usr/local/opt/qt@6 /usr/lib/x86_64-linux-gnu/qt6)
set(MINIMUM_REQUIRED_QT_VERSION 6.4.0)
if (Qt6_VERSION VERSION_LESS ${MINIMUM_REQUIRED_QT_VERSION})
message(FATAL_ERROR "Unsupported Qt version: ${Qt6_VERSION}, the minimum required is ${MINIMUM_REQUIRED_QT_VERSION}")
if (Qt6Widgets_VERSION VERSION_LESS ${MINIMUM_REQUIRED_QT_VERSION})
message(FATAL_ERROR "Unsupported Qt version: ${Qt6Widgets_VERSION}, the minimum required is ${MINIMUM_REQUIRED_QT_VERSION}")
else()
message(STATUS "Found Qt version: ${Qt6_VERSION}")
message(STATUS "Found Qt version: ${Qt6Widgets_VERSION}")
endif()
endif()

View File

@@ -1,31 +0,0 @@
Brezplačno in odprtokodno zemljevidno orodje, ki ga vodi skupnost, temelji na podatkih OpenStreetMap in je okrepljena s predanostjo transparentnosti, zasebnosti in nedobičkonosnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.
Preverite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
Pridružite se skupnosti in pomagajte narediti najboljše zemljevidno orodje
• Uporabljajte orodje in širite glas o njem
• Dajajte povratne informacije in poročajte o napakah
• Posodabljajte podatke zemljevida v tem orodju ali na spletni strani OpenStreetMap
‣ <b>Osredotočeno na uporabo brez povezave</b>: Načrtujte in se usmerjajte na vašem potovanju v tujini vrez potrebe po mobilnih podatkih, iščite vmesne točke potocanja ko ste na daljšem pohodu ipd. Vse zmogljivosti orodja so zasnovane za delo brez povezave.
‣ <b>Spoštovanje zasebnosti</b>: orodje je zasnovano z mislijo na zasebnost ne prepoznava oseb, ne sledi in ne zbira osebnih podatkov. Brez oglasov.
‣ <b>Preprosto in dodelano</b>: nujne zmogljivosti, enostavne za uporabo, ki preprosto delujejo.
‣ <b>Prihrani vašo baterijo in prostor.</b>: ne izčrpava vaše baterije kakor druga usmerjevalna orodja. Strnjeni zemljevidi prihranijo dragocen prostor na vašem telefonu.
‣ <b>Brezplačno in ustvarjeno v skupnosti</b>: ljudje kot ste vi pomagajo ustvarjati to orodje, tako da dodajajo kraje na OpenStreetMap, preizkušajo in dajejo povratne informacije o zmogljivostih in prispevajo svoje razvijalske sposobnosti in sredstva.
‣ <b>Odprto in transparentno odločanje in finance, nedobičkonosno in popolnoma odprtokodno.</b>
<b>Glavne zmogljivosti</b>:
• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovoh zemljevidih niso na voljo.
• Prikaz za dejavnosti na prostem s poudarjenimi pohodniškimi potmi, tabornimi prostori, vodnimi viri, vrhovi, plastnicami itd.
• Pešpoti in kolesarke poti
• Kraji zanimanja, npr. restavracije, bencinske črpalke, hoteli, trgovine, znamenitosti in mnogo več
• Iščite po imenu, hišnemu naslovu ali po vrsti
• Usmerjanje z glasovnimi obvestili za hojo, kolesarjenje ali vožnjo avtomobila.
• Zaznamujte svoje najljubše kraje s preprostim dotikom
• Wikipedijini članki brez povezave
• Prometna plast podzemne železnice z usmerjanjem
• Izvozite ali uvozite zaznamke in sledi v oblikah KML, KMZ, GPX
• Temni prikaz za uporabo ponoči
• Izboljšajtw podatke zemljevida za vse z uporabo vgrajenega urejevalnika
<b>Svoboda je tu</b>
Odkijte več o vašem potovanju, usmerjajte se po svetu s poudarkom na zasebnosti in skupnostnem delovanju!

View File

@@ -1 +0,0 @@
Comaps- Vandra, Cykla, Kör Offline, Privat

View File

@@ -1 +0,0 @@
Comaps- Navigera Privat

View File

@@ -32,8 +32,7 @@ public class DrivingOptionsScreen extends BaseMapScreen
new DrivingOption(RoadType.Dirty, R.string.avoid_unpaved),
new DrivingOption(RoadType.Ferry, R.string.avoid_ferry),
new DrivingOption(RoadType.Motorway, R.string.avoid_motorways),
new DrivingOption(RoadType.Steps, R.string.avoid_steps),
new DrivingOption(RoadType.Paved, R.string.avoid_paved)};
new DrivingOption(RoadType.Steps, R.string.avoid_steps)};
@NonNull
private final Map<RoadType, Boolean> mInitialDrivingOptionsState = new HashMap<>();

View File

@@ -90,36 +90,28 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment
{
SwitchCompat tollsBtn = root.findViewById(R.id.avoid_tolls_btn);
tollsBtn.setChecked(RoutingOptions.hasOption(RoadType.Toll));
CompoundButton.OnCheckedChangeListener tollBtnListener = new ToggleRoutingOptionListener(RoadType.Toll, root);
CompoundButton.OnCheckedChangeListener tollBtnListener = new ToggleRoutingOptionListener(RoadType.Toll);
tollsBtn.setOnCheckedChangeListener(tollBtnListener);
SwitchCompat motorwaysBtn = root.findViewById(R.id.avoid_motorways_btn);
motorwaysBtn.setChecked(RoutingOptions.hasOption(RoadType.Motorway));
CompoundButton.OnCheckedChangeListener motorwayBtnListener =
new ToggleRoutingOptionListener(RoadType.Motorway, root);
CompoundButton.OnCheckedChangeListener motorwayBtnListener = new ToggleRoutingOptionListener(RoadType.Motorway);
motorwaysBtn.setOnCheckedChangeListener(motorwayBtnListener);
SwitchCompat ferriesBtn = root.findViewById(R.id.avoid_ferries_btn);
ferriesBtn.setChecked(RoutingOptions.hasOption(RoadType.Ferry));
CompoundButton.OnCheckedChangeListener ferryBtnListener = new ToggleRoutingOptionListener(RoadType.Ferry, root);
CompoundButton.OnCheckedChangeListener ferryBtnListener = new ToggleRoutingOptionListener(RoadType.Ferry);
ferriesBtn.setOnCheckedChangeListener(ferryBtnListener);
SwitchCompat dirtyRoadsBtn = root.findViewById(R.id.avoid_dirty_roads_btn);
dirtyRoadsBtn.setChecked(RoutingOptions.hasOption(RoadType.Dirty));
dirtyRoadsBtn.setEnabled(!RoutingOptions.hasOption(RoadType.Paved) || RoutingOptions.hasOption(RoadType.Dirty));
CompoundButton.OnCheckedChangeListener dirtyBtnListener = new ToggleRoutingOptionListener(RoadType.Dirty, root);
CompoundButton.OnCheckedChangeListener dirtyBtnListener = new ToggleRoutingOptionListener(RoadType.Dirty);
dirtyRoadsBtn.setOnCheckedChangeListener(dirtyBtnListener);
SwitchCompat stepsBtn = root.findViewById(R.id.avoid_steps_btn);
stepsBtn.setChecked(RoutingOptions.hasOption(RoadType.Steps));
CompoundButton.OnCheckedChangeListener stepsBtnListener = new ToggleRoutingOptionListener(RoadType.Steps, root);
CompoundButton.OnCheckedChangeListener stepsBtnListener = new ToggleRoutingOptionListener(RoadType.Steps);
stepsBtn.setOnCheckedChangeListener(stepsBtnListener);
SwitchCompat pavedBtn = root.findViewById(R.id.avoid_paved_roads_btn);
pavedBtn.setChecked(RoutingOptions.hasOption(RoadType.Paved));
pavedBtn.setEnabled(!RoutingOptions.hasOption(RoadType.Dirty) || RoutingOptions.hasOption(RoadType.Paved));
CompoundButton.OnCheckedChangeListener pavedBtnListener = new ToggleRoutingOptionListener(RoadType.Paved, root);
pavedBtn.setOnCheckedChangeListener(pavedBtnListener);
}
private static class ToggleRoutingOptionListener implements CompoundButton.OnCheckedChangeListener
@@ -127,13 +119,9 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment
@NonNull
private final RoadType mRoadType;
@NonNull
private final View mRoot;
private ToggleRoutingOptionListener(@NonNull RoadType roadType, @NonNull View root)
private ToggleRoutingOptionListener(@NonNull RoadType roadType)
{
mRoadType = roadType;
mRoot = root;
}
@Override
@@ -143,27 +131,6 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment
RoutingOptions.addOption(mRoadType);
else
RoutingOptions.removeOption(mRoadType);
SwitchCompat dirtyRoadsBtn = mRoot.findViewById(R.id.avoid_dirty_roads_btn);
SwitchCompat pavedBtn = mRoot.findViewById(R.id.avoid_paved_roads_btn);
if (mRoadType == RoadType.Dirty)
{
pavedBtn.setEnabled(!isChecked);
if (isChecked)
{
pavedBtn.setChecked(false);
dirtyRoadsBtn.setEnabled(true);
}
}
else if (mRoadType == RoadType.Paved)
{
dirtyRoadsBtn.setEnabled(!isChecked);
if (isChecked)
{
dirtyRoadsBtn.setChecked(false);
pavedBtn.setEnabled(true);
}
}
}
}
}

View File

@@ -59,28 +59,6 @@
android:padding="@dimen/margin_half_double_plus"/>
</LinearLayout>
<include layout="@layout/item_divider"/>
<LinearLayout
android:orientation="horizontal"
android:minHeight="@dimen/height_block_base"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingEnd="@dimen/margin_base"
android:paddingStart="@dimen/margin_base">
<com.google.android.material.textview.MaterialTextView
android:text="@string/avoid_paved"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textColor="?android:attr/textColorPrimary"/>
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/avoid_paved_roads_btn"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="@dimen/margin_half_double_plus"/>
</LinearLayout>
<include layout="@layout/item_divider"/>
<LinearLayout
android:orientation="horizontal"
android:minHeight="@dimen/height_block_base"

View File

@@ -893,5 +893,4 @@
<string name="unknown_count">unbekannt</string>
<string name="error_invalid_number">ungültige Zahl</string>
<string name="list_description_empty">Liste bearbeiten, um eine Beschreibung hinzuzufügen</string>
<string name="avoid_paved">Befst. Straßen vermeiden</string>
</resources>

View File

@@ -623,8 +623,7 @@
<string name="charge_socket_unknown_other">Outro ou descoñecido</string>
<string name="unknow_socket_type">engache descoñecido</string>
<string name="editor_place_doesnt_exist_description">Describe a aparencia do lugar para enviar unha nota co erro á comunidade OpenStreetMap</string>
<string name="avoid_steps">Evitar escaleiras</string>
<string name="avoid_steps">Evitar pasos</string>
<string name="offline_explanation_title">Mapas sen conexión</string>
<string name="offline_explanation_text">Hai que descargar un mapa para ver e navegar polo área.\nDescarga os mapas para as zonas polas que vas viaxar.</string>
<string name="list_description_empty">Editar a lista para engadir unha descrición</string>
</resources>

View File

@@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
</resources>

View File

@@ -27,7 +27,7 @@
<!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
<string name="limited_accuracy">精度有限</string>
<!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
<string name="precise_location_is_disabled_long_text">为确保导航准确,请在设置中启用 \"精确定位\"</string>
<string name="precise_location_is_disabled_long_text">为确保准确导航,请在设置中启用确切位置</string>
<!-- View and button titles for accessibility -->
<string name="zoom_to_country">在地图上显示</string>
<!-- Message to display at the center of the screen when the country download has failed -->

View File

@@ -677,7 +677,6 @@
<string name="avoid_ferry">Avoid ferries</string>
<string name="avoid_motorways">Avoid freeways</string>
<string name="avoid_steps">Avoid stairs</string>
<string name="avoid_paved">Avoid paved roads</string>
<string name="unable_to_calc_alert_title">Unable to calculate route</string>
<string name="unable_to_calc_alert_subtitle">A route could not be found. This may be caused by your routing options or incomplete OpenStreetMap data. Please change your routing options and retry.</string>
<string name="define_to_avoid_btn">Define roads to avoid</string>

View File

@@ -7,6 +7,5 @@ public enum RoadType
Motorway,
Ferry,
Dirty,
Steps,
Paved
Steps
}

View File

@@ -1433,9 +1433,4 @@
<string name="type.leisure.sports_centre.sport.swimming">Plavecké centrum</string>
<string name="type.disusedbusiness">Neobsazený prostor</string>
<string name="type.leisure.fitness_centre.sport.yoga">Studio jógy</string>
<string name="type.amenity.boat_rental">Půjčovna lodí</string>
<string name="type.amenity.mobile_money_agent">Mobilní peněžní agent</string>
<string name="type.amenity.payment_centre">Platební centrum</string>
<string name="type.leisure.indoor_play">Vnitřní herní centrum</string>
<string name="type.shop.telecommunication">Telekomunikační obchod</string>
</resources>

View File

@@ -1438,7 +1438,4 @@
<string name="type.power.portal">Abspannportal</string>
<string name="type.shop.lighting">Lampenladen</string>
<string name="type.disusedbusiness">Leerstehendes Geschäft</string>
<string name="type.leisure.indoor_play">Indoor-Spielplatz</string>
<string name="type.amenity.car_pooling">Fahrgemeinschaften</string>
<string name="type.shop.telecommunication">Telekommunikationsgeschäft</string>
</resources>

View File

@@ -1434,11 +1434,6 @@
<string name="type.leisure.sports_centre.sport.volleyball">Complexe sportif</string>
<string name="type.leisure.sports_centre.sport.yoga">Complexe sportif</string>
<string name="type.leisure.fitness_centre.sport.yoga">Salle de yoga</string>
<string name="type.disusedbusiness">Magasin vacant</string>
<string name="type.disusedbusiness">Locaux commerciaux libres</string>
<string name="type.amenity.lounger">Chaise longue</string>
<string name="type.amenity.boat_rental">Vente de bateau</string>
<string name="type.amenity.payment_centre">Centre de paiement</string>
<string name="type.amenity.mobile_money_agent">Agent d\'argent liquide</string>
<string name="type.leisure.indoor_play">Complexe de jeux intérieurs</string>
<string name="type.shop.telecommunication">Boutique télécom</string>
</resources>

View File

@@ -33,7 +33,7 @@
<string name="type.place.sea">Jūra</string>
<string name="type.amenity.bar">Bārs</string>
<string name="type.amenity.bicycle_parking">Divriteņu novietne</string>
<string name="type.amenity.bicycle_rental">Velosipēdu noma</string>
<string name="type.amenity.bicycle_rental">Velosipēdu īre</string>
<string name="type.amenity.biergarten">Alus dārzs</string>
<string name="type.amenity.bureau_de_change">Valūtas maiņa</string>
<string name="type.amenity.bus_station">Autoosta</string>
@@ -136,16 +136,4 @@
<string name="type.sport.climbing">Kāpšana</string>
<string name="type.sport.scuba_diving">Niršana</string>
<string name="type.sport.cricket">Krikets</string>
<string name="type.shop.telecommunication">Tālsaziņas preču veikals</string>
<string name="type.shop.ticket">Biļešu tirdzniecības vieta</string>
<string name="type.shop.toys">Rotaļlietu veikals</string>
<string name="type.shop.travel_agency">Ceļojumu aģentūra</string>
<string name="type.shop.tyres">Riepu veikals</string>
<string name="type.amenity.payment_centre">Maksājumu centrs</string>
<string name="type.amenity.pharmacy">Aptieka</string>
<string name="type.amenity.place_of_worship">Pielūgsmes vieta</string>
<string name="type.amenity.place_of_worship.buddhist">Budistu templis</string>
<string name="type.amenity.place_of_worship.christian">Baznīca</string>
<string name="type.amenity.boat_rental">Laivu noma</string>
<string name="type.amenity.bicycle_repair_station">Divriteņu darbnīca</string>
</resources>

View File

@@ -975,7 +975,7 @@
<string name="type.shop.books">Bokhandel</string>
<string name="type.shop.butcher">Slakter</string>
<string name="type.shop.cannabis">Cannabisbutikk</string>
<string name="type.shop.car">Bilforhandler</string>
<string name="type.shop.car">Bil butikk</string>
<string name="type.shop.car_parts">Bildeler</string>
<string name="type.shop.car_repair">Bilverksted</string>
<string name="type.shop.car_repair.tyres">Dekkreparasjon</string>
@@ -1353,14 +1353,4 @@
<string name="type.railway.narrow_gauge.bridge">Smalsporet jernbanebru</string>
<string name="type.railway.narrow_gauge.tunnel">Smalsporet jernbanetunnel</string>
<string name="type.leisure.slipway">Slipp</string>
<string name="type.post_office.post_partner">Post i butikk</string>
<string name="type.amenity.pub">Pub</string>
<string name="type.historic.monument">Monument</string>
<string name="type.man_made.crane">Kran</string>
<string name="type.military.bunker">Bunker</string>
<string name="type.railway.construction">Jernbanebygging</string>
<string name="type.railway.funicular.bridge">Kabelbanebru</string>
<string name="type.railway.funicular.tunnel">Kabelbanetunnel</string>
<string name="type.military">Militært</string>
<string name="type.landuse.education">Utdanningsinstitusjon</string>
</resources>

View File

@@ -1180,7 +1180,7 @@
<string name="type.amenity.bar">Bar</string>
<string name="type.amenity.bicycle_parking.covered">Parcare acoperită pentru biciclete</string>
<string name="type.amenity.love_hotel">Hotel cu ora</string>
<string name="type.amenity.studio">Studio Media</string>
<string name="type.amenity.studio">Garsonieră</string>
<string name="type.amenity.bicycle_repair_station">Stație Reparații Biciclete</string>
<string name="type.amenity.car_sharing">Utilizare comună a mașinii</string>
<string name="type.amenity.dentist">Dentist</string>

View File

@@ -153,5 +153,4 @@
<string name="type.leisure.amusement_arcade">Arkadne igre</string>
<string name="type.amenity.charging_station.motorcar.small">Polnilno mesto za avtomobile</string>
<string name="type.amenity.childcare">Vrtec</string>
<string name="type.amenity.cinema">Kino</string>
</resources>

View File

@@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
</resources>

View File

@@ -43,11 +43,6 @@
<string name="type.amenity.motorcycle_rental">Motorcycle Rental</string>
<string name="type.amenity.car_sharing">Car Sharing</string>
<string name="type.amenity.car_wash">Car Wash</string>
<string name="type.man_made.telescope">Telescope</string>
<string name="type.man_made.telescope.optical">Telescope (Optical)</string>
<string name="type.man_made.telescope.radio">Telescope (Radio)</string>
<string name="type.man_made.telescope.gamma">Telescope (Gamma)</string>
<string name="type.man_made.observatory">Observatory</string>
<string name="type.amenity.casino">Casino</string>
<string name="type.amenity.gambling">Gambling</string>
<string name="type.leisure.adult_gaming_centre">Adult Gaming Centre</string>
@@ -128,7 +123,6 @@
<string name="type.amenity.parking_space.private">Parking Space</string>
<string name="type.amenity.parking_space.underground">Parking Space</string>
<string name="type.amenity.parking_space.disabled">Disabled Parking Space</string>
<string name="type.amenity.car_pooling">Car Pooling</string>
<string name="type.amenity.payment_centre">Payment Centre</string>
<string name="type.amenity.payment_terminal">Payment Terminal</string>
<string name="type.amenity.pharmacy">Pharmacy</string>
@@ -284,7 +278,6 @@
<string name="type.craft.shoemaker">Shoe Repair</string>
<string name="type.craft.winery">Winery</string>
<string name="type.craft.tailor">Tailor</string>
<string name="type.cuisine.afghan">Afghan</string>
<string name="type.cuisine.african">African</string>
<string name="type.cuisine.american">American</string>
<string name="type.cuisine.arab">Arab</string>
@@ -293,62 +286,38 @@
<string name="type.cuisine.austrian">Austrian</string>
<string name="type.cuisine.bagel">Bagel</string>
<string name="type.cuisine.balkan">Balkan</string>
<string name="type.cuisine.bar_and_grill">Bar and Grill</string>
<string name="type.cuisine.barbecue">Barbecue</string>
<string name="type.cuisine.bavarian">Bavarian</string>
<string name="type.cuisine.beef_bowl">Beef Bowl</string>
<string name="type.cuisine.bistro">Bistro</string>
<string name="type.cuisine.bolivian">Bolivian</string>
<string name="type.cuisine.brazilian">Brazilian</string>
<string name="type.cuisine.breakfast">Breakfast</string>
<string name="type.cuisine.british">British</string>
<string name="type.cuisine.brunch">Brunch</string>
<string name="type.cuisine.bubble_tea">Bubble Tea</string>
<string name="type.cuisine.buffet">Buffet</string>
<string name="type.cuisine.burger">Burger</string>
<string name="type.cuisine.buschenschank">Buschenschank</string>
<string name="type.cuisine.cajun">Cajun</string>
<string name="type.cuisine.cake">Cake</string>
<string name="type.cuisine.cantonese">Cantonese</string>
<string name="type.cuisine.caribbean">Caribbean</string>
<string name="type.cuisine.chicken">Chicken</string>
<string name="type.cuisine.chinese">Chinese</string>
<string name="type.cuisine.churro">Churro</string>
<string name="type.cuisine.coffee_shop">Coffee</string>
<string name="type.cuisine.colombian">Colombian</string>
<string name="type.cuisine.crepe">Crepe</string>
<string name="type.cuisine.croatian">Croatian</string>
<string name="type.cuisine.cuban">Cuban</string>
<string name="type.cuisine.curry">Curry</string>
<string name="type.cuisine.czech">Czech</string>
<string name="type.cuisine.danish">Danish</string>
<string name="type.cuisine.deli">Deli</string>
<string name="type.cuisine.dessert">Dessert</string>
<string name="type.cuisine.diner">Diner</string>
<string name="type.cuisine.donut">Donut</string>
<string name="type.cuisine.dumplings">Dumplings</string>
<string name="type.cuisine.empanada">Empanada</string>
<string name="type.cuisine.ethiopian">Ethiopian</string>
<string name="type.cuisine.european">European</string>
<string name="type.cuisine.falafel">Falafel</string>
<string name="type.cuisine.filipino">Filipino</string>
<string name="type.cuisine.fine_dining">Fine Dining</string>
<string name="type.cuisine.fish">Fish</string>
<string name="type.cuisine.fish_and_chips">Fish and Chips</string>
<string name="type.cuisine.french">French</string>
<string name="type.cuisine.french_fries">French Fries</string>
<string name="type.cuisine.french_tacos">French Tacos</string>
<string name="type.cuisine.fried_food">Fried Food</string>
<string name="type.cuisine.friture">Friture</string>
<string name="type.cuisine.frozen_yogurt">Frozen Yogurt</string>
<string name="type.cuisine.georgian">Georgian</string>
<string name="type.cuisine.german">German</string>
<string name="type.cuisine.greek">Greek</string>
<string name="type.cuisine.grill">Grill</string>
<string name="type.cuisine.hawaiian">Hawaiian</string>
<string name="type.cuisine.heuriger">Heuriger</string>
<string name="type.cuisine.hotdog">Hotdog</string>
<string name="type.cuisine.hotpot">Hotpot</string>
<string name="type.cuisine.hungarian">Hungarian</string>
<string name="type.cuisine.ice_cream">Ice Cream</string>
<string name="type.cuisine.indian">Indian</string>
@@ -357,76 +326,44 @@
<string name="type.cuisine.irish">Irish</string>
<string name="type.cuisine.italian">Italian</string>
<string name="type.cuisine.italian_pizza">Italian, Pizza</string>
<string name="type.cuisine.jamaican">Jamaican</string>
<string name="type.cuisine.japanese">Japanese</string>
<string name="type.cuisine.juice">Juice</string>
<string name="type.cuisine.kebab">Kebab</string>
<string name="type.cuisine.korean">Korean</string>
<string name="type.cuisine.lao">Lao</string>
<string name="type.cuisine.latin_american">Latin American</string>
<string name="type.cuisine.lebanese">Lebanese</string>
<string name="type.cuisine.local">Local</string>
<string name="type.cuisine.malagasy">Malagasy</string>
<string name="type.cuisine.malaysian">Malaysian</string>
<string name="type.cuisine.meat">Meat</string>
<string name="type.cuisine.mediterranean">Mediterranean</string>
<string name="type.cuisine.mexican">Mexican</string>
<string name="type.cuisine.middle_eastern">Middle Eastern</string>
<string name="type.cuisine.mongolian_grill">Mongolian Grill</string>
<string name="type.cuisine.moroccan">Moroccan</string>
<string name="type.cuisine.nepalese">Nepalese</string>
<string name="type.cuisine.noodles">Noodles</string>
<string name="type.cuisine.oriental">East Asian</string>
<string name="type.cuisine.pakistani">Pakistani</string>
<string name="type.cuisine.pancake">Pancake</string>
<string name="type.cuisine.pasta">Pasta</string>
<string name="type.cuisine.persian">Persian</string>
<string name="type.cuisine.peruvian">Peruvian</string>
<string name="type.cuisine.piadina">Piadina</string>
<string name="type.cuisine.pie_and_mash">Pie and Mash</string>
<string name="type.cuisine.pizza">Pizza</string>
<string name="type.cuisine.poke">Poke</string>
<string name="type.cuisine.polish">Polish</string>
<string name="type.cuisine.portuguese">Portuguese</string>
<string name="type.cuisine.potato">Potato</string>
<string name="type.cuisine.pretzel">Pretzel</string>
<string name="type.cuisine.ramen">Ramen</string>
<string name="type.cuisine.regional">Regional</string>
<string name="type.cuisine.rice_noodle">Rice Noodle</string>
<string name="type.cuisine.russian">Russian</string>
<string name="type.cuisine.sandwich">Sandwich</string>
<string name="type.cuisine.sausage">Sausage</string>
<string name="type.cuisine.savory_pancakes">Savory Pancakes</string>
<string name="type.cuisine.seafood">Seafood</string>
<string name="type.cuisine.shawarma">Shawarma</string>
<string name="type.cuisine.snack">Snack</string>
<string name="type.cuisine.soba">Soba</string>
<string name="type.cuisine.soup">Soup</string>
<string name="type.cuisine.southern">Southern</string>
<string name="type.cuisine.spanish">Spanish</string>
<string name="type.cuisine.steak_house">Steak House</string>
<string name="type.cuisine.sushi">Sushi</string>
<string name="type.cuisine.swedish">Swedish</string>
<string name="type.cuisine.syrian">Syrian</string>
<string name="type.cuisine.tacos">Tacos</string>
<string name="type.cuisine.taiwanese">Taiwanese</string>
<string name="type.cuisine.takoyaki">Takoyaki</string>
<string name="type.cuisine.tapas">Tapas</string>
<string name="type.cuisine.tea">Tea</string>
<string name="type.cuisine.teppanyaki">Teppanyaki</string>
<string name="type.cuisine.thai">Thai</string>
<string name="type.cuisine.turkish">Turkish</string>
<string name="type.cuisine.ukrainian">Ukrainian</string>
<string name="type.cuisine.uzbek">Uzbek</string>
<string name="type.cuisine.vegan">Vegan</string>
<string name="type.cuisine.vegetarian">Vegetarian</string>
<string name="type.cuisine.venezuelan">Venezuelan</string>
<string name="type.cuisine.vietnamese">Vietnamese</string>
<string name="type.cuisine.waffle">Waffle</string>
<string name="type.cuisine.western">Western</string>
<string name="type.cuisine.wings">Wings</string>
<string name="type.cuisine.yakiniku">Yakiniku</string>
<string name="type.cuisine.yakitori">Yakitori</string>
<string name="type.emergency">Emergency</string>
<string name="type.emergency.assembly_point">Emergency Assembly Point</string>
<string name="type.emergency.defibrillator">Defibrillator</string>
@@ -1503,10 +1440,6 @@
<string name="type.self_service.no">No self-service</string>
<!-- https://wiki.openstreetmap.org/wiki/Key:social_facility -->
<string name="type.amenity.social_facility">Social Facility</string>
<string name="type.amenity.soup_kitchen">Soup Kitchen</string>
<string name="type.amenity.food_bank">Food Bank</string>
<string name="type.amenity.food_sharing">Food Sharing</string>
<string name="type.amenity.give_box">Give Box</string>
<!-- https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance -->
<string name="type.emergency.emergency_ward_entrance">Emergency Ward Entrance</string>
<!-- https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo -->

View File

@@ -119,7 +119,7 @@ echo "Generating search categories / synonyms..."
if [ -z "$SKIP_GENERATE_SYMBOLS" ]; then
if Diff data/symbols_hash data/styles/*/*/symbols/* || [ ! -z "$SYMBOLS_NOT_GENERATED" ]; then
echo "Generating symbols..."
bash ./tools/unix/generate_symbols.sh || (rm data/symbols_hash; exit 1)
bash ./tools/unix/generate_symbols.sh
fi
else
echo "Skipping generate symbols..."
@@ -128,7 +128,7 @@ fi
if [ -z "$SKIP_GENERATE_DRULES" ]; then
if Diff data/drules_hash data/styles/*/*/*.mapcss data/styles/*/*/*.prio.txt data/mapcss-mapping.csv || [ ! -z "$DRULES_NOT_GENERATED" ]; then
echo "Generating drules..."
bash ./tools/unix/generate_drules.sh || (rm data/drules_hash; exit 1)
bash ./tools/unix/generate_drules.sh
fi
else
echo "Skipping generate drules..."

View File

@@ -19,13 +19,13 @@
"@category_recycling": "Recycling|Abfallverwertung|Recyclebares Material|Getrennte Müllsammlung|Müllsortierung|Wiederverwendung",
"amenity-bureau_de_change": "3Geldwechselstelle|Wechselstube|Geld|Geldumtausch",
"amenity-bar|amenity-pub|@category_eat|@category_nightlife": "2Bar|2Pub|4Kneipe|Bier|Trinken|4Gaststätte|4Bars und Kneipen|Brauhaus|Cocktail-Lounge",
"amenity-cafe|@category_eat": "3Café|6Kaffeehaus|Kaffeebar|Cafeteria",
"amenity-fast_food|@category_eat": "4Fast Food|Mitnahme|3Imbiss|Essen zum Mitnehmen|Junkfood|7Schnellimbiss",
"amenity-restaurant|@category_eat": "3Restaurant|4Gasthaus|Gaststube|6Speiselokal|Gastwirtschaft",
"amenity-cafe|@category_eat": "3Café|3Restaurant|4Kaffee|6Kaffeehaus|Kaffeebar|Cafeteria",
"amenity-fast_food|@category_eat": "4Fast-Food|Takeaway|Restaurant|Café|Pizzeria|3Imbiss|5Essen zum Mitnehmen|Junkfood|7Schnellimbiss",
"amenity-restaurant|@category_eat": "3Restaurant|3Café|4Gasthaus|Gaststube|6Speiselokal|Gastwirtschaft",
"amenity-fuel|@category_fuel": "Tankstation|3Tankstelle",
"@shop": "3Verbrauchermarkt|5Geschäft|5Laden",
"shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "3Bäckerei|Bäckerladen|Bäcker|4Konditorei|Konditor",
"shop-cosmetics|@category_shopping|@shop": "4Kosmetikgeschäft|Kosmetik|Schönheitspflege|Make Up|Make-Up|Makeup",
"shop-bakery|shop-pastry|@category_eat|@category_food|@shop": "3Bäckerei|Bäckerladen|Bäcker|4Konditorei",
"shop-cosmetics|@category_shopping|@shop": "4Kosmetikgeschäft|Kosmetik|Schönheitspflege",
"shop-convenience|@category_food|@shop": "5Gemischtwarenladen|Lebensmittelhändler|Lebensmittelhandlung|Lebensmittelgeschäft|4Greißler|4Tante-Emma-Laden",
"shop-deli|@category_food|@shop": "4Feinkostladen|Feinkostgeschäft",
"shop-farm|@category_food|@shop": "4Hofladen|4Bauernhofladen",
@@ -484,7 +484,7 @@
"shop-craft|@shop": "Künstlerbedarf",
"shop-pasta|@shop": "Nudelgeschäft",
"amenity-luggage_locker": "Gepäckschließfach",
"amenity-studio": "Medienstudio|Studio",
"amenity-studio": "Studio",
"shop-cannabis|@shop": "Cannabis",
"man_made-cross": "Kreuz",
"leisure-dance|@category_entertainment": "4Tanz|Tanzschule",

View File

@@ -345,8 +345,6 @@
"shop-dry_cleaning": "3Dry Cleaner|cleaning",
"shop-tyres|@shop": "3Tyre|tyres",
"amenity-car_wash": "3Car Wash",
"man_made-telescope|man_made-telescope-optical|man_made-telescope-radio|man_made-telescope-gamma": "5Telescope",
"man_made-observatory": "4Observatory",
"amenity-veterinary": "Veterinary Doctor|4veterinary",
"amenity-animal_shelter": "Animal Shelter",
"@charging_station": "4Charging Station|charging",
@@ -421,7 +419,6 @@
"amenity-internet_cafe": "3Internet Cafe",
"amenity-motorcycle_parking": "4Motorcycle Parking",
"amenity-parking_space-disabled|@category_parking": "Disabled Parking Space",
"amenity-car_pooling|@category_parking": "Car Pooling",
"amenity-nursing_home": "4Nursing Home",
"amenity-payment_terminal": "Payment Terminal",
"amenity-payment_centre": "Payment Centre",
@@ -496,10 +493,6 @@
"man_made-cairn": "4Cairn",
"wheelchair-yes": "5Wheelchair",
"amenity-social_facility": "Social Facility",
"social_facility-soup_kitchen": "4Soup Kitchen|Food",
"social_facility-food_bank": "4Food Bank|foodbank|Food",
"amenity-food_sharing": "Food Sharing|Food",
"amenity-give_box": "Give Box",
"leisure-sports_hall": "Sports hall",
"amenity-arts_centre|@category_tourism": "Arts Center",
"amenity-prison": "prison",

View File

@@ -2931,174 +2931,3 @@ sr:Веганска|Вегетаријанска|Вегетаријанци|Ве
# el:Βιετναμέζικη κουζίνα
# he:מטבח וייטנאמי
# sk:Vietnamská kuchyňa
cuisine-juice
en:Juice
cuisine-wings
en:Wings
# cuisine-dessert
# en:Dessert
cuisine-frozen_yogurt
en:Frozen Yogurt
cuisine-tacos
en:Tacos
cuisine-dumplings
en:Dumplings
# cuisine-taiwanese
# en:Taiwanese cuisine
# cuisine-british
# en:British cuisine
# cuisine-middle_eastern
# en:Middle Eastern cuisine
cuisine-shawarma
en:Shawarma
cuisine-pretzel
en:Pretzel
# cuisine-bistro
# en:Bistro
cuisine-poke
en:Poke
cuisine-hotpot
en:Hotpot
# cuisine-latin_american
# en:Latin American cuisine
# cuisine-hawaiian
# en:Hawaiian cuisine
cuisine-churro
en:Churro
# cuisine-western
# en:Western cuisine
cuisine-french_fries
en:French Fries
cuisine-fried_food
en:Fried Food
cuisine-empanada
en:Empanada
cuisine-piadina
en:Piadina
# cuisine-buffet
# en:Buffet
# cuisine-european
# en:European cuisine
# cuisine-bar_and_grill
# en:Bar and Grill
# cuisine-jamaican
# en:Jamaican cuisine
cuisine-waffle
en:Waffle
# cuisine-potato
# en:Potato
# cuisine-meat
# en:Meat
# cuisine-nepalese
# en:Nepalese cuisine
cuisine-brunch
en:Brunch
# cuisine-ukrainian
# en:Ukrainian cuisine
# cuisine-cuban
# en:Cuban cuisine
# cuisine-uzbek
# en:Uzbek cuisine
# cuisine-bolivian
# en:Bolivian cuisine
cuisine-yakiniku
en:Yakiniku
# cuisine-afghan
# en:Afghan cuisine
# cuisine-syrian
# en:Syrian cuisine
# cuisine-cantonese
# en:Cantonese cuisine
cuisine-french_tacos
en:French Tacos
# cuisine-snack
# en:Snack
# cuisine-danish
# en:Danish cuisine
cuisine-soup
en:Soup
# cuisine-swedish
# en:Swedish cuisine
cuisine-falafel
en:Falafel
cuisine-rice_noodle
en:Rice Noodle
# cuisine-czech
# en:Czech cuisine
cuisine-teppanyaki
en:Teppanyaki
# cuisine-pakistani
# en:Pakistani cuisine
# cuisine-colombian
# en:Colombian cuisine
# cuisine-cajun
# en:Cajun cuisine
cuisine-takoyaki
en:Takoyaki
# cuisine-mongolian_grill
# en:Mongolian Grill
cuisine-yakitori
en:Yakitori
# cuisine-southern
# en:Southern cuisine
cuisine-pie_and_mash
en:Pie and Mash
# cuisine-venezuelan
# en:Venezuelan cuisine

View File

@@ -34,7 +34,7 @@
"Austria_Burgenland":"Burgenland",
"Austria_Carinthia":"Carintia",
"Austria_Lower Austria_West":"Austria Inferioară — Vest",
"Austria_Lower Austria_Wien":"Viena și Austria de Jos",
"Austria_Lower Austria_Wien":"Viena",
"Austria_Salzburg":"Salzburg",
"Austria_Styria":"Stiria",
"Austria_Tyrol":"Tirol",

View File

@@ -386,42 +386,9 @@
<include field="operator" />
<include field="opening_hours" />
</type>
<type id="amenity-car_pooling">
<include field="name" />
<include field="operator" />
<include field="opening_hours" />
</type>
<type id="amenity-pharmacy" group="shop">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="amenity-place_of_worship-buddhist" can_add="no">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="amenity-place_of_worship-christian" can_add="no">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="amenity-place_of_worship-hindu" can_add="no">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="amenity-place_of_worship-jewish" can_add="no">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="amenity-place_of_worship-muslim" can_add="no">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="amenity-place_of_worship-shinto" can_add="no">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="amenity-place_of_worship-taoist" can_add="no">
<include group="poi_internet" />
</type>
<type id="amenity-place_of_worship">
<include group="poi_internet" />
</type>
@@ -1145,25 +1112,6 @@
<include group="poi_internet" />
<include field="self_service" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="tourism-information-office" can_add="no">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="tourism-information-visitor_centre" can_add="no">
<include group="poi_internet" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="tourism-information-board" can_add="no">
<include field="name" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="tourism-information-map" can_add="no">
<include field="name" />
</type>
<!-- Can not be added because it is a complex type -->
<type id="tourism-information-guidepost" can_add="no">
</type>
<type id="tourism-information">
<include group="poi" />
</type>
@@ -1194,14 +1142,6 @@
<include field="opening_hours" />
<include field="level" />
</type>
<type id="amenity-food_sharing">
<include group="poi_internet" />
<include field="operator" />
</type>
<type id="amenity-give_box">
<include group="poi_internet" />
<include field="operator" />
</type>
<type id="tourism-picnic_site" />
<type id="leisure-picnic_table" />
<type id="leisure-park">
@@ -1264,15 +1204,6 @@
</type>
<type id="amenity-social_facility">
<include group="poi_internet" />
<include field="operator" />
</type>
<type id="social_facility-soup_kitchen">
<include group="poi_internet" />
<include field="operator" />
</type>
<type id="social_facility-food_bank">
<include group="poi_internet" />
<include field="operator" />
</type>
<type id="amenity-payment_centre">
<include group="poi_internet" />
@@ -1542,6 +1473,19 @@
<tag k="service" v="tyres" />
<include group="poi_internet" />
</type>
<type id="tourism-information-office">
<tag k="tourism" v="information" />
<tag k="information" v="board" />
<include group="poi_internet" />
</type>
<type id="tourism-information-board">
<tag k="tourism" v="information" />
<tag k="information" v="board" />
</type>
<type id="tourism-information-map">
<tag k="tourism" v="information" />
<tag k="information" v="board" />
</type>
<type id="leisure-sports_centre-climbing">
<tag k="leisure" v="sports_centre" />
<tag k="sport" v="climbing" />

View File

@@ -628,17 +628,17 @@ drinking_water|no;505;
deprecated|deprecated;506;x
deprecated|deprecated;507;x
deprecated|deprecated;508;x
amenity|car_pooling;509;
social_facility|soup_kitchen;510;
social_facility|food_bank;511;
amenity|food_sharing;512;
deprecated:railway|spur|bridge:06.2023;509;x
deprecated|deprecated;510;x
deprecated|deprecated;511;x
deprecated|deprecated;512;x
sport|curling;513;
amenity|give_box;514;
man_made|telescope;515;
man_made|telescope|optical;[man_made=telescope][telescope:type=optical];;name;int_name;516;
man_made|telescope|radio;[man_made=telescope][telescope:type=radio];;name;int_name;517;
man_made|telescope|gamma;[man_made=telescope][telescope:type=gamma];;name;int_name;518;
man_made|observatory;519;
deprecated|deprecated;514;x
deprecated|deprecated;515;x
deprecated|deprecated;516;x
deprecated|deprecated;517;x
deprecated|deprecated;518;x
deprecated|deprecated;519;x
sport|diving;520;
#~270k uses.
man_made|utility_pole;521;
@@ -1446,7 +1446,7 @@ cuisine|savory_pancakes;1318;
cuisine|moroccan;1319;
cuisine|peruvian;1320;
cuisine|fine_dining;1321;
cuisine|tea;[cuisine=tea],[cuisine=tea_house],[cuisine=tea_room];;;;1322;
cuisine|tea;1322;
natural|geyser;1323;
cuisine|bubble_tea;1324;
natural|hot_spring;1325;
@@ -1757,60 +1757,3 @@ amenity|luggage_locker;1629;
building|guardhouse;[building=guardhouse],[amenity=security_booth],[amenity=checkpoint];;;;1630;
office|security;1631;
shop|lighting;1632;
cuisine|afghan;1633;
cuisine|bar_and_grill;1634;
cuisine|bistro;1635;
cuisine|bolivian;1636;
cuisine|british;1637;
cuisine|brunch;1638;
cuisine|buffet;1639;
cuisine|cajun;1640;
cuisine|cantonese;1641;
cuisine|churro;1642;
cuisine|colombian;1643;
cuisine|cuban;1644;
cuisine|czech;1645;
cuisine|danish;1646;
cuisine|dessert;1647;
cuisine|dumplings;1648;
cuisine|empanada;1649;
cuisine|european;1650;
cuisine|falafel;1651;
cuisine|french_fries;1652;
cuisine|french_tacos;1653;
cuisine|fried_food;1654;
cuisine|frozen_yogurt;1655;
cuisine|hawaiian;1656;
cuisine|hotpot;1657;
cuisine|jamaican;1658;
cuisine|juice;1659;
cuisine|latin_american;1660;
cuisine|meat;1661;
cuisine|middle_eastern;1662;
cuisine|mongolian_grill;1663;
cuisine|nepalese;1664;
cuisine|pakistani;1665;
cuisine|piadina;1666;
cuisine|pie_and_mash;1667;
cuisine|poke;1668;
cuisine|potato;1669;
cuisine|pretzel;1670;
cuisine|rice_noodle;1671;
cuisine|shawarma;1672;
cuisine|snack;1673;
cuisine|soup;1674;
cuisine|southern;1675;
cuisine|swedish;1676;
cuisine|syrian;1677;
cuisine|tacos;1678;
cuisine|taiwanese;1679;
cuisine|takoyaki;1680;
cuisine|teppanyaki;1681;
cuisine|ukrainian;1682;
cuisine|uzbek;1683;
cuisine|venezuelan;1684;
cuisine|waffle;1685;
cuisine|western;1686;
cuisine|wings;1687;
cuisine|yakiniku;1688;
cuisine|yakitori;1689;
Can't render this file because it contains an unexpected character in line 7 and column 16.

View File

@@ -1 +0,0 @@
<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="#6e4426" r="8.25"/><path d="m5.40439659 10.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.7936423zm8.48497961-1.30248563c.1648759.16547497.1067017.33549981.0697536.38988023l-.4380042.5278054-.6259719.740475-.5369481.6188133c-.326327.369091-.6071716.6702095-.72781.7580936l-.0452585.0257766-.0128471.0043095c-.1930198.0592449-.9966097.0941052-2.41076971.104581l-1.41415344.0028979-.56983671.3962245-1.22668022-2.05836 1.15247826-.8300108c.39709497-.2523366.78419173-.38244764 1.16129028-.39033316l.0364622-.00038156c.38859717 0 .73067579.13023822 1.02623587.39071472h1.72754997c.2369804.0514113.3554706.1871537.3554706.4072272 0 .2200736-.1184902.3663266-.3554706.4387589h-1.86216448c-.07860487.0051388-.11790731.0426001-.11790731.1123837 0 .1046754.05865282.1491799.11790731.1491799l.90691258-.0103822.4942633-.0160402c.2708403-.012161.5027742-.0299189.6065724-.05585.3293242-.0822724 2.110004-1.67235874 2.2125241-1.75200674s.3026137-.12817636.4764018.04624321zm-3.6909669-3.77570294c-.0953136-.29519343-.0969978-.44798224-.0969978-.69213749 0-.60830957-.49315336-1.10142003-1.10142007-1.10142003-.60830957 0-1.10142003.49311046-1.10142003 1.10142003 0 .24414668-.00168624.39692692-.09699782.69213749-.09534354.29519342-.52319594.80943657-.52319594 1.43566029 0 .95082119.77082259 1.72164378 1.72164379 1.72164378.95082119 0 1.72160097-.77077973 1.72160097-1.72164378 0-.56356277-.3465674-1.03645253-.4853801-1.34062523zm-.35982581-2.77957701c-.00037908-.02303239-.01293243-.04310709-.03149545-.05412282l-.03584588-.0089961-.07532111.00360309c-.13534339.01138062-.41475604.05828767-.60648789.24999351-.12874614.12876329-.19222565.29576342-.22343826.43281093-.02675465-.08282078-.07076517-.17207866-.14346746-.24480239-.13454896-.13456502-.32770192-.1711184-.42926654-.18098477l-.06882538-.00359276c-.03450959.00067646-.06248952.02854864-.06305951.06307666l.00159083.04631626c.00635078.09321555.03708217.30583386.18300631.45172273.13458752.1345811.3277212.17113608.42927376.18100226l.12801359.00359241c.04385109 0 .43525377-.00712751.68185185-.25361374.20610698-.20621669.24487627-.51045136.25198392-.63278334z" fill="#000" fill-rule="evenodd"/></g></svg>

Before

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -1 +0,0 @@
<svg height="12" viewBox="0 0 10 12" width="10" xmlns="http://www.w3.org/2000/svg"><path d="m1.40439659 7.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.79364231zm8.4849796-1.30248563c.16487591.16547497.10670169.33549981.06975361.38988026l-.43800423.52780539-.62597187.74047497-.53694807.61881334c-.32632701.36909096-.60717167.67020945-.72780998.75809352l-.04525857.02577662-.01284708.00430951c-.19301982.05924488-.99660972.09410524-2.41076971.10458107l-1.41415344.0028978-.56983671.39622455-1.22668022-2.05836003 1.15247826-.83001081c.39709497-.25233656.78419173-.3824476 1.16129028-.39033312l.0364622-.00038156c.38859717 0 .73067579.13023823 1.02623587.39071468h1.72754994c.23698041.05141129.35547062.18715372.35547062.40722729 0 .22007356-.11849021.3663265-.35547062.43875883h-1.86216445c-.07860487.00513887-.11790731.04260011-.11790731.11238372 0 .10467541.05865282.14917992.11790731.14917992l.90691261-.01038221.49426323-.01604024c.27084037-.01216092.50277426-.0299189.60657246-.05584997.32932419-.08227242 2.11000399-1.67235874 2.21252409-1.75200674.10252009-.079648.3026137-.12817636.47640178.04624321zm-3.69096692-3.77570294c-.09531354-.29519343-.09699782-.44798224-.09699782-.69213749 0-.60830957-.49315331-1.10142003-1.10142002-1.10142003-.60830957 0-1.10142003.49311046-1.10142003 1.10142003 0 .24414668-.00168624.39692692-.09699782.69213749-.09534354.29519342-.52319594.80943657-.52319594 1.43566029 0 .95082119.77082259 1.72164378 1.72164379 1.72164378.95082119 0 1.72160093-.77077973 1.72160093-1.72164378 0-.56356277-.34656739-1.03645253-.48538006-1.34062523zm-.35982578-2.77957701c-.00037908-.02303239-.01293243-.04310709-.03149545-.05412282l-.03584588-.0089961-.07532111.00360309c-.13534339.01138062-.41475604.05828767-.60648789.24999351-.12874614.12876329-.19222565.29576342-.22343826.43281093-.02675465-.08282078-.07076517-.17207866-.14346746-.24480238-.13454896-.13456503-.32770192-.17111841-.42926654-.18098478l-.06882538-.00359276c-.03450959.00067646-.06248952.02854864-.06305951.06307666l.00159083.04631626c.00635078.09321555.03708217.30583386.18300631.45172273.13458752.1345811.3277212.17113608.42927376.18100226l.12801359.00359241c.04385109 0 .43525377-.00712751.68185185-.25361374.20610698-.20621669.24487627-.51045135.25198392-.63278334z" fill="#777" fill-rule="evenodd"/></svg>

Before

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -1 +0,0 @@
<svg height="11" viewBox="0 0 10 11" width="10" xmlns="http://www.w3.org/2000/svg"><path d="m1.40439659 6.9208845 1.66497587 2.79364231-1.40439659.78547319-1.66497587-2.79364231zm8.4849796-1.30248563c.16487591.16547497.10670169.33549981.06975361.38988026l-.43800423.52780539-.62597187.74047497-.53694807.61881334-.30691719.3410534-.1751764.18625299c-.10683664.11054758-.19209936.19172754-.24571639.23078713l-.04525857.02577662-.01284708.00430951c-.19301982.05924488-.99660972.09410524-2.41076971.10458107l-1.41415344.0028978-.56983671.3962246-1.22668022-2.05836008 1.15247826-.83001081c.39709497-.25233656.78419173-.3824476 1.16129028-.39033312l.0364622-.00038156c.38859717 0 .73067579.13023823 1.02623587.39071468h1.72754994c.23698041.05141129.35547062.18715372.35547062.40722729 0 .22007356-.11849021.3663265-.35547062.43875883h-1.86216445c-.07860487.00513887-.11790731.04260011-.11790731.11238372 0 .10467541.05865282.14917992.11790731.14917992l.90691261-.01038221.49426323-.01604024.36592704-.02276118c.1048133-.00920099.18874632-.02012325.24064542-.03308879.32932419-.08227242 2.11000399-1.67235874 2.21252409-1.75200674.10252009-.079648.3026137-.12817636.47640178.04624321zm-2.38737619-4.86878187-.00166678 4.000383h-5.00033322l-.001-3.997383zm-5.49948258 0-.00045062 1.65580113-.42167958.90580112-.63441545-.29583278zm5.99572437 0 1.05654565 2.26576947-.63441545.29583278-.42167957-.90580112z" fill="#777" fill-rule="evenodd"/></svg>

Before

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -1 +0,0 @@
<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="m11.9788057 9.45701798v4.46417412h-2.48216516v-1.9344754c0-.5341906-.43304708-.9672377-.96723771-.9672377-.51282301 0-.93243211.3990962-.96518032.9036416l-.00205739.0635961v1.9344754h-2.48216512v-4.46417412zm-3.44940287-4.1392834c1.90503617 0 3.44940287 1.54436664 3.44940287 3.44940283h-6.8988057c0-1.90503619 1.54436664-3.44940283 3.44940283-3.44940283zm4.47021307-1.83773458.6985699.69856997-1.0498311 1.04983111c.2863445.33051154.5419599.68947967.7623009 1.07107475l-.8568598.49403817c-.520321-.90122443-1.2678995-1.64880299-2.169124-2.16912399l.4940382-.8568598c.3815951.22034103.7405632.47595638 1.0710748.7623009z" fill="#000"/></g></svg>

Before

Width:  |  Height:  |  Size: 853 B

View File

@@ -1 +0,0 @@
<svg height="19" viewBox="0 0 29 19" width="29" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.185075.4995c1.777125 0 3.382725.375525 4.56885 1.3638 1.2542475 1.043175 1.74465 2.530875 1.74465 4.202625 0 .70428972-.0885354 1.37740429-.2813988 2.0016737.1097684-.01288087.2224325-.01884789.3364903-.01884789 1.0018875 0 1.8962402.46041088 2.4830213 1.18119574.5702976-1.00377388 1.6501558-1.68022155 2.8880068-1.68022155 1.2250215 0 2.2953081.66249835 2.872122 1.64875713.5861846-.70238108 1.4692751-1.14973132 2.4568499-1.14973132 1.7673849 0 3.2001334 1.43274852 3.2001334 3.20013339 0 .7313317-.245322 1.4053653-.6581629 1.944298l-.074637.0915686.1409174.0845388c1.2235368.7673092 2.0881394 2.0596347 2.2705608 3.570914l.0213847.2173535.0984085 1.2911937h-20.69720984l.09840858-1.2911937c.12227689-1.6043637 1.01014496-2.9844197 2.29194549-3.7882675l.13958437-.0845388-.073304-.0915686c-.37843751-.4940216-.61611258-1.1015656-.65309705-1.7627038l-.00506585-.1815942c-.84977747.3668477-1.81813376.5570547-2.8535331.6031408v3.147975c0 .8284275-.67155 1.5-1.5 1.5h-3.0015c-.8284275 0-1.5-.67155-1.5-1.5v-13.0005c0-.8284275.67155-1.5 1.5-1.5z" fill="#111" opacity=".6"/><path d="m12.5536665 13.8204843c.5404977 0 1.0540327.1154407 1.517294.3230112-.6662367.7508614-1.1159451 1.6987981-1.2504799 2.7493425l-.0344806.3559128h-3.936c.14615915-1.9177167 1.7485089-3.4282665 3.7036665-3.4282665zm10.7 0c1.9551576 0 3.5575073 1.5105498 3.7036665 3.4282665h-3.895333l-.0060809-.0911937-.0216381-.2213141c-.1283466-1.0743203-.5858754-2.0432621-1.2667992-2.806658.4550736-.1987522.9577425-.3091007 1.4861847-.3091007zm-5.3289719-.2138492c2.0771169 0 3.7794184 1.6047752 3.9346947 3.6421157h-7.8693893c.1552763-2.0373405 1.8575778-3.6421157 3.9346946-3.6421157zm-11.7390946-11.6068351c1.57395 0 2.786025.3293925 3.61005 1.01595.81477.677625 1.20435 1.70415 1.20435 3.05055 0 1.391025-.416475 2.4687-1.296075 3.208725-.861075.7311-2.111925 1.08855-3.713625 1.08855h-.989775v4.636425h-3.000525l.000225-12.999975zm6.3680665 7.24895081c1.1046432 0 2.0001334.89549019 2.0001334 2.00013339s-.8954902 2.0001334-2.0001334 2.0001334-2.0001334-.8954902-2.0001334-2.0001334.8954902-2.00013339 2.0001334-2.00013339zm10.7 0c1.1046432 0 2.0001334.89549019 2.0001334 2.00013339s-.8954902 2.0001334-2.0001334 2.0001334-2.0001334-.8954902-2.0001334-2.0001334.8954902-2.00013339 2.0001334-2.00013339zm-5.3289719-.49902581c1.1735489 0 2.1248982.95134932 2.1248982 2.1248982 0 1.1735488-.9513493 2.1248982-2.1248982 2.1248982-1.1735488 0-2.1248981-.9513494-2.1248981-2.1248982 0-1.17354888.9513493-2.1248982 2.1248981-2.1248982zm-11.8500196-4.475475h-1.07415v3.8599125h.7027875c.842625 0 1.481685-.1958625 1.898325-.525765.42591-.338775.611055-.82884.611055-1.4619 0-.650925-.1748925-1.1142-.5267175-1.426275-.342675-.30315-.8706-.4459725-1.6113-.4459725z" fill="#20607c"/></g></svg>

Before

Width:  |  Height:  |  Size: 2.8 KiB

View File

@@ -1 +0,0 @@
<svg height="12" viewBox="0 0 18 12" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m3.90636316.31547368c1.12239473 0 2.13645789.23717369 2.88558947.86134737.79215632.65884737 1.10188421 1.59844737 1.10188421 2.65428948 0 .44481455-.05591709.86993955-.17772557 1.26421496.06932743-.00813528.14048371-.01190393.2125202-.01190393.63277103 0 1.19762539.29078582 1.56822398.74601837.36018795-.63396245 1.04220365-1.06119256 1.82400435-1.06119256.7736977 0 1.4496682.41842001 1.8139718 1.04132029.3702218-.4436091.9279632-.7261461 1.5516946-.7261461 1.1162431 0 2.0211369.90489381 2.0211369 2.02113689 0 .46189369-.1549402.88759915-.4156819 1.22797764l-.0471391.05783284.0890005.05339291c.7727601.48461638 1.3188248 1.30082194 1.4340384 2.25531406l.0135061.1372759.0621528.8154908h-13.07192207l.06215279-.8154908c.0772275-1.01328225.63798628-1.88489661 1.44754451-2.39258996l.08815855-.05339291-.04629724-.05783284c-.23901318-.31201361-.38912375-.69572559-.41248237-1.11328658l-.00319948-.11469106c-.53670156.23169325-1.14829501.35182404-1.80223143.38093102v1.98819474c0 .52321737-.42413684.94736839-.94736842.94736839h-1.89568421c-.52321737 0-.94736842-.42413681-.94736842-.94736839v-8.2108421c0-.52321737.42413684-.94736843.94736842-.94736843z" fill="#111" opacity=".6"/><path d="m7.92863147 8.72872693c.34136694 0 .66570485.07290994.95829094.20400705-.42078106.47422827-.70480741 1.07292512-.78977674 1.73642682l-.02177725.2247871h-2.48589474c.09231105-1.21118954 1.10432143-2.16522097 2.33915779-2.16522097zm6.75789473 0c1.2348364 0 2.2468468.95403143 2.3391578 2.16522097h-2.4602103l-.0038406-.0575961-.0136661-.1397773c-.0810611-.6785181-.3700266-1.29048128-.8000838-1.77262609.2874149-.12552769.60489-.19522148.938643-.19522148zm-3.3656664-.13506265c1.3118632 0 2.387001 1.01354223 2.4850703 2.30028362h-4.97014063c.09806925-1.28674139 1.17320703-2.30028362 2.48507033-2.30028362zm-7.41416506-7.3306327c.99407368 0 1.75959473.20803737 2.28003158.64165263.51459157.42797368.7606421 1.07630526.7606421 1.92666316 0 .8785421-.26303684 1.55917895-.81857368 2.02656316-.54383685.46174736-1.33384737.68750526-2.34544737.68750526h-.62512105v2.92826842h-1.89506843l.00014211-8.21051053zm4.02193673 4.57828472c.69766938 0 1.26324215.56557277 1.26324215 1.26324215 0 .69766937-.56557277 1.26324215-1.26324215 1.26324215-.69766937 0-1.26324215-.56557278-1.26324215-1.26324215 0-.69766938.56557278-1.26324215 1.26324215-1.26324215zm6.75789473 0c.6976694 0 1.2632422.56557277 1.2632422 1.26324215 0 .69766937-.5655728 1.26324215-1.2632422 1.26324215s-1.2632421-.56557278-1.2632421-1.26324215c0-.69766938.5655727-1.26324215 1.2632421-1.26324215zm-3.3656664-.31517419c.7411887 0 1.3420409.6008522 1.3420409 1.34204095s-.6008522 1.34204095-1.3420409 1.34204095c-.7411888 0-1.34204098-.6008522-1.34204098-1.34204095s.60085218-1.34204095 1.34204098-1.34204095zm-7.48422296-2.82661579h-.67841052v2.43783947h.44386579c.53218421 0 .93580105-.12370263 1.1989421-.33206211.26899579-.21396315.38592947-.52347789.38592947-.92330526 0-.41111053-.11045842-.70370526-.33266368-.90080526-.21642632-.19146316-.54985263-.28166684-1.01766316-.28166684z" fill="#20607c"/></g></svg>

Before

Width:  |  Height:  |  Size: 3.1 KiB

View File

@@ -1,14 +1 @@
<svg
height="25"
viewBox="0 0 40 25"
width="40"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
fill="#999999"
style="stroke-width:0.594311" />
<path
d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
fill="#294c88"
style="stroke-width:0.519333" />
</svg>
<svg height="26" viewBox="0 0 42 26" width="42" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#999" transform="matrix(.80255481 0 0 .44010193 .471493 3.853665)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#294c88" transform="matrix(.73067099 0 0 .36912143 2.310205 5.333047)"/></svg>

Before

Width:  |  Height:  |  Size: 973 B

After

Width:  |  Height:  |  Size: 917 B

View File

@@ -1,14 +1 @@
<svg
height="18"
viewBox="0 0 29 18"
width="29"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
fill="#999999"
style="stroke-width:0.427404" />
<path
d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
fill="#294c88"
style="stroke-width:0.373483" />
</svg>
<svg height="19" viewBox="0 0 30 19" width="30" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#999" transform="matrix(.57716453 0 0 .31650328 .236739 2.944845)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#294c88" transform="matrix(.52546863 0 0 .26545702 1.559066 4.008757)"/></svg>

Before

Width:  |  Height:  |  Size: 965 B

After

Width:  |  Height:  |  Size: 917 B

View File

@@ -1,14 +1 @@
<svg
height="25"
viewBox="0 0 40 25"
width="40"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
fill="#999999"
style="stroke-width:0.594311" />
<path
d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
fill="#136c30"
style="stroke-width:0.519333" />
</svg>
<svg height="26" viewBox="0 0 42 26" width="42" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#999" transform="matrix(.80255481 0 0 .44010193 .471493 3.853665)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#136c30" transform="matrix(.73067099 0 0 .36912143 2.310205 5.333047)"/></svg>

Before

Width:  |  Height:  |  Size: 992 B

After

Width:  |  Height:  |  Size: 917 B

View File

@@ -1,14 +1 @@
<svg
height="18"
viewBox="0 0 29 18"
width="29"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
fill="#999999"
style="stroke-width:0.427404" />
<path
d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
fill="#136c30"
style="stroke-width:0.373483" />
</svg>
<svg height="19" viewBox="0 0 30 19" width="30" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#999" transform="matrix(.57716453 0 0 .31650328 .236739 2.944845)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#136c30" transform="matrix(.52546863 0 0 .26545702 1.559066 4.008757)"/></svg>

Before

Width:  |  Height:  |  Size: 984 B

After

Width:  |  Height:  |  Size: 917 B

View File

@@ -1,14 +1 @@
<svg
height="25"
viewBox="0 0 40 25"
width="40"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
fill="#999999"
style="stroke-width:0.594311" />
<path
d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
fill="#9f1a17"
style="stroke-width:0.519333" />
</svg>
<svg height="26" viewBox="0 0 42 26" width="42" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#999" transform="matrix(.80255481 0 0 .44010193 .471493 3.853665)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#9f1a17" transform="matrix(.73067099 0 0 .36912143 2.310205 5.333047)"/></svg>

Before

Width:  |  Height:  |  Size: 992 B

After

Width:  |  Height:  |  Size: 917 B

View File

@@ -1,14 +1 @@
<svg
height="18"
viewBox="0 0 29 18"
width="29"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
fill="#999999"
style="stroke-width:0.427404" />
<path
d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
fill="#9f1a17"
style="stroke-width:0.373483" />
</svg>
<svg height="19" viewBox="0 0 30 19" width="30" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#999" transform="matrix(.57716453 0 0 .31650328 .236739 2.944845)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#9f1a17" transform="matrix(.52546863 0 0 .26545702 1.559066 4.008757)"/></svg>

Before

Width:  |  Height:  |  Size: 984 B

After

Width:  |  Height:  |  Size: 917 B

View File

@@ -1,14 +1 @@
<svg
height="25"
viewBox="0 0 40 25"
width="40"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
fill="#212121"
style="stroke-width:0.594311" />
<path
d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
fill="#9f5a17"
style="stroke-width:0.519333" />
</svg>
<svg height="26" viewBox="0 0 42 26" width="42" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#212121" transform="matrix(.80255481 0 0 .44010193 .471493 3.853665)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#9f5a17" transform="matrix(.73067099 0 0 .36912143 2.310205 5.333047)"/></svg>

Before

Width:  |  Height:  |  Size: 992 B

After

Width:  |  Height:  |  Size: 920 B

View File

@@ -1,14 +1 @@
<svg
height="18"
viewBox="0 0 29 18"
width="29"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
fill="#212121"
style="stroke-width:0.427404" />
<path
d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
fill="#9f5a17"
style="stroke-width:0.373483" />
</svg>
<svg height="19" viewBox="0 0 30 19" width="30" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#212121" transform="matrix(.57716453 0 0 .31650328 .236739 2.944845)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#9f5a17" transform="matrix(.52546863 0 0 .26545702 1.559066 4.008757)"/></svg>

Before

Width:  |  Height:  |  Size: 984 B

After

Width:  |  Height:  |  Size: 920 B

View File

@@ -1,14 +0,0 @@
<svg
height="21"
viewBox="0 0 37 21"
width="37"
xmlns="http://www.w3.org/2000/svg">
<g transform="matrix(0.27138802,0,0,0.27138802,4.3878227,-0.11668148)">
<path
d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
<path
d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
style="fill:#294c88;fill-opacity:1;stroke:#00008b;stroke-width:0" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 774 B

View File

@@ -1,14 +0,0 @@
<svg
height="15"
viewBox="0 0 26 15"
width="26"
xmlns="http://www.w3.org/2000/svg">
<g transform="matrix(0.19044333,0,0,0.19044333,3.0791026,0.18161878)">
<path
d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
<path
d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
style="fill:#294c88;fill-opacity:1;stroke:#00008b;stroke-width:0" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 773 B

View File

@@ -1,14 +0,0 @@
<svg
height="21"
viewBox="0 0 37 21"
width="37"
xmlns="http://www.w3.org/2000/svg">
<g transform="matrix(0.27138802,0,0,0.27138802,4.3878227,-0.11668148)">
<path
d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
<path
d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
style="fill:#136c30;fill-opacity:1;stroke:#00008b;stroke-width:0" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 774 B

View File

@@ -1,14 +0,0 @@
<svg
height="15"
viewBox="0 0 26 15"
width="26"
xmlns="http://www.w3.org/2000/svg">
<g transform="matrix(0.19044333,0,0,0.19044333,3.0791026,0.18161878)">
<path
d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
<path
d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
style="fill:#136c30;fill-opacity:1;stroke:#00008b;stroke-width:0" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 773 B

View File

@@ -1 +0,0 @@
<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="#6e4426" r="8.25"/><path d="m5.40439659 10.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.7936423zm8.48497961-1.30248563c.1648759.16547497.1067017.33549981.0697536.38988023l-.4380042.5278054-.6259719.740475-.5369481.6188133c-.326327.369091-.6071716.6702095-.72781.7580936l-.0452585.0257766-.0128471.0043095c-.1930198.0592449-.9966097.0941052-2.41076971.104581l-1.41415344.0028979-.56983671.3962245-1.22668022-2.05836 1.15247826-.8300108c.39709497-.2523366.78419173-.38244764 1.16129028-.39033316l.0364622-.00038156c.38859717 0 .73067579.13023822 1.02623587.39071472h1.72754997c.2369804.0514113.3554706.1871537.3554706.4072272 0 .2200736-.1184902.3663266-.3554706.4387589h-1.86216448c-.07860487.0051388-.11790731.0426001-.11790731.1123837 0 .1046754.05865282.1491799.11790731.1491799l.90691258-.0103822.4942633-.0160402c.2708403-.012161.5027742-.0299189.6065724-.05585.3293242-.0822724 2.110004-1.67235874 2.2125241-1.75200674s.3026137-.12817636.4764018.04624321zm-7.07695726-.61839887-.00064003-.76822841c-.79974138-.64144198-1.31177891-1.6268104-1.31177891-2.73177159h7c0 1.10496119-.5120375 2.09032961-1.3117789 2.73177159l-.00064.76822841z" fill="#000" fill-rule="evenodd"/></g></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1 +0,0 @@
<svg height="19" viewBox="0 0 14 19" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m13.1340274.00741332-8.49199134 1.21422959 1.21962985 1.21976833 6.55564899-.9357696-.9357696 6.55564895 1.2197683 1.21976832 1.2142296-8.49212981c.0725574-.50887145-.3895117-.8436881-.7815158-.78151578m-10.82601505.83814936c-2.97333242 2.97402475-2.97333242 7.79521825 0 10.76924302 2.97402475 2.9733324 7.79521825 2.9733324 10.76924305 0zm-.84645746 11.86715912v3.902594h-.69234211c-.38355753 0-.69234211.2895375-.69234211.6491399v.0864043c0 .3596025.30878458.64914.69234211.64914h8.30810528c.38355753 0 .69234211-.2895375.69234211-.64914v-.0864043c0-.3596024-.30878458-.6491399-.69234211-.6491399h-.6923421v-1.4278864c-2.47539997.1890094-5.00992596-.6352931-6.92342107-2.4747076" fill="#777" transform="translate(0 .5)"/></svg>

Before

Width:  |  Height:  |  Size: 822 B

View File

@@ -1 +0,0 @@
<svg height="15" viewBox="0 0 14 15" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m7.82311911 5.67246657 3.40536139 7.66676663c.1034778.2351768 0 .507982-.244584.6208669-.2351769.1034779-.5079821 0-.620867-.2445839l-1.12884905-2.5399104h-4.40251137l-1.12884907 2.5399104c-.1128849.2445839-.38569009.3480618-.62086698.2445839-.24458397-.1128849-.3480618-.3856901-.24458397-.6208669l3.00085711-6.74487323-1.63683115.76197312-1.1946986-2.54931747 6.38740431-2.98204296 1.19469857 2.54931748zm-.79019435.54561038-1.78734435 4.01682125h3.57468871zm2.59635286-5.02337835 2.55872458-1.1946986 1.5897957 3.41476843-2.5587245 1.1946986zm-9.40707557 5.4278826 2.55872456-1.1946986.79019435 1.70268068-2.55872456 1.1946986z" fill="#777" transform="translate(0 .5)"/></svg>

Before

Width:  |  Height:  |  Size: 771 B

View File

@@ -1 +0,0 @@
<svg height="17" viewBox="0 0 18 17" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m16.6801082.00001-1.6419569 1.64195683c-.5169266-.44784856-1.0783599-.84763607-1.6751823-1.19225383l-.7726855 1.34014584c1.409533.81379244 2.5787608 1.98302024 3.3925532 3.39255325l1.3401459-.77268557c-.3446178-.59682233-.7444053-1.15825566-1.1922539-1.6751823l1.6419569-1.64195683zm-8.72593811 2.09165983c-4.26738784 0-7.72685565 3.45946781-7.72685565 7.72685565h15.45371126c0-4.26738784-3.4594678-7.72685565-7.72685561-7.72685565m-7.72685565 9.27222677v4.6361134h15.45371126v-4.6361134z" fill="#777" transform="translate(0 .5)"/></svg>

Before

Width:  |  Height:  |  Size: 629 B

View File

@@ -1 +0,0 @@
<svg height="19" viewBox="0 0 14 19" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m7.69225716.00010119c-.93627166-.01384608-.93627166 1.39789983 0 1.3846076 2.68461564 0 4.84612664 2.16151093 4.84612664 4.8461266-.0138461.93627166 1.3978998.93627166 1.3846076 0 0-3.43299608-2.7977382-6.2307342-6.23073424-6.2307342m-5.38432358.84641063c-2.9731679 2.9738602-2.9731679 7.79478695 0 10.76864718 2.97386021 2.9731679 7.79478692 2.9731679 10.76864712 0zm5.38432358 1.92280457c-.93627166-.01384608-.93627166 1.39789983 0 1.3846076 1.15517812 0 2.0769114.92159482 2.0769114 2.0769114-.01384607.93627166 1.39789984.93627166 1.38460764 0 0-1.90355853-1.55796051-3.461519-3.46151904-3.461519m-6.2307342 9.94369791v3.9023781h-.6923038c-.38353631 0-.6923038.2895214-.6923038.649104v.0863996c0 .3595826.30876749.649104.6923038.649104h8.3076456c.38353631 0 .6923038-.2895214.6923038-.649104v-.0863996c0-.3595826-.30876749-.649104-.6923038-.649104h-.6923038v-1.4278074c-2.47526301.188999-5.00964876-.6352579-6.923038-2.4745707" fill="#777" transform="translate(0 .5)"/></svg>

Before

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -428,7 +428,6 @@ area|z14-[area:highway=living_street],
area|z14-[amenity=grave_yard],
area|z14-[landuse=cemetery],
area|z15-[amenity=parking],
area|z15-[amenity=car_pooling],
area|z16-[public_transport=platform],
area|z16-[railway=platform],
{fill-opacity: 1;}
@@ -591,7 +590,6 @@ area|z10-[landuse=farmyard],
/* Parking */
area|z15-[amenity=parking],
area|z15-[amenity=car_pooling],
{fill-color: @parking;}
area|z15-[amenity=parking][location=underground],

View File

@@ -848,8 +848,6 @@ node|z17-[leisure=indoor_play],
node|z17-[amenity=courthouse],
node|z17-[amenity=nursing_home],
node|z17-[amenity=social_facility],
node|z17-[social_facility=food_bank],
node|z17-[social_facility=soup_kitchen],
node|z17-[amenity=animal_shelter],
node|z17-[amenity=kindergarten],
node|z17-[amenity=childcare],
@@ -917,13 +915,6 @@ node|z15-[leisure=sports_centre][sport=swimming],
node|z17-[highway=ladder],
node|z18-[amenity=dojo],
node|z18-[amenity=vending_machine],
node|z18-[amenity=food_sharing],
node|z18-[amenity=give_box],
node|z18-[man_made=telescope],
node|z17-[man_made=telescope][telescope:type=optical],
node|z17-[man_made=telescope][telescope:type=radio],
node|z17-[man_made=telescope][telescope:type=gamma],
node|z16-[man_made=observatory],
node|z17-[amenity=fire_station],
node|z18-[amenity=internet_cafe],
node|z18-[emergency=defibrillator],
@@ -1445,12 +1436,6 @@ node|z17-[amenity=nursing_home],
node|z17-[amenity=social_facility],
{icon-image: social_facility-m.svg;}
node|z17-[social_facility=soup_kitchen],
{icon-image: soup_kitchen-m.svg;}
node|z17-[social_facility=food_bank],
{icon-image: food_bank-m.svg;}
node|z17-[amenity=cinema],
{icon-image: cinema-m.svg;}
node|z18-[amenity=cinema],
@@ -1591,23 +1576,6 @@ node|z17-[amenity=parcel_locker],
node|z18-[amenity=vending_machine][vending=fuel],
{icon-image: fuel-dispenser-m.svg;}
node|z18-[amenity=food_sharing],
{icon-image: food_sharing-m.svg;}
node|z18-[amenity=give_box],
{icon-image: give_box-m.svg;}
node|z18-[man_made=telescope],
{icon-image: telescope-m.svg;}
node|z17-[man_made=telescope][telescope:type=optical],
{icon-image: telescope-optical-m.svg;}
node|z17-[man_made=telescope][telescope:type=radio],
{icon-image: telescope-radio-m.svg;}
node|z17-[man_made=telescope][telescope:type=gamma],
{icon-image: telescope-gamma-m.svg;}
node|z16-[man_made=observatory],
{icon-image: observatory-m.svg;}
node|z17-[aeroway=gate],
{icon-image: airport_gate-m.svg;font-size: 11;}
@@ -2189,7 +2157,6 @@ node|z17-[amenity=bicycle_parking],
node|z17-[amenity=motorcycle_parking],
node|z17-[amenity=car_wash],
node|z18-[amenity=parking],
node|z18-[amenity=car_pooling],
node|z18-[amenity=car_rental],
node|z18-[amenity=car_sharing],
{text: name;text-color: @poi_label;text-offset: 1;font-size: 10;}
@@ -2264,11 +2231,6 @@ node|z16-[amenity=parking],
node|z17-[amenity=parking],
{icon-image: parking-m.svg;font-size: 11;icon-min-distance: 10}
node|z16-[amenity=car_pooling],
{icon-image: parking-pooling-s.svg;icon-min-distance: 5;}
node|z17-[amenity=car_pooling],
{icon-image: parking-pooling-m.svg;font-size: 11;icon-min-distance: 10}
node|z16-[amenity=parking][location=underground],
{icon-image:parking_underground-m.svg;}

View File

@@ -73,7 +73,6 @@ node[amenity=place_of_worship]
node[amenity=social_facility],
node[historic=ship],
node[leisure=hackerspace],
node[social_facility],
node[tourism=attraction],
node[tourism=gallery],
node[tourism=museum],
@@ -105,7 +104,6 @@ node[leisure=beach_resort],
node[leisure=marina],
node[leisure=sports_centre][sport=scuba_diving],
node[leisure=sports_centre][sport=swimming],
node[leisure=water_park],
{text-color: @water_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
area[amenity=university][name]
@@ -135,9 +133,6 @@ node[amenity=townhall],
node[amenity=university][name],
node[barrier=border_control],
node[building=guardhouse],
node[man_made=communications_tower],
node[man_made=lighthouse],
node[man_made=observatory],
node[office=diplomatic],
node[office=security],
node[shop=money_lender],

View File

@@ -140,7 +140,6 @@ railway-platform # area z16- (also has captio
amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-)
amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-)
amenity-car_pooling # area z15- (also has icon z16-, caption(optional) z18-)
amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-)
amenity-parking # area z15- (also has icon z16-, caption(optional) z18-)
amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-)

View File

@@ -989,7 +989,6 @@ leisure-escape_game # icon z17- (also has captio
leisure-fitness_centre # icon z16- (also has caption(optional) z17-)
leisure-hackerspace # icon z17- (also has caption(optional) z17-)
leisure-sauna # icon z17- (also has caption(optional) z17-)
man_made-observatory # icon z16- (also has caption(optional) z16-)
office-estate_agent # icon z18- (also has caption(optional) z18-)
office-government # icon z18- (also has caption(optional) z18-)
office-insurance # icon z18- (also has caption(optional) z18-)
@@ -1135,8 +1134,6 @@ amenity-vending_machine-public_transport_tickets # icon z17- (also has captio
amenity-water_point-drinking_water_no # icon z18- (also has caption(optional) z18-)
highway-elevator # icon z17-
leisure-picnic_table # icon z17- (also has caption(optional) z17-)
man_made-telescope-gamma # icon z17- (also has caption(optional) z17-)
man_made-telescope-radio # icon z17- (also has caption(optional) z17-)
man_made-water_tap-drinking_water_no # icon z18- (also has caption(optional) z18-)
man_made-water_well-drinking_water_no # icon z18- (also has caption(optional) z18-)
natural-spring-drinking_water_no # icon z14- (also has caption(optional) z15-)
@@ -1146,10 +1143,6 @@ isoline-step_10 # pathtext z17- (also has li
isoline-zero # pathtext z17- (also has line z15-)
=== 1000
social_facility-food_bank # icon z17- (also has caption(optional) z17-)
social_facility-soup_kitchen # icon z17- (also has caption(optional) z17-)
=== 851
amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-)
amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-)
amenity-nursing_home # icon z17- (also has caption(optional) z17-)
@@ -1262,7 +1255,6 @@ power-portal # icon z19-
power-tower # icon z19-
=== 450
amenity-car_pooling # icon z16- (also has caption(optional) z18-, area z15-)
amenity-parking # icon z16- (also has caption(optional) z18-, area z15-)
amenity-parking-fee # icon z16- (also has caption(optional) z18-, area z15-)
amenity-parking-multi-storey # icon z16- (also has caption(optional) z18-, area z15-)
@@ -2016,7 +2008,6 @@ leisure-swimming_pool-private # icon z17- (also has captio
# leisure-fitness_centre # caption(optional) z17- (also has icon z16-)
# leisure-hackerspace # caption(optional) z17- (also has icon z17-)
# leisure-sauna # caption(optional) z17- (also has icon z17-)
# man_made-observatory # caption(optional) z16- (also has icon z16-)
# office-estate_agent # caption(optional) z18- (also has icon z18-)
# office-government # caption(optional) z18- (also has icon z18-)
# office-insurance # caption(optional) z18- (also has icon z18-)
@@ -2157,17 +2148,11 @@ leisure-swimming_pool-private # icon z17- (also has captio
# amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-)
# amenity-water_point-drinking_water_no # caption(optional) z18- (also has icon z18-)
# leisure-picnic_table # caption(optional) z17- (also has icon z17-)
# man_made-telescope-gamma # caption(optional) z17- (also has icon z17-)
# man_made-telescope-radio # caption(optional) z17- (also has icon z17-)
# man_made-water_tap-drinking_water_no # caption(optional) z18- (also has icon z18-)
# man_made-water_well-drinking_water_no # caption(optional) z18- (also has icon z18-)
# natural-spring-drinking_water_no # caption(optional) z15- (also has icon z14-)
# === -8800
# social_facility-food_bank # caption(optional) z17- (also has icon z17-)
# social_facility-soup_kitchen # caption(optional) z17- (also has icon z17-)
# === -9149
# amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z10-)
# amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z10-)
# amenity-nursing_home # caption(optional) z17- (also has icon z17-)
@@ -2261,7 +2246,6 @@ leisure-swimming_pool-private # icon z17- (also has captio
# man_made-water_tower # caption(optional) z18- (also has icon z16-)
# === -9550
# amenity-car_pooling # caption(optional) z18- (also has icon z16-, area z15-)
# amenity-parking # caption(optional) z18- (also has icon z16-, area z15-)
# amenity-parking-fee # caption(optional) z18- (also has icon z16-, area z15-)
# amenity-parking-multi-storey # caption(optional) z18- (also has icon z16-, area z15-)
@@ -2336,8 +2320,6 @@ amenity-telephone # icon z17- (also has captio
entrance # icon z17- (also has caption(optional) z19-)
=== -9960
amenity-food_sharing # icon z18- (also has caption(optional) z18-)
amenity-give_box # icon z18- (also has caption(optional) z18-)
amenity-parking_space # caption z19-
amenity-parking_space-disabled # icon z18- (also has caption(optional) z19-)
amenity-parking_space-permissive # caption z19-
@@ -2353,7 +2335,6 @@ amenity-vending_machine-food # icon z18- (also has captio
amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-)
amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-)
building-address # caption z16-
man_made-telescope-optical # icon z17- (also has caption(optional) z17-)
=== -9970
amenity-bench # icon z18- (also has caption(optional) z19-)
@@ -2363,7 +2344,6 @@ amenity-waste_disposal # icon z18- (also has captio
emergency-assembly_point # icon z18- (also has caption(optional) z18-)
emergency-defibrillator # icon z18- (also has caption(optional) z18-)
emergency-phone # icon z17-
man_made-telescope # icon z18- (also has caption(optional) z18-)
=== -9980
amenity-waste_basket # icon z18- (also has caption(optional) z19-)
@@ -2373,8 +2353,6 @@ power-substation # icon z17- (also has captio
# 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-lounger # caption(optional) z19- (also has icon z18-)
@@ -2399,8 +2377,6 @@ entrance-exit # icon z17- (also has captio
# entrance-exit # caption(optional) z19- (also has icon z17-)
# 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-)
# man_made-telescope-optical # caption(optional) z17- (also has icon z17-)
# power-substation # caption(optional) z18- (also has icon z17-, area z13-)
# tourism-information # caption(optional) z16- (also has icon z16-)
# tourism-information-board # caption(optional) z16- (also has icon z16-)

View File

@@ -1 +0,0 @@
<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="#9c6136" r="8.25"/><path d="m5.40439659 10.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.7936423zm8.48497961-1.30248563c.1648759.16547497.1067017.33549981.0697536.38988023l-.4380042.5278054-.6259719.740475-.5369481.6188133c-.326327.369091-.6071716.6702095-.72781.7580936l-.0452585.0257766-.0128471.0043095c-.1930198.0592449-.9966097.0941052-2.41076971.104581l-1.41415344.0028979-.56983671.3962245-1.22668022-2.05836 1.15247826-.8300108c.39709497-.2523366.78419173-.38244764 1.16129028-.39033316l.0364622-.00038156c.38859717 0 .73067579.13023822 1.02623587.39071472h1.72754997c.2369804.0514113.3554706.1871537.3554706.4072272 0 .2200736-.1184902.3663266-.3554706.4387589h-1.86216448c-.07860487.0051388-.11790731.0426001-.11790731.1123837 0 .1046754.05865282.1491799.11790731.1491799l.90691258-.0103822.4942633-.0160402c.2708403-.012161.5027742-.0299189.6065724-.05585.3293242-.0822724 2.110004-1.67235874 2.2125241-1.75200674s.3026137-.12817636.4764018.04624321zm-3.6909669-3.77570294c-.0953136-.29519343-.0969978-.44798224-.0969978-.69213749 0-.60830957-.49315336-1.10142003-1.10142007-1.10142003-.60830957 0-1.10142003.49311046-1.10142003 1.10142003 0 .24414668-.00168624.39692692-.09699782.69213749-.09534354.29519342-.52319594.80943657-.52319594 1.43566029 0 .95082119.77082259 1.72164378 1.72164379 1.72164378.95082119 0 1.72160097-.77077973 1.72160097-1.72164378 0-.56356277-.3465674-1.03645253-.4853801-1.34062523zm-.35982581-2.77957701c-.00037908-.02303239-.01293243-.04310709-.03149545-.05412282l-.03584588-.0089961-.07532111.00360309c-.13534339.01138062-.41475604.05828767-.60648789.24999351-.12874614.12876329-.19222565.29576342-.22343826.43281093-.02675465-.08282078-.07076517-.17207866-.14346746-.24480239-.13454896-.13456502-.32770192-.1711184-.42926654-.18098477l-.06882538-.00359276c-.03450959.00067646-.06248952.02854864-.06305951.06307666l.00159083.04631626c.00635078.09321555.03708217.30583386.18300631.45172273.13458752.1345811.3277212.17113608.42927376.18100226l.12801359.00359241c.04385109 0 .43525377-.00712751.68185185-.25361374.20610698-.20621669.24487627-.51045136.25198392-.63278334z" fill="#fff" fill-rule="evenodd"/></g></svg>

Before

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -1 +0,0 @@
<svg height="12" viewBox="0 0 10 12" width="10" xmlns="http://www.w3.org/2000/svg"><path d="m1.40439659 7.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.79364231zm8.4849796-1.30248563c.16487591.16547497.10670169.33549981.06975361.38988026l-.43800423.52780539-.62597187.74047497-.53694807.61881334c-.32632701.36909096-.60717167.67020945-.72780998.75809352l-.04525857.02577662-.01284708.00430951c-.19301982.05924488-.99660972.09410524-2.41076971.10458107l-1.41415344.0028978-.56983671.39622455-1.22668022-2.05836003 1.15247826-.83001081c.39709497-.25233656.78419173-.3824476 1.16129028-.39033312l.0364622-.00038156c.38859717 0 .73067579.13023823 1.02623587.39071468h1.72754994c.23698041.05141129.35547062.18715372.35547062.40722729 0 .22007356-.11849021.3663265-.35547062.43875883h-1.86216445c-.07860487.00513887-.11790731.04260011-.11790731.11238372 0 .10467541.05865282.14917992.11790731.14917992l.90691261-.01038221.49426323-.01604024c.27084037-.01216092.50277426-.0299189.60657246-.05584997.32932419-.08227242 2.11000399-1.67235874 2.21252409-1.75200674.10252009-.079648.3026137-.12817636.47640178.04624321zm-3.69096692-3.77570294c-.09531354-.29519343-.09699782-.44798224-.09699782-.69213749 0-.60830957-.49315331-1.10142003-1.10142002-1.10142003-.60830957 0-1.10142003.49311046-1.10142003 1.10142003 0 .24414668-.00168624.39692692-.09699782.69213749-.09534354.29519342-.52319594.80943657-.52319594 1.43566029 0 .95082119.77082259 1.72164378 1.72164379 1.72164378.95082119 0 1.72160093-.77077973 1.72160093-1.72164378 0-.56356277-.34656739-1.03645253-.48538006-1.34062523zm-.35982578-2.77957701c-.00037908-.02303239-.01293243-.04310709-.03149545-.05412282l-.03584588-.0089961-.07532111.00360309c-.13534339.01138062-.41475604.05828767-.60648789.24999351-.12874614.12876329-.19222565.29576342-.22343826.43281093-.02675465-.08282078-.07076517-.17207866-.14346746-.24480238-.13454896-.13456503-.32770192-.17111841-.42926654-.18098478l-.06882538-.00359276c-.03450959.00067646-.06248952.02854864-.06305951.06307666l.00159083.04631626c.00635078.09321555.03708217.30583386.18300631.45172273.13458752.1345811.3277212.17113608.42927376.18100226l.12801359.00359241c.04385109 0 .43525377-.00712751.68185185-.25361374.20610698-.20621669.24487627-.51045135.25198392-.63278334z" fill="#747e86" fill-rule="evenodd"/></svg>

Before

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -1 +0,0 @@
<svg height="11" viewBox="0 0 10 11" width="10" xmlns="http://www.w3.org/2000/svg"><path d="m1.40439659 6.9208845 1.66497587 2.79364231-1.40439659.78547319-1.66497587-2.79364231zm8.4849796-1.30248563c.16487591.16547497.10670169.33549981.06975361.38988026l-.43800423.52780539-.62597187.74047497-.53694807.61881334-.30691719.3410534-.1751764.18625299c-.10683664.11054758-.19209936.19172754-.24571639.23078713l-.04525857.02577662-.01284708.00430951c-.19301982.05924488-.99660972.09410524-2.41076971.10458107l-1.41415344.0028978-.56983671.3962246-1.22668022-2.05836008 1.15247826-.83001081c.39709497-.25233656.78419173-.3824476 1.16129028-.39033312l.0364622-.00038156c.38859717 0 .73067579.13023823 1.02623587.39071468h1.72754994c.23698041.05141129.35547062.18715372.35547062.40722729 0 .22007356-.11849021.3663265-.35547062.43875883h-1.86216445c-.07860487.00513887-.11790731.04260011-.11790731.11238372 0 .10467541.05865282.14917992.11790731.14917992l.90691261-.01038221.49426323-.01604024.36592704-.02276118c.1048133-.00920099.18874632-.02012325.24064542-.03308879.32932419-.08227242 2.11000399-1.67235874 2.21252409-1.75200674.10252009-.079648.3026137-.12817636.47640178.04624321zm-2.38737619-4.86878187-.00166678 4.000383h-5.00033322l-.001-3.997383zm-5.49948258 0-.00045062 1.65580113-.42167958.90580112-.63441545-.29583278zm5.99572437 0 1.05654565 2.26576947-.63441545.29583278-.42167957-.90580112z" fill="#747e86" fill-rule="evenodd"/></svg>

Before

Width:  |  Height:  |  Size: 1.4 KiB

View File

@@ -1 +0,0 @@
<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="m11.9788057 9.45701798v4.46417412h-2.48216516v-1.9344754c0-.5341906-.43304708-.9672377-.96723771-.9672377-.51282301 0-.93243211.3990962-.96518032.9036416l-.00205739.0635961v1.9344754h-2.48216512v-4.46417412zm-3.44940287-4.1392834c1.90503617 0 3.44940287 1.54436664 3.44940287 3.44940283h-6.8988057c0-1.90503619 1.54436664-3.44940283 3.44940283-3.44940283zm4.47021307-1.83773458.6985699.69856997-1.0498311 1.04983111c.2863445.33051154.5419599.68947967.7623009 1.07107475l-.8568598.49403817c-.520321-.90122443-1.2678995-1.64880299-2.169124-2.16912399l.4940382-.8568598c.3815951.22034103.7405632.47595638 1.0710748.7623009z" fill="#fff"/></g></svg>

Before

Width:  |  Height:  |  Size: 853 B

View File

@@ -1 +0,0 @@
<svg height="19" viewBox="0 0 29 19" width="29" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m6.185075.4995c1.777125 0 3.382725.375525 4.56885 1.3638 1.2542475 1.043175 1.74465 2.530875 1.74465 4.202625 0 .70428972-.0885354 1.37740429-.2813988 2.0016737.1097684-.01288087.2224325-.01884789.3364903-.01884789 1.0018875 0 1.8962402.46041088 2.4830213 1.18119574.5702976-1.00377388 1.6501558-1.68022155 2.8880068-1.68022155 1.2250215 0 2.2953081.66249835 2.872122 1.64875713.5861846-.70238108 1.4692751-1.14973132 2.4568499-1.14973132 1.7673849 0 3.2001334 1.43274852 3.2001334 3.20013339 0 .7313317-.245322 1.4053653-.6581629 1.944298l-.074637.0915686.1409174.0845388c1.2235368.7673092 2.0881394 2.0596347 2.2705608 3.570914l.0213847.2173535.0984085 1.2911937h-20.69720984l.09840858-1.2911937c.12227689-1.6043637 1.01014496-2.9844197 2.29194549-3.7882675l.13958437-.0845388-.073304-.0915686c-.37843751-.4940216-.61611258-1.1015656-.65309705-1.7627038l-.00506585-.1815942c-.84977747.3668477-1.81813376.5570547-2.8535331.6031408v3.147975c0 .8284275-.67155 1.5-1.5 1.5h-3.0015c-.8284275 0-1.5-.67155-1.5-1.5v-13.0005c0-.8284275.67155-1.5 1.5-1.5z" fill="#fff" opacity=".8"/><path d="m12.5536665 13.8204843c.5404977 0 1.0540327.1154407 1.517294.3230112-.6662367.7508614-1.1159451 1.6987981-1.2504799 2.7493425l-.0344806.3559128h-3.936c.14615915-1.9177167 1.7485089-3.4282665 3.7036665-3.4282665zm10.7 0c1.9551576 0 3.5575073 1.5105498 3.7036665 3.4282665h-3.895333l-.0060809-.0911937-.0216381-.2213141c-.1283466-1.0743203-.5858754-2.0432621-1.2667992-2.806658.4550736-.1987522.9577425-.3091007 1.4861847-.3091007zm-5.3289719-.2138492c2.0771169 0 3.7794184 1.6047752 3.9346947 3.6421157h-7.8693893c.1552763-2.0373405 1.8575778-3.6421157 3.9346946-3.6421157zm-11.7390946-11.6068351c1.57395 0 2.786025.3293925 3.61005 1.01595.81477.677625 1.20435 1.70415 1.20435 3.05055 0 1.391025-.416475 2.4687-1.296075 3.208725-.861075.7311-2.111925 1.08855-3.713625 1.08855h-.989775v4.636425h-3.000525l.000225-12.999975zm6.3680665 7.24895081c1.1046432 0 2.0001334.89549019 2.0001334 2.00013339s-.8954902 2.0001334-2.0001334 2.0001334-2.0001334-.8954902-2.0001334-2.0001334.8954902-2.00013339 2.0001334-2.00013339zm10.7 0c1.1046432 0 2.0001334.89549019 2.0001334 2.00013339s-.8954902 2.0001334-2.0001334 2.0001334-2.0001334-.8954902-2.0001334-2.0001334.8954902-2.00013339 2.0001334-2.00013339zm-5.3289719-.49902581c1.1735489 0 2.1248982.95134932 2.1248982 2.1248982 0 1.1735488-.9513493 2.1248982-2.1248982 2.1248982-1.1735488 0-2.1248981-.9513494-2.1248981-2.1248982 0-1.17354888.9513493-2.1248982 2.1248981-2.1248982zm-11.8500196-4.475475h-1.07415v3.8599125h.7027875c.842625 0 1.481685-.1958625 1.898325-.525765.42591-.338775.611055-.82884.611055-1.4619 0-.650925-.1748925-1.1142-.5267175-1.426275-.342675-.30315-.8706-.4459725-1.6113-.4459725z" fill="#427bb8"/></g></svg>

Before

Width:  |  Height:  |  Size: 2.8 KiB

View File

@@ -1 +0,0 @@
<svg height="12" viewBox="0 0 18 12" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><path d="m3.90636316.31547368c1.12239473 0 2.13645789.23717369 2.88558947.86134737.79215632.65884737 1.10188421 1.59844737 1.10188421 2.65428948 0 .44481455-.05591709.86993955-.17772557 1.26421496.06932743-.00813528.14048371-.01190393.2125202-.01190393.63277103 0 1.19762539.29078582 1.56822398.74601837.36018795-.63396245 1.04220365-1.06119256 1.82400435-1.06119256.7736977 0 1.4496682.41842001 1.8139718 1.04132029.3702218-.4436091.9279632-.7261461 1.5516946-.7261461 1.1162431 0 2.0211369.90489381 2.0211369 2.02113689 0 .46189369-.1549402.88759915-.4156819 1.22797764l-.0471391.05783284.0890005.05339291c.7727601.48461638 1.3188248 1.30082194 1.4340384 2.25531406l.0135061.1372759.0621528.8154908h-13.07192207l.06215279-.8154908c.0772275-1.01328225.63798628-1.88489661 1.44754451-2.39258996l.08815855-.05339291-.04629724-.05783284c-.23901318-.31201361-.38912375-.69572559-.41248237-1.11328658l-.00319948-.11469106c-.53670156.23169325-1.14829501.35182404-1.80223143.38093102v1.98819474c0 .52321737-.42413684.94736839-.94736842.94736839h-1.89568421c-.52321737 0-.94736842-.42413681-.94736842-.94736839v-8.2108421c0-.52321737.42413684-.94736843.94736842-.94736843z" fill="#fff" opacity=".8"/><path d="m7.92863147 8.72872693c.34136694 0 .66570485.07290994.95829094.20400705-.42078106.47422827-.70480741 1.07292512-.78977674 1.73642682l-.02177725.2247871h-2.48589474c.09231105-1.21118954 1.10432143-2.16522097 2.33915779-2.16522097zm6.75789473 0c1.2348364 0 2.2468468.95403143 2.3391578 2.16522097h-2.4602103l-.0038406-.0575961-.0136661-.1397773c-.0810611-.6785181-.3700266-1.29048128-.8000838-1.77262609.2874149-.12552769.60489-.19522148.938643-.19522148zm-3.3656664-.13506265c1.3118632 0 2.387001 1.01354223 2.4850703 2.30028362h-4.97014063c.09806925-1.28674139 1.17320703-2.30028362 2.48507033-2.30028362zm-7.41416506-7.3306327c.99407368 0 1.75959473.20803737 2.28003158.64165263.51459157.42797368.7606421 1.07630526.7606421 1.92666316 0 .8785421-.26303684 1.55917895-.81857368 2.02656316-.54383685.46174736-1.33384737.68750526-2.34544737.68750526h-.62512105v2.92826842h-1.89506843l.00014211-8.21051053zm4.02193673 4.57828472c.69766938 0 1.26324215.56557277 1.26324215 1.26324215 0 .69766937-.56557277 1.26324215-1.26324215 1.26324215-.69766937 0-1.26324215-.56557278-1.26324215-1.26324215 0-.69766938.56557278-1.26324215 1.26324215-1.26324215zm6.75789473 0c.6976694 0 1.2632422.56557277 1.2632422 1.26324215 0 .69766937-.5655728 1.26324215-1.2632422 1.26324215s-1.2632421-.56557278-1.2632421-1.26324215c0-.69766938.5655727-1.26324215 1.2632421-1.26324215zm-3.3656664-.31517419c.7411887 0 1.3420409.6008522 1.3420409 1.34204095s-.6008522 1.34204095-1.3420409 1.34204095c-.7411888 0-1.34204098-.6008522-1.34204098-1.34204095s.60085218-1.34204095 1.34204098-1.34204095zm-7.48422296-2.82661579h-.67841052v2.43783947h.44386579c.53218421 0 .93580105-.12370263 1.1989421-.33206211.26899579-.21396315.38592947-.52347789.38592947-.92330526 0-.41111053-.11045842-.70370526-.33266368-.90080526-.21642632-.19146316-.54985263-.28166684-1.01766316-.28166684z" fill="#427bb8"/></g></svg>

Before

Width:  |  Height:  |  Size: 3.1 KiB

View File

@@ -1,14 +1 @@
<svg
height="25"
viewBox="0 0 40 25"
width="40"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
fill="#ffffff"
style="stroke-width:0.594311" />
<path
d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
fill="#1a5ec1"
style="stroke-width:0.519333" />
</svg>
<svg height="26" viewBox="0 0 42 26" width="42" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#fff" transform="matrix(.80255481 0 0 .44010193 .471493 3.853665)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#1a5ec1" transform="matrix(.73067099 0 0 .36912143 2.310205 5.333047)"/></svg>

Before

Width:  |  Height:  |  Size: 973 B

After

Width:  |  Height:  |  Size: 917 B

View File

@@ -1,14 +1 @@
<svg
height="18"
viewBox="0 0 29 18"
width="29"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
fill="#ffffff"
style="stroke-width:0.427404" />
<path
d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
fill="#1a5ec1"
style="stroke-width:0.373483" />
</svg>
<svg height="19" viewBox="0 0 30 19" width="30" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#fff" transform="matrix(.57716453 0 0 .31650328 .236739 2.944845)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#1a5ec1" transform="matrix(.52546863 0 0 .26545702 1.559066 4.008757)"/></svg>

Before

Width:  |  Height:  |  Size: 965 B

After

Width:  |  Height:  |  Size: 917 B

View File

@@ -1,14 +1 @@
<svg
height="25"
viewBox="0 0 40 25"
width="40"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
fill="#ffffff"
style="stroke-width:0.594311" />
<path
d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
fill="#309302"
style="stroke-width:0.519333" />
</svg>
<svg height="26" viewBox="0 0 42 26" width="42" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#fff" transform="matrix(.80255481 0 0 .44010193 .471493 3.853665)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#309302" transform="matrix(.73067099 0 0 .36912143 2.310205 5.333047)"/></svg>

Before

Width:  |  Height:  |  Size: 992 B

After

Width:  |  Height:  |  Size: 917 B

View File

@@ -1,14 +1 @@
<svg
height="18"
viewBox="0 0 29 18"
width="29"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
fill="#fff"
style="stroke-width:0.427404" />
<path
d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
fill="#309302"
style="stroke-width:0.373483" />
</svg>
<svg height="19" viewBox="0 0 30 19" width="30" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#fff" transform="matrix(.57716453 0 0 .31650328 .236739 2.944845)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#309302" transform="matrix(.52546863 0 0 .26545702 1.559066 4.008757)"/></svg>

Before

Width:  |  Height:  |  Size: 981 B

After

Width:  |  Height:  |  Size: 917 B

View File

@@ -1,14 +1 @@
<svg
height="25"
viewBox="0 0 40 25"
width="40"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
fill="#ffffff"
style="stroke-width:0.594311" />
<path
d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
fill="#e63534"
style="stroke-width:0.519333" />
</svg>
<svg height="26" viewBox="0 0 42 26" width="42" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#fff" transform="matrix(.80255481 0 0 .44010193 .471493 3.853665)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#e63534" transform="matrix(.73067099 0 0 .36912143 2.310205 5.333047)"/></svg>

Before

Width:  |  Height:  |  Size: 992 B

After

Width:  |  Height:  |  Size: 917 B

View File

@@ -1,14 +1 @@
<svg
height="18"
viewBox="0 0 29 18"
width="29"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
fill="#fff"
style="stroke-width:0.427404" />
<path
d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
fill="#e63534"
style="stroke-width:0.373483" />
</svg>
<svg height="19" viewBox="0 0 30 19" width="30" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#fff" transform="matrix(.57716453 0 0 .31650328 .236739 2.944845)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#e63534" transform="matrix(.52546863 0 0 .26545702 1.559066 4.008757)"/></svg>

Before

Width:  |  Height:  |  Size: 981 B

After

Width:  |  Height:  |  Size: 917 B

View File

@@ -1,14 +1 @@
<svg
height="25"
viewBox="0 0 40 25"
width="40"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 39.091407,18.544437 C 38.430061,19.172594 21.322691,24.588874 20,24.588874 c -1.322691,0 -18.4300616,-5.41628 -19.09140734,-6.044437 -0.6613457,-0.628156 -0.6613456,-11.4607175 10e-8,-12.0888738 C 1.5699385,5.8274068 18.677309,0.411126 20,0.411126 c 1.322691,0 18.430061,5.4162809 19.091407,6.0444372 0.661346,0.6281564 0.661346,11.4607178 0,12.0888738 z"
fill=""
style="stroke-width:0.594311" />
<path
d="M 37.381413,17.569578 C 36.779304,18.096424 21.204219,22.639156 20,22.639156 18.79578,22.639156 3.2206952,18.096424 2.6185853,17.569577 2.0164755,17.042731 2.0164756,7.9572668 2.6185854,7.4304207 3.2206953,6.9035747 18.79578,2.3608422 20,2.3608422 c 1.204219,0 16.779304,4.5427325 17.381413,5.0695786 0.60211,0.5268461 0.60211,9.6123102 0,10.1391572 z"
fill="#c97600"
style="stroke-width:0.519333" />
</svg>
<svg height="26" viewBox="0 0 42 26" width="42" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" transform="matrix(.80255481 0 0 .44010193 .471493 3.853665)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#c97600" transform="matrix(.73067099 0 0 .36912143 2.310205 5.333047)"/></svg>

Before

Width:  |  Height:  |  Size: 985 B

After

Width:  |  Height:  |  Size: 905 B

View File

@@ -1,14 +1 @@
<svg
height="18"
viewBox="0 0 29 18"
width="29"
xmlns="http://www.w3.org/2000/svg">
<path
d="M 28.229757,13.346912 C 27.754145,13.798656 15.451225,17.693823 14.5,17.693823 c -0.951226,0 -13.2541449,-3.895167 -13.72975757,-4.346912 -0.4756127,-0.451744 -0.47561263,-8.2420781 10e-8,-8.6938224 C 1.2458552,4.2013443 13.548774,0.306177 14.5,0.306177 c 0.951225,0 13.254145,3.8951673 13.729757,4.3469117 0.475613,0.4517443 0.475613,8.2420783 0,8.6938233 z"
fill=""
style="stroke-width:0.427404" />
<path
d="m 27,12.645834 c -0.433012,0.378886 -11.633974,3.645833 -12.5,3.645833 -0.866025,0 -12.0669874,-3.266947 -12.5000002,-3.645833 C 1.5669871,12.266948 1.5669872,5.7330535 1.9999999,5.3541673 2.4330126,4.9752812 13.633975,1.708334 14.5,1.708334 c 0.866026,0 12.066988,3.2669473 12.5,3.6458334 0.433013,0.3788861 0.433013,6.9127806 0,7.2916666 z"
fill="#c97600"
style="stroke-width:0.373483" />
</svg>
<svg height="19" viewBox="0 0 30 19" width="30" xmlns="http://www.w3.org/2000/svg"><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" transform="matrix(.57716453 0 0 .31650328 .236739 2.944845)"/><path d="m49.367237 34.576282c-.82405 1.427297-22.140189 13.734175-23.78829 13.734175s-22.9642395-12.306878-23.7882901-13.734176c-.82405051-1.427297-.8240504-26.0410535.0000001-27.4683509.8240506-1.4272974 22.140189-13.7341756 23.78829-13.7341756s22.96424 12.3068784 23.78829 13.7341758c.824051 1.4272974.824051 26.0410537 0 27.4683517z" fill="#c97600" transform="matrix(.52546863 0 0 .26545702 1.559066 4.008757)"/></svg>

Before

Width:  |  Height:  |  Size: 977 B

After

Width:  |  Height:  |  Size: 905 B

View File

@@ -1,14 +0,0 @@
<svg
height="21"
viewBox="0 0 37 21"
width="37"
xmlns="http://www.w3.org/2000/svg">
<g transform="matrix(0.27138802,0,0,0.27138802,4.3878227,-0.11668148)">
<path
d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
<path
d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
style="fill:#1a5ec1;fill-opacity:1;stroke:#00008b;stroke-width:0" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 774 B

View File

@@ -1,14 +0,0 @@
<svg
height="15"
viewBox="0 0 26 15"
width="26"
xmlns="http://www.w3.org/2000/svg">
<g transform="matrix(0.19044333,0,0,0.19044333,3.0791026,0.18161878)">
<path
d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
<path
d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
style="fill:#1a5ec1;fill-opacity:1;stroke:#00008b;stroke-width:0" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 773 B

View File

@@ -1,14 +0,0 @@
<svg
height="21"
viewBox="0 0 37 21"
width="37"
xmlns="http://www.w3.org/2000/svg">
<g transform="matrix(0.27138802,0,0,0.27138802,4.3878227,-0.11668148)">
<path
d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
<path
d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
style="fill:#309302;fill-opacity:1;stroke:#00008b;stroke-width:0" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 774 B

View File

@@ -1,14 +0,0 @@
<svg
height="15"
viewBox="0 0 26 15"
width="26"
xmlns="http://www.w3.org/2000/svg">
<g transform="matrix(0.19044333,0,0,0.19044333,3.0791026,0.18161878)">
<path
d="M 52,2.3036748 H -16.168078 V 54.476396 c -4.14e-4,6.304117 4.321485,11.786348 10.4515331,13.257534 L 52,77.809925 109.71665,67.73393 c 6.13001,-1.471227 10.45186,-6.953449 10.45143,-13.257534 V 2.3036748 Z"
style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0" />
<path
d="M 52,9.0567997 H -8.0025878 V 53.8068 c -0.1582841,3.383075 1.8308869,6.499251 4.9662002,7.7799 L 52,70.9148 105.86959,61.5867 c 3.59724,-0.863346 6.13337,-4.080505 6.133,-7.7799 V 9.0567997 Z"
style="fill:#309302;fill-opacity:1;stroke:#00008b;stroke-width:0" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 773 B

View File

@@ -1 +0,0 @@
<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="#9c6136" r="8.25"/><path d="m5.40439659 10.9208845 1.66497587 2.7936423-1.40439659.7854732-1.66497587-2.7936423zm8.48497961-1.30248563c.1648759.16547497.1067017.33549981.0697536.38988023l-.4380042.5278054-.6259719.740475-.5369481.6188133c-.326327.369091-.6071716.6702095-.72781.7580936l-.0452585.0257766-.0128471.0043095c-.1930198.0592449-.9966097.0941052-2.41076971.104581l-1.41415344.0028979-.56983671.3962245-1.22668022-2.05836 1.15247826-.8300108c.39709497-.2523366.78419173-.38244764 1.16129028-.39033316l.0364622-.00038156c.38859717 0 .73067579.13023822 1.02623587.39071472h1.72754997c.2369804.0514113.3554706.1871537.3554706.4072272 0 .2200736-.1184902.3663266-.3554706.4387589h-1.86216448c-.07860487.0051388-.11790731.0426001-.11790731.1123837 0 .1046754.05865282.1491799.11790731.1491799l.90691258-.0103822.4942633-.0160402c.2708403-.012161.5027742-.0299189.6065724-.05585.3293242-.0822724 2.110004-1.67235874 2.2125241-1.75200674s.3026137-.12817636.4764018.04624321zm-7.07695726-.61839887-.00064003-.76822841c-.79974138-.64144198-1.31177891-1.6268104-1.31177891-2.73177159h7c0 1.10496119-.5120375 2.09032961-1.3117789 2.73177159l-.00064.76822841z" fill="#fff" fill-rule="evenodd"/></g></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1 +0,0 @@
<svg height="19" viewBox="0 0 14 19" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m13.1340274.00741332-8.49199134 1.21422959 1.21962985 1.21976833 6.55564899-.9357696-.9357696 6.55564895 1.2197683 1.21976832 1.2142296-8.49212981c.0725574-.50887145-.3895117-.8436881-.7815158-.78151578m-10.82601505.83814936c-2.97333242 2.97402475-2.97333242 7.79521825 0 10.76924302 2.97402475 2.9733324 7.79521825 2.9733324 10.76924305 0zm-.84645746 11.86715912v3.902594h-.69234211c-.38355753 0-.69234211.2895375-.69234211.6491399v.0864043c0 .3596025.30878458.64914.69234211.64914h8.30810528c.38355753 0 .69234211-.2895375.69234211-.64914v-.0864043c0-.3596024-.30878458-.6491399-.69234211-.6491399h-.6923421v-1.4278864c-2.47539997.1890094-5.00992596-.6352931-6.92342107-2.4747076" fill="#747e86" transform="translate(0 .5)"/></svg>

Before

Width:  |  Height:  |  Size: 825 B

View File

@@ -1 +0,0 @@
<svg height="15" viewBox="0 0 14 15" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m7.82311911 5.67246657 3.40536139 7.66676663c.1034778.2351768 0 .507982-.244584.6208669-.2351769.1034779-.5079821 0-.620867-.2445839l-1.12884905-2.5399104h-4.40251137l-1.12884907 2.5399104c-.1128849.2445839-.38569009.3480618-.62086698.2445839-.24458397-.1128849-.3480618-.3856901-.24458397-.6208669l3.00085711-6.74487323-1.63683115.76197312-1.1946986-2.54931747 6.38740431-2.98204296 1.19469857 2.54931748zm-.79019435.54561038-1.78734435 4.01682125h3.57468871zm2.59635286-5.02337835 2.55872458-1.1946986 1.5897957 3.41476843-2.5587245 1.1946986zm-9.40707557 5.4278826 2.55872456-1.1946986.79019435 1.70268068-2.55872456 1.1946986z" fill="#747e86" transform="translate(0 .5)"/></svg>

Before

Width:  |  Height:  |  Size: 774 B

View File

@@ -1 +0,0 @@
<svg height="17" viewBox="0 0 18 17" width="18" xmlns="http://www.w3.org/2000/svg"><path d="m16.6801082.00001-1.6419569 1.64195683c-.5169266-.44784856-1.0783599-.84763607-1.6751823-1.19225383l-.7726855 1.34014584c1.409533.81379244 2.5787608 1.98302024 3.3925532 3.39255325l1.3401459-.77268557c-.3446178-.59682233-.7444053-1.15825566-1.1922539-1.6751823l1.6419569-1.64195683zm-8.72593811 2.09165983c-4.26738784 0-7.72685565 3.45946781-7.72685565 7.72685565h15.45371126c0-4.26738784-3.4594678-7.72685565-7.72685561-7.72685565m-7.72685565 9.27222677v4.6361134h15.45371126v-4.6361134z" fill="#747e86" transform="translate(0 .5)"/></svg>

Before

Width:  |  Height:  |  Size: 632 B

View File

@@ -1 +0,0 @@
<svg height="19" viewBox="0 0 14 19" width="14" xmlns="http://www.w3.org/2000/svg"><path d="m7.69225716.00010119c-.93627166-.01384608-.93627166 1.39789983 0 1.3846076 2.68461564 0 4.84612664 2.16151093 4.84612664 4.8461266-.0138461.93627166 1.3978998.93627166 1.3846076 0 0-3.43299608-2.7977382-6.2307342-6.23073424-6.2307342m-5.38432358.84641063c-2.9731679 2.9738602-2.9731679 7.79478695 0 10.76864718 2.97386021 2.9731679 7.79478692 2.9731679 10.76864712 0zm5.38432358 1.92280457c-.93627166-.01384608-.93627166 1.39789983 0 1.3846076 1.15517812 0 2.0769114.92159482 2.0769114 2.0769114-.01384607.93627166 1.39789984.93627166 1.38460764 0 0-1.90355853-1.55796051-3.461519-3.46151904-3.461519m-6.2307342 9.94369791v3.9023781h-.6923038c-.38353631 0-.6923038.2895214-.6923038.649104v.0863996c0 .3595826.30876749.649104.6923038.649104h8.3076456c.38353631 0 .6923038-.2895214.6923038-.649104v-.0863996c0-.3595826-.30876749-.649104-.6923038-.649104h-.6923038v-1.4278074c-2.47526301.188999-5.00964876-.6352579-6.923038-2.4745707" fill="#747e86" transform="translate(0 .5)"/></svg>

Before

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -269,9 +269,6 @@ node|z16-[man_made=survey_point],
area|z14-[highway=rest_area],
{icon-image: picnic-m.svg;}
node|z15-[man_made=observatory],
{icon-image: observatory-m.svg;}
node|z15-[amenity=toilets],
{icon-image: toilets-m.svg; font-size: 11;}

View File

@@ -140,7 +140,6 @@ railway-platform # area z16- (also has captio
amenity-bicycle_parking # area z15- (also has icon z17-, caption(optional) z17-)
amenity-bicycle_parking-covered # area z15- (also has icon z17-, caption(optional) z17-)
amenity-car_pooling # area z15- (also has icon z16-, caption(optional) z18-)
amenity-motorcycle_parking # area z15- (also has icon z17-, caption(optional) z17-)
amenity-parking # area z15- (also has icon z16-, caption(optional) z18-)
amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-)

View File

@@ -989,7 +989,6 @@ leisure-escape_game # icon z17- (also has captio
leisure-fitness_centre # icon z16- (also has caption(optional) z17-)
leisure-hackerspace # icon z17- (also has caption(optional) z17-)
leisure-sauna # icon z17- (also has caption(optional) z17-)
man_made-observatory # icon z15- (also has caption(optional) z16-)
office-estate_agent # icon z18- (also has caption(optional) z18-)
office-government # icon z18- (also has caption(optional) z18-)
office-insurance # icon z18- (also has caption(optional) z18-)
@@ -1135,8 +1134,6 @@ amenity-vending_machine-public_transport_tickets # icon z17- (also has captio
amenity-water_point-drinking_water_no # icon z14- (also has caption(optional) z14-)
highway-elevator # icon z17-
leisure-picnic_table # icon z15- (also has caption(optional) z16-)
man_made-telescope-gamma # icon z17- (also has caption(optional) z17-)
man_made-telescope-radio # icon z17- (also has caption(optional) z17-)
man_made-water_tap-drinking_water_no # icon z14- (also has caption(optional) z14-)
man_made-water_well-drinking_water_no # icon z14- (also has caption(optional) z14-)
natural-spring-drinking_water_no # icon z12- (also has caption(optional) z14-)
@@ -1147,10 +1144,6 @@ isoline-zero # pathtext z15- (also has li
power-line # pathtext z15- (also has line z13-, line::dash z13-)
=== 1000
social_facility-food_bank # icon z17- (also has caption(optional) z17-)
social_facility-soup_kitchen # icon z17- (also has caption(optional) z17-)
=== 851
amenity-grave_yard # icon z17- (also has caption(optional) z17-, area z10-)
amenity-grave_yard-christian # icon z17- (also has caption(optional) z17-, area z10-)
amenity-nursing_home # icon z17- (also has caption(optional) z17-)
@@ -1263,7 +1256,6 @@ power-portal # icon z13-
power-tower # icon z13-
=== 450
amenity-car_pooling # icon z16- (also has caption(optional) z18-, area z15-)
amenity-parking # icon z16- (also has caption(optional) z18-, area z15-)
amenity-parking-fee # icon z16- (also has caption(optional) z18-, area z15-)
amenity-parking-multi-storey # icon z16- (also has caption(optional) z18-, area z15-)
@@ -2019,7 +2011,6 @@ leisure-swimming_pool-private # icon z17- (also has captio
# leisure-fitness_centre # caption(optional) z17- (also has icon z16-)
# leisure-hackerspace # caption(optional) z17- (also has icon z17-)
# leisure-sauna # caption(optional) z17- (also has icon z17-)
# man_made-observatory # caption(optional) z16- (also has icon z15-)
# office-estate_agent # caption(optional) z18- (also has icon z18-)
# office-government # caption(optional) z18- (also has icon z18-)
# office-insurance # caption(optional) z18- (also has icon z18-)
@@ -2160,17 +2151,11 @@ leisure-swimming_pool-private # icon z17- (also has captio
# amenity-vending_machine-public_transport_tickets # caption(optional) z17- (also has icon z17-)
# amenity-water_point-drinking_water_no # caption(optional) z14- (also has icon z14-)
# leisure-picnic_table # caption(optional) z16- (also has icon z15-)
# man_made-telescope-gamma # caption(optional) z17- (also has icon z17-)
# man_made-telescope-radio # caption(optional) z17- (also has icon z17-)
# man_made-water_tap-drinking_water_no # caption(optional) z14- (also has icon z14-)
# man_made-water_well-drinking_water_no # caption(optional) z14- (also has icon z14-)
# natural-spring-drinking_water_no # caption(optional) z14- (also has icon z12-)
# === -8800
# social_facility-food_bank # caption(optional) z17- (also has icon z17-)
# social_facility-soup_kitchen # caption(optional) z17- (also has icon z17-)
# === -9149
# amenity-grave_yard # caption(optional) z17- (also has icon z17-, area z10-)
# amenity-grave_yard-christian # caption(optional) z17- (also has icon z17-, area z10-)
# amenity-nursing_home # caption(optional) z17- (also has icon z17-)
@@ -2267,7 +2252,6 @@ leisure-swimming_pool-private # icon z17- (also has captio
# man_made-water_tower # caption(optional) z14- (also has icon z13-)
# === -9550
# amenity-car_pooling # caption(optional) z18- (also has icon z16-, area z15-)
# amenity-parking # caption(optional) z18- (also has icon z16-, area z15-)
# amenity-parking-fee # caption(optional) z18- (also has icon z16-, area z15-)
# amenity-parking-multi-storey # caption(optional) z18- (also has icon z16-, area z15-)
@@ -2342,8 +2326,6 @@ amenity-telephone # icon z17- (also has captio
entrance # icon z17- (also has caption(optional) z19-)
=== -9960
amenity-food_sharing # icon z18- (also has caption(optional) z18-)
amenity-give_box # icon z18- (also has caption(optional) z18-)
amenity-parking_space # caption z19-
amenity-parking_space-disabled # icon z18- (also has caption(optional) z19-)
amenity-parking_space-permissive # caption z19-
@@ -2359,7 +2341,6 @@ amenity-vending_machine-food # icon z18- (also has captio
amenity-vending_machine-newspapers # icon z18- (also has caption(optional) z18-)
amenity-vending_machine-sweets # icon z18- (also has caption(optional) z18-)
building-address # caption z16-
man_made-telescope-optical # icon z17- (also has caption(optional) z17-)
=== -9970
amenity-bench # icon z18- (also has caption(optional) z19-)
@@ -2369,7 +2350,6 @@ amenity-waste_disposal # icon z18- (also has captio
emergency-assembly_point # icon z18- (also has caption(optional) z18-)
emergency-defibrillator # icon z18- (also has caption(optional) z18-)
emergency-phone # icon z17-
man_made-telescope # icon z18- (also has caption(optional) z18-)
=== -9980
amenity-waste_basket # icon z18- (also has caption(optional) z19-)
@@ -2379,8 +2359,6 @@ power-substation # icon z17- (also has captio
# 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-lounger # caption(optional) z19- (also has icon z18-)
@@ -2405,8 +2383,6 @@ entrance-exit # icon z17- (also has captio
# entrance-exit # caption(optional) z19- (also has icon z17-)
# 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-)
# man_made-telescope-optical # caption(optional) z17- (also has icon z17-)
# power-substation # caption(optional) z18- (also has icon z17-, area z13-)
# tourism-information # caption(optional) z15- (also has icon z15-)
# tourism-information-board # caption(optional) z15- (also has icon z15-)

View File

@@ -294,7 +294,6 @@ area|z14-[landuse=cemetery],
area|z14-[amenity=university],
area|z15-[leisure=stadium],
area|z15-[amenity=parking],
area|z15-[amenity=car_pooling],
{fill-opacity: 1;}
/* 7.1 Industrial */
@@ -386,10 +385,8 @@ area|z14-[landuse=farmyard],
/* Parking */
area|z15-[amenity=parking],
area|z15-[amenity=car_pooling],
{fill-color: @parking;fill-opacity: 1;}
area|z17-[amenity=parking],
area|z17-[amenity=car_pooling],
{fill-color: @parking_l;fill-opacity: 1;}
area|z15-[amenity=parking][location=underground],

View File

@@ -600,7 +600,6 @@ node|z14-[amenity=charging_station][motorcar?][capacity?],
node|z15-[amenity=sanitary_dump_station],
node|z16-[amenity=charging_station],
node|z16-[amenity=parking],
node|z16-[amenity=car_pooling],
area|z16-[landuse=garages],
node|z16-[tourism=caravan_site],
node|z17-[amenity=car_wash],
@@ -733,13 +732,9 @@ node|z18-[amenity=water_point][drinking_water=not],
node|z15-[amenity=parking],
{icon-image: parking-m.svg;icon-min-distance: 10;font-size: 12.5;}
node|z15-[amenity=car_pooling],
{icon-image: parking-pooling-m.svg;icon-min-distance: 10;font-size: 12.5;}
node|z17[amenity=parking],
node|z17[amenity=car_pooling],
{icon-min-distance: 15;font-size: 13.75;}
node|z18-[amenity=parking],
node|z18-[amenity=car_pooling],
{font-size: 14.5;}
node|z15-[amenity=parking][location=underground],

View File

@@ -14,7 +14,6 @@
# - BG-top: water (linear and areal)
# - BG-by-size: landcover areas sorted by their size
amenity-car_pooling # area z15- (also has icon z15-, caption(optional) z16-)
amenity-motorcycle_parking # area z17- (also has icon z17-)
amenity-parking # area z15- (also has icon z15-, caption(optional) z16-)
amenity-parking-fee # area z15- (also has icon z15-, caption(optional) z16-)

View File

@@ -234,7 +234,6 @@ amenity-sanitary_dump_station # icon z15- (also has captio
shop-caravan # icon z17-
=== 2600
amenity-car_pooling # icon z15- (also has caption(optional) z16-, area z15-)
amenity-parking # icon z15- (also has caption(optional) z16-, area z15-)
amenity-parking-fee # icon z15- (also has caption(optional) z16-, area z15-)
amenity-parking-multi-storey # icon z15- (also has caption(optional) z16-, area z15-)
@@ -820,7 +819,6 @@ entrance-main # icon z18- (also has captio
# amenity-sanitary_dump_station # caption(optional) z15- (also has icon z15-)
# === -7400
# amenity-car_pooling # caption(optional) z16- (also has icon z15-, area z15-)
# amenity-parking # caption(optional) z16- (also has icon z15-, area z15-)
# amenity-parking-fee # caption(optional) z16- (also has icon z15-, area z15-)
# amenity-parking-multi-storey # caption(optional) z16- (also has icon z15-, area z15-)

View File

@@ -124,8 +124,17 @@ void RepresentationLayer::Handle(FeatureBuilder & fb)
void RepresentationLayer::HandleArea(FeatureBuilder & fb, FeatureBuilderParams const & params)
{
LayerBase::Handle(fb);
fb.SetParams(params);
if (CanBeArea(params))
{
LayerBase::Handle(fb);
fb.SetParams(params);
}
else if (CanBePoint(params))
{
// CanBePoint ignores exceptional types from TypeAlwaysExists / IsUsefulNondrawableType.
auto featurePoint = MakePoint(fb);
LayerBase::Handle(featurePoint);
}
}
// static

View File

@@ -24,7 +24,11 @@ static inline DeeplinkUrlType deeplinkUrlType(url_scheme::ParsedMapApi::UrlType
+ (DeeplinkUrlType)parseAndSetApiURL:(NSURL *)url {
Framework &f = GetFramework();
return deeplinkUrlType(f.ParseAndSetApiURL(url.absoluteString.UTF8String));
if ([url.scheme isEqual: @"geo-navigation"]) {
return deeplinkUrlType(f.ParseGeoNav(url.absoluteString.UTF8String, f));
} else {
return deeplinkUrlType(f.ParseAndSetApiURL(url.absoluteString.UTF8String));
}
}
+ (void)executeMapApiRequest {

View File

@@ -125,35 +125,27 @@ final class MapTemplateBuilder {
}
private class func setupMuteAndRedirectButtons(template: CPMapTemplate) {
let muteButton = buildBarButton(type: .mute) { _ in
MWMTextToSpeech.setTTSEnabled(false)
setupUnmuteAndRedirectButtons(template: template)
}
let redirectButton = buildBarButton(type: .redirectRoute) { _ in
let listTemplate = ListTemplateBuilder.buildListTemplate(for: .history)
CarPlayService.shared.pushTemplate(listTemplate, animated: true)
}
if MWMTextToSpeech.isTTSEnabled() {
let muteButton = buildBarButton(type: .mute) { _ in
MWMTextToSpeech.tts().active = false
setupUnmuteAndRedirectButtons(template: template)
}
template.leadingNavigationBarButtons = [muteButton, redirectButton]
} else {
template.leadingNavigationBarButtons = [redirectButton]
}
template.leadingNavigationBarButtons = [muteButton, redirectButton]
}
private class func setupUnmuteAndRedirectButtons(template: CPMapTemplate) {
let unmuteButton = buildBarButton(type: .unmute) { _ in
MWMTextToSpeech.setTTSEnabled(true)
setupMuteAndRedirectButtons(template: template)
}
let redirectButton = buildBarButton(type: .redirectRoute) { _ in
let listTemplate = ListTemplateBuilder.buildListTemplate(for: .history)
CarPlayService.shared.pushTemplate(listTemplate, animated: true)
}
if MWMTextToSpeech.isTTSEnabled() {
let unmuteButton = buildBarButton(type: .unmute) { _ in
MWMTextToSpeech.tts().active = true
setupMuteAndRedirectButtons(template: template)
}
template.leadingNavigationBarButtons = [unmuteButton, redirectButton]
} else {
template.leadingNavigationBarButtons = [redirectButton]
}
template.leadingNavigationBarButtons = [unmuteButton, redirectButton]
}
// MARK: - CPMapButton builder

View File

@@ -12,10 +12,8 @@ final class SettingsTemplateBuilder {
private class func buildGridButtons() -> [CPGridButton] {
let options = RoutingOptions()
return [createTollButton(options: options),
createUnpavedButton(options: options),
createPavedButton(options: options),
createMotorwayButton(options: options),
return [createUnpavedButton(options: options),
createTollButton(options: options),
createFerryButton(options: options),
createStepsButton(options: options),
createSpeedcamButton()]
@@ -23,7 +21,7 @@ final class SettingsTemplateBuilder {
// MARK: - CPGridButton builders
private class func createTollButton(options: RoutingOptions) -> CPGridButton {
var tollIconName = "tolls.circle"
var tollIconName = "options.tolls"
if options.avoidToll { tollIconName += ".slash" }
let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
var image = UIImage(named: tollIconName, in: nil, with: configuration)!
@@ -41,8 +39,8 @@ final class SettingsTemplateBuilder {
}
private class func createUnpavedButton(options: RoutingOptions) -> CPGridButton {
var unpavedIconName = "unpaved.circle"
if options.avoidDirty && !options.avoidPaved { unpavedIconName += ".slash" }
var unpavedIconName = "options.unpaved"
if options.avoidDirty { unpavedIconName += ".slash" }
let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
var image = UIImage(named: unpavedIconName, in: nil, with: configuration)!
if #unavailable(iOS 26) {
@@ -51,59 +49,15 @@ final class SettingsTemplateBuilder {
}
let unpavedButton = CPGridButton(titleVariants: [L("avoid_unpaved")], image: image) { _ in
options.avoidDirty = !options.avoidDirty
if options.avoidDirty {
options.avoidPaved = false
}
options.save()
CarPlayService.shared.updateRouteAfterChangingSettings()
CarPlayService.shared.popTemplate(animated: true)
}
unpavedButton.isEnabled = !options.avoidPaved
return unpavedButton
}
private class func createPavedButton(options: RoutingOptions) -> CPGridButton {
var pavedIconName = "paved.circle"
if options.avoidPaved && !options.avoidDirty { pavedIconName += ".slash" }
let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
var image = UIImage(named: pavedIconName, in: nil, with: configuration)!
if #unavailable(iOS 26) {
image = image.withTintColor(.white, renderingMode: .alwaysTemplate)
image = UIImage(data: image.pngData()!)!.withRenderingMode(.alwaysTemplate)
}
let pavedButton = CPGridButton(titleVariants: [L("avoid_paved")], image: image) { _ in
options.avoidPaved = !options.avoidPaved
if options.avoidPaved {
options.avoidDirty = false
}
options.save()
CarPlayService.shared.updateRouteAfterChangingSettings()
CarPlayService.shared.popTemplate(animated: true)
}
pavedButton.isEnabled = !options.avoidDirty
return pavedButton
}
private class func createMotorwayButton(options: RoutingOptions) -> CPGridButton {
var motorwayIconName = "motorways.circle"
if options.avoidMotorway { motorwayIconName += ".slash" }
let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
var image = UIImage(named: motorwayIconName, in: nil, with: configuration)!
if #unavailable(iOS 26) {
image = image.withTintColor(.white, renderingMode: .alwaysTemplate)
image = UIImage(data: image.pngData()!)!.withRenderingMode(.alwaysTemplate)
}
let motorwayButton = CPGridButton(titleVariants: [L("avoid_motorways")], image: image) { _ in
options.avoidMotorway = !options.avoidMotorway
options.save()
CarPlayService.shared.updateRouteAfterChangingSettings()
CarPlayService.shared.popTemplate(animated: true)
}
return motorwayButton
}
private class func createFerryButton(options: RoutingOptions) -> CPGridButton {
var ferryIconName = "ferries.circle"
var ferryIconName = "options.ferries"
if options.avoidFerry { ferryIconName += ".slash" }
let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
var image = UIImage(named: ferryIconName, in: nil, with: configuration)!
@@ -121,7 +75,7 @@ final class SettingsTemplateBuilder {
}
private class func createStepsButton(options: RoutingOptions) -> CPGridButton {
var stepsIconName = "steps.circle"
var stepsIconName = "options.steps"
if options.avoidSteps { stepsIconName += ".slash" }
let configuration = UIImage.SymbolConfiguration(textStyle: .title1)
var image = UIImage(named: stepsIconName, in: nil, with: configuration)!
@@ -139,7 +93,7 @@ final class SettingsTemplateBuilder {
}
private class func createSpeedcamButton() -> CPGridButton {
var speedcamIconName = "speedcamera"
var speedcamIconName = "options.speedcamera"
let isSpeedCamActivated = CarPlayService.shared.isSpeedCamActivated
if !isSpeedCamActivated { speedcamIconName += ".slash" }
let configuration = UIImage.SymbolConfiguration(textStyle: .title1)

View File

@@ -19,6 +19,8 @@
<string>CloudDocuments</string>
<string>CloudKit</string>
</array>
<key>com.apple.developer.navigation-app</key>
<true/>
<key>com.apple.developer.ubiquity-container-identifiers</key>
<array>
<string>iCloud.app.comaps.debug</string>

View File

@@ -19,6 +19,8 @@
<string>CloudDocuments</string>
<string>CloudKit</string>
</array>
<key>com.apple.developer.navigation-app</key>
<true/>
<key>com.apple.developer.ubiquity-container-identifiers</key>
<array>
<string>iCloud.app.comaps</string>

View File

@@ -65,6 +65,7 @@
<string>mapsme</string>
<string>ge0</string>
<string>geo</string>
<string>geo-navigation</string>
<string>om</string>
<string>mapswithmepro</string>
</array>
@@ -89,7 +90,7 @@
<true/>
<key>NSExceptionDomains</key>
<dict>
<key>comaps.at</key>
<key>comaps.app</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>
@@ -98,7 +99,7 @@
<key>NSThirdPartyExceptionRequiresForwardSecrecy</key>
<false/>
</dict>
<key>comaps.app</key>
<key>comaps.at</key>
<dict>
<key>NSExceptionAllowsInsecureHTTPLoads</key>
<true/>

View File

@@ -91,7 +91,7 @@
switch urlType {
case .route:
if let adapter = DeepLinkRouteStrategyAdapter(url) {
MWMRouter.buildApiRoute(with: adapter.type, start: adapter.p1, finish: adapter.p2)
MWMRouter.buildApiRoute(with: adapter.type, start: adapter.pStart, intermediatePoint: adapter.pIntermediate, finish: adapter.pFinish)
MapsAppDelegate.theApp().showMap()
return true
}

View File

@@ -6,8 +6,9 @@ NS_ASSUME_NONNULL_BEGIN
@class MWMRoutePoint;
@interface DeepLinkRouteStrategyAdapter : NSObject
@property(nonatomic, readonly) MWMRoutePoint* p1;
@property(nonatomic, readonly) MWMRoutePoint* p2;
@property(nonatomic, readonly) MWMRoutePoint* pStart;
@property(nonatomic, readonly) MWMRoutePoint* pIntermediate;
@property(nonatomic, readonly) MWMRoutePoint* pFinish;
@property(nonatomic, readonly) MWMRouterType type;
- (nullable instancetype)init:(NSURL*)url;

View File

@@ -11,11 +11,29 @@
auto const parsedData = GetFramework().GetParsedRoutingData();
auto const points = parsedData.m_points;
if (points.size() == 2) {
_p1 = [[MWMRoutePoint alloc] initWithURLSchemeRoutePoint:points.front()
for (auto point: points) {
if (point.m_type == RouteMarkType::Start) {
_pStart = [[MWMRoutePoint alloc] initWithURLSchemeRoutePoint:point
type:MWMRoutePointTypeStart
intermediateIndex:0];
} else if (point.m_type == RouteMarkType::Finish) {
_pFinish = [[MWMRoutePoint alloc] initWithURLSchemeRoutePoint:point
type:MWMRoutePointTypeFinish
intermediateIndex:0];
} else if (point.m_type == RouteMarkType::Intermediate) {
_pIntermediate = [[MWMRoutePoint alloc] initWithURLSchemeRoutePoint:point
type:MWMRoutePointTypeIntermediate
intermediateIndex:0];
}
}
if (_pStart && _pFinish) {
_type = routerType(parsedData.m_type);
} else if (points.size() == 2) {
_pStart = [[MWMRoutePoint alloc] initWithURLSchemeRoutePoint:points.front()
type:MWMRoutePointTypeStart
intermediateIndex:0];
_p2 = [[MWMRoutePoint alloc] initWithURLSchemeRoutePoint:points.back()
_pFinish = [[MWMRoutePoint alloc] initWithURLSchemeRoutePoint:points.back()
type:MWMRoutePointTypeFinish
intermediateIndex:0];
_type = routerType(parsedData.m_type);

View File

@@ -6,8 +6,7 @@ typedef NS_ENUM(NSInteger, MWMRoadType) {
MWMRoadTypeDirty,
MWMRoadTypeFerry,
MWMRoadTypeMotorway,
MWMRoadTypeSteps,
MWMRoadTypePaved
MWMRoadTypeSteps
};
typedef void (^MWMImageHeightBlock)(UIImage *, NSString *, NSString *);
@@ -57,6 +56,7 @@ typedef void (^MWMImageHeightBlock)(UIImage *, NSString *, NSString *);
+ (void)buildToPoint:(MWMRoutePoint *)finish bestRouter:(BOOL)bestRouter;
+ (void)buildApiRouteWithType:(MWMRouterType)type
startPoint:(MWMRoutePoint *)startPoint
intermediatePoint:(MWMRoutePoint *)intermediatePoint
finishPoint:(MWMRoutePoint *)finishPoint;
+ (void)rebuildWithBestRouter:(BOOL)bestRouter;

View File

@@ -255,6 +255,7 @@ char const *kRenderAltitudeImagesQueueLabel = "mapsme.mwmrouter.renderAltitudeIm
+ (void)buildApiRouteWithType:(MWMRouterType)type
startPoint:(MWMRoutePoint *)startPoint
intermediatePoint:(MWMRoutePoint *)intermediatePoint
finishPoint:(MWMRoutePoint *)finishPoint {
if (!startPoint || !finishPoint)
return;
@@ -264,6 +265,9 @@ char const *kRenderAltitudeImagesQueueLabel = "mapsme.mwmrouter.renderAltitudeIm
auto router = [MWMRouter router];
router.isAPICall = YES;
[self addPoint:startPoint];
if (intermediatePoint) {
[self addPoint:intermediatePoint];
}
[self addPoint:finishPoint];
router.isAPICall = NO;
@@ -592,9 +596,6 @@ char const *kRenderAltitudeImagesQueueLabel = "mapsme.mwmrouter.renderAltitudeIm
case MWMRoadTypeDirty:
options.avoidDirty = YES;
break;
case MWMRoadTypePaved:
options.avoidPaved = YES;
break;
case MWMRoadTypeFerry:
options.avoidFerry = YES;
break;

Some files were not shown because too many files have changed in this diff Show More