diff --git a/android/gradle.properties b/android/gradle.properties
index 325aa0f257..a005920359 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -3,8 +3,8 @@ propMinSdkVersion=15
# https://code.google.com/p/android/issues/detail?id=184567
propTargetSdkVersion=22
propBuildToolsVersion=22.0.1
-propVersionCode=613
-propVersionName=6.1.3
+propVersionCode=614
+propVersionName=6.1.4
propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1
propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index a6cb785e13..b44078e1c7 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -796,7 +796,7 @@
携帯通信ネットワークで接続してダウンロードしますか？
プランによって、またはローミングしている場合、非常に高額になる可能性があります。
正しい番地を入力してください
- フロアの数（最大％d）
+ フロアの数（最大%d）
最高25階までのビルを編集
郵便番号
正しい郵便番号を入力してください
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index ee10ccd7ef..4a50e3d95d 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -871,7 +871,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
break;
}
- if (LocationHelper.INSTANCE.shouldResolveErrors())
+ if (LocationHelper.INSTANCE.shouldResolveErrors() || LocationUtils.areLocationServicesTurnedOn())
{
String message = String.format("%s\n\n%s", getString(R.string.current_location_unknown_message),
getString(R.string.current_location_unknown_title));
diff --git a/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java b/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java
index 7bbd2b6c7a..d2e338c66a 100644
--- a/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java
+++ b/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java
@@ -108,7 +108,6 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
{
case LocationSettingsStatusCodes.SUCCESS:
LocationHelper.INSTANCE.setShouldResolveErrors(true);
- requestLocationUpdates();
break;
case LocationSettingsStatusCodes.RESOLUTION_REQUIRED:
// Location settings are not satisfied, but this can be fixed by showing the user a dialog.
@@ -118,6 +117,7 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
// Location settings are not satisfied. However, we have no way to fix the settings so we won't show the dialog.
break;
}
+ requestLocationUpdates();
}
});
}
diff --git a/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java b/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java
index b0681fd143..b0b0160b75 100644
--- a/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java
+++ b/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java
@@ -27,8 +27,11 @@ public class MyPositionButton
{
Statistics.INSTANCE.trackEvent(Statistics.EventName.TOOLBAR_MY_POSITION);
AlohaHelper.logClick(AlohaHelper.TOOLBAR_MY_POSITION);
- LocationHelper.INSTANCE.setShouldResolveErrors(true);
- LocationHelper.INSTANCE.restart(); // restart to check location settings again.
+ if (!LocationState.INSTANCE.isTurnedOn())
+ {
+ LocationHelper.INSTANCE.setShouldResolveErrors(true);
+ LocationHelper.INSTANCE.restart(); // restart to check location settings again.
+ }
LocationState.INSTANCE.nativeSwitchToNextMode();
}
});
diff --git a/android/src/com/mapswithme/util/LocationUtils.java b/android/src/com/mapswithme/util/LocationUtils.java
index 8982609ca8..cf780a5243 100644
--- a/android/src/com/mapswithme/util/LocationUtils.java
+++ b/android/src/com/mapswithme/util/LocationUtils.java
@@ -1,5 +1,6 @@
package com.mapswithme.util;
+import android.annotation.SuppressLint;
import android.content.ContentResolver;
import android.location.Location;
import android.os.Build;
@@ -112,28 +113,20 @@ public class LocationUtils
Math.abs(first.getLon() - second.getLon()) < LocationUtils.LAT_LON_EPSILON;
}
+ @SuppressLint("InlinedApi")
@SuppressWarnings("deprecation")
- public static boolean isLocationServicesTurnedOn()
+ public static boolean areLocationServicesTurnedOn()
{
- // If location is turned off(by user in system settings), google client( = fused provider) api doesn't work at all
- // but external gps receivers still can work. In that case we prefer native provider instead of fused - it works.
final ContentResolver resolver = MwmApplication.get().getContentResolver();
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT)
+ try
{
- final String providers = Settings.Secure.getString(resolver, Settings.Secure.LOCATION_PROVIDERS_ALLOWED);
- return !TextUtils.isEmpty(providers);
- }
- else
+ return Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT
+ ? !TextUtils.isEmpty(Settings.Secure.getString(resolver, Settings.Secure.LOCATION_PROVIDERS_ALLOWED))
+ : Settings.Secure.getInt(resolver, Settings.Secure.LOCATION_MODE) != Settings.Secure.LOCATION_MODE_OFF;
+ } catch (Settings.SettingNotFoundException e)
{
- try
- {
- final int mode = Settings.Secure.getInt(resolver, Settings.Secure.LOCATION_MODE);
- return mode != Settings.Secure.LOCATION_MODE_OFF;
- } catch (Settings.SettingNotFoundException e)
- {
- e.printStackTrace();
- return false;
- }
+ e.printStackTrace();
+ return false;
}
}
}
diff --git a/data/categories.txt b/data/categories.txt
index 858710a8d4..1cc67cf172 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -340,7 +340,7 @@ de:2Bar|2Pub|Kneipe|Bier|Essen
fr:2Bar|2pub|bière|boisson|nourriture
it:2Bar|2birra|pub|mangiare|cibo
es:2Bar|2pub|comer
-ko:바|술집|맥주|음료|음식
+ko:주점|맥주|음료|음식
ja:1居酒屋|バー|パブ|ビール|飲食|飲み屋|呑み屋|酒
cs:2Bar|pivo|pití|jídlo|voda|pitná voda|tekutiny
sk:2Bar|pivo|pitie|jedlo|voda|pitná voda|tekutiny
@@ -350,7 +350,7 @@ pl:2Bar|2pub|piwo|napoje|jedzenie
pt:2Bar|2pub|cerveja|beber|alimentação
hu:2Bár|2kocsma|sör|ital|élelmiszer
th:2บาร์|ผับ|เบียร์|เครื่องดื่ม|อาหาร
-zh-Hans:1酒吧์|酒馆์|啤酒|饮料|食物
+zh-Hans:1酒吧|酒馆์|啤酒|饮料|食物
ar:الحانة|خمارة์|بيرة ์|شراب|الطعام
da:2Bar|øl|pub|drink|mad
tr:2Bar|2bira|pub|içki|yemek
@@ -375,7 +375,7 @@ hu:Kocsma|Bár|sör|ital|élelmiszer
id:Pub|Bar|minuman|makanan
it:Pub|Bar|birra|mangiare|cibo
ja:バー|パブ|ビール|居酒屋|飲食|飲み屋|呑み屋|酒
-ko:바|술집|맥주|음료|음식
+ko:술집|맥주|음료|음식
nb:Pub|Bar|mat
nl:Kroeg|Bar|bier|drinken|eten
pl:Pub|Bar|piwo|napoje|jedzenie
@@ -388,7 +388,7 @@ th:ผับ|บาร์|ผับ|เบียร์|เครื่องด
tr:Pub|bar|Bira|içki|yemek
uk:Паб|Бар|пиво|напої|їжа
vi:Quán rượu|Quán bar|quán rượu|đồ uống|ẩm thực
-zh-Hans:酒吧์|酒馆์|啤酒|饮料|食物
+zh-Hans:酒馆|酒馆์|啤酒|饮料|食物
zh-Hant:酒館|啤酒吧|酒吧|飲酒|PUB|吧台|飲食
amenity-cafe
@@ -780,8 +780,8 @@ en:Liquor Store|liquor|U+1F377|2shop
ru:Магазин алкоголя|4алкоголь|3винный|3вино-водочный|2магазин
fr:Magasin de vins et spiritueux|vins et spiritueux|2magasin
da:Vinhandel|2butik
-id:Toko minuman keras|minuman keras|2toko
-ko:주류 판매점|1쇼핑|가게
+id:Toko alkohol|minuman keras|2toko
+ko:주류 샵|1쇼핑|가게
sv:Spritaffär|alkohol|2butik
tr:Içki dükkanı|2mağaza
uk:Винний магазин|крамниця спиртних напоїв|2магазин|крамниця
@@ -1438,8 +1438,8 @@ pl:Sklep rowerowy|4rower|sklep
pt:Loja de bicicletas|4bicicleta|compras
hu:4Kerékpár üzlet|kerékpár|kocsi|bolt
th:4จักรยาน|ร้าน|ร้านค้า
-zh-Hans:自行车|商店
-ar:دراجة هوائية|المتجر
+zh-Hans:自行车店|商店
+ar:متجر دراجات
da:Cykelforretning|butik
tr:Bisiklet|mağaza
sv:4Cykelaffär|cykel|cykel|butik
@@ -1797,7 +1797,7 @@ pl:3Punkt widokowy|widok|krajobraz|osobliwości miasta
pt:4Ponto de vista|turismo|vistas
hu:4Kilátó|kirándulás|látványosság|látnivaló|túrizmus
th:3จุดชมวิว|การท่องเที่ยว|สถานที่ท่องเที่ยว
-zh-Hans:1景点|旅游|景点
+zh-Hans:1观点|旅游|景点
ar:أماكن مراقبة|سياحة|مناظر
da:4Synspunkt|turisme|sightseeing|seværdigheder
tr:3Bakış|3turizm|3görülecek yerler
@@ -2170,7 +2170,7 @@ de:Denkmal|Gedenkstätte|Sehenswürdigkeit
fr:Mémorial|monument|attraction|tourisme|site touristique
it:Memoriale|monumento|turistico
es:Memorial|turismo
-ko:1기념물|관광
+ko:1기념비|관광
ja:追悼|1記念碑|観光|追悼碑
cs:Pomník|památka|zajímavost|pamětihodnost
sk:Pomník|pamiatka|atrakcia|zaujímavosť|pamätihodnosť
@@ -2181,7 +2181,7 @@ pt:Memorial|monumento|turismo|vistas
hu:3Emlékmű|látnivaló|túrizmus|látványosság
th:ที่ระลึก|สถานที่ท่องเที่ยว
zh-Hans:纪念馆|景点
-ar:تمثال|سياحة
+ar:مبنى او نصب تزكارى
da:Mindested|seværdigheder
tr:Anıt|abide|cazibe merkezleri|turizm|görülecek yerler
sv:3Minnesmärke|monument|attraktion|turism|sevärdheter
@@ -2200,7 +2200,7 @@ de:Monument|Denkmal|Sehenswürdigkeit
fr:Monument|attraction|tourisme|site touristique
it:Monumento|turistico
es:Monumento|turismo
-ko:1기념물|관광
+ko:1기념탑|관광
ja:1記念碑|観光
cs:Zajímavost|pomník|památka|pamětihodnost
sk:Zaujímavosť|pamätihodnosť|pomník|pamiatka
@@ -2208,10 +2208,10 @@ nl:Monument|attractie|toerisme
zh-Hant:1紀念碑|紀念塔|紀念館|旅遊景點
pl:3Pomnik historyczny|osobliwości miasta
pt:Monumento|turismo|vistas
-hu:Emlékmű|Szobor|túrizmus|látványosság|látnivaló
+hu:Műemlék|Szobor|túrizmus|látványosság|látnivaló
th:3อนุสาวรีย์|การท่องเที่ยว|สถานที่ท่องเที่ยว
zh-Hans:纪念碑|景点
-ar:تمثال|أماكن الجذب|سياحة
+ar:نصب تزكارى
da:Monument|seværdigheder
tr:Abide|cazibe merkezleri|turizm|görülecek yerler
sv:Monument|attraktion|tursim|sevärdheter
@@ -2390,8 +2390,8 @@ pl:4Wynajem rowerów|4rower|3Wynajem
pt:Aluguel de bicicletas|4bicicleta|3aluguel
hu:4Kerékpárkölcsönző|kerékpár|3bérlet
th:4จักรยานให้เช่า|4จักรยาน|บริการรถเช่า|
-zh-Hans:1自行车
-ar:دراجة هوائية
+zh-Hans:1自行车租赁
+ar:استئجار دراجات
da:4Cykel
tr:Bisiklet kiralama|4Bisiklet
sv:4Cykeluthyrning|cykel|cykel|3uthyrning
@@ -2774,7 +2774,7 @@ hu:Klinika|kórház|szanatórium
id:Klinik|rumah sakit
it:Clinica|ospedale
ja:クリニック|病院、診療所|病院
-ko:병원|의원
+ko:클리닉|의원
nl:Kliniek|ziekenhuis
nb:Klinikk|sykehus
pl:Klinika|Szpital
@@ -2924,7 +2924,7 @@ pl:3Biblioteka|książki
pt:Biblioteca
hu:3Könyvtár
th:3ห้องสมุด
-zh-Hans:幼儿园
+zh-Hans:图书馆
ar:مكتبة
da:3Bibliotek
tr:3Kütüphane
@@ -2993,7 +2993,7 @@ vi:3Hiệu thuốc
id:3Apotek
ro:3Farmacie
nb:3Apotek
-fi:3Apteekki
+fi:3Farmasia
sw:Duka la dawa
amenity-post_box
@@ -3169,7 +3169,7 @@ ar:مأوى
da:Hjem|ly|tilflugtssted
tr:Barınak
sv:Logi
-vi:Trường học
+vi:Chổ nương thân
id:Tempat penampungan
ro:Adăpost
nb:Tilfluktsrom
@@ -4058,7 +4058,7 @@ pl:4Hostel|4hotel|4motel
pt:3Hostel|3Pousada|4hotel|motel|Albergue
hu:3Hostel|szálloda|szállás
th:3หอพัก|โรงแรม|โมเทล
-zh-Hans:2旅社|旅店
+zh-Hans:2旅馆|旅店
ar:نزُل|فندق|فندق رخيص|الفندق
da:3Hostel|kro|vandrerhjem|hotel|motel
tr:3Pansiyon|otel|motel
@@ -4088,7 +4088,7 @@ pl:3Hotel|motel
pt:3Hotel|motel
hu:3Szálloda|hotel|szállás
th:3โรงแรม|โมเทล
-zh-Hans:2旅社|汽车旅馆|旅店
+zh-Hans:2宾馆|汽车旅馆|旅店
ar:فندق|فندق رخيص|الفندق
da:2Hotel|motel
tr:2Otel|motel
@@ -5611,7 +5611,7 @@ th:สถานรับเลี้ยงเด็ก|ดูแลเด็ก
tr:Çocuk Yuvası|Kreş
uk:Дитяча кімната|ясла
vi:Nhà trẻ|Chăm sóc Trẻ em
-zh-Hans:幼儿园|儿童看护
+zh-Hans:托儿所|儿童看护
zh-Hant:保育|幼兒園|兒童看護
amenity-bicycle_parking
@@ -5685,7 +5685,7 @@ fi:Hätänumero
fr:Téléphone d'urgence
he:טלפון חירום
hu:Sürgősségi telefon
-id:Telepon
+id:Telepon darurat
it:Telefono di emergenza
ja:緊急電話
ko:긴급 전화
@@ -5829,7 +5829,7 @@ da:Medicinbutik|Drugstore
de:Drogerie
es:Droguería
fi:Apteekki
-fr:Pharmacie
+fr:Droguerie
hu:Drogéria
id:Toko bahan kimia
it:Farmacia
@@ -6223,7 +6223,7 @@ th:ร้านรับแทงพนัน
tr:Bookmaker
uk:Букмекерська контора
vi:Người nhận cá cược
-zh-Hans:书店
+zh-Hans:做书店
zh-Hant:賭博業者
shop-seafood|@shop
@@ -6295,10 +6295,10 @@ es:Establecimiento de bebidas alcohólicas
fi:Alkoholimyymälä
fr:Hors licence
hu:Szeszesital-üzlet
-id:Toko minuman keras
+id:Toko anggur
it:Negozio di alcolici
ja:ワイン|酒屋|ワインショップ
-ko:주류 판매점
+ko:와인 샵
nl:Wijn|Slijterij
nb:Alkoholutsalg
pl:Sklep monopolowy
diff --git a/drape_frontend/animation_system.cpp b/drape_frontend/animation_system.cpp
index 7ff30cdb74..67f5df0b34 100644
--- a/drape_frontend/animation_system.cpp
+++ b/drape_frontend/animation_system.cpp
@@ -1092,6 +1092,7 @@ void AnimationSystem::CombineAnimation(drape_ptr animation)
return;
}
}
+
PushAnimation(move(animation));
}
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm
index 73a8ccb3fb..e37574f4d3 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Sound/MWMTextToSpeech.mm
@@ -161,7 +161,7 @@ using namespace locale_translator;
AVSpeechSynthesisVoice * voice = nil;
for (NSString * loc in candidateLocales)
{
- if ([loc isEqualToString:@"en-US"])
+ if (!(isIOS7 || isIOS8) && [loc isEqualToString:@"en-US"])
voice = [AVSpeechSynthesisVoice voiceWithLanguage:AVSpeechSynthesisVoiceIdentifierAlex];
if (voice)
break;
diff --git a/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursSection.mm b/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursSection.mm
index e498efb299..a07dd1f9a5 100644
--- a/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursSection.mm
+++ b/iphone/Maps/Classes/Editor/OpeningHours/MWMOpeningHoursSection.mm
@@ -15,6 +15,8 @@ extern UITableViewRowAnimation const kMWMOpeningHoursEditorRowAnimation;
@property (nonatomic) BOOL skipStoreCachedData;
+@property (nonatomic) BOOL removeBrokenExcludeTime;
+
@end
using namespace editor::ui;
@@ -147,7 +149,7 @@ using namespace osmoh;
if (isClosed)
{
- if (!tt.ReplaceExcludeTime(span, index))
+ if (!tt.ReplaceExcludeTime(span, index) && self.removeBrokenExcludeTime)
tt.RemoveExcludeTime(index);
}
else
@@ -178,6 +180,7 @@ using namespace osmoh;
- (void)addClosedTime
{
+ self.removeBrokenExcludeTime = YES;
self.selectedRow = nil;
NSUInteger const row = [self firstRowForKey:MWMOpeningHoursEditorAddClosedCell];
@@ -402,6 +405,7 @@ using namespace osmoh;
self.cachedStartTime = nil;
self.cachedEndTime = nil;
self.skipStoreCachedData = NO;
+ self.removeBrokenExcludeTime = NO;
}
#pragma mark - Scrolling
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 86b513c99f..f9a90c7efd 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -568,11 +568,12 @@ BOOL gIsFirstMyPositionMode = YES;
{
[m_predictor setMode:mode];
+ LocationManager * lm = [MapsAppDelegate theApp].locationManager;
switch (mode)
{
case location::PendingPosition:
self.disableStandbyOnLocationStateMode = NO;
- [[MapsAppDelegate theApp].locationManager start:self];
+ [lm start:self];
break;
case location::NotFollowNoPosition:
if (gIsFirstMyPositionMode && ![Alohalytics isFirstSession])
@@ -582,15 +583,20 @@ BOOL gIsFirstMyPositionMode = YES;
else
{
self.disableStandbyOnLocationStateMode = NO;
- BOOL const isLocationManagerStarted = [MapsAppDelegate theApp].locationManager.isStarted;
BOOL const isMapVisible = (self.navigationController.visibleViewController == self);
- if (isLocationManagerStarted && isMapVisible && ![Alohalytics isFirstSession])
+ if (isMapVisible && lm.isStarted)
{
- [[MapsAppDelegate theApp].locationManager stop:self];
- [self.alertController presentLocationNotFoundAlertWithOkBlock:^
+ [lm stop:self];
+ BOOL const isLocationProhibited =
+ lm.lastLocationError == location::TLocationError::EDenied ||
+ lm.lastLocationError == location::TLocationError::EGPSIsOff;
+ if (!isLocationProhibited)
{
- GetFramework().SwitchMyPositionNextMode();
- }];
+ [self.alertController presentLocationNotFoundAlertWithOkBlock:^
+ {
+ GetFramework().SwitchMyPositionNextMode();
+ }];
+ }
}
}
break;
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 037831967e..ccb460d8bc 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -4276,7 +4276,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 6.1.3;
+ CURRENT_PROJECT_VERSION = 6.1.4;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics";
@@ -4395,7 +4395,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 6.1.3;
+ CURRENT_PROJECT_VERSION = 6.1.4;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@@ -4515,7 +4515,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 6.1.3;
+ CURRENT_PROJECT_VERSION = 6.1.4;
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -4639,7 +4639,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 6.1.3;
+ CURRENT_PROJECT_VERSION = 6.1.4;
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -4763,7 +4763,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 6.1.3;
+ CURRENT_PROJECT_VERSION = 6.1.4;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics";
@@ -4885,7 +4885,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 6.1.3;
+ CURRENT_PROJECT_VERSION = 6.1.4;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Statistics";
diff --git a/iphone/Maps/Platform/LocationManager.h b/iphone/Maps/Platform/LocationManager.h
index 44edb44561..1b00754ec0 100644
--- a/iphone/Maps/Platform/LocationManager.h
+++ b/iphone/Maps/Platform/LocationManager.h
@@ -17,6 +17,7 @@
@interface LocationManager : NSObject
@property (nonatomic, readonly) BOOL isStarted;
+@property (nonatomic, readonly) location::TLocationError lastLocationError;
- (void)start:(id )observer;
- (void)stop:(id )observer;
diff --git a/iphone/Maps/Platform/LocationManager.mm b/iphone/Maps/Platform/LocationManager.mm
index 92a5482ee8..380e20fb1b 100644
--- a/iphone/Maps/Platform/LocationManager.mm
+++ b/iphone/Maps/Platform/LocationManager.mm
@@ -58,7 +58,7 @@ map const kGeoSettings{
.accuracy = {.charging = kCLLocationAccuracyBestForNavigation,
.battery = kCLLocationAccuracyBest}}},
{GeoMode::VehicleRouting,
- {.distanceFilter = 10,
+ {.distanceFilter = 5,
.accuracy = {.charging = kCLLocationAccuracyBestForNavigation,
.battery = kCLLocationAccuracyBest}}},
{GeoMode::PedestrianRouting,
@@ -78,6 +78,7 @@ map const kGeoSettings{
@property (nonatomic) CLLocationManager * locationManager;
@property (nonatomic, readwrite) BOOL isStarted;
+@property (nonatomic, readwrite) location::TLocationError lastLocationError;
@property (nonatomic) NSMutableSet * observers;
@property (nonatomic) NSDate * lastLocationTime;
@@ -236,6 +237,7 @@ map const kGeoSettings{
if (location.horizontalAccuracy < 0.)
return;
+ self.lastLocationError = location::TLocationError::ENoError;
// Save current device time for location.
self.lastLocationTime = [NSDate date];
[[Statistics instance] logLocation:location];
@@ -417,6 +419,7 @@ map const kGeoSettings{
- (void)observer:(id)observer onLocationError:(location::TLocationError)errorCode
{
+ self.lastLocationError = errorCode;
if ([(NSObject *)observer respondsToSelector:@selector(onLocationError:)])
[observer onLocationError:errorCode];
}
diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings
index 44da95b69e..c085b14b3f 100644
--- a/iphone/Maps/ja.lproj/Localizable.strings
+++ b/iphone/Maps/ja.lproj/Localizable.strings
@@ -1376,7 +1376,7 @@
"error_enter_correct_house_number" = "正しい番地を入力してください";
-"editor_storey_number" = "フロアの数（最大％d）";
+"editor_storey_number" = "フロアの数（最大%d）";
"error_enter_correct_storey_number" = "最高25階までのビルを編集";
diff --git a/map/framework.cpp b/map/framework.cpp
index 0d553ff336..ceab16977d 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -2639,7 +2639,8 @@ bool Framework::CreateMapObject(m2::PointD const & mercator, uint32_t const feat
osm::EditableMapObject & emo) const
{
emo = {};
- MwmSet::MwmId const mwmId = m_model.GetIndex().GetMwmIdByCountryFile(
+ auto const & index = m_model.GetIndex();
+ MwmSet::MwmId const mwmId = index.GetMwmIdByCountryFile(
platform::CountryFile(m_infoGetter->GetRegionCountryId(mercator)));
if (!mwmId.IsAlive())
return false;
@@ -2649,6 +2650,10 @@ bool Framework::CreateMapObject(m2::PointD const & mercator, uint32_t const feat
coder.GetNearbyStreets(mwmId, mercator, streets);
emo.SetNearbyStreets(TakeSomeStreetsAndLocalize(streets, m_model.GetIndex()));
+
+ // TODO(mgsergio): Check emo is a poi. For now it is the only option.
+ SetHostingBuildingAddress(FindBuildingAtPoint(mercator), index, coder, emo);
+
return osm::Editor::Instance().CreatePoint(featureType, mercator, mwmId, emo);
}
diff --git a/strings.txt b/strings.txt
index f429129aa0..c190d83720 100644
--- a/strings.txt
+++ b/strings.txt
@@ -16265,7 +16265,7 @@
nb = Antall etasjer (maks. %d)
zh-Hans = 楼号 (最大 %d)
th = จำนวนชั้น (มากสุด %d)
- ja = フロアの数（最大％d）
+ ja = フロアの数（最大%d）
ro = Număr de etaje (max %d)
ar = عدد الطوابق (بحد أقصى %d)
sk = Počet poschodí (max %d)