forked from organicmaps/organicmaps
Merge branch 'organicmaps:master' into patch-1
This commit is contained in:
IYYAPPAN R
GitHub
commit
d87bb46903
96 changed files with 1872 additions and 415 deletions
|
|
@ -158,8 +158,8 @@ android {
|
|||
targetSdkVersion propTargetSdkVersion.toInteger()
|
||||
applicationId project.ext.appId
|
||||
buildConfigField 'String', 'SUPPORT_MAIL', '"android@organicmaps.app"'
|
||||
buildConfigField 'String', 'REVIEW_URL', '"https://organicmaps.app/donate/"'
|
||||
buildConfigField 'int', 'RATING_THRESHOLD', '5'
|
||||
// Should be customized in flavors.
|
||||
buildConfigField 'String', 'REVIEW_URL', '""'
|
||||
|
||||
multiDexEnabled true
|
||||
multiDexKeepFile file('multidex-config.txt')
|
||||
|
|
|
|||
|
|
@ -704,8 +704,10 @@
|
|||
<string name="enable_show_on_lock_screen_description">Калі ўключана, вам не трэба разблакіраваць прыладу кожны раз падчас працы дадатку.</string>
|
||||
<!-- OpenStreetMap text on splash screen -->
|
||||
<string name="splash_subtitle">Дадзеныя карты з OpenStreetMap</string>
|
||||
<!-- Telegram group url for the help page -->
|
||||
<!-- Telegram group url for the "?" About page -->
|
||||
<string name="telegram_url">https://t.me/OrganicMapsRu</string>
|
||||
<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
|
||||
<string name="translated_om_site_url">https://organicmaps.app/ru/</string>
|
||||
|
||||
<!-- SECTION: Types -->
|
||||
<string name="type.amenity.bicycle_parking">Велапаркоўка</string>
|
||||
|
|
|
|||
|
|
@ -664,7 +664,7 @@
|
|||
<string name="enable_screen_sleep_description">درصورت فعال بودن ، بعد از یک دوره عدم فعالیت به صفحه اجازه خواب داده می شود.</string>
|
||||
<!-- OpenStreetMap text on splash screen -->
|
||||
<string name="splash_subtitle">OpenStreetMap ﺯﺍ ﻪﺸﻘﻧ ﯼﺎﻫ ﻩﺩﺍﺩ</string>
|
||||
<!-- Telegram group url for the help page -->
|
||||
<!-- Telegram group url for the "?" About page -->
|
||||
<string name="telegram_url">https://t.me/OrganicMapsIR</string>
|
||||
|
||||
<!-- SECTION: Types -->
|
||||
|
|
|
|||
|
|
@ -692,6 +692,8 @@
|
|||
<string name="enable_show_on_lock_screen_description">Quando è abilitata, non è necessario sbloccare il dispositivo ogni volta mentre l\'app è in esecuzione.</string>
|
||||
<!-- OpenStreetMap text on splash screen -->
|
||||
<string name="splash_subtitle">Dati della mappa da OpenStreetMap</string>
|
||||
<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
|
||||
<string name="translated_om_site_url">https://organicmaps.app/it/</string>
|
||||
|
||||
<!-- SECTION: Types -->
|
||||
<string name="type.aerialway">Impianto a fune</string>
|
||||
|
|
|
|||
|
|
@ -722,8 +722,10 @@
|
|||
<string name="enable_show_on_lock_screen_description">Если эта функция включена, вам не нужно каждый раз разблокировать устройство во время работы приложения.</string>
|
||||
<!-- OpenStreetMap text on splash screen -->
|
||||
<string name="splash_subtitle">Картографические данные из OpenStreetMap</string>
|
||||
<!-- Telegram group url for the help page -->
|
||||
<!-- Telegram group url for the "?" About page -->
|
||||
<string name="telegram_url">https://t.me/OrganicMapsRu</string>
|
||||
<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
|
||||
<string name="translated_om_site_url">https://organicmaps.app/ru/</string>
|
||||
|
||||
<!-- SECTION: Types -->
|
||||
<string name="type.aerialway">Канатная дорога</string>
|
||||
|
|
|
|||
|
|
@ -711,10 +711,12 @@
|
|||
<string name="enable_show_on_lock_screen_description">Etkinleştirildiğinde, uygulama çalışırken her seferinde cihazınızın kilidini açmanıza gerek kalmaz.</string>
|
||||
<!-- OpenStreetMap text on splash screen -->
|
||||
<string name="splash_subtitle">Harita verileri OpenStreetMap\'ten</string>
|
||||
<!-- Telegram group url for the help page -->
|
||||
<!-- Telegram group url for the "?" About page -->
|
||||
<string name="telegram_url">https://t.me/OrganicMapsTR</string>
|
||||
<!-- Instagram account url for the help page -->
|
||||
<!-- Instagram account url for the "?" About page -->
|
||||
<string name="instagram_url">https://www.instagram.com/organicmapstr</string>
|
||||
<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
|
||||
<string name="translated_om_site_url">https://organicmaps.app/tr/</string>
|
||||
|
||||
<!-- SECTION: Types -->
|
||||
<string name="type.aerialway">Teleferik</string>
|
||||
|
|
|
|||
|
|
@ -60,7 +60,4 @@
|
|||
<string name="always_enum_value" translatable="false">ALWAYS</string>
|
||||
<string name="auto_enum_value" translatable="false">AUTO</string>
|
||||
<string name="placepage_behavior" translatable="false">com.google.android.material.bottomsheet.BottomSheetBehavior</string>
|
||||
|
||||
<string name="privacy_policy_url" translatable="false">https://organicmaps.app/privacy</string>
|
||||
<string name="terms_of_use_url" translatable="false">https://organicmaps.app/terms</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -738,10 +738,12 @@
|
|||
<string name="enable_show_on_lock_screen_description">When enabled, you don\'t need to unlock your device every time while the app is running.</string>
|
||||
<!-- OpenStreetMap text on splash screen -->
|
||||
<string name="splash_subtitle">Map data from OpenStreetMap</string>
|
||||
<!-- Telegram group url for the help page -->
|
||||
<!-- Telegram group url for the "?" About page -->
|
||||
<string name="telegram_url">https://t.me/OrganicMapsApp</string>
|
||||
<!-- Instagram account url for the help page -->
|
||||
<!-- Instagram account url for the "?" About page -->
|
||||
<string name="instagram_url">https://www.instagram.com/organicmaps.app</string>
|
||||
<!-- Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content -->
|
||||
<string name="translated_om_site_url">https://organicmaps.app/</string>
|
||||
|
||||
<!-- SECTION: Types -->
|
||||
<string name="type.aerialway">Aerialway</string>
|
||||
|
|
|
|||
|
|
@ -88,7 +88,10 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
|
|||
setupItem(R.id.donate, true, root);
|
||||
setupItem(R.id.support_us, true, root);
|
||||
}
|
||||
setupItem(R.id.rate, true, root);
|
||||
if (BuildConfig.REVIEW_URL.isEmpty())
|
||||
root.findViewById(R.id.rate).setVisibility(View.GONE);
|
||||
else
|
||||
setupItem(R.id.rate, true, root);
|
||||
setupItem(R.id.copyright, false, root);
|
||||
View termOfUseView = root.findViewById(R.id.term_of_use_link);
|
||||
View privacyPolicyView = root.findViewById(R.id.privacy_policy);
|
||||
|
|
@ -105,12 +108,12 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
|
|||
|
||||
private void onPrivacyPolicyClick()
|
||||
{
|
||||
openLink(getResources().getString(R.string.privacy_policy_url));
|
||||
openLink(getResources().getString(R.string.translated_om_site_url) + "policy/");
|
||||
}
|
||||
|
||||
private void onTermOfUseClick()
|
||||
{
|
||||
openLink(getResources().getString(R.string.terms_of_use_url));
|
||||
openLink(getResources().getString(R.string.translated_om_site_url) + "terms/");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -118,9 +121,9 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
|
|||
{
|
||||
final int id = v.getId();
|
||||
if (id == R.id.web)
|
||||
openLink(Constants.Url.WEB_SITE);
|
||||
openLink(getResources().getString(R.string.translated_om_site_url));
|
||||
else if (id == R.id.news)
|
||||
openLink(Constants.Url.NEWS);
|
||||
openLink(getResources().getString(R.string.translated_om_site_url) + "news/");
|
||||
else if (id == R.id.email)
|
||||
Utils.sendTo(requireContext(), BuildConfig.SUPPORT_MAIL, "Organic Maps");
|
||||
else if (id == R.id.github)
|
||||
|
|
@ -142,7 +145,7 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
|
|||
else if (id == R.id.report)
|
||||
Utils.sendBugReport(requireActivity(), "");
|
||||
else if (id == R.id.support_us)
|
||||
openLink(Constants.Url.SUPPORT_US);
|
||||
openLink(getResources().getString(R.string.translated_om_site_url) + "support-us/");
|
||||
else if (id == R.id.donate)
|
||||
openLink(mDonateUrl);
|
||||
else if (id == R.id.rate)
|
||||
|
|
|
|||
|
|
@ -25,10 +25,6 @@ public final class Constants
|
|||
public static final String TWITTER = "https://twitter.com/OrganicMapsApp";
|
||||
public static final String MATRIX = "https://matrix.to/#/%23organicmaps:matrix.org";
|
||||
|
||||
public static final String SUPPORT_US = "https://organicmaps.app/support-us";
|
||||
|
||||
public static final String NEWS = "https://organicmaps.app/news/";
|
||||
public static final String WEB_SITE = "https://organicmaps.app";
|
||||
public static final String GITHUB = "https://github.com/organicmaps/organicmaps";
|
||||
|
||||
public static final String COPYRIGHT = "file:///android_asset/copyright.html";
|
||||
|
|
@ -45,7 +41,6 @@ public final class Constants
|
|||
public static class Email
|
||||
{
|
||||
public static final String SUPPORT = BuildConfig.SUPPORT_MAIL;
|
||||
public static final String RATING = "rating@organicmaps.app";
|
||||
|
||||
private Email() {}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -350,6 +350,10 @@ world +
|
|||
tunnel -
|
||||
{}
|
||||
bus_stop -
|
||||
busway +
|
||||
bridge -
|
||||
tunnel -
|
||||
{}
|
||||
construction -
|
||||
cycleway +
|
||||
bridge -
|
||||
|
|
@ -431,6 +435,7 @@ world +
|
|||
service +
|
||||
area -
|
||||
bridge -
|
||||
busway -
|
||||
driveway -
|
||||
parking_aisle -
|
||||
tunnel -
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -4224,7 +4224,7 @@ cont {
|
|||
scale: 18
|
||||
symbol {
|
||||
name: "car_sharing-m"
|
||||
priority: 16613
|
||||
priority: 16650
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -4233,14 +4233,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "car_sharing-m"
|
||||
priority: 16613
|
||||
priority: 16650
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -4249,7 +4249,7 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -4934,7 +4934,7 @@ cont {
|
|||
scale: 17
|
||||
symbol {
|
||||
name: "dentist-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -4942,14 +4942,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "dentist-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -4958,14 +4958,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "dentist-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -4974,7 +4974,7 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6051,14 +6051,14 @@ cont {
|
|||
scale: 16
|
||||
symbol {
|
||||
name: "ice_cream-m"
|
||||
priority: 16000
|
||||
priority: 16698
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "ice_cream-m"
|
||||
priority: 16000
|
||||
priority: 16698
|
||||
min_distance: 24
|
||||
}
|
||||
}
|
||||
|
|
@ -6066,7 +6066,7 @@ cont {
|
|||
scale: 18
|
||||
symbol {
|
||||
name: "ice_cream-m"
|
||||
priority: 16000
|
||||
priority: 16698
|
||||
min_distance: 24
|
||||
}
|
||||
}
|
||||
|
|
@ -6074,7 +6074,7 @@ cont {
|
|||
scale: 19
|
||||
symbol {
|
||||
name: "ice_cream-m"
|
||||
priority: 16000
|
||||
priority: 16698
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -6084,7 +6084,7 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15300
|
||||
priority: 15698
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6303,7 +6303,7 @@ cont {
|
|||
scale: 16
|
||||
symbol {
|
||||
name: "marketplace-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -6312,14 +6312,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "marketplace-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
min_distance: 8
|
||||
}
|
||||
caption {
|
||||
|
|
@ -6328,14 +6328,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "marketplace-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
min_distance: 8
|
||||
}
|
||||
caption {
|
||||
|
|
@ -6344,14 +6344,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "marketplace-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
min_distance: 8
|
||||
}
|
||||
caption {
|
||||
|
|
@ -6360,7 +6360,7 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6456,7 +6456,7 @@ cont {
|
|||
scale: 16
|
||||
symbol {
|
||||
name: "bar-m"
|
||||
priority: 16650
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -6464,14 +6464,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15650
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "bar-m"
|
||||
priority: 16650
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -6479,14 +6479,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15650
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "bar-m"
|
||||
priority: 16650
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -6494,14 +6494,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15650
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "bar-m"
|
||||
priority: 16650
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -6509,7 +6509,7 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15650
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -14839,6 +14839,234 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-busway"
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.2
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 3.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 4.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-busway-bridge"
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.2
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 3.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 4.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-busway-tunnel"
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.2
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 3.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 4.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-construction"
|
||||
element {
|
||||
|
|
@ -25828,6 +26056,91 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-service-busway"
|
||||
element {
|
||||
scale: 14
|
||||
lines {
|
||||
width: 1.2
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.2
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 3.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 4.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-service-driveway"
|
||||
element {
|
||||
|
|
@ -54913,6 +55226,16 @@ cont {
|
|||
}
|
||||
cont {
|
||||
name: "place-island"
|
||||
element {
|
||||
scale: 9
|
||||
caption {
|
||||
primary {
|
||||
height: 8
|
||||
color: 8355711
|
||||
}
|
||||
priority: 15000
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 10
|
||||
caption {
|
||||
|
|
@ -91880,7 +92203,7 @@ cont {
|
|||
scale: 16
|
||||
symbol {
|
||||
name: "charity_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 10
|
||||
}
|
||||
caption {
|
||||
|
|
@ -91889,14 +92212,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "charity_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -91906,14 +92229,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "charity_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -91923,14 +92246,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "charity_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -91940,7 +92263,7 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -95999,7 +96322,7 @@ cont {
|
|||
scale: 16
|
||||
symbol {
|
||||
name: "second_hand_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 10
|
||||
}
|
||||
caption {
|
||||
|
|
@ -96008,14 +96331,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "second_hand_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -96025,14 +96348,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "second_hand_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -96042,14 +96365,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "second_hand_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -96059,7 +96382,7 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -4224,7 +4224,7 @@ cont {
|
|||
scale: 18
|
||||
symbol {
|
||||
name: "car_sharing-m"
|
||||
priority: 16613
|
||||
priority: 16650
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -4233,14 +4233,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "car_sharing-m"
|
||||
priority: 16613
|
||||
priority: 16650
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -4249,7 +4249,7 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -4934,7 +4934,7 @@ cont {
|
|||
scale: 17
|
||||
symbol {
|
||||
name: "dentist-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -4942,14 +4942,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "dentist-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -4958,14 +4958,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "dentist-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -4974,7 +4974,7 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6017,14 +6017,14 @@ cont {
|
|||
scale: 16
|
||||
symbol {
|
||||
name: "ice_cream-m"
|
||||
priority: 16000
|
||||
priority: 16698
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "ice_cream-m"
|
||||
priority: 16000
|
||||
priority: 16698
|
||||
min_distance: 24
|
||||
}
|
||||
}
|
||||
|
|
@ -6032,7 +6032,7 @@ cont {
|
|||
scale: 18
|
||||
symbol {
|
||||
name: "ice_cream-m"
|
||||
priority: 16000
|
||||
priority: 16698
|
||||
min_distance: 24
|
||||
}
|
||||
}
|
||||
|
|
@ -6040,7 +6040,7 @@ cont {
|
|||
scale: 19
|
||||
symbol {
|
||||
name: "ice_cream-m"
|
||||
priority: 16000
|
||||
priority: 16698
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -6050,7 +6050,7 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15300
|
||||
priority: 15698
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6269,7 +6269,7 @@ cont {
|
|||
scale: 16
|
||||
symbol {
|
||||
name: "marketplace-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -6278,14 +6278,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "marketplace-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
min_distance: 8
|
||||
}
|
||||
caption {
|
||||
|
|
@ -6294,14 +6294,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "marketplace-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
min_distance: 8
|
||||
}
|
||||
caption {
|
||||
|
|
@ -6310,14 +6310,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "marketplace-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
min_distance: 8
|
||||
}
|
||||
caption {
|
||||
|
|
@ -6326,7 +6326,7 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6422,7 +6422,7 @@ cont {
|
|||
scale: 16
|
||||
symbol {
|
||||
name: "bar-m"
|
||||
priority: 16650
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -6430,14 +6430,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15650
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "bar-m"
|
||||
priority: 16650
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -6445,14 +6445,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15650
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "bar-m"
|
||||
priority: 16650
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -6460,14 +6460,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15650
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "bar-m"
|
||||
priority: 16650
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -6475,7 +6475,7 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15650
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -14608,6 +14608,234 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-busway"
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.2
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 3.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 4.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-busway-bridge"
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.2
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 3.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 4.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-busway-tunnel"
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.2
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 3.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 4.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-construction"
|
||||
element {
|
||||
|
|
@ -25570,6 +25798,82 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-service-busway"
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.2
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 3.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 4.0
|
||||
color: 16777215
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-service-driveway"
|
||||
element {
|
||||
|
|
@ -54554,6 +54858,16 @@ cont {
|
|||
}
|
||||
cont {
|
||||
name: "place-island"
|
||||
element {
|
||||
scale: 9
|
||||
caption {
|
||||
primary {
|
||||
height: 8
|
||||
color: 8355711
|
||||
}
|
||||
priority: 15000
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 10
|
||||
caption {
|
||||
|
|
@ -91385,7 +91699,7 @@ cont {
|
|||
scale: 16
|
||||
symbol {
|
||||
name: "charity_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 10
|
||||
}
|
||||
caption {
|
||||
|
|
@ -91394,14 +91708,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "charity_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -91411,14 +91725,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "charity_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -91428,14 +91742,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "charity_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -91445,7 +91759,7 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -95504,7 +95818,7 @@ cont {
|
|||
scale: 16
|
||||
symbol {
|
||||
name: "second_hand_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 10
|
||||
}
|
||||
caption {
|
||||
|
|
@ -95513,14 +95827,14 @@ cont {
|
|||
color: 4473924
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "second_hand_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -95530,14 +95844,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "second_hand_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -95547,14 +95861,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "second_hand_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -95564,7 +95878,7 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -4224,7 +4224,7 @@ cont {
|
|||
scale: 18
|
||||
symbol {
|
||||
name: "car_sharing-m"
|
||||
priority: 16613
|
||||
priority: 16650
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -4233,14 +4233,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "car_sharing-m"
|
||||
priority: 16613
|
||||
priority: 16650
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -4249,7 +4249,7 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -4934,7 +4934,7 @@ cont {
|
|||
scale: 17
|
||||
symbol {
|
||||
name: "dentist-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -4942,14 +4942,14 @@ cont {
|
|||
color: 5592405
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "dentist-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -4958,14 +4958,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "dentist-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -4974,7 +4974,7 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6017,14 +6017,14 @@ cont {
|
|||
scale: 16
|
||||
symbol {
|
||||
name: "ice_cream-m"
|
||||
priority: 16000
|
||||
priority: 16698
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "ice_cream-m"
|
||||
priority: 16000
|
||||
priority: 16698
|
||||
min_distance: 24
|
||||
}
|
||||
}
|
||||
|
|
@ -6032,7 +6032,7 @@ cont {
|
|||
scale: 18
|
||||
symbol {
|
||||
name: "ice_cream-m"
|
||||
priority: 16000
|
||||
priority: 16698
|
||||
min_distance: 24
|
||||
}
|
||||
}
|
||||
|
|
@ -6040,7 +6040,7 @@ cont {
|
|||
scale: 19
|
||||
symbol {
|
||||
name: "ice_cream-m"
|
||||
priority: 16000
|
||||
priority: 16698
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -6050,7 +6050,7 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15300
|
||||
priority: 15698
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6269,7 +6269,7 @@ cont {
|
|||
scale: 16
|
||||
symbol {
|
||||
name: "marketplace-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -6278,14 +6278,14 @@ cont {
|
|||
color: 5592405
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "marketplace-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
min_distance: 8
|
||||
}
|
||||
caption {
|
||||
|
|
@ -6294,14 +6294,14 @@ cont {
|
|||
color: 5592405
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "marketplace-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
min_distance: 8
|
||||
}
|
||||
caption {
|
||||
|
|
@ -6310,14 +6310,14 @@ cont {
|
|||
color: 5592405
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "marketplace-m"
|
||||
priority: 16613
|
||||
priority: 16669
|
||||
min_distance: 8
|
||||
}
|
||||
caption {
|
||||
|
|
@ -6326,7 +6326,7 @@ cont {
|
|||
color: 5592405
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15613
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6422,7 +6422,7 @@ cont {
|
|||
scale: 16
|
||||
symbol {
|
||||
name: "bar-m"
|
||||
priority: 16650
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -6430,14 +6430,14 @@ cont {
|
|||
color: 5592405
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15650
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "bar-m"
|
||||
priority: 16650
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -6445,14 +6445,14 @@ cont {
|
|||
color: 5592405
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15650
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "bar-m"
|
||||
priority: 16650
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -6460,14 +6460,14 @@ cont {
|
|||
color: 5592405
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15650
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "bar-m"
|
||||
priority: 16650
|
||||
priority: 16669
|
||||
}
|
||||
caption {
|
||||
primary {
|
||||
|
|
@ -6475,7 +6475,7 @@ cont {
|
|||
color: 5592405
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15650
|
||||
priority: 15669
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -14608,6 +14608,234 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-busway"
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.2
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 7829367
|
||||
stroke_color: 856756480
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 7829367
|
||||
stroke_color: 856756480
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 3.0
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 7829367
|
||||
stroke_color: 1118464
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 4.0
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 7829367
|
||||
stroke_color: 1118464
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-busway-bridge"
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.2
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 7829367
|
||||
stroke_color: 856756480
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 7829367
|
||||
stroke_color: 856756480
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 3.0
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 7829367
|
||||
stroke_color: 1118464
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 4.0
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 7829367
|
||||
stroke_color: 1118464
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-busway-tunnel"
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.2
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 7829367
|
||||
stroke_color: 856756480
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 7829367
|
||||
stroke_color: 856756480
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 3.0
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 7829367
|
||||
stroke_color: 1118464
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 4.0
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 7829367
|
||||
stroke_color: 1118464
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-construction"
|
||||
element {
|
||||
|
|
@ -25671,6 +25899,82 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-service-busway"
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.2
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 7829367
|
||||
stroke_color: 856756480
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 2.0
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 10
|
||||
color: 7829367
|
||||
stroke_color: 856756480
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 3.0
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 7829367
|
||||
stroke_color: 1118464
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 4.0
|
||||
color: 4933187
|
||||
priority: 1339
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 12
|
||||
color: 7829367
|
||||
stroke_color: 1118464
|
||||
}
|
||||
priority: 16339
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-service-driveway"
|
||||
element {
|
||||
|
|
@ -54649,6 +54953,16 @@ cont {
|
|||
}
|
||||
cont {
|
||||
name: "place-island"
|
||||
element {
|
||||
scale: 9
|
||||
caption {
|
||||
primary {
|
||||
height: 8
|
||||
color: 5592405
|
||||
}
|
||||
priority: 15000
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 10
|
||||
caption {
|
||||
|
|
@ -91470,7 +91784,7 @@ cont {
|
|||
scale: 16
|
||||
symbol {
|
||||
name: "charity_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 10
|
||||
}
|
||||
caption {
|
||||
|
|
@ -91479,14 +91793,14 @@ cont {
|
|||
color: 5592405
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "charity_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -91496,14 +91810,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "charity_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -91513,14 +91827,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "charity_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -91530,7 +91844,7 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -95589,7 +95903,7 @@ cont {
|
|||
scale: 16
|
||||
symbol {
|
||||
name: "second_hand_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 10
|
||||
}
|
||||
caption {
|
||||
|
|
@ -95598,14 +95912,14 @@ cont {
|
|||
color: 5592405
|
||||
offset_y: 1
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
symbol {
|
||||
name: "second_hand_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -95615,14 +95929,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
symbol {
|
||||
name: "second_hand_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -95632,14 +95946,14 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
symbol {
|
||||
name: "second_hand_shop-m"
|
||||
priority: 16735
|
||||
priority: 16650
|
||||
min_distance: 24
|
||||
}
|
||||
caption {
|
||||
|
|
@ -95649,7 +95963,7 @@ cont {
|
|||
offset_y: 1
|
||||
is_optional: true
|
||||
}
|
||||
priority: 15735
|
||||
priority: 15650
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -13779,6 +13779,91 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-service-busway"
|
||||
element {
|
||||
scale: 14
|
||||
lines {
|
||||
width: 1.0
|
||||
color: 16579836
|
||||
priority: 1364
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 16579836
|
||||
priority: 1364
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 3.0
|
||||
color: 16579836
|
||||
priority: 1364
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 15
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16364
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 6.0
|
||||
color: 16579836
|
||||
priority: 1364
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 15
|
||||
color: 3355443
|
||||
stroke_color: 872415231
|
||||
}
|
||||
priority: 16364
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 7.0
|
||||
color: 16579836
|
||||
priority: 1364
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 15
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16364
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 8.0
|
||||
color: 16579836
|
||||
priority: 1364
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 15
|
||||
color: 3355443
|
||||
stroke_color: 16777215
|
||||
}
|
||||
priority: 16364
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-service-driveway"
|
||||
element {
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -13998,6 +13998,91 @@ cont {
|
|||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-service-busway"
|
||||
element {
|
||||
scale: 14
|
||||
lines {
|
||||
width: 1.0
|
||||
color: 3354929
|
||||
priority: 1364
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 15
|
||||
lines {
|
||||
width: 1.6
|
||||
color: 3354929
|
||||
priority: 1364
|
||||
cap: BUTTCAP
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 16
|
||||
lines {
|
||||
width: 3.0
|
||||
color: 3354929
|
||||
priority: 1364
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 15
|
||||
color: 9211020
|
||||
stroke_color: 856756480
|
||||
}
|
||||
priority: 16364
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 17
|
||||
lines {
|
||||
width: 6.0
|
||||
color: 3354929
|
||||
priority: 1364
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 15
|
||||
color: 9211020
|
||||
stroke_color: 856756480
|
||||
}
|
||||
priority: 16364
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 18
|
||||
lines {
|
||||
width: 7.0
|
||||
color: 3354929
|
||||
priority: 1364
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 15
|
||||
color: 9211020
|
||||
stroke_color: 1118464
|
||||
}
|
||||
priority: 16364
|
||||
}
|
||||
}
|
||||
element {
|
||||
scale: 19
|
||||
lines {
|
||||
width: 8.0
|
||||
color: 3354929
|
||||
priority: 1364
|
||||
}
|
||||
path_text {
|
||||
primary {
|
||||
height: 15
|
||||
color: 9211020
|
||||
stroke_color: 1118464
|
||||
}
|
||||
priority: 16364
|
||||
}
|
||||
}
|
||||
}
|
||||
cont {
|
||||
name: "highway-service-driveway"
|
||||
element {
|
||||
|
|
|
|||
|
|
@ -338,7 +338,7 @@
|
|||
</h4>
|
||||
<h4 lang="ru">
|
||||
Больше информации на нашем сайте
|
||||
<a href="https://organicmaps.app/">organicmaps.app</a>
|
||||
<a href="https://organicmaps.app/ru/">organicmaps.app</a>
|
||||
</h4>
|
||||
<h4 lang="de">
|
||||
Für weitere Informationen besuchen Sie bitte unsere Website
|
||||
|
|
|
|||
|
|
@ -854,10 +854,10 @@ deprecated|deprecated;853;x
|
|||
deprecated|deprecated;854;x
|
||||
deprecated|deprecated;855;x
|
||||
mapswithme|grid;856;
|
||||
deprecated|deprecated;857;x
|
||||
deprecated|deprecated;858;x
|
||||
deprecated|deprecated;859;x
|
||||
deprecated|deprecated;860;x
|
||||
highway|service|busway;[highway=service][service=busway];;name;int_name;857;
|
||||
highway|busway;858;
|
||||
highway|busway|bridge;[highway=busway][bridge?];;name;int_name;859;
|
||||
highway|busway|tunnel;[highway=busway][tunnel?];;name;int_name;860;
|
||||
natural|salt_pond;861;landuse|salt_pond
|
||||
deprecated|deprecated;862;x
|
||||
deprecated|deprecated;863;x
|
||||
|
|
|
|||
|
Can't render this file because it has a wrong number of fields in line 11.
|
|
|
@ -5540,10 +5540,10 @@
|
|||
|
||||
[donate]
|
||||
comment = Button in the main menu
|
||||
tags = android
|
||||
tags = android,ios
|
||||
en = Donate
|
||||
ar = ﻉﺮﺒﺘﻳ
|
||||
be = Ахвяраваць
|
||||
be = Падтрымаць грашыма
|
||||
bg = Дарете
|
||||
ca = Donatiu
|
||||
cs = Darovat
|
||||
|
|
@ -5574,7 +5574,7 @@
|
|||
sw = Changia
|
||||
th = บริจาค
|
||||
tr = Bağış Yapın
|
||||
uk = Пожертвувати
|
||||
uk = Підтримати грошима
|
||||
vi = Quyên tặng
|
||||
zh-Hans = 捐
|
||||
zh-Hant = 捐
|
||||
|
|
@ -25130,7 +25130,7 @@
|
|||
zh-Hant = 來自 OpenStreetMap 的地圖數據
|
||||
|
||||
[telegram_url]
|
||||
comment = Telegram group url for the help page
|
||||
comment = Telegram group url for the "?" About page
|
||||
tags = android,ios
|
||||
en = https://t.me/OrganicMapsApp
|
||||
be = https://t.me/OrganicMapsRu
|
||||
|
|
@ -25139,7 +25139,16 @@
|
|||
tr = https://t.me/OrganicMapsTR
|
||||
|
||||
[instagram_url]
|
||||
comment = Instagram account url for the help page
|
||||
comment = Instagram account url for the "?" About page
|
||||
tags = android,ios
|
||||
en = https://www.instagram.com/organicmaps.app
|
||||
tr = https://www.instagram.com/organicmapstr
|
||||
|
||||
[translated_om_site_url]
|
||||
comment = Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content
|
||||
tags = android,ios
|
||||
en = https://organicmaps.app/
|
||||
be = https://organicmaps.app/ru/
|
||||
it = https://organicmaps.app/it/
|
||||
ru = https://organicmaps.app/ru/
|
||||
tr = https://organicmaps.app/tr/
|
||||
|
|
|
|||
|
|
@ -113,10 +113,10 @@ line[waterway],
|
|||
{text-position: center;fill-position: background;}
|
||||
|
||||
node|z1-2[place=continent],
|
||||
node|z10-[place=archipelago],
|
||||
area|z10-[place=archipelago],
|
||||
node|z10-[place=island],
|
||||
area|z10-[place=island],
|
||||
node|z9-[place=archipelago],
|
||||
area|z9-[place=archipelago],
|
||||
node|z9-[place=island],
|
||||
area|z9-[place=island],
|
||||
node|z14-[natural=cape],
|
||||
area|z14-[natural=cape],
|
||||
node|z14-[place=islet],
|
||||
|
|
@ -126,10 +126,10 @@ area|z14-[place=islet],
|
|||
node|z1-2[place=continent]
|
||||
{font-size: 12;text-color: @country_label;max-width: 5;-x-me-text-priority:16000;}
|
||||
|
||||
node|z10-[place=archipelago],
|
||||
area|z10-[place=archipelago],
|
||||
node|z10-[place=island],
|
||||
area|z10-[place=island]
|
||||
node|z9-[place=archipelago],
|
||||
area|z9-[place=archipelago],
|
||||
node|z9-[place=island],
|
||||
area|z9-[place=island],
|
||||
{font-size: 8;text-color: @district_label;}
|
||||
|
||||
node|z12-[place=archipelago],
|
||||
|
|
|
|||
|
|
@ -119,8 +119,6 @@ area[vending=parking_tickets]
|
|||
|
||||
node[shop],
|
||||
area[shop],
|
||||
node[amenity=marketplace],
|
||||
area[amenity=marketplace],
|
||||
node[amenity=veterinary],
|
||||
area[amenity=veterinary],
|
||||
node[leisure=playground],
|
||||
|
|
@ -134,8 +132,6 @@ node[tourism=caravan_site],
|
|||
area[tourism=caravan_site],
|
||||
node[amenity=bicycle_parking],
|
||||
area[amenity=bicycle_parking],
|
||||
node[amenity=dentist],
|
||||
area[amenity=dentist],
|
||||
node[leisure=water_park],
|
||||
area[leisure=water_park],
|
||||
node[amenity=taxi],
|
||||
|
|
@ -156,8 +152,6 @@ node[amenity=childcare],
|
|||
area[amenity=childcare],
|
||||
node[amenity=post_office],
|
||||
area[amenity=post_office],
|
||||
node[amenity=car_sharing],
|
||||
area[amenity=car_sharing],
|
||||
node[power=station],
|
||||
area[power=station],
|
||||
node[power=substation],
|
||||
|
|
@ -261,12 +255,12 @@ node[amenity=bicycle_repair_station],
|
|||
area[amenity=bicycle_repair_station],
|
||||
node[amenity=car_wash],
|
||||
area[amenity=car_wash],
|
||||
node[amenity=car_sharing],
|
||||
area[amenity=car_sharing],
|
||||
node[amenity=car_rental],
|
||||
area[amenity=car_rental],
|
||||
node|z18-[office],
|
||||
area|z18-[office],
|
||||
node[amenity=nightclub],
|
||||
area[amenity=nightclub],
|
||||
node[amenity=fire_station],
|
||||
area[amenity=fire_station],
|
||||
node[amenity=atm],
|
||||
|
|
@ -274,7 +268,12 @@ area[amenity=atm],
|
|||
node[amenity=bureau_de_change],
|
||||
node[shop=pawnbroker],
|
||||
area[shop=pawnbroker],
|
||||
node[amenity=library]
|
||||
node[amenity=library],
|
||||
area[amenity=library],
|
||||
node[shop=charity],
|
||||
area[shop=charity],
|
||||
node[shop=second_hand],
|
||||
area[shop=second_hand],
|
||||
{z-index: 2500;}
|
||||
|
||||
node[amenity=fuel],
|
||||
|
|
@ -295,6 +294,8 @@ node[aerialway=magic_carpet],
|
|||
node[aerialway=platter],
|
||||
node[aerialway=rope_tow],
|
||||
node[railway=level_crossing],
|
||||
node[amenity=marketplace],
|
||||
area[amenity=marketplace],
|
||||
node[shop=supermarket],
|
||||
area[shop=supermarket],
|
||||
node[shop=car_repair][service=tyres],
|
||||
|
|
@ -303,6 +304,8 @@ node[shop=caravan],
|
|||
area[shop=caravan],
|
||||
node[highway=services],
|
||||
area[highway=services],
|
||||
node[amenity=dentist],
|
||||
area[amenity=dentist],
|
||||
node[amenity=clinic],
|
||||
area[amenity=clinic],
|
||||
node[amenity=doctors],
|
||||
|
|
@ -325,6 +328,8 @@ node[amenity=courthouse],
|
|||
area[amenity=courthouse],
|
||||
node[amenity=cinema],
|
||||
area[amenity=cinema],
|
||||
node[amenity=nightclub],
|
||||
area[amenity=nightclub],
|
||||
node[amenity=police],
|
||||
area[amenity=police],
|
||||
node[amenity=prison],
|
||||
|
|
@ -352,10 +357,6 @@ area[tourism=attraction][attraction=animal],
|
|||
|
||||
node[amenity=cafe],
|
||||
area[amenity=cafe],
|
||||
node[shop=charity],
|
||||
area[shop=charity],
|
||||
node[shop=second_hand],
|
||||
area[shop=second_hand],
|
||||
node[amenity=theatre],
|
||||
area[amenity=theatre]
|
||||
{z-index: 2790;}
|
||||
|
|
@ -374,7 +375,9 @@ area[amenity=bar]
|
|||
node[amenity=pub],
|
||||
area[amenity=pub],
|
||||
node[amenity=biergarten],
|
||||
area[amenity=biergarten]
|
||||
area[amenity=biergarten],
|
||||
node[amenity=ice_cream],
|
||||
area[amenity=ice_cream],
|
||||
{z-index: 2782;}
|
||||
|
||||
node[historic=monument],
|
||||
|
|
|
|||
|
|
@ -172,7 +172,9 @@ line[route=hiking],
|
|||
line[highway=footway]
|
||||
{z-index: 600;}
|
||||
|
||||
line[highway=service]
|
||||
line[highway=service],
|
||||
line[highway=service][service=busway],
|
||||
line[highway=busway],
|
||||
{z-index: 650;}
|
||||
|
||||
line[highway=pedestrian],
|
||||
|
|
@ -704,6 +706,8 @@ line|z12-[highway=living_street],
|
|||
line|z12-[aeroway=runway],
|
||||
line|z14-[aeroway=taxiway],
|
||||
line|z15-[highway=service],
|
||||
line|z15-[highway=service][service=busway],
|
||||
line|z15-[highway=busway],
|
||||
{color: @unclassified; opacity: 1;}
|
||||
line|z16-[highway=unclassified][tunnel?],
|
||||
line|z16-[highway=living_street][tunnel?],
|
||||
|
|
@ -773,17 +777,27 @@ line|z18-[highway=unclassified][bridge?]::bridgeblack,
|
|||
|
||||
/* 7.4 Service 15-22 ZOOM */
|
||||
|
||||
line|z15[highway=service]
|
||||
line|z15[highway=service],
|
||||
line|z15[highway=service][service=busway],
|
||||
line|z15[highway=busway],
|
||||
{width: 1.2;}
|
||||
line|z15-16[highway=service][service=driveway]
|
||||
{width: 0;}
|
||||
line|z16[highway=service]
|
||||
line|z16[highway=service],
|
||||
line|z16[highway=service][service=busway],
|
||||
line|z16[highway=busway],
|
||||
{width: 1.6;}
|
||||
line|z17[highway=service]
|
||||
line|z17[highway=service],
|
||||
line|z17[highway=service][service=busway],
|
||||
line|z17[highway=busway],
|
||||
{width: 2;}
|
||||
line|z18[highway=service]
|
||||
line|z18[highway=service],
|
||||
line|z18[highway=service][service=busway],
|
||||
line|z18[highway=busway],
|
||||
{width: 3;}
|
||||
line|z19-[highway=service]
|
||||
line|z19-[highway=service],
|
||||
line|z19-[highway=service][service=busway],
|
||||
line|z19-[highway=busway],
|
||||
{width: 4;}
|
||||
|
||||
/* 8.OTHERS ROADS 13-22 ZOOM */
|
||||
|
|
|
|||
|
|
@ -67,7 +67,9 @@ line[route=hiking],
|
|||
line[highway=footway]
|
||||
{z-index: 600;}
|
||||
|
||||
line[highway=service]
|
||||
line[highway=service],
|
||||
line[highway=service][service=busway],
|
||||
line[highway=busway],
|
||||
{z-index: 650;}
|
||||
|
||||
line[highway=pedestrian],
|
||||
|
|
@ -382,6 +384,8 @@ line|z14-[highway=road],
|
|||
line|z14-[highway=living_street],
|
||||
line|z14-[highway=pedestrian],
|
||||
line|z16-[highway=service],
|
||||
line|z16-[highway=service][service=busway],
|
||||
line|z16-[highway=busway],
|
||||
{text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_medium;}
|
||||
|
||||
line|z13[highway=unclassified]
|
||||
|
|
@ -401,12 +405,16 @@ line|z16-17[highway=living_street],
|
|||
{font-size: 12;text-halo-color: @label_halo_light;}
|
||||
line|z16-17[highway=pedestrian],
|
||||
line|z16-17[highway=service],
|
||||
line|z16-17[highway=service][service=busway],
|
||||
line|z16-17[highway=busway],
|
||||
line|z16-17[highway=road],
|
||||
{font-size: 10;text-halo-color: @label_halo_light;}
|
||||
line|z18-[highway=unclassified],
|
||||
line|z18-[highway=living_street],
|
||||
line|z18-[highway=pedestrian],
|
||||
line|z18-[highway=service],
|
||||
line|z18-[highway=service][service=busway],
|
||||
line|z18-[highway=busway],
|
||||
line|z18-[highway=road],
|
||||
{font-size: 12;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
|
||||
|
||||
|
|
|
|||
|
|
@ -854,10 +854,10 @@ mapswithme
|
|||
mapswithme
|
||||
mapswithme
|
||||
*mapswithme|grid
|
||||
mapswithme
|
||||
mapswithme
|
||||
mapswithme
|
||||
mapswithme
|
||||
*highway|service|busway
|
||||
*highway|busway
|
||||
*highway|busway|bridge
|
||||
*highway|busway|tunnel
|
||||
landuse|salt_pond
|
||||
mapswithme
|
||||
mapswithme
|
||||
|
|
|
|||
|
|
@ -350,6 +350,10 @@ world 00000000000000000000 +
|
|||
tunnel 00000000000000000000 -
|
||||
{}
|
||||
bus_stop 00000000000000000000 -
|
||||
busway 00000000000000000000 +
|
||||
bridge 00000000000000000000 -
|
||||
tunnel 00000000000000000000 -
|
||||
{}
|
||||
construction 00000000000001111111 -
|
||||
cycleway 00000000000000000000 +
|
||||
bridge 00000000000000000000 -
|
||||
|
|
@ -431,6 +435,7 @@ world 00000000000000000000 +
|
|||
service 00000000000000111111 +
|
||||
area 00000000000000111111 -
|
||||
bridge 00000000000000111111 -
|
||||
busway 00000000000000111111 -
|
||||
driveway 00000000000000101111 -
|
||||
parking_aisle 00000000000000111111 -
|
||||
tunnel 00000000000000111111 -
|
||||
|
|
|
|||
|
|
@ -68,12 +68,9 @@ Check `./configure.sh --help` to see how to copy the configs automatically from
|
|||
|
||||
### Preparing
|
||||
|
||||
You need a Linux or a Mac machine to build a desktop version of Organic Maps.
|
||||
You need a Linux or a Mac machine to build a desktop version of Organic Maps. [Windows](#windows) users can use the [WSL](https://learn.microsoft.com/en-us/windows/wsl/) (Windows Subsystem for Linux) and follow ["Linux or Mac"](#linux-or-mac) steps described below.
|
||||
|
||||
- We haven't compiled Organic Maps on Windows in a long time, though it is possible.
|
||||
It is likely some make files should be updated.
|
||||
If you succeed, please submit a tutorial.
|
||||
You'll need to have python3, cmake, ninja in the PATH and also to have Qt5 installed.
|
||||
### Linux or Mac
|
||||
|
||||
Ensure that you have at least 20GB of free space.
|
||||
|
||||
|
|
@ -132,6 +129,38 @@ _macOS:_
|
|||
brew install cmake ninja qt@5
|
||||
```
|
||||
|
||||
### Windows
|
||||
|
||||
We haven't compiled Organic Maps on Windows *natively* in a long time, though it is possible.
|
||||
Some files should be updated. There is a work in progress on [windows](https://github.com/organicmaps/organicmaps/tree/windows) branch.
|
||||
Please contribute if you have time.
|
||||
You'll need to have python3, cmake, ninja, and QT5 in the PATH, and Visual Studio 2022 or Visual Studio 2022 Build Tools installed. Use [Visual Studio Developer Command Prompt](https://learn.microsoft.com/en-us/visualstudio/ide/reference/command-prompt-powershell?view=vs-2022) or generate Visual Studio project files with CMake to build the project.
|
||||
|
||||
However, it is possible to use the WSL (Windows Subsystem for Linux) to run GUI applications.
|
||||
|
||||
#### Windows 11 (WSL)
|
||||
|
||||
Since Windows 11 Build 22000 running GUI apps from the WSL is supported [out-of-the box](https://learn.microsoft.com/en-us/windows/wsl/tutorials/gui-apps). After [building](#building-1) the app you should be able to [run](#running) it without any additional steps.
|
||||
|
||||
#### Windows 10 (WSL)
|
||||
|
||||
For Windows 10 you should do these steps (taken from [here](https://techcommunity.microsoft.com/t5/windows-dev-appconsult/running-wsl-gui-apps-on-windows-10/ba-p/1493242), check this blog post if you have any problems):
|
||||
1. Download and install [VcXsrv Windows X Server](https://sourceforge.net/projects/vcxsrv/).
|
||||
2. Run _XLaunch_ app to launch X Server. During settings make sure "Disable access control" checkbox is selected.
|
||||
3. (optionally) Click "Save configuration" and save configuration to some file (for example to _config.xlaunch_). With this you will be able to quickly run desktop app in the future.
|
||||
4. When asked about firewall, allow access for public and private networks.
|
||||
5. Add this line:
|
||||
```bash
|
||||
export DISPLAY=$(ip route|awk '/^default/{print $3}'):0.0
|
||||
```
|
||||
to _/etc/bash.bashrc_ file.
|
||||
6. Close WSL and open it again.
|
||||
|
||||
Now when you want to run the desktop app you just need to first launch the X Server on Windows (for example, by running previously saved _config.xlaunch_ file) and then you should be able to [build](#building-1) and [run](#running) the app from WSL.
|
||||
|
||||
Running X Server is also required to run `generate_symbols.sh` script when you change icons for [styles](STYLES.md)
|
||||
|
||||
|
||||
### Building
|
||||
|
||||
To build a desktop app:
|
||||
|
|
@ -201,6 +230,19 @@ ln -s ../data/ data
|
|||
|
||||
Some tests [are known to be broken](https://github.com/organicmaps/organicmaps/issues?q=is%3Aissue+is%3Aopen+label%3ATests).
|
||||
|
||||
### Debug commands
|
||||
|
||||
Desktop app has some "hidden" debug commands that you can trigger by entering them in Offline Search input.
|
||||
|
||||
For example you can switch theme which is very useful for checking [styles](STYLES.md) changes.
|
||||
To switch themes you can enter this commands:
|
||||
- `?light` - Day theme
|
||||
- `?dark` - Night theme
|
||||
- `?vlight` - Day theme for vehicle navigation
|
||||
- `?vdark` - Night theme for vehicle navigation
|
||||
|
||||
There are also other commands for turning on/off isolines, antialiasing, etc. Check [the code](https://github.com/organicmaps/organicmaps/blob/6ae19b40c2b7a515338eb128547df05da13bdb78/map/framework.cpp#L2570-L2671) to learn about them.
|
||||
|
||||
### More options
|
||||
|
||||
To make the desktop app display maps in a different language add a `-lang` option, e.g. for russian language:
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@ To run the `generate_symbols.sh` script install `optipng` also, e.g. for Ubuntu
|
|||
sudo apt install optipng
|
||||
```
|
||||
|
||||
If you use WSL on Windows 10 you might need to run [X Server](INSTALL.md#windows-10-wsl) before running `generate_symbols.sh`
|
||||
|
||||
## Files
|
||||
|
||||
Map styles are defined in text files located in `data/styles/clear/include/`:
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
@interface PlacePagePreviewData : NSObject
|
||||
|
||||
@property(nonatomic, readonly, nullable) NSString *title;
|
||||
@property(nonatomic, readonly, nullable) NSString *secondaryTitle;
|
||||
@property(nonatomic, readonly, nullable) NSString *subtitle;
|
||||
@property(nonatomic, readonly, nullable) NSString *coordinates;
|
||||
@property(nonatomic, readonly, nullable) NSString *address;
|
||||
|
|
|
|||
|
|
@ -89,6 +89,7 @@ static PlacePageDataHotelType convertHotelType(std::optional<ftypes::IsHotelChec
|
|||
self = [super init];
|
||||
if (self) {
|
||||
_title = rawData.GetTitle().empty() ? nil : @(rawData.GetTitle().c_str());
|
||||
_secondaryTitle = rawData.GetSecondaryTitle().empty() ? nil : @(rawData.GetSecondaryTitle().c_str());
|
||||
_subtitle = rawData.GetSubtitle().empty() ? nil : @(rawData.GetSubtitle().c_str());
|
||||
_coordinates = rawData.GetFormattedCoordinate(true).empty() ? nil : @(rawData.GetFormattedCoordinate(true).c_str());
|
||||
_address = rawData.GetAddress().empty() ? nil : @(rawData.GetAddress().c_str());
|
||||
|
|
|
|||
|
|
@ -31,4 +31,6 @@ NS_SWIFT_NAME(Settings)
|
|||
+ (BOOL)isTrackWarningAlertShown;
|
||||
+ (void)setTrackWarningAlertShown:(BOOL)shown;
|
||||
|
||||
+ (NSString *)donateUrl;
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -77,9 +77,9 @@ NSString * const kUDTrackWarningAlertWasShown = @"TrackWarningAlertWasShown";
|
|||
if ([MWMCarPlayService shared].isCarplayActivated) {
|
||||
UIUserInterfaceStyle style = [[MWMCarPlayService shared] interfaceStyle];
|
||||
switch (style) {
|
||||
case UIUserInterfaceStyleLight: return MWMThemeDay;
|
||||
case UIUserInterfaceStyleDark: return MWMThemeNight;
|
||||
case UIUserInterfaceStyleUnspecified: break;
|
||||
case UIUserInterfaceStyleLight: return MWMThemeDay;
|
||||
case UIUserInterfaceStyleDark: return MWMThemeNight;
|
||||
case UIUserInterfaceStyleUnspecified: break;
|
||||
}
|
||||
}
|
||||
auto ud = NSUserDefaults.standardUserDefaults;
|
||||
|
|
@ -148,4 +148,12 @@ NSString * const kUDTrackWarningAlertWasShown = @"TrackWarningAlertWasShown";
|
|||
[ud setBool:shown forKey:kUDTrackWarningAlertWasShown];
|
||||
[ud synchronize];
|
||||
}
|
||||
|
||||
+ (NSString *)donateUrl
|
||||
{
|
||||
std::string url;
|
||||
if (settings::Get("DonateUrl", url)) return @(url.c_str());
|
||||
return nil;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,15 +0,0 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "ic_menu_discovery.pdf"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
},
|
||||
"properties" : {
|
||||
"template-rendering-intent" : "template"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
|
@ -1,15 +1,15 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "icTypeHotel.pdf"
|
||||
"filename" : "ic_menu_donate.svg",
|
||||
"idiom" : "universal"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
},
|
||||
"properties" : {
|
||||
"template-rendering-intent" : "template"
|
||||
}
|
||||
}
|
||||
}
|
||||
1
iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_donate.imageset/ic_menu_donate.svg
vendored
Normal file
1
iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_donate.imageset/ic_menu_donate.svg
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48"><path d="M32.3 25.1Q29.95 23 27.825 21 25.7 19 24.1 17.1t-2.55-3.675Q20.6 11.65 20.6 10q0-2.6 1.75-4.35Q24.1 3.9 26.7 3.9q1.5 0 2.975.825T32.3 6.95q1.15-1.4 2.625-2.225Q36.4 3.9 37.9 3.9q2.6 0 4.35 1.75Q44 7.4 44 10q0 1.65-.95 3.425T40.5 17.1Q38.9 19 36.775 21T32.3 25.1Zm-4 19.8-15.55-4.45V23.6h4.7l12.75 4.8q1.35.5 2.275 1.625.925 1.125.925 3.225h-3.2q-2.45 0-3.575-.15t-2.375-.55l-3.65-1.2-.5 1.4 3.75 1.3q1.15.4 2.575.55 1.425.15 2.925.15h9.75q2.85 0 3.875 1.1T44 38.8v1.3ZM2 43.3V23.6h7.7v19.7Z"/></svg>
|
||||
|
After Width: | Height: | Size: 571 B |
|
|
@ -1,26 +0,0 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "ic_menu_showcase.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "ic_menu_showcase@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "ic_menu_showcase@3x.png",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
},
|
||||
"properties" : {
|
||||
"template-rendering-intent" : "template"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 111 B |
Binary file not shown.
|
Before Width: | Height: | Size: 165 B |
Binary file not shown.
|
Before Width: | Height: | Size: 215 B |
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "اسئلة مكررة";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "ﻉﺮﺒﺘﻳ";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "كيف يمكنك دعمنا؟";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "مسار";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Пытанні і адказы";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Ахвяраваць";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Як нас падтрымаць?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Сцежка";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsRu";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/ru/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Въпроси и отговори";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Дарете";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Как да ни подкрепите?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Пътека";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Preguntes més freqüents";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Donatiu";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Com ajudar-nos?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Traça";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Otázky a odpovědi";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Darovat";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Jak nás podpořit?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Dráha";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Spørgsmål og svar";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Doner";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Sådan støtter vi os?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Rute";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Fragen und Antworten";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Spenden";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Wie unterstützen Sie uns?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Strecke";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Ερωτήσεις και απαντήσεις";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Προσφέρω";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Πώς να μας υποστηρίξετε;";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Τροχιά";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Frequently Asked Questions";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Donate";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "How to support us?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Track";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Frequently Asked Questions";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Donate";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "How to support us?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Track";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Preguntas frecuentes";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Donar";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "¿Cómo apoyarnos?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Ruta";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Preguntas frecuentes";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Donar";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "¿Cómo apoyarnos?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Ruta";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Korduma kippuvad küsimused";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Anneta";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Kuidas meid toetada?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Rada";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Maiz galderak";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Dohaintza eman";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Nola lagundu diguzu?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Ibilbidea";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "ﺦﺳﺎﭘ ﻭ ﺶﺳﺮﭘ";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "ﺪﯿﻨﮐ ﺍﺪﻫﺍ";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "چگونه از ما حمایت کنیم؟";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "مسیر";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsIR";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Kysymykset ja vastaukset";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Lahjoittaa";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Kuinka tukea meitä?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Reitti";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Foire aux questions";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Faire un don";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Comment nous soutenir?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Route";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "תובושתו תולאש";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "םוֹרתְלִ";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "כיצד לתמוך בנו?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "מַסלוּל";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Kérdések és válaszok";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Adományozni";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Hogyan támogathatsz minket?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Útvonal";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Pertanyaan dan jawaban";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Menyumbangkan";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Bagaimana cara mendukung kami?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Trek";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Domande frequenti";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Donare";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Come sostenerci?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Percorso";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/it/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "質問と回答";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "寄付";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "どのように私たちを支持する方法？";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "トラック";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "질문과 답변";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "기부";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "우리를 지원하는 방법?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "길";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "वारंवार विचारलेले प्रश्न";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Donate";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "आम्हाला आधार कसा द्यायचा?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "ट्रॅक";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Spørsmål og svar";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Donere";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Hvordan støtte oss?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Rute";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Vragen en antwoorden";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Doneren";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Hoe ons te steunen?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Track";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Pytania i odpowiedzi";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Wspomóż";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Jak nas wspierać?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Trasa";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Perguntas e respostas";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Doar";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Como nos apoiar?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Percurso";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Perguntas e respostas";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Doar";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Como nos apoiar?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Percurso";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Întrebări frecvente";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Donează";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Cum să ne sprijiniți?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Traseu";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Вопросы и ответы";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Поддержать рублём";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Как наc поддержать?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Трек";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsRu";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/ru/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Otázky a odpovede";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Darovať";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Ako nás podporiť?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Šľapaj Stopy";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Frågor och svar";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Donera";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Hur stöder vi oss?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Rutt";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Maswali na majibu";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Changia";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Jinsi ya kutuunga mkono?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Track";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "คำถามและคำตอบ";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "บริจาค";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "วิธีการสนับสนุนเรา";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "ติดตาม";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Sıkça Sorulan Sorular";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Bağış Yapın";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Sizi nasıl destekleyebilirim?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Kayıt";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsTR";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmapstr";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/tr/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Питання та відповіді";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Пожертвувати";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Як нас підтримати?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Маршрут";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "Câu hỏi và trả lời";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "Quyên tặng";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "Làm thế nào để hỗ trợ chúng tôi?";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "Dấu chân";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "问题和解答";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "捐";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "如何支持我们？";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "追踪";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -297,6 +297,9 @@
|
|||
/* Button in the main Help dialog */
|
||||
"faq" = "問題和解答";
|
||||
|
||||
/* Button in the main menu */
|
||||
"donate" = "捐";
|
||||
|
||||
/* Button in the main Help dialog */
|
||||
"how_to_support_us" = "如何支持我們？";
|
||||
|
||||
|
|
@ -1221,12 +1224,15 @@
|
|||
/* edit track screen title */
|
||||
"track_title" = "追踪";
|
||||
|
||||
/* Telegram group url for the help page */
|
||||
/* Telegram group url for the "?" About page */
|
||||
"telegram_url" = "https://t.me/OrganicMapsApp";
|
||||
|
||||
/* Instagram account url for the help page */
|
||||
/* Instagram account url for the "?" About page */
|
||||
"instagram_url" = "https://www.instagram.com/organicmaps.app";
|
||||
|
||||
/* Translated Organic Maps site, add new translations here: https://github.com/organicmaps/organicmaps.github.io/tree/master/content */
|
||||
"translated_om_site_url" = "https://organicmaps.app/";
|
||||
|
||||
|
||||
/********** Types **********/
|
||||
|
||||
|
|
|
|||
|
|
@ -4503,7 +4503,7 @@
|
|||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 2021.06.20;
|
||||
MARKETING_VERSION = 2022.11.17;
|
||||
OTHER_SWIFT_FLAGS = "$(inherited)";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.debug;
|
||||
PROVISIONING_PROFILE_SPECIFIER = "CarPlay Debug";
|
||||
|
|
@ -4524,7 +4524,7 @@
|
|||
"$(inherited)",
|
||||
"@executable_path/Frameworks",
|
||||
);
|
||||
MARKETING_VERSION = 2021.06.20;
|
||||
MARKETING_VERSION = 2022.11.17;
|
||||
OTHER_SWIFT_FLAGS = "$(inherited)";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps;
|
||||
PROVISIONING_PROFILE_SPECIFIER = "CarPlay Release";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
protocol BottomMenuInteractorProtocol: AnyObject {
|
||||
func close()
|
||||
func addPlace()
|
||||
func downloadRoutes()
|
||||
func downloadMaps()
|
||||
func donate()
|
||||
func openSettings()
|
||||
func shareLocation(cell: BottomMenuItemCell)
|
||||
}
|
||||
|
|
@ -43,8 +43,13 @@ extension BottomMenuInteractor: BottomMenuInteractorProtocol {
|
|||
delegate?.addPlace()
|
||||
}
|
||||
|
||||
func downloadRoutes() {
|
||||
func donate() {
|
||||
close()
|
||||
guard var url = Settings.donateUrl() else { return }
|
||||
if url == "https://organicmaps.app/donate/" {
|
||||
url = L("translated_om_site_url") + "donate/"
|
||||
}
|
||||
viewController?.openUrl(url, inSafari: true)
|
||||
}
|
||||
|
||||
func downloadMaps() {
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ protocol BottomMenuPresenterProtocol: UITableViewDelegate, UITableViewDataSource
|
|||
class BottomMenuPresenter: NSObject {
|
||||
enum CellType: Int, CaseIterable {
|
||||
case addPlace
|
||||
//case downloadRoutes
|
||||
case downloadMaps
|
||||
case donate
|
||||
case settings
|
||||
case share
|
||||
}
|
||||
|
|
@ -26,6 +26,8 @@ class BottomMenuPresenter: NSObject {
|
|||
self.interactor = interactor
|
||||
self.sections = sections
|
||||
}
|
||||
|
||||
let disableDonate = Settings.donateUrl() == nil
|
||||
}
|
||||
|
||||
extension BottomMenuPresenter: BottomMenuPresenterProtocol {
|
||||
|
|
@ -42,58 +44,49 @@ extension BottomMenuPresenter {
|
|||
}
|
||||
|
||||
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
|
||||
section == Sections.layers.rawValue ? 1 : CellType.allCases.count
|
||||
section == Sections.layers.rawValue ? 1 : CellType.allCases.count - (disableDonate ? 1 : 0)
|
||||
}
|
||||
|
||||
private func correctedRow(_ row: Int) -> Int {
|
||||
disableDonate && row >= CellType.donate.rawValue ? row + 1 : row
|
||||
}
|
||||
|
||||
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
|
||||
if indexPath.section == Sections.layers.rawValue {
|
||||
let cell = tableView.dequeueReusableCell(cell: BottomMenuLayersCell.self)!
|
||||
cell.onClose = { [weak self] in self?.onClosePressed() }
|
||||
return cell
|
||||
}
|
||||
if indexPath.section == Sections.items.rawValue {
|
||||
let cell = tableView.dequeueReusableCell(cell: BottomMenuItemCell.self)!
|
||||
switch CellType(rawValue: indexPath.row)! {
|
||||
case .addPlace:
|
||||
let enabled = MWMNavigationDashboardManager.shared().state == .hidden && FrameworkHelper.canEditMap()
|
||||
cell.configure(imageName: "ic_add_place",
|
||||
title: L("placepage_add_place_button"),
|
||||
badgeCount: 0,
|
||||
enabled: enabled)
|
||||
// case .downloadRoutes:
|
||||
// cell.configure(imageName: "ic_menu_routes", title: L("download_guides"))
|
||||
case .downloadMaps:
|
||||
cell.configure(imageName: "ic_menu_download",
|
||||
title: L("download_maps"),
|
||||
badgeCount: MapsAppDelegate.theApp().badgeNumber(),
|
||||
enabled: true)
|
||||
case .settings:
|
||||
cell.configure(imageName: "ic_menu_settings",
|
||||
title: L("settings"),
|
||||
badgeCount: 0,
|
||||
enabled: true)
|
||||
case .share:
|
||||
cell.configure(imageName: "ic_menu_share",
|
||||
title: L("share_my_location"),
|
||||
badgeCount: 0,
|
||||
enabled: true)
|
||||
}
|
||||
return cell
|
||||
let cell = tableView.dequeueReusableCell(cell: BottomMenuItemCell.self)!
|
||||
switch CellType(rawValue: correctedRow(indexPath.row))! {
|
||||
case .addPlace:
|
||||
let enabled = MWMNavigationDashboardManager.shared().state == .hidden && FrameworkHelper.canEditMap()
|
||||
cell.configure(imageName: "ic_add_place",
|
||||
title: L("placepage_add_place_button"),
|
||||
badgeCount: 0,
|
||||
enabled: enabled)
|
||||
case .downloadMaps:
|
||||
cell.configure(imageName: "ic_menu_download",
|
||||
title: L("download_maps"),
|
||||
badgeCount: MapsAppDelegate.theApp().badgeNumber(),
|
||||
enabled: true)
|
||||
case .donate:
|
||||
cell.configure(imageName: "ic_menu_donate",
|
||||
title: L("donate"),
|
||||
badgeCount: 0,
|
||||
enabled: true)
|
||||
case .settings:
|
||||
cell.configure(imageName: "ic_menu_settings",
|
||||
title: L("settings"),
|
||||
badgeCount: 0,
|
||||
enabled: true)
|
||||
case .share:
|
||||
cell.configure(imageName: "ic_menu_share",
|
||||
title: L("share_my_location"),
|
||||
badgeCount: 0,
|
||||
enabled: true)
|
||||
}
|
||||
fatalError()
|
||||
}
|
||||
|
||||
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
|
||||
return section > 0 ? 12 : 0
|
||||
}
|
||||
|
||||
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
|
||||
if section > 0 {
|
||||
let view = UIView()
|
||||
view.styleName = "BlackOpaqueBackground";
|
||||
return view;
|
||||
}
|
||||
return nil
|
||||
return cell
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -106,13 +99,13 @@ extension BottomMenuPresenter {
|
|||
return
|
||||
}
|
||||
tableView.deselectRow(at: indexPath, animated: true)
|
||||
switch CellType(rawValue: indexPath.row)! {
|
||||
switch CellType(rawValue: correctedRow(indexPath.row))! {
|
||||
case .addPlace:
|
||||
interactor.addPlace()
|
||||
// case .downloadRoutes:
|
||||
// interactor.downloadRoutes()
|
||||
case .downloadMaps:
|
||||
interactor.downloadMaps()
|
||||
case .donate:
|
||||
interactor.donate()
|
||||
case .settings:
|
||||
interactor.openSettings()
|
||||
case .share:
|
||||
|
|
|
|||
|
|
@ -165,13 +165,13 @@ final class AboutController: MWMViewController, UITableViewDataSource, UITableVi
|
|||
// See labels array above.
|
||||
switch indexPath[0] {
|
||||
// Header section click.
|
||||
case 0: self.openUrl("https://organicmaps.app/donate/")
|
||||
case 0: self.openUrl(L("translated_om_site_url") + "donate/")
|
||||
// First buttons section.
|
||||
case 1: switch indexPath[1] {
|
||||
case 0: self.openUrl("https://organicmaps.app/news/")
|
||||
case 0: self.openUrl(L("translated_om_site_url") + "news/")
|
||||
case 1: self.navigationController?.pushViewController(FaqController(), animated: true)
|
||||
case 2: sendEmailWith(header: "Organic Maps Bugreport", toRecipients: [kiOSEmail])
|
||||
case 3: self.openUrl("https://organicmaps.app/support-us/")
|
||||
case 3: self.openUrl(L("translated_om_site_url") + "support-us/")
|
||||
case 4: UIApplication.shared.rateApp()
|
||||
default: fatalError("Invalid cell0 \(indexPath)")
|
||||
}
|
||||
|
|
@ -179,7 +179,7 @@ final class AboutController: MWMViewController, UITableViewDataSource, UITableVi
|
|||
case 2: switch indexPath[1] {
|
||||
case 0: self.openUrl(L("telegram_url"), inSafari: true)
|
||||
case 1: self.openUrl("https://github.com/organicmaps/organicmaps/", inSafari: true)
|
||||
case 2: self.openUrl("https://organicmaps.app/")
|
||||
case 2: self.openUrl(L("translated_om_site_url"))
|
||||
case 3: sendEmailWith(header: "Organic Maps", toRecipients: [kiOSEmail])
|
||||
case 4: self.openUrl("https://facebook.com/OrganicMaps", inSafari: true)
|
||||
case 5: self.openUrl("https://twitter.com/OrganicMapsApp", inSafari: true)
|
||||
|
|
@ -190,8 +190,8 @@ final class AboutController: MWMViewController, UITableViewDataSource, UITableVi
|
|||
}
|
||||
// Third section.
|
||||
case 3: switch indexPath[1] {
|
||||
case 0: self.openUrl("https://organicmaps.app/privacy")
|
||||
case 1: self.openUrl("https://organicmaps.app/terms")
|
||||
case 0: self.openUrl(L("translated_om_site_url") + "privacy/")
|
||||
case 1: self.openUrl(L("translated_om_site_url") + "terms/")
|
||||
case 2: showCopyright()
|
||||
default: fatalError("Invalid cell2 \(indexPath)")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ class PlacePageHeaderPresenter {
|
|||
|
||||
extension PlacePageHeaderPresenter: PlacePageHeaderPresenterProtocol {
|
||||
func configure() {
|
||||
view?.setTitle(placePagePreviewData.title ?? "")
|
||||
view?.setTitle(placePagePreviewData.title, secondaryTitle: placePagePreviewData.secondaryTitle)
|
||||
switch headerType {
|
||||
case .flexible:
|
||||
view?.isExpandViewHidden = false
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ protocol PlacePageHeaderViewProtocol: AnyObject {
|
|||
var isExpandViewHidden: Bool { get set }
|
||||
var isShadowViewHidden: Bool { get set }
|
||||
|
||||
func setTitle(_ title: String)
|
||||
func setTitle(_ title: String?, secondaryTitle: String?)
|
||||
}
|
||||
|
||||
class PlacePageHeaderViewController: UIViewController {
|
||||
|
|
@ -50,7 +50,33 @@ extension PlacePageHeaderViewController: PlacePageHeaderViewProtocol {
|
|||
}
|
||||
}
|
||||
|
||||
func setTitle(_ title: String) {
|
||||
titleLabel?.text = title
|
||||
func setTitle(_ title: String?, secondaryTitle: String?) {
|
||||
guard let title else {
|
||||
titleLabel?.attributedText = nil
|
||||
return
|
||||
}
|
||||
|
||||
let titleAttributes: [NSAttributedString.Key: Any] = [
|
||||
.font: StyleManager.shared.theme!.fonts.medium20,
|
||||
.foregroundColor: UIColor.blackPrimaryText()
|
||||
]
|
||||
|
||||
let attributedText = NSMutableAttributedString(string: title, attributes: titleAttributes)
|
||||
|
||||
guard let secondaryTitle else {
|
||||
titleLabel?.attributedText = attributedText
|
||||
return
|
||||
}
|
||||
|
||||
let paragraphStyle = NSMutableParagraphStyle()
|
||||
paragraphStyle.paragraphSpacingBefore = 2
|
||||
let secondaryTitleAttributes: [NSAttributedString.Key: Any] = [
|
||||
.font: StyleManager.shared.theme!.fonts.medium16,
|
||||
.foregroundColor: UIColor.blackPrimaryText(),
|
||||
.paragraphStyle: paragraphStyle
|
||||
]
|
||||
|
||||
attributedText.append(NSAttributedString(string: "\n" + secondaryTitle, attributes: secondaryTitleAttributes))
|
||||
titleLabel?.attributedText = attributedText
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="bX8-ZQ-XDA">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="bX8-ZQ-XDA">
|
||||
<device id="retina4_7" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
|
||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||
<capability name="Stack View standard spacing" minToolsVersion="9.0"/>
|
||||
<capability name="System colors in document resources" minToolsVersion="11.0"/>
|
||||
|
|
@ -1726,9 +1726,6 @@
|
|||
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium20:blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yZT-ea-Kac">
|
||||
<rect key="frame" x="333" y="12" width="30" height="30"/>
|
||||
|
|
|
|||
|
|
@ -184,8 +184,9 @@ extension PlacePageCommonLayout {
|
|||
isBookmark = true
|
||||
}
|
||||
if let title = placePageData.previewData.title {
|
||||
header?.setTitle(title)
|
||||
placePageNavigationViewController.setTitle(title)
|
||||
let secondaryTitle = placePageData.previewData.secondaryTitle
|
||||
header?.setTitle(title, secondaryTitle: secondaryTitle)
|
||||
placePageNavigationViewController.setTitle(title, secondaryTitle: secondaryTitle)
|
||||
}
|
||||
self.presenter?.layoutIfNeeded()
|
||||
UIView.animate(withDuration: kDefaultAnimationDuration) { [unowned self] in
|
||||
|
|
|
|||
|
|
@ -56,9 +56,17 @@ void Info::SetFromFeatureType(FeatureType & ft)
|
|||
{
|
||||
m_uiTitle = GetBookmarkName();
|
||||
|
||||
auto const secondaryTitle = m_customName.empty() ? m_primaryFeatureName : m_customName;
|
||||
std::string secondaryTitle;
|
||||
|
||||
if (!m_customName.empty())
|
||||
secondaryTitle = m_customName;
|
||||
else if (!out.secondary.empty())
|
||||
secondaryTitle = out.secondary;
|
||||
else
|
||||
secondaryTitle = m_primaryFeatureName;
|
||||
|
||||
if (m_uiTitle != secondaryTitle)
|
||||
m_uiSecondaryTitle = secondaryTitle;
|
||||
m_uiSecondaryTitle = std::move(secondaryTitle);
|
||||
|
||||
m_uiSubtitle = FormatSubtitle(true /* withType */);
|
||||
m_uiAddress = m_address;
|
||||
|
|
|
|||
|
|
@ -227,7 +227,8 @@ UNIT_CLASS_TEST(MwmTestsFixture, NY_Subway)
|
|||
auto const & results = request->Results();
|
||||
TEST_GREATER(results.size(), kPopularPoiResultsCount, ());
|
||||
|
||||
Range const range(results, 0, 3);
|
||||
// Fast food "Subways" should be the first despite of some "metro" subways are a bit closer ..
|
||||
Range const range(results, 0, 2);
|
||||
EqualClassifType(range, GetClassifTypes({{"amenity", "fast_food"}}));
|
||||
double const dist = SortedByDistance(range, center);
|
||||
TEST_LESS(dist, 1000, ());
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue