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

fixed the bounds box and the zoom to center correctly

Browse Source
This commit is contained in:
Greg Lonnon
2010-02-23 19:33:19 -07:00
committed by Sean Rhea
parent a392b33b51
commit f97bc9c152
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/GoogleMapControl.cpp
View File

@@ -163,14 +163,10 @@ void GoogleMapControl::createHtml()
minLon = std::min(minLon,rfp->lon);
maxLon = std::max(maxLon,rfp->lon);
}
/// seems to be the magic number... to stop the scrollbars
int width = view->width() -16;
int height = view->height() -16;
double startLat = ride->ride()->dataPoints().first()->lat;
double startLong = ride->ride()->dataPoints().first()->lon;
std::ostringstream oss;
oss.precision(6);
oss.setf(ios::fixed,ios::floatfield);
@@ -189,10 +185,15 @@ void GoogleMapControl::createHtml()
<< "if (GBrowserIsCompatible()) {" << endl
<< "map = new GMap2(document.getElementById(\"map_canvas\")," << endl
<< " {size: new GSize(" << width << "," << height << ") } );" << endl
<< "map.setCenter(new GLatLng(" << startLat <<"," << startLong << "), 13,G_PHYSICAL_MAP);" << endl
<< "map.setUIToDefault()" << endl
<< CreatePolyLine(ride) << endl
<< CreateIntervalMarkers(ride) << endl
<< "var sw = new GLatLng(" << minLat << "," << minLon << ");" << endl
<< "var ne = new GLatLng(" << maxLat << "," << maxLon << ");" << endl
<< "var bounds = new GLatLngBounds(sw,ne);" << endl
<< "var zoomLevel = map.getBoundsZoomLevel(bounds);" << endl
<< "var center = bounds.getCenter(); " << endl
<< "map.setCenter(bounds.getCenter(),map.getBoundsZoomLevel(bounds),G_PHYSICAL_MAP);" << endl
<< "map.enableScrollWheelZoom();" << endl
<< "}" << endl
<< "}" << endl
@@ -208,6 +209,7 @@ void GoogleMapControl::createHtml()
<< "</body>" << endl
<< "</html>" << endl;
#define DEBUG_GMAPS 1
#if DEBUG_GMAPS
QString htmlFile(QDir::tempPath());
htmlFile.append("/maps.html");
@@ -287,7 +289,9 @@ void GoogleMapControl::CreateSubPolyLine(const std::vector<RideFilePoint> &point
BOOST_FOREACH(RideFilePoint rfp, points)
{
if (ceil(rfp.lat) != 180 && ceil(rfp.lon) != 180)
oss << "new GLatLng(" << rfp.lat << "," << rfp.lon << ")," << endl;
{
oss << "new GLatLng(" << rfp.lat << "," << rfp.lon << ")," << endl;
}
}
oss << "],\"" << colorstr.toStdString() << "\",5));";