mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-19 04:53:36 +00:00
[android][ios] Remove controversial Kayak integration
This patch removes the "Photos, reviews, booking" referral link displayed for certain hotels. Apologies to all users who experienced moral distress due to this integration. Thanks to everyone who spoke up. It should’ve been removed a year ago. Let's close this chapter. Better late than never. Zap it! Sorry again. Relevant discussions: - https://github.com/organicmaps/organicmaps/pull/6523 - https://gitlab.com/fdroid/fdroiddata/-/merge_requests/14082 Commits reverted: 51b3fc99 Add "Details on ..." button to hotels eee51c1b Rename "More on KAYAK" 2f1b6ce0 Add a setting to display Kayak links Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
committed by
Konstantin Pastbin
parent
3a31956eca
commit
584e76dd47
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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>(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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user