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

[ios] add self_service and outdoor_seating tags to the pp

Browse source 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2024-08-10 21:49:27 +04:00 • committed by Viktor Havaka
parent 61251a01ef
commit 9557eb8ed0
7 changed files with 59 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.h
View file

@ -32,6 +32,8 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, readonly, nullable) NSString *wheelchair;
@property(nonatomic, readonly, nullable) NSString *driveThrough;
@property(nonatomic, readonly, nullable) NSString *websiteMenu;
@property(nonatomic, readonly, nullable) NSString *selfService;
@property(nonatomic, readonly, nullable) NSString *outdoorSeating;
@end

15
iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm
View file

@ -8,12 +8,18 @@
#include "indexer/validate_and_format_contacts.hpp"
#include "indexer/kayak.hpp"
#include "indexer/feature_meta.hpp"
#include "map/place_page_info.hpp"
using namespace place_page;
using namespace osm;
/// Get localized metadata value string when string format is "type.feature.value".
NSString * GetLocalizedMetadataValueString(MapObject::MetadataID metaID, std::string const & value) {
return ToNSString(platform::GetLocalizedTypeName(feature::ToString(metaID) + "." + value));
}
@implementation PlacePageInfoData
@end
@ -84,13 +90,18 @@ using namespace osm;
_driveThrough = NSLocalizedString(@"drive_through", nil);
break;
case MetadataID::FMD_WEBSITE_MENU: _websiteMenu = ToNSString(value); break;
case MetadataID::FMD_SELF_SERVICE: _selfService = GetLocalizedMetadataValueString(metaID, value); break;
case MetadataID::FMD_OUTDOOR_SEATING:
if (value == "yes")
_outdoorSeating = NSLocalizedString(@"outdoor_seating", nil);
break;
default:
break;
}
});
_atm = rawData.HasAtm() ? NSLocalizedString(@"type.amenity.atm", nil) : nil;
_address = rawData.GetAddress().empty() ? nil : @(rawData.GetAddress().c_str());
_coordFormats = @[@(rawData.GetFormattedCoordinate(place_page::CoordinatesFormat::LatLonDMS).c_str()),
@(rawData.GetFormattedCoordinate(place_page::CoordinatesFormat::LatLonDecimal).c_str()),

15
iphone/Maps/Images.xcassets/Place Page/ic_placepage_outdoor_seating.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "ic_placepage_outdoor_seating.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}

1
iphone/Maps/Images.xcassets/Place Page/ic_placepage_outdoor_seating.imageset/ic_placepage_outdoor_seating.svg vendored Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#e8eaed"><path d="M440-80v-520H80l400-280 400 280H520v520h-80Zm40-600h146-292 146ZM120-80v-210L88-466l78-14 30 160h164v240h-80v-160h-80v160h-80Zm480 0v-240h164l30-160 78 14-32 176v210h-80v-160h-80v160h-80ZM334-680h292L480-782 334-680Z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 341 B

15
iphone/Maps/Images.xcassets/Place Page/ic_placepage_self_service.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "ic_placepage_self_service.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}

3
iphone/Maps/Images.xcassets/Place Page/ic_placepage_self_service.imageset/ic_placepage_self_service.svg vendored Normal file
View file

@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3.00001 3.41406C2.74439 3.41406 2.48885 3.51116 2.29298 3.70703C1.90124 4.09877 1.90124 4.72936 2.29298 5.12109L6.85939 9.6875C6.59538 9.89712 6.3465 10.1208 6.1172 10.3633C4.72683 11.8338 4.00001 13.8444 4.00001 16C4.00006 16.5523 4.44775 16.9999 5.00001 17H14.1719L15.1719 18H4.00001C3.44601 18 3.00001 18.446 3.00001 19C3.00001 19.554 3.44601 20 4.00001 20H17.1719L18.8789 21.707C19.2707 22.0988 19.9012 22.0988 20.293 21.707C20.6847 21.3153 20.6847 20.6847 20.293 20.293L20 20L18 18L17 17L8.64064 8.64062L3.70704 3.70703C3.51117 3.51116 3.25563 3.41406 3.00001 3.41406ZM11 5C10.446 5 10 5.446 10 6C10 6.554 10.446 7 11 7V8C11 8.018 11.003 8.03498 11.0039 8.05273C10.9672 8.05656 10.9311 8.06217 10.8945 8.06641L19.6133 16.7852C19.8469 16.6021 20 16.3198 20 16C20 13.8444 19.2732 11.8338 17.8828 10.3633C16.6858 9.09729 15.0018 8.26128 12.9961 8.05273C12.997 8.03498 13 8.018 13 8V7C13.554 7 14 6.554 14 6C14 5.446 13.554 5 13 5H12H11Z" fill="black"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

10
iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
View file

@ -127,6 +127,8 @@ class PlacePageInfoViewController: UIViewController {
private var openWithAppView: InfoItemViewController?
private var capacityView: InfoItemViewController?
private var wheelchairView: InfoItemViewController?
private var selfServiceView: InfoItemViewController?
private var outdoorSeatingView: InfoItemViewController?
private var driveThroughView: InfoItemViewController?
var placePageInfoData: PlacePageInfoData!
@ -251,6 +253,14 @@ class PlacePageInfoViewController: UIViewController {
wheelchairView = createInfoItem(wheelchair, icon: UIImage(named: "ic_placepage_wheelchair"))
}
if let selfService = placePageInfoData.selfService {
selfServiceView = createInfoItem(selfService, icon: UIImage(named: "ic_placepage_self_service"))
}
if let outdoorSeating = placePageInfoData.outdoorSeating {
outdoorSeatingView = createInfoItem(outdoorSeating, icon: UIImage(named: "ic_placepage_outdoor_seating"))
}
if let driveThrough = placePageInfoData.driveThrough {
driveThroughView = createInfoItem(driveThrough, icon: UIImage(named: "ic_placepage_drive_through"))
}