nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

RideMapWindow - Fix marker icons position for OSM maps

Browse Source 
Leaflet.js API uses the upper left corner as reference point while
GoldenCheetah icons, designed for Google Maps API, uses bottom center.
Since all marker icons are fixed size 32x37, this change adds the attribute
iconAnchor:[16,37] to fix positioning.
Fixes #3193
This commit is contained in:
Ale Martinez
2021-04-09 12:03:50 -03:00
parent 378cf95784
commit df1b5fdcaa
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Charts/RideMapWindow.cpp
View File

@@ -964,7 +964,7 @@ RideMapWindow::createMarkers()
if (loop) {
if (mapCombo->currentIndex() == OSM) {
code = QString("{ var latlng = new L.LatLng(%1,%2);"
"var image = new L.icon({iconUrl:'qrc:images/maps/loop.png'});"
"var image = new L.icon({iconUrl:'qrc:images/maps/loop.png',iconAnchor:[16,37]});"
"var marker = new L.marker(latlng, { icon: image });"
"marker.addTo(map); }").arg(points[0]->lat,0,'g',GPS_COORD_TO_STRING).arg(points[0]->lon,0,'g',GPS_COORD_TO_STRING);
} else if (mapCombo->currentIndex() == GOOGLE) {
@@ -982,7 +982,7 @@ RideMapWindow::createMarkers()
if (mapCombo->currentIndex() == OSM) {
code = QString("{ var latlng = new L.LatLng(%1,%2);"
"var image = new L.icon({iconUrl:'%3'});"
"var image = new L.icon({iconUrl:'%3',iconAnchor:[16,37]});"
"var marker = new L.marker(latlng, { icon: image });"
"marker.addTo(map); }").arg(points[0]->lat,0,'g',GPS_COORD_TO_STRING).arg(points[0]->lon,0,'g',GPS_COORD_TO_STRING).arg(marker);
} else if (mapCombo->currentIndex() == GOOGLE) {
@@ -994,7 +994,7 @@ RideMapWindow::createMarkers()
view->page()->runJavaScript(code);
if (mapCombo->currentIndex() == OSM) {
code = QString("{ var latlng = new L.LatLng(%1,%2);"
"var image = new L.icon({iconUrl:'qrc:images/maps/finish.png'});"
"var image = new L.icon({iconUrl:'qrc:images/maps/finish.png',iconAnchor:[16,37]});"
"var marker = new L.marker(latlng, { icon: image });"
"marker.addTo(map); }").arg(points[points.count()-1]->lat,0,'g',GPS_COORD_TO_STRING).arg(points[points.count()-1]->lon,0,'g',GPS_COORD_TO_STRING);
} else if (mapCombo->currentIndex() == GOOGLE) {
@@ -1050,7 +1050,7 @@ RideMapWindow::createMarkers()
if (mapCombo->currentIndex() == OSM) {
code = QString("{ var latlng = new L.LatLng(%1,%2);"
"var image = new L.icon({iconUrl:'%3'});"
"var image = new L.icon({iconUrl:'%3',iconAnchor:[16,37]});"
"var marker = new L.marker(latlng, { icon: image });"
"marker.addTo(map); }").arg(rfp->lat,0,'g',GPS_COORD_TO_STRING).arg(rfp->lon,0,'g',GPS_COORD_TO_STRING).arg(marker);
} else if (mapCombo->currentIndex() == GOOGLE) {