Compare commits

..

1 Commits

Author SHA1 Message Date
Yannik Bloscheck
c81999d968 [ios] Remove unused compass calibration setting
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2026-01-09 15:22:33 +01:00
113 changed files with 159 additions and 634 deletions

View File

@@ -256,18 +256,17 @@ android {
noCompress = ['txt', 'bin', 'html', 'png', 'json', 'mwm', 'ttf', 'sdf', 'ui', 'config', 'csv', 'spv', 'obj']
// Some languages not supported by Android require to be specified here to be applied
localeFilters += [
"en",
"af",
"ar",
"az",
"be",
"bg",
"bn",
"ca",
"cs",
"da",
"de",
"el",
"en",
"en-rGB",
"es",
"es-rMX",
@@ -277,16 +276,11 @@ android {
"fi",
"fr",
"fr-rCA",
"gl",
"gsw",
"he",
"iw",
"hi",
"hu",
"id",
"in",
"is",
"it",
"iw",
"ja",
"kw",
"ko",
@@ -295,20 +289,16 @@ android {
"mr",
"mt",
"nb",
"nb-rNO",
"nl",
"pl",
"pt",
"pt-rBR",
"ro",
"ru",
"sl",
"sk",
"sr-rCyrl",
"sr-rLatn",
"sr",
"sv",
"sw",
"ta",
"th",
"tr",
"uk",

View File

@@ -53,7 +53,7 @@ public class MenuBottomSheetFragment extends BottomSheetDialogFragment
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState)
{
return new BottomSheetDialog(requireContext(), R.style.MwmTheme_BottomSheetDialog) {
return new BottomSheetDialog(requireContext(), getTheme()) {
@Override
public void onAttachedToWindow()
{

View File

@@ -105,12 +105,4 @@ public class PlacePageUtils
});
popup.show();
}
public static String buildPanoramaxURL(double lat, double lon)
{
final String panoramaxURL = "https://api.panoramax.xyz/?map=";
final String levelZoom = "16";
final String quality_score = "&pic_score=ABC";
return panoramaxURL + levelZoom + "/" + lat + "/" + lon + quality_score;
}
}

View File

@@ -4,7 +4,6 @@ import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static app.organicmaps.sdk.util.Utils.getLocalizedFeatureType;
import static app.organicmaps.sdk.util.Utils.getTagValueLocalized;
import static app.organicmaps.widget.placepage.PlacePageUtils.buildPanoramaxURL;
import android.content.Context;
import android.content.res.ColorStateList;
@@ -291,9 +290,6 @@ public class PlacePageView extends Fragment
openIn.setOnClickListener(this);
openIn.setOnLongClickListener(this);
openIn.setVisibility(VISIBLE);
LinearLayout openPhotoViewer = mFrame.findViewById(R.id.ll__place_open_phviewer);
openPhotoViewer.setOnClickListener(this);
openPhotoViewer.setVisibility(VISIBLE);
mTvLatlon = mFrame.findViewById(R.id.tv__place_latlon);
mWifi = mFrame.findViewById(R.id.ll__place_wifi);
mTvWiFi = mFrame.findViewById(R.id.tv__place_wifi);
@@ -1009,8 +1005,6 @@ public class PlacePageView extends Fragment
mMapObject.getName());
Utils.openUri(requireContext(), Uri.parse(uri), R.string.uri_open_location_failed);
}
else if (id == R.id.ll__place_open_phviewer)
Utils.openUrl(requireContext(), buildPanoramaxURL(mMapObject.getLat(),mMapObject.getLon()));
else if (id == R.id.direction_frame)
showBigDirection();
else if (id == R.id.item_icon)
@@ -1058,10 +1052,6 @@ public class PlacePageView extends Fragment
mMapObject.getName());
PlacePageUtils.copyToClipboard(requireContext(), mFrame, uri);
}
else if (id == R.id.ll__place_open_phviewer)
{
PlacePageUtils.copyToClipboard(requireContext(),mFrame, buildPanoramaxURL(mMapObject.getLat(),mMapObject.getLon()));
}
else if (id == R.id.ll__place_operator)
items.add(mTvOperator.getText().toString());
else if (id == R.id.ll__place_network)

View File

@@ -41,5 +41,5 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_gravity="bottom|start"
android:background="?colorSurfaceContainerLow"/>
android:background="?cardBackground"/>
</FrameLayout>

View File

@@ -8,6 +8,7 @@
android:paddingStart="@dimen/margin_base"
android:paddingEnd="@dimen/margin_base"
android:gravity="center_vertical"
android:background="?clickableBackground"
android:orientation="horizontal">
<com.google.android.material.imageview.ShapeableImageView

View File

@@ -40,5 +40,5 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_gravity="bottom|center"
android:background="?colorSurfaceContainerLow"/>
android:background="?cardBackground"/>
</FrameLayout>

View File

@@ -4,7 +4,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:descendantFocusability="blocksDescendants"
android:background="?cardBackground"
android:orientation="vertical">
<include
android:id="@+id/pp__preview"

View File

@@ -71,8 +71,6 @@
<include layout="@layout/place_page_latlon"/>
<include layout="@layout/place_page_open_in"/>
<include layout="@layout/place_page_open_photoviewer" />
</LinearLayout>
<include

View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/ll__place_open_phviewer"
style="@style/PlacePageItemFrame"
tools:background="#20FF0000"
tools:visibility="visible">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/iv__place_open_phviewer"
style="@style/PlacePageMetadataIcon"
app:srcCompat="@drawable/ic_panoramax"
app:tint="?colorSecondary"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__place_open_phviewer"
android:textAlignment="viewStart"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/open_place_in_pnx"
android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"/>
</LinearLayout>

View File

@@ -15,7 +15,6 @@
<color name="bg_cards">#FF3C4044</color>
<color name="bg_panel">@color/bg_window</color>
<color name="bg_primary_dark">#FF588157</color>
<color name="bg_app">#10140F</color>
<color name="bg_menu">#CC2D3237</color>

View File

@@ -975,5 +975,4 @@
<string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
<string name="download_resources_custom_url_summary_none">Not set</string>
<string name="download_resources_custom_url_error_scheme">Please enter a URL starting with http:// or https://</string>
<string name="open_place_in_pnx">Open in Panoramax</string>
</resources>

View File

@@ -287,13 +287,13 @@
</style>
<style name="MwmWidget.BottomSheetDialog" parent="Widget.Material3.BottomSheet.Modal">
<item name="backgroundTint">?colorSurfaceContainerLow</item>
<item name="backgroundTint">?cardBackground</item>
<item name="elevationOverlayEnabled">false</item>
<item name="shapeAppearance">@style/ShapeAppearance.Material3.LargeComponent</item>
</style>
<style name="MwmWidget.BottomSheet" parent="MwmWidget.BottomSheetDialog">
<item name="android:background">?colorSurfaceContainerLow</item>
<item name="android:background">?cardBackground</item>
<item name="behavior_hideable">false</item>
</style>

View File

@@ -7,7 +7,6 @@
<locale android:name="az" />
<locale android:name="be" />
<locale android:name="bg" />
<locale android:name="bn" />
<locale android:name="ca" />
<locale android:name="cs" />
<locale android:name="da" />
@@ -22,16 +21,11 @@
<locale android:name="fi" />
<locale android:name="fr" />
<locale android:name="fr-CA" />
<locale android:name="gl" />
<locale android:name="gsw" />
<locale android:name="he" />
<locale android:name="iw" />
<locale android:name="hi" />
<locale android:name="hu" />
<locale android:name="id" />
<locale android:name="in" />
<locale android:name="is" />
<locale android:name="it" />
<locale android:name="iw" />
<locale android:name="ja" />
<locale android:name="kw" />
<locale android:name="ko" />
@@ -40,20 +34,16 @@
<locale android:name="mr" />
<locale android:name="mt" />
<locale android:name="nb" />
<locale android:name="nb-NO" />
<locale android:name="nl" />
<locale android:name="pl" />
<locale android:name="pt" />
<locale android:name="pt-BR" />
<locale android:name="ro" />
<locale android:name="ru" />
<locale android:name="sl" />
<locale android:name="sk" />
<locale android:name="sr-Cyrl" />
<locale android:name="sr-Latn" />
<locale android:name="sr" />
<locale android:name="sv" />
<locale android:name="sw" />
<locale android:name="ta" />
<locale android:name="th" />
<locale android:name="tr" />
<locale android:name="uk" />

View File

@@ -43,10 +43,9 @@
<string name="type.leisure.adult_gaming_centre">Spielhalle für Erwachsene</string>
<string name="type.leisure.amusement_arcade">Spielhalle für Unterhaltungsspiele</string>
<string name="type.amenity.charging_station">Ladestation</string>
<string name="type.amenity.charging_station.bicycle">Fahrräder</string>
<string name="type.amenity.charging_station.motorcycle">Motorräder</string>
<string name="type.amenity.charging_station.motorcar">Autos</string>
<string name="type.amenity.charging_station.small">Begrenzte Kapazität</string>
<string name="type.amenity.charging_station.bicycle">Fahrrad-Ladestation</string>
<string name="type.amenity.charging_station.motorcar">Kfz-Ladestation</string>
<string name="type.amenity.charging_station.motorcar.small">Kfz-Ladestation</string>
<string name="type.amenity.childcare">Kindertagesstätte</string>
<string name="type.amenity.cinema">Kino</string>
<string name="type.leisure.bowling_alley">Bowlingbahn</string>

