pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Added information about Wi-Fi to place page.

Browse source
This commit is contained in:
v.mikhaylenko 2015-06-23 20:22:21 +03:00 • committed by Alex Zolotarev
parent 9c67fe2ea7
commit bea4feb1c6
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/Maps/Classes/MWMPlacePageEntity.h
View file

@ -21,6 +21,7 @@ typedef NS_ENUM (NSUInteger, MWMPlacePageMetadataType)
MWMPlacePageMetadataTypeEmail,
MWMPlacePageMetadataTypeOpenHours,
MWMPlacePageMetadataTypeCoordinate,
MWMPlacePageMetadataTypeWiFi,
MWMPlacePageMetadataTypeBookmark
};

11
iphone/Maps/Classes/MWMPlacePageEntity.mm
View file

@ -15,7 +15,7 @@
extern NSArray * const kBookmarkColorsVariant = @[@"placemark-red", @"placemark-yellow", @"placemark-blue", @"placemark-green", @"placemark-purple", @"placemark-orange", @"placemark-brown", @"placemark-pink"];
extern NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS";
static NSArray * const kPatternTypesArray = @[@(MWMPlacePageMetadataTypePostcode), @(MWMPlacePageMetadataTypePhoneNumber), @(MWMPlacePageMetadataTypeWebsite), @(MWMPlacePageMetadataTypeURL), @(MWMPlacePageMetadataTypeEmail), @(MWMPlacePageMetadataTypeOpenHours), @(MWMPlacePageMetadataTypeCoordinate)];
static NSArray * const kPatternTypesArray = @[@(MWMPlacePageMetadataTypePostcode), @(MWMPlacePageMetadataTypePhoneNumber), @(MWMPlacePageMetadataTypeWebsite), @(MWMPlacePageMetadataTypeURL), @(MWMPlacePageMetadataTypeEmail), @(MWMPlacePageMetadataTypeOpenHours), @(MWMPlacePageMetadataTypeWiFi), @(MWMPlacePageMetadataTypeCoordinate)];
static NSString * const kTypesKey = @"types";
static NSString * const kValuesKey = @"values";
@ -174,10 +174,13 @@ using feature::Metadata;
case Metadata::FMD_OPEN_HOURS:
case Metadata::FMD_EMAIL:
case Metadata::FMD_POSTCODE:
case Metadata::FMD_INTERNET:
{
NSString * v;
if (type == Metadata::EType::FMD_OPEN_HOURS)
v = [self formattedOpenHoursFromString:metadata.Get(type)];
else if (type == Metadata::FMD_INTERNET)
v = L(@"WiFi_available");
else
v = [NSString stringWithUTF8String:metadata.Get(type).c_str()];
@ -186,9 +189,6 @@ using feature::Metadata;
[values addObject:v];
break;
}
case Metadata::FMD_INTERNET:
/// @todo Add Internet processing here
break;
default:
break;
@ -253,7 +253,8 @@ using feature::Metadata;
return @(MWMPlacePageMetadataTypeEmail);
case Metadata::FMD_POSTCODE:
return @(MWMPlacePageMetadataTypePostcode);
case Metadata::FMD_INTERNET:
return @(MWMPlacePageMetadataTypeWiFi);
default:
return nil;
}

3
iphone/Maps/Classes/MWMPlacePageInfoCell.mm
View file

@ -51,6 +51,9 @@ extern NSString * const kUserDefaultsLatLonAsDMSKey;
case MWMPlacePageMetadataTypeOpenHours:
[imageName appendString:@"OpenHours"];
break;
case MWMPlacePageMetadataTypeWiFi:
[imageName appendFormat:@"WiFi"];
break;
case MWMPlacePageMetadataTypeBookmark:
NSAssert(false, @"Incorrect type!");
break;