organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

WIP: Add check_date support #8440

Draft
eisams wants to merge 2 commits from eisams/check_date into master
pull from: eisams/check_date
merge into: organicmaps:master
Conversation 0 Commits 2 Files changed 6 +11
6 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
generator/osm2meta.cpp
View file

@ -503,6 +503,7 @@ void MetadataTagProcessor::operator()(std::string const & k, std::string const &
break;
case Metadata::FMD_WEBSITE: valid = ValidateAndFormat_url(v); break;
case Metadata::FMD_WEBSITE_MENU: valid = ValidateAndFormat_url(v); break;
case Metadata::FMD_CHECK_DATE: valid = ValidateAndFormat_url(v); break;
case Metadata::FMD_CONTACT_FACEBOOK: valid = osm::ValidateAndFormat_facebook(v); break;
case Metadata::FMD_CONTACT_INSTAGRAM: valid = osm::ValidateAndFormat_instagram(v); break;
case Metadata::FMD_CONTACT_TWITTER: valid = osm::ValidateAndFormat_twitter(v); break;

3
indexer/feature_meta.cpp
View file

@ -136,6 +136,8 @@ bool Metadata::TypeFromString(string_view k, Metadata::EType & outType)
outType = Metadata::FMD_DRIVE_THROUGH;
else if (k == "website:menu")
outType = Metadata::FMD_WEBSITE_MENU;
else if (k == "check_date")
outType = Metadata::FMD_CHECK_DATE;
else
return false;
@ -256,6 +258,7 @@ string ToString(Metadata::EType type)
case Metadata::FMD_LOCAL_REF: return "local_ref";
case Metadata::FMD_DRIVE_THROUGH: return "drive_through";
case Metadata::FMD_WEBSITE_MENU: return "website:menu";
case Metadata::FMD_CHECK_DATE: return "check_date";
case Metadata::FMD_COUNT: CHECK(false, ("FMD_COUNT can not be used as a type."));
};

1
indexer/feature_meta.hpp
View file

@ -152,6 +152,7 @@ public:
FMD_LOCAL_REF = 44,
FMD_DRIVE_THROUGH = 45,
FMD_WEBSITE_MENU = 46,
FMD_CHECK_DATE = 47,
FMD_COUNT
};

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

@ -32,6 +32,7 @@ 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 *checkDate;
@end

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

@ -50,6 +50,7 @@ using namespace osm;
break;
}
case MetadataID::FMD_WEBSITE: _website = ToNSString(value); break;
case MetadataID::FMD_CHECK_DATE: _checkDate = ToNSString(value); break;
case MetadataID::FMD_EXTERNAL_URI:
{
NSString *countryIsoCode = [[NSLocale currentLocale] objectForKey:NSLocaleCountryCode] ?: @"US";

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

@ -81,6 +81,7 @@ class PlacePageInfoViewController: UIViewController {
private var phoneView: InfoItemViewController?
private var websiteView: InfoItemViewController?
private var websiteMenuView: InfoItemViewController?
private var checkDateView: InfoItemViewController?
private var kayakView: InfoItemViewController?
private var wikipediaView: InfoItemViewController?
private var wikimediaCommonsView: InfoItemViewController?
@ -144,6 +145,9 @@ class PlacePageInfoViewController: UIViewController {
self?.delegate?.didCopy(phone)
})
}
if let checkDate = placePageInfoData.checkDate {
checkDateView = createInfoItem(checkDate, icon: UIImage(named: "ic_placepage_operator"))
}
if let ppOperator = placePageInfoData.ppOperator {
operatorView = createInfoItem(ppOperator, icon: UIImage(named: "ic_placepage_operator"))