View File

@@ -53,10 +53,9 @@
<string name="type.leisure.adult_gaming_centre">Adult Gaming Centre</string>
<string name="type.leisure.amusement_arcade">Arcade</string>
<string name="type.amenity.charging_station">Charging Station</string>
<string name="type.amenity.charging_station.bicycle">Bicycles</string>
<string name="type.amenity.charging_station.motorcycle">Motorcycles</string>
<string name="type.amenity.charging_station.motorcar">Cars</string>
<string name="type.amenity.charging_station.small">Limited Capacity</string>
<string name="type.amenity.charging_station.bicycle">Bicycle Charging Station</string>
<string name="type.amenity.charging_station.motorcar">Car Charging Station</string>
<string name="type.amenity.charging_station.motorcar.small">Car Charging Point</string>
<string name="type.amenity.childcare">Nursery</string>
<string name="type.amenity.cinema">Cinema</string>
<string name="type.amenity.studio">Media Studio</string>
@@ -932,11 +931,11 @@
<string name="type.public_transport.platform">Platform</string>
<string name="type.railway">Railway</string>
<string name="type.railway.abandoned">Abandoned Railway</string>
<string name="type.railway.abandoned.bridge">Abandoned Railway Bridge</string>
<string name="type.railway.abandoned.tunnel">Abandoned Railway Tunnel</string>
<string name="type.railway.construction">Railway Construction</string>
<string name="type.railway.crossing">Railway Crossing</string>
<string name="type.railway.disused">Disused Railway</string>
<string name="type.railway.disused.bridge">Disused Railway Bridge</string>
<string name="type.railway.disused.tunnel">Disused Railway Tunnel</string>
<string name="type.railway.funicular">Funicular</string>
<string name="type.railway.funicular.bridge">Funicular Bridge</string>
<string name="type.railway.funicular.tunnel">Funicular Tunnel</string>

View File

@@ -331,9 +331,7 @@
"amenity-car_wash": "4Autowaschanlage|Autowäsche",
"amenity-veterinary": "4Tierarzt|4Tierärztin|4Tierarztpraxis|4Tierpraxis|4Tierdoktor|5Hundearzt|5Katzenarzt|4Haustiere|U+2695",
"@charging_station": "4Ladestation|aufladen",
"amenity-charging_station-bicycle|@charging_station": "5Fahrradladestation|Fahrrad aufladen|E-Bike aufladen|Fahrrad laden|E-Bike laden",
"amenity-charging_station-motorcycle|@charging_station": "6Motorradladestation|Motorrad aufladen|Motorrad laden",
"amenity-charging_station-motorcar|@charging_station": "4Autoladestation|5Autoladegerät|Auto aufladen|Auto laden",
"amenity-charging_station-bicycle|@charging_station": "Fahrrad aufladen",
"amenity-childcare": "Kindertagesstätte|Kindergarten|Kinderbetreuung",
"amenity-bicycle_parking": "6Fahrradständer",
"amenity-waste_basket": "6Abfalleimer|4Mülleimer|4Restmüll|3Müll|4Müllkorb|U+1F6AE|U+1F5D1",
@@ -518,6 +516,7 @@
"attraction-amusement_ride|attraction-carousel|attraction-roller_coaster|attraction-maze|attraction-historic|attraction-big_wheel|attraction-bumper_car|@category_children": "4Attraktion|4Labyrinth",
"building-guardhouse": "4Wache",
"shop-lighting|@shop": "Leuchtmittel|Lampen|Leuchte",
"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Autoladestation|5Autoladegerät|4Ladestation|4Ladegerät|U+1F50C|U+1FAAB|U+1F50B",
"amenity-mobile_money_agent": "6Mobile Money Vertretung|6Mobile Money|6Mobiles Geld",
"man_made-telescope|man_made-telescope-optical|man_made-telescope-radio|man_made-telescope-gamma": "4Teleskop",
"amenity-sailing_school": "5Segelschule|5Bootsschule|Bootsfahrschule",

View File

@@ -353,11 +353,10 @@
"man_made-observatory": "4Observatory",
"amenity-veterinary": "4Veterinary Doctor|3Veterinary|vet|veterinarian",
"amenity-animal_shelter": "6Animal Shelter",
"@charging_station": "4Charging Station|charging|charger",
"@charging_station": "4Charging Station|charging",
"amenity-charging_station|@charging_station": "",
"amenity-charging_station-bicycle|@charging_station": "4Bicycle Charging Station|Bicycle Charging|Bike Charging",
"amenity-charging_station-motorcycle|@charging_station": "5Motorcycle Charging Station|Motorcycle Charging|Motorbike Charging",
"amenity-charging_station-motorcar|@charging_station": "3Car Charging Station|Motorcar Charging|Car Charging",
"amenity-charging_station-bicycle|@charging_station": "4Bicycle Charging|4Bike Charging",
"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Motorcar Charging|3Car Charging|Charger",
"amenity-childcare": "Nursery|4Child Care|childcare",
"amenity-bicycle_parking": "4Bicycle Parking|4Bike Parking",
"amenity-waste_basket": "4Trash Bin|4litter bin|5waste basket|bin",

View File

@@ -518,7 +518,7 @@
"amenity-toilets|toilets-yes|@category_toilet": "wc",
"leisure-sports_centre-sport-swimming": "4Centro de natación",
"amenity-police|@category_police": "Estación de policía|policía",
"amenity-charging_station-motorcar|@charging_station": "Cargador de autos|cargador de coches|cargador de carros|4Estación de carga|3Estación de carga|Cargador",
"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "Cargador de autos|cargador de coches|cargador de carros|4Estación de carga|3Estación de carga|Cargador",
"amenity-sailing_school": "Escuela de vela|Escuela de navegación",
"amenity-flight_school": "Escuela de aviación|Escuela de aeronáutica|Escuela de pilotos|aeronáutica|vuelo|aviación",
"amenity-prep_school": "Propedéutico|Tutoría",

View File

@@ -486,7 +486,7 @@
"amenity-love_hotel": "Hôtel de passe|Hôtel de sexe|Hôtel pour adultes",
"healthcare-sample_collection": "Prélèvement d'échantillons",
"recycling-cardboard|@category_recycling": "5Recyclage de carton|Déchets de carton|Carton",
"amenity-charging_station-motorcar|@charging_station": "Chargeur automobile|Chargeur de voiture|Chargeur",
"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "Chargeur automobile|Chargeur de voiture|Chargeur",
"shop-lighting|@shop": "4Lumières|Luminaires|4Lampes",
"office-security": "Bureau de sécurité",
"building-guardhouse": "Garde|poste de sécurité|poste de gardiennage",

View File

@@ -320,7 +320,7 @@
"amenity-veterinary": "4Veterinārārsts|vetārsts|vetklīnika|veterinārā klīnika",
"@charging_station": "4Uzlādes stacija|uzlāde",
"amenity-charging_station-bicycle|@charging_station": "4Velosipēdu uzlāde|Riteņu uzlāde|Ričuku uzlāde|Divriteņu uzlāde",
"amenity-charging_station-motorcar|@charging_station": "Automobiļu uzlāde|mašīnu uzlāde",
"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "Automobiļu uzlāde|mašīnu uzlāde",
"amenity-childcare": "Bērnistaba",
"amenity-bicycle_parking": "4Velonovietne",
"amenity-waste_basket": "Atkritumu tvertne|4miskaste",

View File

@@ -330,7 +330,7 @@
"amenity-animal_shelter": "Приют для животных",
"@charging_station": "4Зарядная станция|зарядка|электрозарядка|зарядить",
"amenity-charging_station-bicycle|@charging_station": "4Велозарядка|Зарядка для велосипедов",
"amenity-charging_station-motorcar|@charging_station": "4Автозарядка",
"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Автозарядка",
"amenity-childcare": "Детская комната|3ясли",
"amenity-bicycle_parking": "4Велопарковка|велостоянка",
"amenity-waste_basket": "3Урна|4Мусорная корзина",

View File

@@ -331,7 +331,7 @@
"amenity-veterinary": "4Veteriner",
"@charging_station": "Şarj İstasyonu|şarj etme",
"amenity-charging_station-bicycle|@charging_station": "4Bisiklet Şarjı",
"amenity-charging_station-motorcar|@charging_station": "4Otomobil Şarj Cihazı|4Araba Şarj Cihazı|4Araç Şarj Cihazı|3Trugo|4TOGG Şarj",
"amenity-charging_station-motorcar|amenity-charging_station-motorcar-small|@charging_station": "4Otomobil Şarj Cihazı|4Araba Şarj Cihazı|4Araç Şarj Cihazı|3Trugo|4TOGG Şarj",
"amenity-childcare": "Çocuk Yuvası|Kreş",
"amenity-bicycle_parking": "4Bisiklet park etme|bisiklet park",
"amenity-waste_basket": "Çöp Kutusu",

View File

