summaryrefslogtreecommitdiffstats
path: root/map-widget/qmlmapwidgethelper.cpp
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-05-08 22:15:01 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-05-11 12:06:19 -0700
commit0da86dfd8601edd33c47c787d42e4a687fff8aaf (patch)
tree3cb8c6b9acc358e17e1bb6e5b34c17b813f2bf7b /map-widget/qmlmapwidgethelper.cpp
parent0c387549164d7eec3ea6647c54ada2fba7f8d5e6 (diff)
downloadsubsurface-0da86dfd8601edd33c47c787d42e4a687fff8aaf.tar.gz
Map: in edit mode place no-gps dive sites at center of map
Move the code to add the first selected dive site from MapWidgetHelper::enterEditMode() to MapLocationModel::reload(). Thus, the list of sites is built only at one place. For this it is necessary to pass a pointer to the map, so that new dive sites can be added at the center of the map. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'map-widget/qmlmapwidgethelper.cpp')
-rw-r--r--map-widget/qmlmapwidgethelper.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/map-widget/qmlmapwidgethelper.cpp b/map-widget/qmlmapwidgethelper.cpp
index a7ef00bf8..9aba7f27a 100644
--- a/map-widget/qmlmapwidgethelper.cpp
+++ b/map-widget/qmlmapwidgethelper.cpp
@@ -100,7 +100,7 @@ void MapWidgetHelper::reloadMapLocations()
else
exitEditMode();
#endif
- m_mapLocationModel->reload();
+ m_mapLocationModel->reload(m_map);
}
void MapWidgetHelper::selectedLocationChanged(MapLocation *location)
@@ -239,14 +239,6 @@ void MapWidgetHelper::enterEditMode()
return;
m_editMode = true;
- // if divesite of the first selected dive doesn't exist in the model, add a new MapLocation.
- const QVector<dive_site *> selDs = m_mapLocationModel->selectedDs();
- if (!selDs.isEmpty() && ! m_mapLocationModel->getMapLocation(selDs[0])) {
- // If the dive site doesn't have a GPS location, use the centre of the map
- QGeoCoordinate coord = has_location(&selDs[0]->location) ? getCoordinates(selDs[0])
- : m_map->property("center").value<QGeoCoordinate>();
- m_mapLocationModel->add(new MapLocation(selDs[0], coord, QString(selDs[0]->name)));
- }
emit editModeChanged();
}