diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java index 3b560b4d9..659bcf504 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java @@ -14,12 +14,9 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; import app.organicmaps.Framework; -import app.organicmaps.MwmActivity; import app.organicmaps.R; import app.organicmaps.bookmarks.data.MapObject; import app.organicmaps.bookmarks.data.Metadata; -import app.organicmaps.util.Config; -import app.organicmaps.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.widget.placepage.PlacePageUtils; import app.organicmaps.widget.placepage.PlacePageViewModel; diff --git a/coding/url.cpp b/coding/url.cpp index acc2bc7d6..4613e2f03 100644 --- a/coding/url.cpp +++ b/coding/url.cpp @@ -113,30 +113,6 @@ string Join(string const & lhs, string const & rhs) return lhs + rhs; } -string Slug(string const & raw) -{ - size_t const count = raw.size(); - string result; - result.reserve(count); - - for (size_t i = 0; i < count; ++i) - { - char const c = raw[i]; - if (c < '-' || c == '/' || (c > '9' && c < 'A') || (c > 'Z' && c < '_') || - c == '`' || (c > 'z' && c < '~') || c > '~') - { - // No more than two dashes in a row. - size_t sz = result.length(); - if (sz < 2 || result[sz - 2] != '-' || result[sz - 1] != '-') - result += '-'; - } - else - result += raw[i]; - } - - return result; -} - string UrlEncode(string const & rawUrl) { size_t const count = rawUrl.size(); diff --git a/coding/url.hpp b/coding/url.hpp index 0f29717fd..811794525 100644 --- a/coding/url.hpp +++ b/coding/url.hpp @@ -57,9 +57,6 @@ std::string Join(std::string const & lhs, std::string const & rhs, Args &&... ar return Join(Join(lhs, rhs), std::forward(args)...); } -// Replaces all special characters with '-' -std::string Slug(std::string const & raw); - std::string UrlEncode(std::string const & rawUrl); std::string UrlDecode(std::string_view encodedUrl); diff --git a/indexer/map_object.hpp b/indexer/map_object.hpp index 155652945..7c765ad80 100644 --- a/indexer/map_object.hpp +++ b/indexer/map_object.hpp @@ -58,6 +58,7 @@ public: case MetadataID::FMD_CUSTOM_IDS: case MetadataID::FMD_PRICE_RATES: case MetadataID::FMD_RATINGS: + case MetadataID::FMD_EXTERNAL_URI: break; default: fn(id, value); break; } diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm index f30d67826..8fb9fee4f 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm +++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm @@ -62,7 +62,6 @@ NSString * GetLocalizedMetadataValueString(MapObject::MetadataID metaID, std::st break; } case MetadataID::FMD_WEBSITE: _website = ToNSString(value); break; - case MetadataID::FMD_EXTERNAL_URI: break; case MetadataID::FMD_WIKIPEDIA: _wikipedia = ToNSString(value); break; case MetadataID::FMD_WIKIMEDIA_COMMONS: _wikimediaCommons = ToNSString(value); break; case MetadataID::FMD_EMAIL: