mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

mapwidgethelper: add the same logic for markers as in globe.cpp

Browse source 
The marble globe tracks dive sites with the same name and discards
such that are less than 50 meters apart.

We already store names in MapLocation objects, but using a
QMap<QString, MapLocation *> to check the names is probably faster
with the expense of using more memory.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
Lubomir I. Ivanov 2017-07-27 23:49:28 +03:00 • committed by Dirk Hohndel
parent ff4924f650
commit 5e57e42874
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
mobile-widgets/qmlmapwidgethelper.cpp
View file

@ -37,26 +37,38 @@ void MapWidgetHelper::reloadMapLocations()
{ {
struct dive_site *ds; struct dive_site *ds;
int idx; int idx;
QMap<QString, MapLocation *> locationNameMap;
m_mapLocationModel->clear(); m_mapLocationModel->clear();
MapLocation *location;
QVector<MapLocation *> locationList; QVector<MapLocation *> locationList;
qreal latitude, longitude;
if (displayed_dive_site.uuid && dive_site_has_gps_location(&displayed_dive_site)) {
latitude = displayed_dive_site.latitude.udeg * 0.000001;
longitude = displayed_dive_site.longitude.udeg * 0.000001;
location = new MapLocation(displayed_dive_site.uuid, QGeoCoordinate(latitude, longitude),
QString(displayed_dive_site.name));
locationList.append(location);
locationNameMap[QString(displayed_dive_site.name)] = location;
}
for_each_dive_site(idx, ds) { for_each_dive_site(idx, ds) {
if (!dive_site_has_gps_location(ds)) if (!dive_site_has_gps_location(ds) || ds->uuid == displayed_dive_site.uuid)
continue; continue;
const qreal latitude = ds->latitude.udeg * 0.000001; latitude = ds->latitude.udeg * 0.000001;
const qreal longitude = ds->longitude.udeg * 0.000001; longitude = ds->longitude.udeg * 0.000001;
QGeoCoordinate dsCoord(latitude, longitude); QGeoCoordinate dsCoord(latitude, longitude);
// check if there are no locations too close to the current dive site QString name(ds->name);
bool diveSiteTooClose = false; // don't add dive locations with the same name, unless they are
foreach(MapLocation *location, locationList) { // at least MIN_DISTANCE_BETWEEN_DIVE_SITES_M apart
QGeoCoordinate coord = qvariant_cast<QGeoCoordinate>(location->getRole(MapLocation::Roles::RoleCoordinate)); if (locationNameMap[name]) {
if (dsCoord.distanceTo(coord) < MIN_DISTANCE_BETWEEN_DIVE_SITES_M) { MapLocation *existingLocation = locationNameMap[name];
diveSiteTooClose = true; QGeoCoordinate coord = qvariant_cast<QGeoCoordinate>(existingLocation->getRole(MapLocation::Roles::RoleCoordinate));
break; if (dsCoord.distanceTo(coord) < MIN_DISTANCE_BETWEEN_DIVE_SITES_M)
} continue;
} }
if (!diveSiteTooClose) location = new MapLocation(ds->uuid, dsCoord, name);
locationList.append(new MapLocation(ds->uuid, QGeoCoordinate(latitude, longitude), QString(ds->name))); locationList.append(location);
locationNameMap[name] = location;
} }
m_mapLocationModel->addList(locationList); m_mapLocationModel->addList(locationList);
} }