@@ -302,7 +302,7 @@ railway|crossing;197;
boundary|national_park;198;
deprecated:natural|wood|deciduous:01.2020;[natural=wood][wood=deciduous],[natural=wood][leaf_type=deciduous],[natural=wood][leaf_cycle=deciduous];x;name;int_name;199;landuse|forest|deciduous
waterway|dam;200;
amenity|charging_station|small;[amenity=charging_station][motorcar?][!capacity],[amenity=charging_station][motorcar?][capacity=1],[amenity=charging_station][motorcar?][capacity=2],[amenity=charging_station][!capacity],[amenity=charging_station][capacity=1],[amenity=charging_station][capacity=2],;;name;int_name;201;
amenity|charging_station|motorcar|small;[amenity=charging_station][motorcar?][!capacity],[amenity=charging_station][motorcar?][capacity=1],[amenity=charging_station][motorcar?][capacity=2];;name;int_name;201;
leisure|golf_course;202;
highway|service|bridge;[highway=service][bridge?];;name;int_name;203;
# ~250K usages.
@@ -403,14 +403,15 @@ place|farm;294;
deprecated:boundary|administrative|11:04.2024;[boundary=administrative][admin_level=11];x;name;int_name;295;
waterway|weir;296;
highway|secondary|tunnel;[highway=secondary][tunnel?];;name;int_name;297;
railway|disused|bridge;[railway=disused][bridge?],[railway=abandoned][bridge?];;name;int_name;298;
# TODO: its a mismapping likely, if there is a bridge structure still, then it should be railway=disused.
railway|abandoned|bridge;[railway=abandoned][bridge?];;name;int_name;298;
man_made|lighthouse;299;
amenity|charging_station|motorcycle;[amenity=charging_station][motorcycle?];;name;int_name;300;
deprecated:highway|path|demanding_mountain_hiking:04.2024;[highway=path][sac_scale=demanding_mountain_hiking];x;name;int_name;300;highway|path|difficult
man_made|storage_tank;301;
man_made|silo;302;
power|generator;303;
highway|pedestrian|bridge;[highway=pedestrian][bridge?];;name;int_name;304;
amenity|charging_station|motorcar;[amenity=charging_station][motorcar?][capacity?],[amenity=charging_station][motorcar?];;name;int_name;305;
amenity|charging_station|motorcar;[amenity=charging_station][motorcar?][capacity?];;name;int_name;305;
natural|saddle;306;
mountain_pass;[mountain_pass];;name;int_name;307;
highway|raceway;308;
@@ -419,7 +420,7 @@ highway|primary_link|bridge;[highway=primary_link][bridge?];;name;int_name;310;
man_made|tower|communication;[man_made=tower][tower:type=communication];;name;int_name;311;
sport|equestrian;312;
tourism|information|office;[tourism=information][information=office];;name;int_name;313;
amenity|charging_station|carless;[amenity=charging_station][motorcar=not],[amenity=charging_station][motorcar=no];;name;int_name;314;
deprecated:highway|footway|hiking:04.2024;[highway=footway][sac_scale=hiking];x;name;int_name;314;highway|path
aeroway|gate;315;
# TODO: railway=preserved is deprecated in OSM, recommended mapping is railway:preserved=yes + railway=*
railway|preserved;316;
@@ -510,7 +511,8 @@ railway|rail|spur|tunnel;[railway=rail][service=spur][!usage][tunnel?];;name;int
highway|secondary_link|bridge;[highway=secondary_link][bridge?];;name;int_name;397;
railway|tram|tunnel;[railway=tram][tunnel?];;name;int_name;398;
railway|rail|tourism;[railway=rail][usage=tourism][!service];;name;int_name;399;
railway|disused|tunnel;[railway=disused][tunnel?],[railway=abandoned][tunnel?];;name;int_name;400;
# TODO: its a mismapping likely, if there is a tunnel structure still, then it should be railway=disused.
railway|abandoned|tunnel;[railway=abandoned][tunnel?];;name;int_name;400;
area:highway|living_street;401;
piste:type|sled;402;
leisure|beach_resort;403;
@@ -1191,7 +1193,7 @@ shop|tyres;1064;
craft|beekeeper;1065;
amenity|car_wash;1066;
amenity|veterinary;1067;
amenity|charging_station;[amenity=charging_station];;name;int_name;1068;
amenity|charging_station;1068;
amenity|childcare;1069;
craft|blacksmith;1070;
amenity|bicycle_parking;1071;
Can't render this file because it contains an unexpected character in line 7 and column 16.

View File

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@@ -559,9 +559,8 @@ area|z15-[amenity=marketplace],
area|z15-[office=diplomatic],
area|z15-[amenity=vehicle_inspection],
area|z15-[amenity=car_wash],
area|z15-[amenity=fuel],
area|z15-[amenity=charging_station][motorcar?],
area|z16-[amenity=charging_station],
area|z15-[amenity=fuel],
area|z15-[amenity=motorcycle_parking],
area|z15-[amenity=bicycle_parking],
{fill-opacity: 1; fill-color: @general_area;}

View File

@@ -2399,28 +2399,18 @@ node|z17-[amenity=fuel],
node|z18-[amenity=fuel],
{font-size: 11;}
node|z15-[amenity=charging_station][motorcar?],
node|z16-[amenity=charging_station][motorcycle?],
node|z16-[amenity=charging_station][bicycle?],
node|z16-[amenity=charging_station][motorcar=not],
node|z16-[amenity=charging_station],
{icon-image: charging_station-small-m.svg;}
node|z14[amenity=charging_station][motorcar?][capacity?],
{icon-image: charging_station-s.svg;}
node|z15-[amenity=charging_station][motorcar?][capacity?],
{icon-image: charging_station-m.svg;}
node|z14[amenity=charging_station][motorcar?][!capacity],
node|z14[amenity=charging_station][motorcar?][capacity=1],
node|z14[amenity=charging_station][motorcar?][capacity=2],
{icon-image: none;}
node|z15-[amenity=charging_station][motorcar?][!capacity],
node|z15-[amenity=charging_station][motorcar?][capacity=1],
node|z15-[amenity=charging_station][motorcar?][capacity=2],
{icon-image: charging_station-small-m.svg;}
node|z16-[amenity=charging_station],
{icon-image: charging-point-m.svg;}
node|z14[amenity=charging_station][motorcar?],
node|z14[amenity=charging_station][motorcar?][capacity?],
{icon-image: charging-station-s.svg;}
node|z15-[amenity=charging_station][motorcar?][capacity?],
{icon-image: charging-station-m.svg;}
node|z14[amenity=charging_station][motorcar?][capacity?],
{text-offset: 1;font-size: 10;icon-min-distance: 20;}
node|z15[amenity=charging_station][motorcar?],
{icon-min-distance: 20;}

View File

@@ -1217,14 +1217,14 @@ line|z13-[railway=subway][bridge?]::bridgewhite,
line|z13-[railway=light_rail][bridge?]::bridgewhite,
line|z15-[railway=preserved][bridge?]::bridgewhite,
line|z16-[railway=miniature][bridge?]::bridgewhite,
line|z16-[railway=disused][bridge?]::bridgewhite,
line|z16-[railway=abandoned][bridge?]::bridgewhite,
{casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;}
line|z16-[railway=rail][bridge?]::bridgeblack,
line|z16-[railway=subway][bridge?]::bridgeblack,
line|z16-[railway=light_rail][bridge?]::bridgeblack,
line|z16-[railway=preserved][bridge?]::bridgeblack,
line|z16-[railway=miniature][bridge?]::bridgeblack,
line|z16-[railway=disused][bridge?]::bridgeblack,
line|z16-[railway=abandoned][bridge?]::bridgeblack,
{casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;}
/* 9.1 RAIL 11-22 ZOOM */
@@ -1375,11 +1375,11 @@ line|z18-[railway=light_rail][!tunnel]::dash,
line|z15-[railway=preserved],
line|z16-[railway=miniature],
line|z16-[railway=disused],
line|z16-[railway=abandoned],
{width: 1.6;dashes: 6.3,6.3;}
line|z15-[railway=construction],
line|z16-[railway=abandoned],
line|z16-[railway=disused],
{width: 1;dashes: 1.8,5.4;}
line|z17-[railway=turntable],
@@ -1434,21 +1434,21 @@ line|z16[railway=subway][bridge?]::bridgewhite,
line|z16[railway=light_rail][bridge?]::bridgewhite,
line|z16[railway=preserved][bridge?]::bridgewhite,
line|z16[railway=miniature][bridge?]::bridgewhite,
line|z16[railway=disused][bridge?]::bridgewhite,
line|z16[railway=abandoned][bridge?]::bridgewhite,
{casing-width-add: 1.6;}
line|z17[railway=rail][bridge?]::bridgewhite,
line|z17[railway=subway][bridge?]::bridgewhite,
line|z17[railway=light_rail][bridge?]::bridgewhite,
line|z17[railway=preserved][bridge?]::bridgewhite,
line|z17[railway=miniature][bridge?]::bridgewhite,
line|z17[railway=disused][bridge?]::bridgewhite,
line|z17[railway=abandoned][bridge?]::bridgewhite,
{casing-width-add: 2.3;}
line|z18-[railway=rail][bridge?]::bridgewhite,
line|z18-[railway=subway][bridge?]::bridgewhite,
line|z18-[railway=light_rail][bridge?]::bridgewhite,
line|z18-[railway=preserved][bridge?]::bridgewhite,
line|z18-[railway=miniature][bridge?]::bridgewhite,
line|z18-[railway=disused][bridge?]::bridgewhite,
line|z18-[railway=abandoned][bridge?]::bridgewhite,
{casing-width-add: 3.5;}
line|z16[railway=rail][bridge?]::bridgeblack,
@@ -1456,21 +1456,21 @@ line|z16[railway=subway][bridge?]::bridgeblack,
line|z16[railway=light_rail][bridge?]::bridgeblack,
line|z16[railway=preserved][bridge?]::bridgeblack,
line|z16[railway=miniature][bridge?]::bridgeblack,
line|z16[railway=disused][bridge?]::bridgeblack,
line|z16[railway=abandoned][bridge?]::bridgeblack,
{casing-width-add: 2.2;}
line|z17[railway=rail][bridge?]::bridgeblack,
line|z17[railway=subway][bridge?]::bridgeblack,
line|z17[railway=light_rail][bridge?]::bridgeblack,
line|z17[railway=preserved][bridge?]::bridgeblack,
line|z17[railway=miniature][bridge?]::bridgeblack,
line|z17[railway=disused][bridge?]::bridgeblack,
line|z17[railway=abandoned][bridge?]::bridgeblack,
{casing-width-add: 3;}
line|z18-[railway=rail][bridge?]::bridgeblack,
line|z18-[railway=subway][bridge?]::bridgeblack,
line|z18-[railway=light_rail][bridge?]::bridgeblack,
line|z18-[railway=preserved][bridge?]::bridgeblack,
line|z18-[railway=miniature][bridge?]::bridgeblack,
line|z18-[railway=disused][bridge?]::bridgeblack,
line|z18-[railway=abandoned][bridge?]::bridgeblack,
{casing-width-add: 4.4;}
/* 9.4 Monorail 14-22 ZOOM */

