mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-23 22:53:43 +00:00
Multiple phone numbers should be [separated with `;`][parsing] in OSM `phone` values. This commit adds support for parsing and displaying such phone numbers individually. Example POI with three phone numbers: https://www.openstreetmap.org/way/233417266. Before this change, the phone was displayed as one value and trying to call it would fail because all the digits were concatenated together, resulting in an invalid number. For the POI above, the program tried to call `tel://+150332563111503325879018008756807`. This change fixes the parsing of `FMD_PHONE_NUMBER` into an array of phone numbers. That required updates in a few areas: - the POI details view (`PlacePageInfoViewController`) now displays every phone number as a separate row, each with a clickable link for that number; long-click to copy also works. - the share info preparation (`MWMShareActivityItem`) displays phone numbers separated with `; `, which provides a better phone detection for iOS. - the Call button (`PlacePageInteractor`) now has to ask the user which number to call if there are more than one. I tested this on an iPhone 15 Pro, iOS 17.2 simulator (temporarily commenting the "can make phone call" checks). Note: the Editing screen wasn't updated in order to keep this PR smaller. Fixes https://git.omaps.dev/organicmaps/organicmaps/issues/2458. The corresponding fix for Android was in https://github.com/organicmaps/organicmaps/pull/845. [parsing]: https://wiki.openstreetmap.org/wiki/Key:phone#Parsing_phone_numbers Signed-off-by: Eugene Nikolsky <omaps@egeek.me>
170 lines
5.1 KiB
Plaintext
170 lines
5.1 KiB
Plaintext
#import "MWMShareActivityItem.h"
|
|
|
|
#include <CoreApi/Framework.h>
|
|
#import <CoreApi/PlacePageData.h>
|
|
#import <CoreApi/PlacePagePreviewData.h>
|
|
#import <CoreApi/PlacePageInfoData.h>
|
|
#import <CoreApi/PlacePagePhone.h>
|
|
#import <LinkPresentation/LPLinkMetadata.h>
|
|
|
|
NSString * httpGe0Url(NSString * shortUrl)
|
|
{
|
|
// Replace 'om://' with 'https://omaps.app/'
|
|
return [shortUrl stringByReplacingCharactersInRange:NSMakeRange(0, 5) withString:@"https://omaps.app/"];
|
|
}
|
|
|
|
@interface MWMShareActivityItem ()
|
|
|
|
@property(nonatomic) PlacePageData *data;
|
|
@property(nonatomic) CLLocationCoordinate2D location;
|
|
@property(nonatomic) BOOL isMyPosition;
|
|
|
|
@end
|
|
|
|
@implementation MWMShareActivityItem
|
|
|
|
- (instancetype)initForMyPositionAtLocation:(CLLocationCoordinate2D const &)location
|
|
{
|
|
self = [super init];
|
|
if (self)
|
|
{
|
|
_location = location;
|
|
_isMyPosition = YES;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (instancetype)initForPlacePageObject:(id<MWMPlacePageObject>)object
|
|
{
|
|
NSAssert(false, @"deprecated");
|
|
|
|
return nil;
|
|
}
|
|
|
|
- (instancetype)initForPlacePage:(PlacePageData *)data {
|
|
self = [super init];
|
|
if (self)
|
|
{
|
|
NSAssert(data, @"Entity can't be nil!");
|
|
_isMyPosition = data.isMyPosition;
|
|
_data = data;
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (NSString *)url:(BOOL)isShort
|
|
{
|
|
auto & f = GetFramework();
|
|
|
|
auto const title = ^NSString *(PlacePageData *data)
|
|
{
|
|
if (!data || data.isMyPosition)
|
|
return L(@"core_my_position");
|
|
else if (data.previewData.title.length > 0)
|
|
return data.previewData.title;
|
|
else if (data.previewData.subtitle.length)
|
|
return data.previewData.subtitle;
|
|
else if (data.previewData.secondarySubtitle.length)
|
|
return data.previewData.secondarySubtitle;
|
|
else
|
|
return @"";
|
|
};
|
|
|
|
ms::LatLon const ll = self.data ? ms::LatLon(self.data.locationCoordinate.latitude,
|
|
self.data.locationCoordinate.longitude)
|
|
: ms::LatLon(self.location.latitude, self.location.longitude);
|
|
std::string const & s = f.CodeGe0url(ll.m_lat, ll.m_lon, f.GetDrawScale(), title(self.data).UTF8String);
|
|
|
|
NSString * url = @(s.c_str());
|
|
if (!isShort)
|
|
return url;
|
|
NSUInteger const kGe0UrlLength = 16;
|
|
return [url substringWithRange:NSMakeRange(0, kGe0UrlLength)];
|
|
}
|
|
|
|
#pragma mark - UIActivityItemSource
|
|
|
|
- (id)activityViewControllerPlaceholderItem:(UIActivityViewController *)activityViewController
|
|
{
|
|
return [self url:YES];
|
|
}
|
|
|
|
- (id)activityViewController:(UIActivityViewController *)activityViewController
|
|
itemForActivityType:(NSString *)activityType
|
|
{
|
|
NSString * type = activityType;
|
|
if ([UIActivityTypePostToTwitter isEqualToString:type])
|
|
return self.itemForTwitter;
|
|
return [self itemDefaultWithActivityType:type];
|
|
}
|
|
|
|
- (NSString *)activityViewController:(UIActivityViewController *)activityViewController
|
|
subjectForActivityType:(NSString *)activityType
|
|
{
|
|
return [self subjectDefault];
|
|
}
|
|
|
|
- (LPLinkMetadata *)activityViewControllerLinkMetadata:(UIActivityViewController *)activityViewController API_AVAILABLE(ios(13.0))
|
|
{
|
|
LPLinkMetadata * metadata = [[LPLinkMetadata alloc] init];
|
|
metadata.originalURL = [NSURL URLWithString:[self url:NO]];
|
|
metadata.title = self.isMyPosition ? L(@"core_my_position") : self.data.previewData.title;
|
|
metadata.iconProvider = [[NSItemProvider alloc] initWithObject:[UIImage imageNamed:@"imgLogo"]];
|
|
return metadata;
|
|
}
|
|
|
|
#pragma mark - Message
|
|
|
|
- (NSString *)itemForTwitter
|
|
{
|
|
NSString * shortUrl = [self url:YES];
|
|
return [NSString stringWithFormat:@"%@\n%@", httpGe0Url(shortUrl),
|
|
self.isMyPosition ? L(@"my_position_share_email_subject")
|
|
: self.data.previewData.title];
|
|
}
|
|
|
|
- (NSString *)itemDefaultWithActivityType:(NSString *)activityType
|
|
{
|
|
NSString * ge0Url = [self url:NO];
|
|
NSString * url = httpGe0Url(ge0Url);
|
|
if (self.isMyPosition)
|
|
{
|
|
BOOL const hasSubject = [activityType isEqualToString:UIActivityTypeMail];
|
|
if (hasSubject)
|
|
return [NSString stringWithFormat:@"%@ %@", url, ge0Url];
|
|
return [NSString
|
|
stringWithFormat:@"%@ %@\n%@", L(@"my_position_share_email_subject"), url, ge0Url];
|
|
}
|
|
|
|
NSMutableArray *phones = [NSMutableArray new];
|
|
[self.data.infoData.phones enumerateObjectsUsingBlock:^(PlacePagePhone * _Nonnull phone, NSUInteger idx, BOOL * _Nonnull stop) {
|
|
[phones addObject:phone.phone];
|
|
}];
|
|
|
|
NSMutableString * result = [L(@"sharing_call_action_look") mutableCopy];
|
|
std::vector<NSString *> strings{self.data.previewData.title,
|
|
self.data.previewData.subtitle,
|
|
self.data.previewData.secondarySubtitle,
|
|
[phones componentsJoinedByString:@"; "],
|
|
url,
|
|
ge0Url};
|
|
|
|
for (auto const & str : strings)
|
|
{
|
|
if (str.length)
|
|
[result appendString:[NSString stringWithFormat:@"\n%@", str]];
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
#pragma mark - Subject
|
|
|
|
- (NSString *)subjectDefault
|
|
{
|
|
return self.isMyPosition ? L(@"my_position_share_email_subject")
|
|
: L(@"bookmark_share_email_subject");
|
|
}
|
|
|
|
@end
|