drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-21 05:43:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '7312560f48' into traffic

Browse Source 
# Conflicts:
#	iphone/Maps/UI/Settings/SettingsNavigationView.swift
#	libs/drape_frontend/rule_drawer.cpp
#	libs/traffic/traffic_info.cpp
This commit is contained in:
mvglasow
2025-11-21 22:33:12 +02:00
parent 48a3e5d4b0 7312560f48
commit 67b1d918ba
803 changed files with 13591 additions and 7562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libs/map/framework.cpp
View File

@@ -124,7 +124,7 @@ size_t constexpr kMaxTrafficCacheSizeBytes = 64 /* Mb */ * 1024 * 1024;
// This is temporary solution while we don't have a good filter.
bool ParseSetGpsTrackMinAccuracyCommand(string const & query)
{
char const kGpsAccuracy[] = "?gpstrackaccuracy:";
char constexpr kGpsAccuracy[] = "?gpstrackaccuracy:";
if (!query.starts_with(kGpsAccuracy))
return false;
@@ -954,6 +954,9 @@ void Framework::PrepareToShutdown()
void Framework::SaveViewport()
{
if (m_routingManager.IsRoutingActive())
return;
m2::AnyRectD rect;
if (m_currentModelView.isPerspective())
{
@@ -3179,7 +3182,16 @@ bool Framework::RollBackChanges(FeatureID const & fid)
void Framework::CreateNote(osm::MapObject const & mapObject, osm::Editor::NoteProblemType const type,
string const & note)
{
osm::Editor::Instance().CreateNote(mapObject.GetLatLon(), mapObject.GetID(), mapObject.GetTypes(),
ms::LatLon latLon;
if (HasPlacePageInfo())
latLon = mercator::ToLatLon(GetCurrentPlacePageInfo().GetMercator());
else
{
LOG(LWARNING, ("Could not get selected map point, falling back to mapObject location"));
latLon = mapObject.GetLatLon();
}
osm::Editor::Instance().CreateNote(latLon, mapObject.GetID(), mapObject.GetTypes(),
mapObject.GetDefaultName(), type, note);
if (type == osm::Editor::NoteProblemType::PlaceDoesNotExist)
DeactivateMapSelection();