View File

@@ -85,12 +85,8 @@ landuse-cemetery-christian # area z10- (also has icon z
=== 180
amenity-car_wash # area z15- (also has icon z17-, caption(optional) z17-)
amenity-charging_station # area z16- (also has icon z16-, caption(optional) z16-)
amenity-charging_station-bicycle # area z16- (also has icon z16-, caption(optional) z16-)
amenity-charging_station-carless # area z16- (also has icon z16-, caption(optional) z16-)
amenity-charging_station-motorcar # area z15- (also has icon z14-, caption(optional) z14-)
amenity-charging_station-motorcycle # area z16- (also has icon z16-, caption(optional) z16-)
amenity-charging_station-small # area z15- (also has icon z15-, caption(optional) z16-)
amenity-charging_station-motorcar-small # area z15- (also has icon z16-, caption(optional) z16-)
amenity-courthouse # area z15- (also has icon z17-, caption(optional) z17-)
amenity-fire_station # area z15- (also has icon z16-, caption(optional) z17-)
amenity-fuel # area z15- (also has icon z14-, caption(optional) z14-)

View File

@@ -295,10 +295,10 @@ highway-track-tunnel # line z15- (also has line::
highway-construction # line z13- (also has pathtext z15-)
leisure-track # line z15- (also has caption z16-)
railway-abandoned # line z16-
railway-abandoned-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-abandoned-tunnel # line z16-
railway-construction # line z15-
railway-disused # line z16-
railway-disused-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-disused-tunnel # line z16-
railway-miniature # line z16-
railway-miniature-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-miniature-tunnel # line z16-
@@ -354,7 +354,7 @@ highway-track-bridge::bridgewhite # line::bridgewhite z15- (al
highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
railway-disused-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
railway-preserved-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-)
@@ -391,7 +391,7 @@ highway-track-bridge::bridgeblack # line::bridgeblack z17- (al
highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
railway-disused-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-)

View File

@@ -374,13 +374,13 @@ tourism-attraction # icon z14- (also has captio
tourism-gallery # icon z15- (also has caption(optional) z15-)
=== 4300
amenity-charging_station-small # icon z15- (also has caption(optional) z16-, area z15-)
=== 4280
amenity-charging_station-motorcar # icon z14- (also has caption(optional) z14-, area z15-)
amenity-fuel # icon z14- (also has caption(optional) z14-, area z15-)
=== 4270
amenity-charging_station-motorcar-small # icon z16- (also has caption(optional) z16-, area z15-)
=== 4260
highway-services # icon z14- (also has caption(optional) z14-, area z13-)
=== 4250
@@ -424,23 +424,13 @@ highway-rest_area # icon z15- (also has captio
tourism-camp_site # icon z16- (also has caption(optional) z16-, area z13-)
tourism-caravan_site # icon z16- (also has caption(optional) z16-)
tourism-chalet # icon z16- (also has caption(optional) z16-)
=== 3850
shop-car_repair-tyres # icon z15- (also has caption(optional) z15-)
=== 3800
amenity-charging_station-motorcycle # icon z16- (also has caption(optional) z16-, area z16-)
=== 3752
amenity-charging_station-bicycle # icon z16- (also has caption(optional) z16-, area z16-)
=== 3751
amenity-charging_station # icon z16- (also has caption(optional) z16-, area z16-)
amenity-charging_station # icon z16- (also has caption(optional) z16-)
amenity-charging_station-bicycle # icon z16- (also has caption(optional) z16-)
shop-car_repair-tyres # icon z15- (also has caption(optional) z15-)
=== 3750
amenity-charging_station-carless # icon z16- (also has caption(optional) z16-, area z16-)
=== 3749
railway-subway_entrance # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-adana # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-algiers # icon z16- (also has caption(optional) z17-)
@@ -1651,13 +1641,13 @@ leisure-swimming_pool-private # icon z17- (also has captio
# tourism-gallery # caption(optional) z15- (also has icon z15-)
# === -5700
# amenity-charging_station-small # caption(optional) z16- (also has icon z15-, area z15-)
# === -5720
# amenity-charging_station-motorcar # caption(optional) z14- (also has icon z14-, area z15-)
# amenity-fuel # caption(optional) z14- (also has icon z14-, area z15-)
# === -5730
# amenity-charging_station-motorcar-small # caption(optional) z16- (also has icon z16-, area z15-)
# === -5740
# highway-services # caption(optional) z14- (also has icon z14-, area z13-)
# === -5750
@@ -1701,23 +1691,13 @@ leisure-swimming_pool-private # icon z17- (also has captio
# tourism-camp_site # caption(optional) z16- (also has icon z16-, area z13-)
# tourism-caravan_site # caption(optional) z16- (also has icon z16-)
# tourism-chalet # caption(optional) z16- (also has icon z16-)
# === -6150
# shop-car_repair-tyres # caption(optional) z15- (also has icon z15-)
# === -6200
# amenity-charging_station-motorcycle # caption(optional) z16- (also has icon z16-, area z16-)
# === -6248
# amenity-charging_station-bicycle # caption(optional) z16- (also has icon z16-, area z16-)
# === -6249
# amenity-charging_station # caption(optional) z16- (also has icon z16-, area z16-)
# amenity-charging_station # caption(optional) z16- (also has icon z16-)
# amenity-charging_station-bicycle # caption(optional) z16- (also has icon z16-)
# shop-car_repair-tyres # caption(optional) z15- (also has icon z15-)
# === -6250
# amenity-charging_station-carless # caption(optional) z16- (also has icon z16-, area z16-)
# === -6251
# railway-subway_entrance # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-adana # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-algiers # caption(optional) z17- (also has icon z16-)

View File

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@@ -559,18 +559,18 @@ line|z13-[railway=abandoned],
line|z13-[railway=preserved],
line|z13-[railway=miniature],
line|z13-[railway=disused]
line|z13-[railway=abandoned]
{width: 1.6; dashes: 6.3,6.3;}
line|z16-[railway=preserved],
line|z16-[railway=miniature],
line|z16-[railway=disused]
line|z16-[railway=abandoned]
{width: 2.2; dashes: 8,8;}
line|z13-[railway=construction],
line|z13-[railway=abandoned]
line|z13-[railway=disused]
{width: 1; dashes: 1.8,5.5;}
line|z16-[railway=construction],
line|z16-[railway=abandoned]
line|z16-[railway=disused]
{width: 1.7; dashes: 2.5,7;}
line|z12[railway=rail][tunnel?],

View File

@@ -78,7 +78,6 @@ leisure-sports_centre-sport-volleyball # area z13- (also has icon z
leisure-sports_centre-sport-yoga # area z13- (also has icon z16-, caption(optional) z16-)
=== 190
amenity-courthouse # area z15- (also has icon z17-, caption(optional) z17-)
amenity-grave_yard # area z10- (also has icon z17-, caption(optional) z17-)
amenity-grave_yard-christian # area z10- (also has icon z17-, caption(optional) z17-)
landuse-cemetery # area z10- (also has icon z14-, caption(optional) z15-)
@@ -86,12 +85,9 @@ landuse-cemetery-christian # area z10- (also has icon z
=== 180
amenity-car_wash # area z15- (also has icon z17-, caption(optional) z17-)
amenity-charging_station # area z16- (also has icon z16-, caption(optional) z16-)
amenity-charging_station-bicycle # area z16- (also has icon z16-, caption(optional) z16-)
amenity-charging_station-carless # area z16- (also has icon z16-, caption(optional) z16-)
amenity-charging_station-motorcar # area z15- (also has icon z14-, caption(optional) z14-)
amenity-charging_station-motorcycle # area z16- (also has icon z16-, caption(optional) z16-)
amenity-charging_station-small # area z15- (also has icon z15-, caption(optional) z16-)
amenity-charging_station-motorcar-small # area z15- (also has icon z16-, caption(optional) z16-)
amenity-courthouse # area z15- (also has icon z17-, caption(optional) z17-)
amenity-fire_station # area z15- (also has icon z16-, caption(optional) z17-)
amenity-fuel # area z15- (also has icon z14-, caption(optional) z14-)
amenity-marketplace # area z15- (also has icon z16-, caption(optional) z16-)

View File

@@ -297,10 +297,10 @@ highway-track-tunnel # line z11- (also has line::
highway-construction # line z11- (also has pathtext z15-)
leisure-track # line z15- (also has caption z16-)
railway-abandoned # line z13-
railway-abandoned-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-abandoned-tunnel # line z13-
railway-construction # line z13-
railway-disused # line z13-
railway-disused-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-disused-tunnel # line z13-
railway-miniature # line z13-
railway-miniature-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-miniature-tunnel # line z13-
@@ -356,7 +356,7 @@ highway-track-bridge::bridgewhite # line::bridgewhite z15- (al
highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
railway-disused-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
railway-light_rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
railway-preserved-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z16-)
@@ -393,7 +393,7 @@ highway-track-bridge::bridgeblack # line::bridgeblack z17- (al
highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
railway-disused-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z13-, line::dash z16-)
railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z15-)

View File

@@ -374,13 +374,13 @@ tourism-attraction # icon z14- (also has captio
tourism-gallery # icon z15- (also has caption(optional) z15-)
=== 4300
amenity-charging_station-small # icon z15- (also has caption(optional) z16-, area z15-)
=== 4280
amenity-charging_station-motorcar # icon z14- (also has caption(optional) z14-, area z15-)
amenity-fuel # icon z14- (also has caption(optional) z14-, area z15-)
=== 4270
amenity-charging_station-motorcar-small # icon z16- (also has caption(optional) z16-, area z15-)
=== 4260
highway-services # icon z14- (also has caption(optional) z14-, area z13-)
=== 4250
@@ -424,23 +424,13 @@ highway-rest_area # icon z14- (also has captio
tourism-camp_site # icon z13- (also has caption(optional) z13-, area z13-)
tourism-caravan_site # icon z13- (also has caption(optional) z13-)
tourism-chalet # icon z14- (also has caption(optional) z14-)
=== 3850
shop-car_repair-tyres # icon z15- (also has caption(optional) z15-)
=== 3800
amenity-charging_station-motorcycle # icon z16- (also has caption(optional) z16-, area z16-)
=== 3752
amenity-charging_station-bicycle # icon z16- (also has caption(optional) z16-, area z16-)
=== 3751
amenity-charging_station # icon z16- (also has caption(optional) z16-, area z16-)
amenity-charging_station # icon z16- (also has caption(optional) z16-)
amenity-charging_station-bicycle # icon z16- (also has caption(optional) z16-)
shop-car_repair-tyres # icon z15- (also has caption(optional) z15-)
=== 3750
amenity-charging_station-carless # icon z16- (also has caption(optional) z16-, area z16-)
=== 3749
railway-subway_entrance # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-adana # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-algiers # icon z16- (also has caption(optional) z17-)
@@ -1654,13 +1644,13 @@ leisure-swimming_pool-private # icon z17- (also has captio
# tourism-gallery # caption(optional) z15- (also has icon z15-)
# === -5700
# amenity-charging_station-small # caption(optional) z16- (also has icon z15-, area z15-)
# === -5720
# amenity-charging_station-motorcar # caption(optional) z14- (also has icon z14-, area z15-)
# amenity-fuel # caption(optional) z14- (also has icon z14-, area z15-)
# === -5730
# amenity-charging_station-motorcar-small # caption(optional) z16- (also has icon z16-, area z15-)
# === -5740
# highway-services # caption(optional) z14- (also has icon z14-, area z13-)
# === -5750
@@ -1704,23 +1694,13 @@ leisure-swimming_pool-private # icon z17- (also has captio
# tourism-camp_site # caption(optional) z13- (also has icon z13-, area z13-)
# tourism-caravan_site # caption(optional) z13- (also has icon z13-)
# tourism-chalet # caption(optional) z14- (also has icon z14-)
# === -6150
# shop-car_repair-tyres # caption(optional) z15- (also has icon z15-)
# === -6200
# amenity-charging_station-motorcycle # caption(optional) z16- (also has icon z16-, area z16-)
# === -6248
# amenity-charging_station-bicycle # caption(optional) z16- (also has icon z16-, area z16-)
# === -6249
# amenity-charging_station # caption(optional) z16- (also has icon z16-, area z16-)
# amenity-charging_station # caption(optional) z16- (also has icon z16-)
# amenity-charging_station-bicycle # caption(optional) z16- (also has icon z16-)
# shop-car_repair-tyres # caption(optional) z15- (also has icon z15-)
# === -6250
# amenity-charging_station-carless # caption(optional) z16- (also has icon z16-, area z16-)
# === -6251
# railway-subway_entrance # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-adana # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-algiers # caption(optional) z17- (also has icon z16-)

View File

@@ -350,10 +350,9 @@ area|z13-[highway=services],
area|z13-[highway=rest_area],
area|z13-[landuse=garages],
area|z15-[amenity=recycling][recycling_type=centre],
area|z15-[amenity=fuel],
area|z15-[amenity=charging_station][motorcar?],
area|z16-[amenity=charging_station],
area|z15-[amenity=fuel],
area|z15-[amenity=recycling][recycling_type=centre],
area|z17-[amenity=vehicle_inspection],
area|z17-[amenity=car_wash],
area|z17-[amenity=motorcycle_parking],

View File

@@ -630,28 +630,16 @@ node|z17[amenity=fuel],
node|z18-[amenity=fuel],
{icon-image: fuel-m.svg;font-size: 14.5;}
node|z15-[amenity=charging_station][motorcar?],
node|z16-[amenity=charging_station][motorcycle?],
node|z16-[amenity=charging_station][bicycle?],
node|z16-[amenity=charging_station][motorcar=not],
node|z14-[amenity=charging_station][motorcar?][!capacity],
node|z14-[amenity=charging_station][motorcar?][capacity=1],
node|z14-[amenity=charging_station][motorcar?][capacity=2],
node|z16-[amenity=charging_station],
{icon-image: charging_station-small-m.svg;}
{icon-image: charging-point-m.svg;}
node|z14-[amenity=charging_station][motorcar?][capacity?],
{icon-image: charging-station-m.svg;}
node|z14[amenity=charging_station][motorcar?][capacity?],
{icon-image: charging_station-s.svg;}
node|z15-[amenity=charging_station][motorcar?][capacity?],
{icon-image: charging_station-m.svg;}
node|z14[amenity=charging_station][motorcar?][!capacity],
node|z14[amenity=charging_station][motorcar?][capacity=1],
node|z14[amenity=charging_station][motorcar?][capacity=2],
{icon-image: none;}
node|z15-[amenity=charging_station][motorcar?][!capacity],
node|z15-[amenity=charging_station][motorcar?][capacity=1],
node|z15-[amenity=charging_station][motorcar?][capacity=2],
{icon-image: charging_station-small-m.svg;}
node|z14[amenity=charging_station][motorcar?],
{text-offset: 1;font-size: 12.25;icon-min-distance: 20;}
node|z15[amenity=charging_station][motorcar?],
{icon-min-distance: 20;font-size: 12.5;}

View File

@@ -743,7 +743,7 @@ line|z14-[railway=subway][bridge?]::bridgewhite,
line|z14-[railway=light_rail][bridge?]::bridgewhite,
line|z16-[railway=preserved][bridge?]::bridgewhite,
line|z16-[railway=miniature][bridge?]::bridgewhite,
line|z16-[railway=disused][bridge?]::bridgewhite,
line|z16-[railway=abandoned][bridge?]::bridgewhite,
line|z16-[railway=tram][bridge?]::bridgewhite,
{casing-linecap: butt;casing-color:@bridge_background; opacity: 0.8;}
line|z16-[railway=rail][bridge?]::bridgeblack,
@@ -751,7 +751,7 @@ line|z16-[railway=subway][bridge?]::bridgeblack,
line|z16-[railway=light_rail][bridge?]::bridgeblack,
line|z16-[railway=preserved][bridge?]::bridgeblack,
line|z16-[railway=miniature][bridge?]::bridgeblack,
line|z16-[railway=disused][bridge?]::bridgeblack,
line|z16-[railway=abandoned][bridge?]::bridgeblack,
line|z16-[railway=tram][bridge?]::bridgeblack,
{casing-linecap: butt;casing-color:@bridge_casing; opacity: 0.6;}
@@ -915,11 +915,11 @@ line|z19-[railway=light_rail][!tunnel]::dash,
line|z16-[railway=preserved],
line|z16-[railway=miniature],
line|z16-[railway=disused]
line|z16-[railway=abandoned]
{width: 1.6;dashes: 6.3,6.3;}
line|z16-[railway=construction],
line|z16-[railway=abandoned]
line|z16-[railway=disused]
{width: 1;dashes: 1.8,5.4;}
line|z17-[railway=turntable],
@@ -954,21 +954,21 @@ line|z16[railway=subway][bridge?]::bridgewhite,
line|z16[railway=light_rail][bridge?]::bridgewhite,
line|z16[railway=preserved][bridge?]::bridgewhite,
line|z16[railway=miniature][bridge?]::bridgewhite,
line|z16[railway=disused][bridge?]::bridgewhite,
line|z16[railway=abandoned][bridge?]::bridgewhite,
{casing-width-add: 1.6;}
line|z17[railway=rail][bridge?]::bridgewhite,
line|z17[railway=subway][bridge?]::bridgewhite,
line|z17[railway=light_rail][bridge?]::bridgewhite,
line|z17[railway=preserved][bridge?]::bridgewhite,
line|z17[railway=miniature][bridge?]::bridgewhite,
line|z17[railway=disused][bridge?]::bridgewhite,
line|z17[railway=abandoned][bridge?]::bridgewhite,
{casing-width-add: 2.3;}
line|z18-[railway=rail][bridge?]::bridgewhite,
line|z18-[railway=subway][bridge?]::bridgewhite,
line|z18-[railway=light_rail][bridge?]::bridgewhite,
line|z18-[railway=preserved][bridge?]::bridgewhite,
line|z18-[railway=miniature][bridge?]::bridgewhite,
line|z18-[railway=disused][bridge?]::bridgewhite,
line|z18-[railway=abandoned][bridge?]::bridgewhite,
{casing-width-add: 3.5;}
line|z16[railway=rail][bridge?]::bridgeblack,
@@ -976,21 +976,21 @@ line|z16[railway=subway][bridge?]::bridgeblack,
line|z16[railway=light_rail][bridge?]::bridgeblack,
line|z16[railway=preserved][bridge?]::bridgeblack,
line|z16[railway=miniature][bridge?]::bridgeblack,
line|z16[railway=disused][bridge?]::bridgeblack,
line|z16[railway=abandoned][bridge?]::bridgeblack,
{casing-width-add: 2.2;}
line|z17[railway=rail][bridge?]::bridgeblack,
line|z17[railway=subway][bridge?]::bridgeblack,
line|z17[railway=light_rail][bridge?]::bridgeblack,
line|z17[railway=preserved][bridge?]::bridgeblack,
line|z17[railway=miniature][bridge?]::bridgeblack,
line|z17[railway=disused][bridge?]::bridgeblack,
line|z17[railway=abandoned][bridge?]::bridgeblack,
{casing-width-add: 3;}
line|z18-[railway=rail][bridge?]::bridgeblack,
line|z18-[railway=subway][bridge?]::bridgeblack,
line|z18-[railway=light_rail][bridge?]::bridgeblack,
line|z18-[railway=preserved][bridge?]::bridgeblack,
line|z18-[railway=miniature][bridge?]::bridgeblack,
line|z18-[railway=disused][bridge?]::bridgeblack,
line|z18-[railway=abandoned][bridge?]::bridgeblack,
{casing-width-add: 4.4;}
/* 9.4 Monorail 14-22 ZOOM */

View File

@@ -33,12 +33,8 @@ amenity-parking-street_side-private # area z15- (also has icon z
=== 160
amenity-car_wash # area z17- (also has icon z17-, caption(optional) z17-)
amenity-charging_station # area z16- (also has icon z16-, caption(optional) z16-)
amenity-charging_station-bicycle # area z16- (also has icon z16-, caption(optional) z16-)
amenity-charging_station-carless # area z16- (also has icon z16-, caption(optional) z16-)
amenity-charging_station-motorcar # area z15- (also has icon z14-, caption(optional) z14-)
amenity-charging_station-motorcycle # area z16- (also has icon z16-, caption(optional) z16-)
amenity-charging_station-small # area z15- (also has icon z15-, caption(optional) z16-)
amenity-charging_station-motorcar-small # area z15- (also has icon z16-, caption(optional) z16-)
amenity-fuel # area z15- (also has icon z12-, caption(optional) z12-)
amenity-recycling-centre # area z15- (also has icon z16-, caption(optional) z16-)
amenity-vehicle_inspection # area z17- (also has icon z17-)

View File

@@ -272,10 +272,10 @@ highway-track-no-access # line z16-
highway-construction # line z13-
railway-abandoned # line z16-
railway-abandoned-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-abandoned-tunnel # line z16-
railway-construction # line z16-
railway-disused # line z16-
railway-disused-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-disused-tunnel # line z16-
railway-miniature # line z16-
railway-miniature-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-miniature-tunnel # line z16-
@@ -297,7 +297,7 @@ highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (al
highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield::shield z10-)
highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z14-)
railway-disused-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
railway-light_rail-bridge::bridgewhite # line::bridgewhite z14- (also has line z13-, line::bridgeblack z16-, line::dash z16-)
railway-miniature-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
railway-preserved-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
@@ -324,7 +324,7 @@ highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (al
highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-)
highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z14-)
railway-disused-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
railway-light_rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z14-, line::dash z16-)
railway-miniature-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)

View File

@@ -170,28 +170,17 @@ aeroway-aerodrome-international # icon z7- (also has caption
place-town # caption z8-
=== 3250
amenity-charging_station-small # icon z15- (also has caption(optional) z16-, area z15-)
=== 3210
amenity-charging_station-motorcar # icon z14- (also has caption(optional) z14-, area z15-)
amenity-fuel # icon z12- (also has caption(optional) z12-, area z15-)
=== 3200
amenity-charging_station-motorcar-small # icon z16- (also has caption(optional) z16-, area z15-)
=== 3190
amenity-charging_station # icon z16- (also has caption(optional) z16-)
amenity-vending_machine-fuel # icon z17- (also has caption(optional) z17-)
=== 3153
amenity-charging_station-motorcycle # icon z16- (also has caption(optional) z16-, area z16-)
=== 3152
amenity-charging_station-bicycle # icon z16- (also has caption(optional) z16-, area z16-)
=== 3151
amenity-charging_station # icon z16- (also has caption(optional) z16-, area z16-)
=== 3150
amenity-charging_station-carless # icon z16- (also has caption(optional) z16-, area z16-)
=== 3149
railway-station-subway-moscow # icon z11-15 (also has caption(optional) z15)
railway-station-subway-spb # icon z11-16 (also has caption(optional) z15-16)
=== 3100
@@ -540,6 +529,9 @@ natural-beach-gravel # caption z15- (also has are
natural-beach-sand # caption z15- (also has area z10-)
=== 900
amenity-charging_station-bicycle # icon z16- (also has caption(optional) z16-)
=== 850
historic-boundary_stone # icon z16- (also has caption(optional) z16-)
historic-gallows # icon z16- (also has caption(optional) z16-)
historic-pillory # icon z16- (also has caption(optional) z16-)
@@ -793,28 +785,17 @@ entrance-emergency # icon z19- (also has captio
# aeroway-aerodrome-international # caption(optional) z10- (also has icon z7-, area z10-)
# === -6700
# amenity-charging_station-small # caption(optional) z16- (also has icon z15-, area z15-)
# === -6790
# amenity-charging_station-motorcar # caption(optional) z14- (also has icon z14-, area z15-)
# amenity-fuel # caption(optional) z12- (also has icon z12-, area z15-)
# === -6800
# amenity-charging_station-motorcar-small # caption(optional) z16- (also has icon z16-, area z15-)
# === -6810
# amenity-charging_station # caption(optional) z16- (also has icon z16-)
# amenity-vending_machine-fuel # caption(optional) z17- (also has icon z17-)
# === -6847
# amenity-charging_station-motorcycle # caption(optional) z16- (also has icon z16-, area z16-)
# === -6848
# amenity-charging_station-bicycle # caption(optional) z16- (also has icon z16-, area z16-)
# === -6849
# amenity-charging_station # caption(optional) z16- (also has icon z16-, area z16-)
# === -6850
# amenity-charging_station-carless # caption(optional) z16- (also has icon z16-, area z16-)
# === -6851
# railway-station-subway-moscow # caption(optional) z15 (also has icon z11-15)
# railway-station-subway-spb # caption(optional) z15-16 (also has icon z11-16)
# === -6900
@@ -1077,6 +1058,9 @@ entrance-emergency # icon z19- (also has captio
# amenity-hospital # caption(optional) z15- (also has icon z15-)
# === -9000
# amenity-charging_station-bicycle # caption(optional) z16- (also has icon z16-)
# === -9150
# historic-boundary_stone # caption(optional) z16- (also has icon z16-)
# historic-gallows # caption(optional) z16- (also has icon z16-)
# historic-pillory # caption(optional) z16- (also has icon z16-)

View File

