From 3f4adc2d31a5e8a4ade62b797abb99ccdd6c61d7 Mon Sep 17 00:00:00 2001
From: Mark Liversedge <markl@DenPC-ubuntu.(none)>
Date: Wed, 14 Apr 2010 20:48:52 +0100
Subject: [PATCH] Use Zone Colors on Map

A patch to use the GC zone color scheme (or preferences) when
plotting power on the Map tab.

fixes #82
---
 src/GoogleMapControl.cpp | 27 ++++++++-------------------
 src/GoogleMapControl.h   |  5 ++++-
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/GoogleMapControl.cpp b/src/GoogleMapControl.cpp
index a5a95afc7..419b8a3ce 100644
--- a/src/GoogleMapControl.cpp
+++ b/src/GoogleMapControl.cpp
@@ -139,7 +139,7 @@ using namespace gm;
 
 #define GOOGLE_KEY "ABQIAAAAS9Z2oFR8vUfLGYSzz40VwRQ69UCJw2HkJgivzGoninIyL8-QPBTtnR-6pM84ljHLEk3PDql0e2nJmg"
 
-GoogleMapControl::GoogleMapControl(MainWindow *mw) : current(NULL)
+GoogleMapControl::GoogleMapControl(MainWindow *mw) : main(mw), range(-1), current(NULL)
 {
     parent = mw;
     view = new QWebView();
@@ -164,14 +164,14 @@ GoogleMapControl::rideSelected()
   else
       current = ride;
 
-  int zone =ride->zoneRange();
-  if(zone < 0)
+  range =ride->zoneRange();
+  if(range < 0)
   {
       rideCP = 300;  // default cp to 300 watts
   }
   else
   {
-      rideCP = ride->zones->getCP(zone);
+      rideCP = ride->zones->getCP(range);
   }
 
   rideData.clear();
@@ -326,21 +326,10 @@ void GoogleMapControl::createHtml()
 }
 
 
-QColor GoogleMapControl::GetColor(int cp, int watts)
+QColor GoogleMapControl::GetColor(int watts)
 {
-    double effort = watts/ (double) cp /1.25;
-
-    if(effort < 0.25)
-    {
-        effort = 0;
-    }
-    if(effort > 1.0)
-    {
-        effort = 1;
-    }
-    QColor color;
-    color.setHsv(int(360 - (360 * effort)), 255, 255);
-    return color;
+    if (range < 0) return Qt::red;
+    else return zoneColor(main->zones()->whichZone(range, watts), 7);
 }
 
 
@@ -380,7 +369,7 @@ void GoogleMapControl::CreateSubPolyLine(const std::vector<RideFilePoint> &point
                                          int avgPower)
 {
     oss.precision(6);
-    QColor color = GetColor(rideCP,avgPower);
+    QColor color = GetColor(avgPower);
     QString colorstr = color.name();
     oss.setf(ios::fixed,ios::floatfield);
     oss << "var polyline = new GPolyline([";
diff --git a/src/GoogleMapControl.h b/src/GoogleMapControl.h
index 7cdc858b3..809107d79 100644
--- a/src/GoogleMapControl.h
+++ b/src/GoogleMapControl.h
@@ -26,6 +26,7 @@
 #include <sstream>
 #include <string>
 #include "RideFile.h"
+#include "MainWindow.h"
 
 class QMouseEvent;
 class RideItem;
@@ -39,10 +40,12 @@ class GoogleMapControl : public QWidget
 Q_OBJECT
 
  private:
+    MainWindow *main;
     QVBoxLayout *layout;
     QWebView *view;
     MainWindow *parent;
     GoogleMapControl();  // default ctor
+    int range;
     std::string CreatePolyLine();
     void CreateSubPolyLine(const std::vector<RideFilePoint> &points,
                            std::ostringstream &oss,
@@ -55,7 +58,7 @@ Q_OBJECT
     // the ride has changed, load a new page
     bool newRideToLoad;
 
-    QColor GetColor(int cp, int watts);
+    QColor GetColor(int watts);
 
     // a GPS normalized vectory of ride data points,
     // when a GPS unit loses signal it seems to