@@ -2896,8 +2896,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
{{"place", "state", "USA"}, {{"place", "state"}, {"is_in", "USA"}}},
{{"place", "state", "USA"}, {{"place", "state"}, {"is_in:country", "USA"}}},
{{"place", "state", "USA"}, {{"place", "state"}, {"is_in:country_code", "us"}}},
{{"railway", "disused", "bridge"}, {{"railway", "disused"}, {"bridge", "any_value"}}},
{{"railway", "disused", "tunnel"}, {{"railway", "disused"}, {"tunnel", "any_value"}}},
{{"railway", "abandoned", "bridge"}, {{"railway", "abandoned"}, {"bridge", "any_value"}}},
{{"railway", "abandoned", "tunnel"}, {{"railway", "abandoned"}, {"tunnel", "any_value"}}},
{{"railway", "funicular", "bridge"}, {{"railway", "funicular"}, {"bridge", "any_value"}}},
{{"railway", "funicular", "tunnel"}, {{"railway", "funicular"}, {"tunnel", "any_value"}}},
{{"railway", "light_rail", "bridge"}, {{"railway", "light_rail"}, {"bridge", "any_value"}}},

View File

@@ -351,11 +351,6 @@ private:
// - both amenity-charging_station-motorcar and amenity-charging_station-bicycle are left;
void LeaveLongestTypes(std::vector<generator::TypeStrings> & matchedTypes)
{
auto const isChargingStation = [](auto const & lhs, auto const & rhs)
{
return lhs.size() > 1 && rhs.size() > 1 && lhs.at(1) == "charging_station" && rhs.at(1) == "charging_station" && lhs.at(0) == "amenity" && rhs.at(0) == "amenity";
};
auto const equalPrefix = [](auto const & lhs, auto const & rhs)
{
size_t const prefixSz = std::min(lhs.size(), rhs.size());
@@ -374,11 +369,8 @@ void LeaveLongestTypes(std::vector<generator::TypeStrings> & matchedTypes)
return lhs < rhs;
};
auto const isEqual = [&equalPrefix, &isChargingStation](auto const & lhs, auto const & rhs)
auto const isEqual = [&equalPrefix](auto const & lhs, auto const & rhs)
{
if (isChargingStation(lhs, rhs))
return false;
if (equalPrefix(lhs, rhs))
{
// Keep longest type only, so return equal is true.

View File

@@ -32,7 +32,7 @@ NSDate * _Nullable ParseDateString(NSString * _Nullable dateString) {
dateFormatter = [[NSDateFormatter alloc] init];
dateFormatter.dateFormat = @"yyyy-MM-dd";
dateFormatter.locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"];
dateFormatter.timeZone = [NSTimeZone localTimeZone];
dateFormatter.timeZone = [NSTimeZone timeZoneWithAbbreviation:@"UTC"];
});
return [dateFormatter dateFromString:dateString];

View File

@@ -19,9 +19,6 @@ NS_SWIFT_NAME(SettingsBridge)
+ (BOOL)zoomButtonsEnabled;
+ (void)setZoomButtonsEnabled:(BOOL)zoomButtonsEnabled;
+ (BOOL)compassCalibrationEnabled;
+ (void)setCompassCalibrationEnabled:(BOOL)compassCalibrationEnabled;
+ (MWMTheme)theme;
+ (void)setTheme:(MWMTheme)theme;

View File

@@ -12,7 +12,6 @@ namespace
{
char const * kAutoDownloadEnabledKey = "AutoDownloadEnabled";
char const * kZoomButtonsEnabledKey = "ZoomButtonsEnabled";
char const * kCompassCalibrationEnabledKey = "CompassCalibrationEnabled";
char const * kMapLanguageCode = "MapLanguageCode";
char const * kRoutingDisclaimerApprovedKey = "IsDisclaimerApproved";
@@ -116,18 +115,6 @@ NSString * const kUDFileLoggingEnabledKey = @"FileLoggingEnabledKey";
[MWMMapViewControlsManager manager].zoomHidden = !zoomButtonsEnabled;
}
+ (BOOL)compassCalibrationEnabled
{
bool enabled = true;
UNUSED_VALUE(settings::Get(kCompassCalibrationEnabledKey, enabled));
return enabled;
}
+ (void)setCompassCalibrationEnabled:(BOOL)compassCalibrationEnabled
{
settings::Set(kCompassCalibrationEnabledKey, static_cast<bool>(compassCalibrationEnabled));
}
+ (MWMTheme)theme
{
if ([MWMCarPlayService shared].isCarplayActivated) {

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "E-posstuurfout";
/* Settings item title */
"pref_calibration_title" = "Kompaskalibrering";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Langtik weer op die kaart om die koppelvlak te sien";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "حدث خطأ في إرسال البريد الإلكتروني";
/* Settings item title */
"pref_calibration_title" = "معايرة البوصلة";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "اضغط مطولاً على الخريطة مرة أخرى لرؤية الواجهة";

View File

@@ -333,9 +333,6 @@
/* Alert title */
"email_error_title" = "E-poçt göndərmə xətası";
/* Settings item title */
"pref_calibration_title" = "Kompas kalibrlənməsi";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "İnterfeysi görmək üçün yenidən xəritəyə uzun müddət toxunun";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "Памылка пры адпраўцы пошты";
/* Settings item title */
"pref_calibration_title" = "Каліброўка компаса";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Паўторнае працяглае націсканне верне бачнасць інтэрфейсу";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "Грешка при изпращане на поща";
/* Settings item title */
"pref_calibration_title" = "Калибриране на компас";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Докоснете отново картата, за да видите интерфейса";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "S'ha produït un error en enviar el correu";
/* Settings item title */
"pref_calibration_title" = "Calibratge de la brúixola";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Toqueu llargament el mapa de nou per veure la interfície";

View File

@@ -336,9 +336,6 @@
/* Alert title */
"email_error_title" = "Chyba při odesílání emailu";
/* Settings item title */
"pref_calibration_title" = "Kalibrace kompasu";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Dlouhým klepnutím na mapu znovu zobrazíte rozhraní";

View File

@@ -333,9 +333,6 @@
/* Alert title */
"email_error_title" = "Mailforsendelsesfejl";
/* Settings item title */
"pref_calibration_title" = "Kalibrering af kompas";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Tryk længe på kortet igen for at se grænsefladen";

View File

@@ -336,9 +336,6 @@
/* Alert title */
"email_error_title" = "Fehler beim E-Mail-Versand";
/* Settings item title */
"pref_calibration_title" = "Kompass-Kalibrierung";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Tippe erneut lange auf die Karte, um die Benutzeroberfläche wiederzusehen";

View File

@@ -43,10 +43,9 @@
"type.leisure.adult_gaming_centre" = "Spielhalle für Erwachsene";
"type.leisure.amusement_arcade" = "Spielhalle für Unterhaltungsspiele";
"type.amenity.charging_station" = "Ladestation";
"type.amenity.charging_station.motorcar" = "Autos";
"type.amenity.charging_station.motorcycle" = "Motorräder";
"type.amenity.charging_station.bicycle" = "Fahrräder";
"type.amenity.charging_station.small" = "Begrenzte Kapazität";
"type.amenity.charging_station.bicycle" = "Fahrrad-Ladestation";
"type.amenity.charging_station.motorcar" = "Kfz-Ladestation";
"type.amenity.charging_station.motorcar.small" = "Kfz-Ladestation";
"type.amenity.childcare" = "Kindertagesstätte";
"type.amenity.cinema" = "Kino";
"type.leisure.bowling_alley" = "Bowlingbahn";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "Σφάλμα κατά την αποστολή του e-mail";
/* Settings item title */
"pref_calibration_title" = "Καλιμπράρισμα πυξίδας";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Πατήστε ξανά παρατεταμένα στο χάρτη για να δείτε το περιβάλλον εργασίας";

View File

@@ -352,9 +352,6 @@
/* Alert title */
"email_error_title" = "Error sending email";
/* Settings item title */
"pref_calibration_title" = "Compass calibration";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Long-tap on the map again to see the interface";

View File

@@ -48,10 +48,9 @@
"type.leisure.adult_gaming_centre" = "Adult Gaming Centre";
"type.leisure.amusement_arcade" = "Arcade";
"type.amenity.charging_station" = "Charging Station";
"type.amenity.charging_station.motorcar" = "Cars";
"type.amenity.charging_station.motorcycle" = "Motorcycles";
"type.amenity.charging_station.bicycle" = "Bicycles";
"type.amenity.charging_station.small" = "Limited Capacity";
"type.amenity.charging_station.bicycle" = "Bicycle Charging Station";
"type.amenity.charging_station.motorcar" = "Car Charging Station";
"type.amenity.charging_station.motorcar.small" = "Car Charging Point";
"type.amenity.childcare" = "Nursery";
"type.amenity.cinema" = "Cinema";
"type.leisure.bowling_alley" = "Bowling Alley";

View File

@@ -363,9 +363,6 @@
/* Alert title */
"email_error_title" = "Error sending email";
/* Settings item title */
"pref_calibration_title" = "Compass calibration";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Long-tap on the map again to see the interface";

View File

@@ -55,10 +55,9 @@
"type.leisure.adult_gaming_centre" = "Adult Gaming Centre";
"type.leisure.amusement_arcade" = "Arcade";
"type.amenity.charging_station" = "Charging Station";
"type.amenity.charging_station.motorcar" = "Cars";
"type.amenity.charging_station.motorcycle" = "Motorcycles";
"type.amenity.charging_station.bicycle" = "Bicycles";
"type.amenity.charging_station.small" = "Limited Capacity";
"type.amenity.charging_station.bicycle" = "Bicycle Charging Station";
"type.amenity.charging_station.motorcar" = "Car Charging Station";
"type.amenity.charging_station.motorcar.small" = "Car Charging Point";
"type.amenity.childcare" = "Nursery";
"type.amenity.cinema" = "Cinema";
"type.leisure.bowling_alley" = "Bowling Alley";
@@ -1025,11 +1024,11 @@
"type.public_transport.platform" = "Platform";
"type.railway" = "Railway";
"type.railway.abandoned" = "Abandoned Railway";
"type.railway.abandoned.bridge" = "Abandoned Railway Bridge";
"type.railway.abandoned.tunnel" = "Abandoned Railway Tunnel";
"type.railway.construction" = "Railway Construction";
"type.railway.crossing" = "Railway Crossing";
"type.railway.disused" = "Disused Railway";
"type.railway.disused.bridge" = "Disused Railway Bridge";
"type.railway.disused.tunnel" = "Disused Railway Tunnel";
"type.railway.funicular" = "Funicular";
"type.railway.funicular.bridge" = "Funicular Bridge";
"type.railway.funicular.tunnel" = "Funicular Tunnel";

View File

@@ -336,9 +336,6 @@
/* Alert title */
"email_error_title" = "Error de envío de correo";
/* Settings item title */
"pref_calibration_title" = "Calibración de la brújula";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Vuelve a pulsar prolongadamente sobre el mapa para ver la interfaz";

View File

@@ -336,9 +336,6 @@
/* Alert title */
"email_error_title" = "Error de envío de correo";
/* Settings item title */
"pref_calibration_title" = "Calibración de la brújula";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Vuelva a pulsar prolongadamente sobre el mapa para ver la interfaz";

View File

@@ -333,9 +333,6 @@
/* Alert title */
"email_error_title" = "Viga teate saatmisel";
/* Settings item title */
"pref_calibration_title" = "Kompassi kalibreerimine";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Kasutajaliidese nägemiseks vajuta kaarti pikalt";

View File

@@ -333,9 +333,6 @@
/* Alert title */
"email_error_title" = "Errore bat mezua bidaltzean";
/* Settings item title */
"pref_calibration_title" = "Iparrorratzaren kalibrazioa";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Sakatu luze berriro mapan interfazea ikusteko";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "خطا در ارسال ایمیل";
/* Settings item title */
"pref_calibration_title" = "تنظیم کردن قطب نما";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "دوباره روی نقشه ضربه طولانی بزنید تا رابط کاربری را ببینید";

View File

@@ -336,9 +336,6 @@
/* Alert title */
"email_error_title" = "Virhe lähetettäessä viestiä";
/* Settings item title */
"pref_calibration_title" = "Kompassin kalibrointi";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Paina karttaa pitkään uudelleen nähdäksesi käyttöliittymän";

View File

@@ -336,9 +336,6 @@
/* Alert title */
"email_error_title" = "Erreur denvoi de courriel";
/* Settings item title */
"pref_calibration_title" = "Étalonnage de la boussole";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Appuyez à nouveau longuement sur la carte pour voir linterface";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "שגיאה בשליחת דוא\"ל";
/* Settings item title */
"pref_calibration_title" = "כיול המצפן";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "לחץ לחיצה ארוכה במפה כדי להציג את הממשק";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "ईमेल भेजने में त्रुटि";
/* Settings item title */
"pref_calibration_title" = "कम्पास अंशांकन";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "इंटरफ़ेस देखने के लिए मानचित्र पर फिर से देर तक टैप करें";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "Hiba az e-mail küldése során";
/* Settings item title */
"pref_calibration_title" = "Iránytű kalibrálása";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Érintse meg újra hosszan a térképet a kezelőfelület megjelenítéséhez";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "Gangguan pengiriman surel";
/* Settings item title */
"pref_calibration_title" = "Kalibrasi kompas";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Ketuk lama pada peta sekali lagi untuk melihat antarmuka";

View File

@@ -336,9 +336,6 @@
/* Alert title */
"email_error_title" = "Errore invio e-mail";
/* Settings item title */
"pref_calibration_title" = "Calibrazione bussola";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Tocca di nuovo a lungo sulla mappa per visualizzare l'interfaccia";

View File

@@ -336,9 +336,6 @@
/* Alert title */
"email_error_title" = "メール送信エラー";
/* Settings item title */
"pref_calibration_title" = "コンパスの調整";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "インターフェイスを見るには、もう一度地図をロングタップする";

View File

@@ -329,9 +329,6 @@
/* Alert title */
"email_error_title" = "메일 전송 중 오류";
/* Settings item title */
"pref_calibration_title" = "나침반 보정";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "지도를 다시 길게 탭하면 인터페이스가 표시됩니다.";

View File

@@ -333,9 +333,6 @@
/* Alert title */
"email_error_title" = "Klaida siunčiant laišką";
/* Settings item title */
"pref_calibration_title" = "Kompaso kalibravimas";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Bakstelėkite ir palaikykite žemėlapį vėl, kad pamatytumėte sąsają";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "Kļūda, nosūtot vēstuli";
/* Settings item title */
"pref_calibration_title" = "Kompasa kalibrēšana";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Vēlreiz piespiediet un paturiet uz kartes, lai redzētu saskarni";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "मेल पाठवताना त्रुटी";
/* Settings item title */
"pref_calibration_title" = "होकायंत्र अंशशोधन";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "इंटरफेस पाहण्यासाठी पुन्हा नकाशावर दीर्घ टॅप करा";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "Żball meta bgħatt e-mejl";
/* Settings item title */
"pref_calibration_title" = "Kalibrazzjoni tal-boxxla";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Itteppja fit-tul darb oħra fuq il-mappa biex tara l-interface";

View File

@@ -333,9 +333,6 @@
/* Alert title */
"email_error_title" = "Feil ved sending av e-post";
/* Settings item title */
"pref_calibration_title" = "Kompasskalibrering";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Trykk lenge på kartet igjen for å se grensesnittet";

View File

@@ -336,9 +336,6 @@
/* Alert title */
"email_error_title" = "E-mail verzendfout";
/* Settings item title */
"pref_calibration_title" = "Kompaskalibratie";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Tik nogmaals lang op de kaart om de interface te zien";

View File

@@ -333,9 +333,6 @@
/* Alert title */
"email_error_title" = "Błąd wysyłania wiadomości";
/* Settings item title */
"pref_calibration_title" = "Kalibracja kompasu";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Ponownie dotknij długo mapy, aby wyświetlić interfejs";

View File

@@ -336,9 +336,6 @@
/* Alert title */
"email_error_title" = "Erro no envio de email";
/* Settings item title */
"pref_calibration_title" = "Calibração da bússola";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Dê um toque longo no mapa novamente para ver a interface";

View File

@@ -333,9 +333,6 @@
/* Alert title */
"email_error_title" = "Erro ao enviar o email";
/* Settings item title */
"pref_calibration_title" = "Calibração da bússola";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Dê um toque longo no mapa novamente para ver a interface";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "Eroare de trimitere e-mail";
/* Settings item title */
"pref_calibration_title" = "Calibrare busolă";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Atingeți lung pe hartă din nou pentru a vedea interfața";

View File

@@ -336,9 +336,6 @@
/* Alert title */
"email_error_title" = "Ошибка при отправлении письма";
/* Settings item title */
"pref_calibration_title" = "Калибровка компаса";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Долгое нажатие на карту вернет интерфейс обратно";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "Chyba pri odosielaní emailu";
/* Settings item title */
"pref_calibration_title" = "Kalibrácia kompasu";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Opätovným dlhým ťuknutím na mapu zobrazíte rozhranie";

View File

@@ -333,9 +333,6 @@
/* Alert title */
"email_error_title" = "Грешка приликом слања email-а";
/* Settings item title */
"pref_calibration_title" = "Калибрација компаса";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Додирните дуго мапу да бисте поново видели интерфејс";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "Fel när mailet skulle skickas";
/* Settings item title */
"pref_calibration_title" = "Kompasskalibrering";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Tryck länge på kartan för att se gränssnittet";

View File

@@ -320,9 +320,6 @@
/* Alert title */
"email_error_title" = "Error sending email";
/* Settings item title */
"pref_calibration_title" = "Compass calibration";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Gusa kwa muda mrefu kwenye ramani tena ili kuona kiolesura";

View File

@@ -330,9 +330,6 @@
/* Alert title */
"email_error_title" = "จดหมายที่ส่งเกิดความผิดพลาด";
/* Settings item title */
"pref_calibration_title" = "การปรับเทียบเข็มทิศ";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "แตะยาวบนแผนที่อีกครั้งเพื่อดูอินเทอร์เฟซ";

View File

@@ -336,9 +336,6 @@
/* Alert title */
"email_error_title" = "E-Posta gönderme hatası";
/* Settings item title */
"pref_calibration_title" = "Pusula kalibrasyonu";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Seçenekleri görmek için haritaya tekrar basılı tutun";

View File

@@ -333,9 +333,6 @@
/* Alert title */
"email_error_title" = "Помилка при відправленні листа";
/* Settings item title */
"pref_calibration_title" = "Калібрування компаса";
/* Toast text when user hides UI with a long tap anywhere on the map */
"long_tap_toast" = "Ще раз потримайте палець на карті, щоб побачити інтерфейс";

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