From 6d6741b90aff7acc2e41ee7d2c7706841a1df4ab Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Sun, 3 Jan 2021 17:24:11 +0100
Subject: [PATCH 01/60] copy everything from original PR

---
 requirements.txt                              |   1 +
 tapiriik/services/MapMyFitness/__init__.py    |   1 +
 .../services/MapMyFitness/mapmyfitness.py     | 153 ++++++++++++++++++
 tapiriik/services/__init__.py                 |   2 +
 tapiriik/services/service.py                  |   4 +-
 tapiriik/services/service_base.py             |   1 +
 tapiriik/web/static/css/style.css             |   5 +
 .../web/static/img/services/mapmyfitness.png  | Bin 0 -> 2266 bytes
 .../static/img/services/mapmyfitness_l.png    | Bin 0 -> 2977 bytes
 tapiriik/web/static/js/tapiriik.js            |   2 +
 10 files changed, 168 insertions(+), 1 deletion(-)
 create mode 100644 tapiriik/services/MapMyFitness/__init__.py
 create mode 100644 tapiriik/services/MapMyFitness/mapmyfitness.py
 create mode 100644 tapiriik/web/static/img/services/mapmyfitness.png
 create mode 100644 tapiriik/web/static/img/services/mapmyfitness_l.png

diff --git a/requirements.txt b/requirements.txt
index bb13abcf3..0758da3da 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
 requests
+requests-oauthlib
 dnspython
 pymongo==3.10.1
 pytz
diff --git a/tapiriik/services/MapMyFitness/__init__.py b/tapiriik/services/MapMyFitness/__init__.py
new file mode 100644
index 000000000..7955bbcf7
--- /dev/null
+++ b/tapiriik/services/MapMyFitness/__init__.py
@@ -0,0 +1 @@
+from .mapmyfitness import *
diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
new file mode 100644
index 000000000..9fefe6944
--- /dev/null
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -0,0 +1,153 @@
+from tapiriik.services.service_authentication import ServiceAuthenticationType
+from tapiriik.services.api import APIException, APIAuthorizationException
+from tapiriik.services.interchange import UploadedActivity, ActivityType, WaypointType, Waypoint, Location
+from tapiriik.settings import WEB_ROOT, MAPMYFITNESS_CLIENT_KEY, MAPMYFITNESS_CLIENT_SECRET
+
+from datetime import datetime, timedelta
+import requests
+from django.core.urlresolvers import reverse
+from requests_oauthlib import OAuth1
+
+
+class MapMyFitnessService():
+    ID = "mapmyfitness"
+    DisplayName = "MapMyFitness"
+    AuthenticationType = ServiceAuthenticationType.OAuthSigned
+    UserAuthorizationURL = None
+    OutstandingOAuthRequestTokens = {}
+
+    _activityMappings = {16: ActivityType.Running,
+                         11: ActivityType.Cycling,
+                         41: ActivityType.MountainBiking,
+                         9: ActivityType.Walking,
+                         24: ActivityType.Hiking,
+                         398: ActivityType.DownhillSkiing,
+                         397: ActivityType.CrossCountrySkiing,  # actually "backcountry" :S
+                         107: ActivityType.Snowboarding,
+                         86: ActivityType.Skating,  # ice skating
+                         15: ActivityType.Swimming,
+                         57: ActivityType.Rowing,  # canoe/rowing
+                         211: ActivityType.Elliptical,
+                         21: ActivityType.Other}
+    SupportedActivities = list(_activityMappings.values())
+
+    def WebInit(self):
+        pass
+
+    def GenerateUserAuthorizationURL(self):
+        oauth = OAuth1(MAPMYFITNESS_CLIENT_KEY, client_secret=MAPMYFITNESS_CLIENT_SECRET)
+        response = requests.post("http://api.mapmyfitness.com/3.1/oauth/request_token", auth=oauth)
+        from urllib.parse import parse_qs, urlencode
+        credentials = parse_qs(response.text)
+        token = credentials["oauth_token"][0]
+        self.OutstandingOAuthRequestTokens[token] = credentials["oauth_token_secret"][0]
+        reqObj = {"oauth_token": token, "oauth_callback": WEB_ROOT + reverse("oauth_return", kwargs={"service": "mapmyfitness"})}
+        return "http://api.mapmyfitness.com/3.1/oauth/authorize?" + urlencode(reqObj)
+
+    def _getOauthClient(self, svcRec):
+        return OAuth1(MAPMYFITNESS_CLIENT_KEY,
+                       client_secret=MAPMYFITNESS_CLIENT_SECRET,
+                       resource_owner_key=svcRec["Authorization"]["Key"],
+                       resource_owner_secret=svcRec["Authorization"]["Secret"])
+
+    def _getUserId(self, svcRec):
+        oauth = self._getOauthClient(svcRec)
+        response = requests.get("http://api.mapmyfitness.com/3.1/users/get_user", auth=oauth)
+        responseData = response.json()
+        return responseData["result"]["output"]["user"]["user_id"]
+
+    def RetrieveAuthorizationToken(self, req):
+        from tapiriik.services import Service
+
+        token = req.GET.get("oauth_token")
+
+        oauth = OAuth1(MAPMYFITNESS_CLIENT_KEY,
+                       client_secret=MAPMYFITNESS_CLIENT_SECRET,
+                       resource_owner_key=token,
+                       resource_owner_secret=self.OutstandingOAuthRequestTokens[token])
+
+        response = requests.post("http://api.mapmyfitness.com/3.1/oauth/access_token", auth=oauth)
+        if response.status_code != 200:
+            raise APIAuthorizationException("Invalid code", None)
+
+        del self.OutstandingOAuthRequestTokens[token]
+
+        from urllib.parse import parse_qs
+
+        responseData = parse_qs(response.text)
+
+        token = responseData["oauth_token"][0]
+        secret = responseData["oauth_token_secret"][0]
+
+        # hacky, but also totally their fault for not giving the user id in the token req
+        existingRecord = Service.GetServiceRecordWithAuthDetails(self, {"Key": token})
+        if existingRecord is None:
+            uid = self._getUserId({"Authorization": {"Key": token, "Secret": secret}})  # meh
+        else:
+            uid = existingRecord["ExternalID"]
+        return (uid, {"Key": token, "Secret": secret})
+
+    def RevokeAuthorization(self, serviceRecord):
+        oauth = self._getOauthClient(serviceRecord)
+        resp = requests.post("http://api.mapmyfitness.com/3.1/oauth/revoke", auth=oauth)
+        if resp.status_code != 200:
+            raise APIException("Unable to deauthorize MMF auth token, status " + str(resp.status_code) + " resp " + resp.text, serviceRecord)
+
+    def _getActivityTypeHierarchy(self):
+        if hasattr(self, "_activityTypes"):
+            return self._activityTypes
+        response = requests.get("http://api.mapmyfitness.com/3.1/workouts/get_activity_types")
+        data = response.json()
+        self._activityTypes = {}
+        for actType in data["result"]["output"]["activity_types"]:
+            self._activityTypes[int(actType["activity_type_id"])] = actType
+        return self._activityTypes
+
+    def _resolveActivityType(self, actType):
+        self._getActivityTypeHierarchy()
+        while actType not in self._activityMappings or self._activityTypes[actType]["parent_activity_type_id"] is not None:
+            actType = int(self._activityTypes[actType]["parent_activity_type_id"])
+        if actType in self._activityMappings:
+            return self._activityMappings[actType]
+        else:
+            return ActivityType.Other
+
+    def DownloadActivityList(self, serviceRecord, exhaustive=False):
+        oauth = self._getOauthClient(serviceRecord)
+
+        allItems = []
+
+        offset = 0
+
+        while True:
+            response = requests.get("http://api.mapmyfitness.com/3.1/workouts/get_workouts?limit=25&start_record=" + str(offset), auth=oauth)
+            if response.status_code != 200:
+                if response.status_code == 401 or response.status_code == 403:
+                    raise APIAuthorizationException("No authorization to retrieve activity list", serviceRecord)
+                raise APIException("Unable to retrieve activity list " + str(response), serviceRecord)
+            data = response.json()
+            print(data)
+            allItems += data["result"]["output"]["workouts"]
+            if not exhaustive or int(data["result"]["output"]["count"]) < 25:
+                break
+
+        activities = []
+        for act in allItems:
+            activity = UploadedActivity()
+            activity.StartTime = datetime.strptime(act["workout_date"] + " " + act["workout_start_time"], "%Y-%m-%d %H:%M:%S")
+            activity.EndTime = activity.StartTime + timedelta(0, round(float(act["time_taken"])))
+            activity.Distance = act["distance"]
+
+            activity.Type = self._resolveActivityType(int(act["activity_type_id"]))
+            activity.CalculateUID()
+
+            activity.UploadedTo = [{"Connection": serviceRecord, "ActivityID": act["workout_id"]}]
+            activities.append(activity)
+        return activities
+
+    def DownloadActivity(self, serviceRecord, activity):
+        activityID = [x["ActivityID"] for x in activity.UploadedTo if x["Connection"] == serviceRecord][0]
+        print (activityID)# route id 175411456 key 2025466620
+        oauth = self._getOauthClient(serviceRecord)
+        response = requests.get("http://api.mapmyfitness.com/3.1/routes/get_routes", auth=oauth)
+        print (response.text)
diff --git a/tapiriik/services/__init__.py b/tapiriik/services/__init__.py
index c4bd65421..170df32b3 100644
--- a/tapiriik/services/__init__.py
+++ b/tapiriik/services/__init__.py
@@ -38,6 +38,8 @@
 Singletracker = SingletrackerService()
 from tapiriik.services.Aerobia import AerobiaService
 Aerobia = AerobiaService()
+from tapiriik.services.MapMyFitness import MapMyFitnessService
+MapMyFitness = MapMyFitnessService()
 
 PRIVATE_SERVICES = []
 try:
diff --git a/tapiriik/services/service.py b/tapiriik/services/service.py
index 93af9e8d2..b92d6de79 100644
--- a/tapiriik/services/service.py
+++ b/tapiriik/services/service.py
@@ -47,6 +47,7 @@ def List():
             Setio,
             Singletracker,
             Aerobia,
+            MapMyFitness,
             private_svc_map.get("runsense")
         )
         return tuple(x for x in svc_list if x is not None)
@@ -74,7 +75,8 @@ def PreferredDownloadPriorityList():
             Pulsstory,
             Setio,
             Singletracker,
-            Aerobia
+            Aerobia,
+            MapMyFitness
         ] + PRIVATE_SERVICES
 
     def WebInit():
diff --git a/tapiriik/services/service_base.py b/tapiriik/services/service_base.py
index 13b7280d8..9074f4c3d 100644
--- a/tapiriik/services/service_base.py
+++ b/tapiriik/services/service_base.py
@@ -3,6 +3,7 @@
 
 class ServiceAuthenticationType:
     OAuth = "oauth"
+    OAuthSigned = "oauth-signed"
     UsernamePassword = "direct"
 
 class InvalidServiceOperationException(Exception):
diff --git a/tapiriik/web/static/css/style.css b/tapiriik/web/static/css/style.css
index 324d9a5f0..184181b40 100644
--- a/tapiriik/web/static/css/style.css
+++ b/tapiriik/web/static/css/style.css
@@ -121,6 +121,11 @@ body {
 	height:475px;
 }
 
+.popover iframe#mapmyfitness {
+	width:400px;
+	height:680px;
+}
+
 .logo {
 	width:100%;
 	position:absolute;
diff --git a/tapiriik/web/static/img/services/mapmyfitness.png b/tapiriik/web/static/img/services/mapmyfitness.png
new file mode 100644
index 0000000000000000000000000000000000000000..575f2892ead244e2fc24e423380ffe809b8ce3b4
GIT binary patch
literal 2266
zcmaJ@dsGu=7LNiNp!6uP@({~3ps)y;JV<~@z`W3C18G7fAQkc$A;x54GLQfwq98&6
z3E&IxwNgQ-7*JGJ#1|@T6}7Iwkwp<%5P|Y2j|yhppknurrE|{A_kH*Le!qL~ckj7p
zGP%L)tSlTYP$-lYdp(n9Tn`!FRp>>t-=9T?jf(@q5+HndE20sqAQVjkiy(k47sfz5
zNGM6z(G2;cP$n2@r~nagzM+U=IaWA}!D{77BO8VC57a7!Vi|-0A}B_xpkjuvUdI4Z
z2^AAY;@~(+1{5n@pQwWPiNT@bM48x6f(Z-&{IwLLfE+@EfL6X;p{8i5m=C%X<9^l*
zVt@}2L`KDY3`)S^0t{FM0VFKWON=Aq0kSt1?~U{G_VWY?I6Mx-6F{7g7am6;`A~3p
z;M0RKdQ(ZZQh3auPri&NDkc^|loSxuXf#+25eutgK)j!yABZD>1cH|l;iXPcAVRH|
zLhUlAz=YIdl~jpHVFfU&C=|hQ2o+<D^kWKg<!4!i`qMQTFAUTQl^`CAn@wpB$l?4s
zR4)IFRwF#<k9hyDusSqB34uIF4acd(#=>oNnRTV4FjSBbfmNX}ynXH#xv?+;t7Bm$
zz~GaxcpyxwkiZ)C2Rw&EVJp;#P$7ocOe)5xfR#!m6dxKh$UDfF;KLx3@pu-2M)RTh
z5`4XVXg)X+iO!niGGTF?98w^2T*)6?;=J71R*)-=o|%wJ8V^Z=RInWQkTOL&e=N9p
z^*(VW^T&dpmkSz$0cQ*QKZTw%8M|k8`?+n6htG`<DU98&GPd>6J;g6kD6?QTlNPFd
zHW)dyqr-PeEn(WZ5EZ6G%!D53?^F9Nf~x?PnaU$CGPT6QJq*}l#`8GITVSGHR&;M-
zVX3IUaLsV>&HWhK&cOyl7jLp$-eH;E-TwPY4A;Hdc7tcS^~O_N(O(M%7Ap_YPc`yB
z8tJ3Mr{x|0s;!d^T>9Z3wMS*~H|!gtOs2@*y@k0k9{p2{^6Vy}>2cpxgcfhr!~Eoj
zU0*TME>&c{w>!I`SGX@ar)PI{UWwW<DY!9w?_%QG3gxcpsDjQWI6HUXaqLBxQ}+HD
zFHye^MKUZiW~lL1Q4el!5Vf3JbD32c=L}}4`ofY2Zpa>`1TH$BkyO7<?;DuIr(Jey
z%i8axL9Trvz7l_@H9gSfZMJOp#L!eX+f3G==_^Y<74d8{J#d9z+1>2^qMWv;M0Ioi
z&*0IC=v~~JyrsAI)oJgCwCYBpfy?Gcn60{RJ6x+WU+(LTZFdS93FYUr1ea4sHgW9-
z2Wjo#I&9>_rh?39Ls{O5I69%@#L}^=Cl8wsY(}dF2b-7wZON_2VmrIVS2X6F{qHaS
zZc8>X%{gM(xXorDmiJo?^}h8Yq0L)v(86P>)*gS4ao;gr6~bRmUAv3l{;H;I*mSah
z&N7gxhQahk^0KMX2yA4rzN9p5ml^+x>-rKk7LB*754TUTshixkWrSSPL!>D=w{CbQ
zWB0lRyH4R>9eL#E(!|J5X}aV3mc+bUva~$&zSl%2+BEW31U*2YA9Z}B8F{8|P7?H5
zFI_d3MjXz3axmI~ahr$T?s_RVXC(H(t)7<;ELy`R)5fp4p&Qq0E3c{2seRke<=a)d
z4!ewlHf=S9RY&{@>@Z!8rDIXQS6+?e%Yxd!Y<!NRUG(%+w&l=w)}oKM&oJ>fpTt_T
z&57M^#cr<c3(R!SYE1nH61v{n=1UxjA>$<cP3NJ0nRkSqzk1bh$OzSK#dkN?Txf8g
zIm(5J*>+ntSsk!nS6N>$0VburbL(2}^g=%ou=LyMZ9#R+i>5V!vF{JHIy<@<u0@|r
zMV=Ek^`MvOMh*N6Zt{SD?mdsyJHLE>z`B#2Rd}CYWD}to>h1U?F(JHXM;9)#{6MK|
zu{*28W^=sLYW!f69@{)%YBG(UPD;2HZ%}mhQ9GuroKhT4tWWJoOIPoV8(Ovv<6x6U
zO>HZ}?`@|WVpuY3Mzu_%Z#|s%I`@2e??Ef{#Pz)g;44$klLm?|IQkfTXWMsvjsgAJ
z1<CKG@@_+~Yy{~)G7~rc@Y>RBWq8veo&F5{-_@D5C=vU4MX>hxW{=k`4E#S=%q&S9
z3b<~Wlx%snVXyzHubmO~_h0$8*f?Z;%@{MEvRRQ4&z`Yh2}3GkFi1<zvGJ>?4F=^9
zc;;%~XtjS~@!*2Ut!4St8v}yY7`ys*^ZK)PT?;FEj*SGh{pc}6GLL&;Dz~m{eYM=G
zYjyUC(`Ei#A59nMr@SIt?-y40SF(y0pQ-fhe(HR;P=BZXQF2e_z*ExY)HOBFK-^2B
z*H(;wwW-$fU2*4y-O8efdmf{qSF)Ub8{t}>CpX|low^$pX^Y8wvX|*dgVU2V)9V;j
zczo2GTF!&M(U4r*3I&iFMSJg9U)p28GpSS$v&$UvD$msI`L(4WYz*_-p*QN@o3%QM
zK&PG2=hnx$V{L~s1a#UH*Xfpy7mTwJyHXm9tdeEGxbs*Gj~y2zN`Esv_JtZ2o!?|V
z)k6hU)r4~+3CFU!0N%c_=KuI`ep++}-S|t2xYXBd{5<k$x*2EMhw0W$eRUXRg6fJo
V_^7nHJ7o56gUt$NR?(yP{1-W^v)BLt

literal 0
HcmV?d00001

diff --git a/tapiriik/web/static/img/services/mapmyfitness_l.png b/tapiriik/web/static/img/services/mapmyfitness_l.png
new file mode 100644
index 0000000000000000000000000000000000000000..236e21cfb45c6f38687c61cc8ea8fbe1678e8ae2
GIT binary patch
literal 2977
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

literal 0
HcmV?d00001

diff --git a/tapiriik/web/static/js/tapiriik.js b/tapiriik/web/static/js/tapiriik.js
index df2c3e35f..a6889a590 100644
--- a/tapiriik/web/static/js/tapiriik.js
+++ b/tapiriik/web/static/js/tapiriik.js
@@ -204,6 +204,8 @@ tapiriik.OpenAuthDialog = function(svcId){
 		} else {
 			contents = $("<iframe>").attr("src",tapiriik.ServiceInfo[svcId].AuthorizationURL).attr("id",svcId);
 		}
+	} else if (mode == "oauth-signed"){
+		contents = $("<iframe>").attr("src","/auth/redirect/"+svcId).attr("id",svcId);
 	} else if (mode == "direct") {
 		contents = tapiriik.CreateDirectLoginForm(svcId);
 	}

From 2cd97ce729f57c3128a5f4237a3356a7be273e2c Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Sun, 3 Jan 2021 17:31:31 +0100
Subject: [PATCH 02/60] add variables for key

---
 tapiriik/local_settings.py.example | 3 +++
 tapiriik/local_settings.py.os      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/tapiriik/local_settings.py.example b/tapiriik/local_settings.py.example
index d2c814422..5839f4353 100644
--- a/tapiriik/local_settings.py.example
+++ b/tapiriik/local_settings.py.example
@@ -68,3 +68,6 @@ TRAININGPEAKS_CLIENT_SECRET = "####"
 TRAININGPEAKS_CLIENT_SCOPE = "cats:cuddle dogs:throw-frisbee"
 TRAININGPEAKS_API_BASE_URL = "https://api.trainingpeaks.com"
 TRAININGPEAKS_OAUTH_BASE_URL = "https://oauth.trainingpeaks.com"
+
+MAPMYFITNESS_CLIENT_KEY = "####"
+MAPMYFITNESS_CLIENT_SECRET = "####"
diff --git a/tapiriik/local_settings.py.os b/tapiriik/local_settings.py.os
index 9dd2a09a0..b54c0e2a5 100644
--- a/tapiriik/local_settings.py.os
+++ b/tapiriik/local_settings.py.os
@@ -94,3 +94,6 @@ TRAININGPEAKS_CLIENT_SECRET = os.getenv("TRAININGPEAKS_CLIENT_SECRET")
 TRAININGPEAKS_CLIENT_SCOPE = "cats:cuddle dogs:throw-frisbee"
 TRAININGPEAKS_API_BASE_URL = "https://api.trainingpeaks.com"
 TRAININGPEAKS_OAUTH_BASE_URL = "https://oauth.trainingpeaks.com"
+
+MAPMYFITNESS_CLIENT_KEY = os.getenv("MAPMYFITNESS_CLIENT_KEY")
+MAPMYFITNESS_CLIENT_SECRET = os.getenv("MAPMYFITNESS_CLIENT_SECRET")

From e01c41ff639878b401b58725b7af1f9ca35aa121 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Sun, 3 Jan 2021 17:38:42 +0100
Subject: [PATCH 03/60] add key to kubernetes settings

---
 .github/workflows/docker-kubernetes.yml |  2 ++
 kubernetes-secrets.yml                  |  4 +++-
 kubernetes.yml                          | 20 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-kubernetes.yml b/.github/workflows/docker-kubernetes.yml
index 53552d5b8..31db00cd8 100644
--- a/.github/workflows/docker-kubernetes.yml
+++ b/.github/workflows/docker-kubernetes.yml
@@ -60,6 +60,8 @@ jobs:
             -e 's/SPORTTRACKS_CLIENT_ID/${{ secrets.SPORTTRACKS_CLIENT_ID }}/g' \
             -e 's/SPORTTRACKS_CLIENT_SECRET/${{ secrets.SPORTTRACKS_CLIENT_SECRET }}/g' \
             -e 's/RWGPS_APIKEY/${{ secrets.RWGPS_APIKEY }}/g' \
+            -e 's/MAPMYFITNESS_CLIENT_KEY/${{ secrets.MAPMYFITNESS_CLIENT_KEY }}/g' \
+            -e 's/MAPMYFITNESS_CLIENT_SECRET/${{ secrets.MAPMYFITNESS_CLIENT_SECRET }}/g' \
             kubernetes-secrets.yml
           sed -i'' -e 's/tapiriik:latest/tapiriik:${{ github.sha }}/g' kubernetes.yml
           kubectl apply -f kubernetes-secrets.yml --namespace tapiriik
diff --git a/kubernetes-secrets.yml b/kubernetes-secrets.yml
index b9a309e55..08cd6e09c 100644
--- a/kubernetes-secrets.yml
+++ b/kubernetes-secrets.yml
@@ -28,4 +28,6 @@ stringData:
   strava-client-secret: "STRAVA_CLIENT_SECRET"
   sporttracks-client-id: "SPORTTRACKS_CLIENT_ID"
   sporttracks-client-secret: "SPORTTRACKS_CLIENT_SECRET"
-  rwgps-api-key: "RWGPS_APIKEY"
\ No newline at end of file
+  rwgps-api-key: "RWGPS_APIKEY"
+  mapmyfitness-client-key: "MAPMYFITNESS_CLIENT_KEY"
+  mapmyfitness-client-secret: "MAPMYFITNESS_CLIENT_SECRET"
\ No newline at end of file
diff --git a/kubernetes.yml b/kubernetes.yml
index 8cabceeac..1ad644f35 100644
--- a/kubernetes.yml
+++ b/kubernetes.yml
@@ -201,6 +201,16 @@ spec:
             secretKeyRef:
               name: tapiriik-secret
               key: rwgps-api-key
+        - name: MAPMYFITNESS_CLIENT_KEY
+          valueFrom:
+            secretKeyRef:
+              name: tapiriik-secret
+              key: mapmyfitness-client-key
+        - name: MAPMYFITNESS_CLIENT_SECRET
+          valueFrom:
+            secretKeyRef:
+              name: tapiriik-secret
+              key: mapmyfitness-client-secret
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -357,6 +367,16 @@ spec:
             secretKeyRef:
               name: tapiriik-secret
               key: rwgps-api-key
+        - name: MAPMYFITNESS_CLIENT_KEY
+          valueFrom:
+            secretKeyRef:
+              name: tapiriik-secret
+              key: mapmyfitness-client-key
+        - name: MAPMYFITNESS_CLIENT_SECRET
+          valueFrom:
+            secretKeyRef:
+              name: tapiriik-secret
+              key: mapmyfitness-client-secret
 ---
 apiVersion: v1
 kind: Service

From c1e52b984528a4be927bc41f7baa61b857915594 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Sun, 3 Jan 2021 17:54:03 +0100
Subject: [PATCH 04/60] remove duplicate

---
 requirements.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 0758da3da..bb13abcf3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
 requests
-requests-oauthlib
 dnspython
 pymongo==3.10.1
 pytz

From ede5686b16918d135ebe3b9ed09bd29a7656e405 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Sun, 3 Jan 2021 19:07:47 +0100
Subject: [PATCH 05/60] fix compilation errors

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 4 ++--
 tapiriik/services/api.py                       | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 9fefe6944..c42d8ee4e 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -1,4 +1,4 @@
-from tapiriik.services.service_authentication import ServiceAuthenticationType
+from tapiriik.services.service_base import ServiceAuthenticationType, ServiceBase
 from tapiriik.services.api import APIException, APIAuthorizationException
 from tapiriik.services.interchange import UploadedActivity, ActivityType, WaypointType, Waypoint, Location
 from tapiriik.settings import WEB_ROOT, MAPMYFITNESS_CLIENT_KEY, MAPMYFITNESS_CLIENT_SECRET
@@ -9,7 +9,7 @@
 from requests_oauthlib import OAuth1
 
 
-class MapMyFitnessService():
+class MapMyFitnessService(ServiceBase):
     ID = "mapmyfitness"
     DisplayName = "MapMyFitness"
     AuthenticationType = ServiceAuthenticationType.OAuthSigned
diff --git a/tapiriik/services/api.py b/tapiriik/services/api.py
index 4133d472a..32b42f705 100644
--- a/tapiriik/services/api.py
+++ b/tapiriik/services/api.py
@@ -23,6 +23,9 @@ class ServiceWarning(ServiceException):
 class APIException(ServiceException):
     pass
 
+class APIAuthorizationException(APIException):
+    pass
+
 class APIWarning(ServiceWarning):
     pass
 

From 5c16f45efef7a26336504eeee3eeed9170c4d18b Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Mon, 4 Jan 2021 11:34:54 +0100
Subject: [PATCH 06/60] add missing parameters

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index c42d8ee4e..eb4ae7f6c 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -34,7 +34,7 @@ class MapMyFitnessService(ServiceBase):
     def WebInit(self):
         pass
 
-    def GenerateUserAuthorizationURL(self):
+    def GenerateUserAuthorizationURL(self, session, level=None):
         oauth = OAuth1(MAPMYFITNESS_CLIENT_KEY, client_secret=MAPMYFITNESS_CLIENT_SECRET)
         response = requests.post("http://api.mapmyfitness.com/3.1/oauth/request_token", auth=oauth)
         from urllib.parse import parse_qs, urlencode

From 9f5a7a9d9b39d7c5d58063b032001dbdd2fc8cc6 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Mon, 4 Jan 2021 14:30:58 +0100
Subject: [PATCH 07/60] dumb replacement of latest api version urls

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index eb4ae7f6c..b4c5da7a7 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -36,13 +36,13 @@ def WebInit(self):
 
     def GenerateUserAuthorizationURL(self, session, level=None):
         oauth = OAuth1(MAPMYFITNESS_CLIENT_KEY, client_secret=MAPMYFITNESS_CLIENT_SECRET)
-        response = requests.post("http://api.mapmyfitness.com/3.1/oauth/request_token", auth=oauth)
+        response = requests.post("https://api.mapmyfitness.com/v7.1/oauth2/request_token", auth=oauth)
         from urllib.parse import parse_qs, urlencode
         credentials = parse_qs(response.text)
         token = credentials["oauth_token"][0]
         self.OutstandingOAuthRequestTokens[token] = credentials["oauth_token_secret"][0]
         reqObj = {"oauth_token": token, "oauth_callback": WEB_ROOT + reverse("oauth_return", kwargs={"service": "mapmyfitness"})}
-        return "http://api.mapmyfitness.com/3.1/oauth/authorize?" + urlencode(reqObj)
+        return "https://api.mapmyfitness.com/v7.1/oauth2/authorize?" + urlencode(reqObj)
 
     def _getOauthClient(self, svcRec):
         return OAuth1(MAPMYFITNESS_CLIENT_KEY,
@@ -52,7 +52,7 @@ def _getOauthClient(self, svcRec):
 
     def _getUserId(self, svcRec):
         oauth = self._getOauthClient(svcRec)
-        response = requests.get("http://api.mapmyfitness.com/3.1/users/get_user", auth=oauth)
+        response = requests.get("https://api.mapmyfitness.com/v7.1/users/get_user", auth=oauth)
         responseData = response.json()
         return responseData["result"]["output"]["user"]["user_id"]
 
@@ -66,7 +66,7 @@ def RetrieveAuthorizationToken(self, req):
                        resource_owner_key=token,
                        resource_owner_secret=self.OutstandingOAuthRequestTokens[token])
 
-        response = requests.post("http://api.mapmyfitness.com/3.1/oauth/access_token", auth=oauth)
+        response = requests.post("https://api.mapmyfitness.com/v7.1/oauth2/access_token", auth=oauth)
         if response.status_code != 200:
             raise APIAuthorizationException("Invalid code", None)
 
@@ -89,14 +89,14 @@ def RetrieveAuthorizationToken(self, req):
 
     def RevokeAuthorization(self, serviceRecord):
         oauth = self._getOauthClient(serviceRecord)
-        resp = requests.post("http://api.mapmyfitness.com/3.1/oauth/revoke", auth=oauth)
+        resp = requests.post("https://api.mapmyfitness.com/v7.1/oauth2/revoke", auth=oauth)
         if resp.status_code != 200:
             raise APIException("Unable to deauthorize MMF auth token, status " + str(resp.status_code) + " resp " + resp.text, serviceRecord)
 
     def _getActivityTypeHierarchy(self):
         if hasattr(self, "_activityTypes"):
             return self._activityTypes
-        response = requests.get("http://api.mapmyfitness.com/3.1/workouts/get_activity_types")
+        response = requests.get("https://api.mapmyfitness.com/v7.1/workouts/get_activity_types")
         data = response.json()
         self._activityTypes = {}
         for actType in data["result"]["output"]["activity_types"]:
@@ -120,7 +120,7 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
         offset = 0
 
         while True:
-            response = requests.get("http://api.mapmyfitness.com/3.1/workouts/get_workouts?limit=25&start_record=" + str(offset), auth=oauth)
+            response = requests.get("https://api.mapmyfitness.com/v7.1/workouts/get_workouts?limit=25&start_record=" + str(offset), auth=oauth)
             if response.status_code != 200:
                 if response.status_code == 401 or response.status_code == 403:
                     raise APIAuthorizationException("No authorization to retrieve activity list", serviceRecord)
@@ -149,5 +149,5 @@ def DownloadActivity(self, serviceRecord, activity):
         activityID = [x["ActivityID"] for x in activity.UploadedTo if x["Connection"] == serviceRecord][0]
         print (activityID)# route id 175411456 key 2025466620
         oauth = self._getOauthClient(serviceRecord)
-        response = requests.get("http://api.mapmyfitness.com/3.1/routes/get_routes", auth=oauth)
+        response = requests.get("https://api.mapmyfitness.com/v7.1/routes/get_routes", auth=oauth)
         print (response.text)

From 891e2ead5e8b108b240a83ccf07fb3338f6bb355 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Mon, 4 Jan 2021 14:31:29 +0100
Subject: [PATCH 08/60] do the same as other oauth services

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 6 +++---
 tapiriik/services/service_base.py              | 1 -
 tapiriik/web/static/js/tapiriik.js             | 2 --
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index b4c5da7a7..5d821485d 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -12,7 +12,7 @@
 class MapMyFitnessService(ServiceBase):
     ID = "mapmyfitness"
     DisplayName = "MapMyFitness"
-    AuthenticationType = ServiceAuthenticationType.OAuthSigned
+    AuthenticationType = ServiceAuthenticationType.OAuth
     UserAuthorizationURL = None
     OutstandingOAuthRequestTokens = {}
 
@@ -32,7 +32,7 @@ class MapMyFitnessService(ServiceBase):
     SupportedActivities = list(_activityMappings.values())
 
     def WebInit(self):
-        pass
+        self.UserAuthorizationURL = reverse("oauth_return", kwargs={"service": "mapmyfitness"})
 
     def GenerateUserAuthorizationURL(self, session, level=None):
         oauth = OAuth1(MAPMYFITNESS_CLIENT_KEY, client_secret=MAPMYFITNESS_CLIENT_SECRET)
@@ -56,7 +56,7 @@ def _getUserId(self, svcRec):
         responseData = response.json()
         return responseData["result"]["output"]["user"]["user_id"]
 
-    def RetrieveAuthorizationToken(self, req):
+    def RetrieveAuthorizationToken(self, req, level):
         from tapiriik.services import Service
 
         token = req.GET.get("oauth_token")
diff --git a/tapiriik/services/service_base.py b/tapiriik/services/service_base.py
index 9074f4c3d..13b7280d8 100644
--- a/tapiriik/services/service_base.py
+++ b/tapiriik/services/service_base.py
@@ -3,7 +3,6 @@
 
 class ServiceAuthenticationType:
     OAuth = "oauth"
-    OAuthSigned = "oauth-signed"
     UsernamePassword = "direct"
 
 class InvalidServiceOperationException(Exception):
diff --git a/tapiriik/web/static/js/tapiriik.js b/tapiriik/web/static/js/tapiriik.js
index a6889a590..df2c3e35f 100644
--- a/tapiriik/web/static/js/tapiriik.js
+++ b/tapiriik/web/static/js/tapiriik.js
@@ -204,8 +204,6 @@ tapiriik.OpenAuthDialog = function(svcId){
 		} else {
 			contents = $("<iframe>").attr("src",tapiriik.ServiceInfo[svcId].AuthorizationURL).attr("id",svcId);
 		}
-	} else if (mode == "oauth-signed"){
-		contents = $("<iframe>").attr("src","/auth/redirect/"+svcId).attr("id",svcId);
 	} else if (mode == "direct") {
 		contents = tapiriik.CreateDirectLoginForm(svcId);
 	}

From 5b18f008eb10ff75897a030c32b6681771e5fc98 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Mon, 4 Jan 2021 20:52:28 +0100
Subject: [PATCH 09/60] set auth url

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 5d821485d..f880c5ccb 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -32,7 +32,11 @@ class MapMyFitnessService(ServiceBase):
     SupportedActivities = list(_activityMappings.values())
 
     def WebInit(self):
-        self.UserAuthorizationURL = reverse("oauth_return", kwargs={"service": "mapmyfitness"})
+        params = {'client_id': MAPMYFITNESS_CLIENT_KEY,
+                  'response_type': 'code',
+                  'redirect_uri': WEB_ROOT + reverse("oauth_return", kwargs={"service": "mapmyfitness"})}
+        self.UserAuthorizationURL = \
+            "https://api.mapmyfitness.com/v7.1/oauth2/authorize/?" + urlencode(params)
 
     def GenerateUserAuthorizationURL(self, session, level=None):
         oauth = OAuth1(MAPMYFITNESS_CLIENT_KEY, client_secret=MAPMYFITNESS_CLIENT_SECRET)

From d78d066793dd24d59c22696cec88e602ba063dc2 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Mon, 4 Jan 2021 20:57:28 +0100
Subject: [PATCH 10/60] add method logging

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index f880c5ccb..f6839c897 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -8,6 +8,9 @@
 from django.core.urlresolvers import reverse
 from requests_oauthlib import OAuth1
 
+import logging
+
+logger = logging.getLogger(__name__)
 
 class MapMyFitnessService(ServiceBase):
     ID = "mapmyfitness"
@@ -32,6 +35,7 @@ class MapMyFitnessService(ServiceBase):
     SupportedActivities = list(_activityMappings.values())
 
     def WebInit(self):
+        logger.debug("WebInit")
         params = {'client_id': MAPMYFITNESS_CLIENT_KEY,
                   'response_type': 'code',
                   'redirect_uri': WEB_ROOT + reverse("oauth_return", kwargs={"service": "mapmyfitness"})}
@@ -39,6 +43,7 @@ def WebInit(self):
             "https://api.mapmyfitness.com/v7.1/oauth2/authorize/?" + urlencode(params)
 
     def GenerateUserAuthorizationURL(self, session, level=None):
+        logger.debug("GenerateUserAuthorizationURL")
         oauth = OAuth1(MAPMYFITNESS_CLIENT_KEY, client_secret=MAPMYFITNESS_CLIENT_SECRET)
         response = requests.post("https://api.mapmyfitness.com/v7.1/oauth2/request_token", auth=oauth)
         from urllib.parse import parse_qs, urlencode
@@ -49,18 +54,21 @@ def GenerateUserAuthorizationURL(self, session, level=None):
         return "https://api.mapmyfitness.com/v7.1/oauth2/authorize?" + urlencode(reqObj)
 
     def _getOauthClient(self, svcRec):
+        logger.debug("_getOauthClient")
         return OAuth1(MAPMYFITNESS_CLIENT_KEY,
                        client_secret=MAPMYFITNESS_CLIENT_SECRET,
                        resource_owner_key=svcRec["Authorization"]["Key"],
                        resource_owner_secret=svcRec["Authorization"]["Secret"])
 
     def _getUserId(self, svcRec):
+        logger.debug("_getUserId")
         oauth = self._getOauthClient(svcRec)
         response = requests.get("https://api.mapmyfitness.com/v7.1/users/get_user", auth=oauth)
         responseData = response.json()
         return responseData["result"]["output"]["user"]["user_id"]
 
     def RetrieveAuthorizationToken(self, req, level):
+        logger.debug("RetrieveAuthorizationToken")
         from tapiriik.services import Service
 
         token = req.GET.get("oauth_token")
@@ -92,12 +100,14 @@ def RetrieveAuthorizationToken(self, req, level):
         return (uid, {"Key": token, "Secret": secret})
 
     def RevokeAuthorization(self, serviceRecord):
+        logger.debug("RevokeAuthorization")
         oauth = self._getOauthClient(serviceRecord)
         resp = requests.post("https://api.mapmyfitness.com/v7.1/oauth2/revoke", auth=oauth)
         if resp.status_code != 200:
             raise APIException("Unable to deauthorize MMF auth token, status " + str(resp.status_code) + " resp " + resp.text, serviceRecord)
 
     def _getActivityTypeHierarchy(self):
+        logger.debug("_getActivityTypeHierarchy")
         if hasattr(self, "_activityTypes"):
             return self._activityTypes
         response = requests.get("https://api.mapmyfitness.com/v7.1/workouts/get_activity_types")
@@ -108,6 +118,7 @@ def _getActivityTypeHierarchy(self):
         return self._activityTypes
 
     def _resolveActivityType(self, actType):
+        logger.debug("_resolveActivityType")
         self._getActivityTypeHierarchy()
         while actType not in self._activityMappings or self._activityTypes[actType]["parent_activity_type_id"] is not None:
             actType = int(self._activityTypes[actType]["parent_activity_type_id"])
@@ -117,6 +128,7 @@ def _resolveActivityType(self, actType):
             return ActivityType.Other
 
     def DownloadActivityList(self, serviceRecord, exhaustive=False):
+        logger.debug("DownloadActivityList")
         oauth = self._getOauthClient(serviceRecord)
 
         allItems = []
@@ -150,6 +162,7 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
         return activities
 
     def DownloadActivity(self, serviceRecord, activity):
+        logger.debug("DownloadActivity")
         activityID = [x["ActivityID"] for x in activity.UploadedTo if x["Connection"] == serviceRecord][0]
         print (activityID)# route id 175411456 key 2025466620
         oauth = self._getOauthClient(serviceRecord)

From 9ac7a765e504ee03416e079096d521bbfb56d142 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Mon, 4 Jan 2021 21:02:41 +0100
Subject: [PATCH 11/60] import

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index f6839c897..d55274b56 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -4,6 +4,7 @@
 from tapiriik.settings import WEB_ROOT, MAPMYFITNESS_CLIENT_KEY, MAPMYFITNESS_CLIENT_SECRET
 
 from datetime import datetime, timedelta
+from urllib.parse import parse_qs, urlencode
 import requests
 from django.core.urlresolvers import reverse
 from requests_oauthlib import OAuth1
@@ -46,7 +47,6 @@ def GenerateUserAuthorizationURL(self, session, level=None):
         logger.debug("GenerateUserAuthorizationURL")
         oauth = OAuth1(MAPMYFITNESS_CLIENT_KEY, client_secret=MAPMYFITNESS_CLIENT_SECRET)
         response = requests.post("https://api.mapmyfitness.com/v7.1/oauth2/request_token", auth=oauth)
-        from urllib.parse import parse_qs, urlencode
         credentials = parse_qs(response.text)
         token = credentials["oauth_token"][0]
         self.OutstandingOAuthRequestTokens[token] = credentials["oauth_token_secret"][0]

From dacf2a7437e767de5857d6e4a3eb0177b00ddd2c Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Mon, 4 Jan 2021 22:14:57 +0100
Subject: [PATCH 12/60] initial redirect

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index d55274b56..a1d9431d4 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -18,6 +18,7 @@ class MapMyFitnessService(ServiceBase):
     DisplayName = "MapMyFitness"
     AuthenticationType = ServiceAuthenticationType.OAuth
     UserAuthorizationURL = None
+    AuthenticationNoFrame = True
     OutstandingOAuthRequestTokens = {}
 
     _activityMappings = {16: ActivityType.Running,
@@ -37,9 +38,10 @@ class MapMyFitnessService(ServiceBase):
 
     def WebInit(self):
         logger.debug("WebInit")
+        redirect_uri = WEB_ROOT + reverse("oauth_return", kwargs={"service": "mapmyfitness"})
         params = {'client_id': MAPMYFITNESS_CLIENT_KEY,
                   'response_type': 'code',
-                  'redirect_uri': WEB_ROOT + reverse("oauth_return", kwargs={"service": "mapmyfitness"})}
+                  'redirect_uri': redirect_uri}
         self.UserAuthorizationURL = \
             "https://api.mapmyfitness.com/v7.1/oauth2/authorize/?" + urlencode(params)
 

From ef32f206fcde8d3aa863ca5b2e309cbb7ab34929 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Mon, 4 Jan 2021 22:20:51 +0100
Subject: [PATCH 13/60] base on runkeeper

---
 .../services/MapMyFitness/mapmyfitness.py     | 52 ++++++++-----------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index a1d9431d4..f728644b2 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -1,4 +1,5 @@
 from tapiriik.services.service_base import ServiceAuthenticationType, ServiceBase
+from tapiriik.services.service_record import ServiceRecord
 from tapiriik.services.api import APIException, APIAuthorizationException
 from tapiriik.services.interchange import UploadedActivity, ActivityType, WaypointType, Waypoint, Location
 from tapiriik.settings import WEB_ROOT, MAPMYFITNESS_CLIENT_KEY, MAPMYFITNESS_CLIENT_SECRET
@@ -55,17 +56,14 @@ def GenerateUserAuthorizationURL(self, session, level=None):
         reqObj = {"oauth_token": token, "oauth_callback": WEB_ROOT + reverse("oauth_return", kwargs={"service": "mapmyfitness"})}
         return "https://api.mapmyfitness.com/v7.1/oauth2/authorize?" + urlencode(reqObj)
 
-    def _getOauthClient(self, svcRec):
-        logger.debug("_getOauthClient")
-        return OAuth1(MAPMYFITNESS_CLIENT_KEY,
-                       client_secret=MAPMYFITNESS_CLIENT_SECRET,
-                       resource_owner_key=svcRec["Authorization"]["Key"],
-                       resource_owner_secret=svcRec["Authorization"]["Secret"])
+    def _apiHeaders(self, serviceRecord):
+        logger.debug("_apiHeaders")
+        return {"Authorization": "Bearer " + serviceRecord.Authorization["Token"],
+                "Accept-Charset": "UTF-8"}
 
-    def _getUserId(self, svcRec):
+    def _getUserId(self, serviceRecord):
         logger.debug("_getUserId")
-        oauth = self._getOauthClient(svcRec)
-        response = requests.get("https://api.mapmyfitness.com/v7.1/users/get_user", auth=oauth)
+        response = requests.get("https://api.mapmyfitness.com/v7.1/users/get_user", headers=self._apiHeaders(serviceRecord))
         responseData = response.json()
         return responseData["result"]["output"]["user"]["user_id"]
 
@@ -73,33 +71,25 @@ def RetrieveAuthorizationToken(self, req, level):
         logger.debug("RetrieveAuthorizationToken")
         from tapiriik.services import Service
 
-        token = req.GET.get("oauth_token")
+        code = req.GET.get("code")
+        params = {"grant_type": "authorization_code",
+                  "code": code,
+                  "client_id": MAPMYFITNESS_CLIENT_KEY,
+                  "client_secret": MAPMYFITNESS_CLIENT_SECRET,
+                  "redirect_uri": WEB_ROOT + reverse("oauth_return", kwargs={"service": "mapmyfitness"})}
 
-        oauth = OAuth1(MAPMYFITNESS_CLIENT_KEY,
-                       client_secret=MAPMYFITNESS_CLIENT_SECRET,
-                       resource_owner_key=token,
-                       resource_owner_secret=self.OutstandingOAuthRequestTokens[token])
+        response = requests.post("https://api.mapmyfitness.com/v7.1/oauth2/access_token",
+                                 data=urlencode(params),
+                                 headers={"Content-Type": "application/x-www-form-urlencoded",
+                                          "api-key": MAPMYFITNESS_CLIENT_KEY})
 
-        response = requests.post("https://api.mapmyfitness.com/v7.1/oauth2/access_token", auth=oauth)
         if response.status_code != 200:
-            raise APIAuthorizationException("Invalid code", None)
+            raise APIException("Invalid code")
+        token = response.json()["access_token"]
 
-        del self.OutstandingOAuthRequestTokens[token]
+        uid = self._getUserId(ServiceRecord({"Authorization": {"Token": token}}))
 
-        from urllib.parse import parse_qs
-
-        responseData = parse_qs(response.text)
-
-        token = responseData["oauth_token"][0]
-        secret = responseData["oauth_token_secret"][0]
-
-        # hacky, but also totally their fault for not giving the user id in the token req
-        existingRecord = Service.GetServiceRecordWithAuthDetails(self, {"Key": token})
-        if existingRecord is None:
-            uid = self._getUserId({"Authorization": {"Key": token, "Secret": secret}})  # meh
-        else:
-            uid = existingRecord["ExternalID"]
-        return (uid, {"Key": token, "Secret": secret})
+        return (uid, {"Token": token})
 
     def RevokeAuthorization(self, serviceRecord):
         logger.debug("RevokeAuthorization")

From 0d607ead7a04280511d038d7a7a610560ce4e6ae Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Tue, 5 Jan 2021 07:29:24 +0100
Subject: [PATCH 14/60] add vscode run config

---
 .gitignore              |  2 +-
 .vscode/extensions.json |  6 ++++++
 .vscode/launch.json     | 15 +++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 .vscode/extensions.json
 create mode 100644 .vscode/launch.json

diff --git a/.gitignore b/.gitignore
index d4ecdaccc..4e3a8214c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@
 local_settings.py
 *.sublime-workspace
 private/
-.vscode/
+.env
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 000000000..f71f5b318
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,6 @@
+{
+    "recommendations": [
+        "ms-python.python",
+        "tht13.python"
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 000000000..4beae6a5d
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python: Django",
+            "type": "python",
+            "request": "launch",
+            "program": "${workspaceFolder}\\manage.py",
+            "args": [
+                "runserver", "0.0.0.0:8000"
+            ],
+            "django": true
+        }
+    ]
+}
\ No newline at end of file

From 6004d0a380497d27b736b0e44b468f55b689da67 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Tue, 5 Jan 2021 14:38:08 +0100
Subject: [PATCH 15/60] change for mmf api urls

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index f728644b2..b8b80f672 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -63,9 +63,10 @@ def _apiHeaders(self, serviceRecord):
 
     def _getUserId(self, serviceRecord):
         logger.debug("_getUserId")
-        response = requests.get("https://api.mapmyfitness.com/v7.1/users/get_user", headers=self._apiHeaders(serviceRecord))
+        response = requests.get("https://api.mapmyfitness.com/v7.1/user/self", headers=self._apiHeaders(serviceRecord))
+        logger.debug("_getUserId response=%s" % response)
         responseData = response.json()
-        return responseData["result"]["output"]["user"]["user_id"]
+        return responseData["id"]
 
     def RetrieveAuthorizationToken(self, req, level):
         logger.debug("RetrieveAuthorizationToken")

From badebca907c288a2931e316e846de7d2a853e846 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Tue, 5 Jan 2021 14:40:46 +0100
Subject: [PATCH 16/60] add methods to disconnect

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index b8b80f672..0ed09c700 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -93,11 +93,8 @@ def RetrieveAuthorizationToken(self, req, level):
         return (uid, {"Token": token})
 
     def RevokeAuthorization(self, serviceRecord):
-        logger.debug("RevokeAuthorization")
-        oauth = self._getOauthClient(serviceRecord)
-        resp = requests.post("https://api.mapmyfitness.com/v7.1/oauth2/revoke", auth=oauth)
-        if resp.status_code != 200:
-            raise APIException("Unable to deauthorize MMF auth token, status " + str(resp.status_code) + " resp " + resp.text, serviceRecord)
+        # there doesn't seem to be a way to revoke the token
+        pass
 
     def _getActivityTypeHierarchy(self):
         logger.debug("_getActivityTypeHierarchy")
@@ -161,3 +158,13 @@ def DownloadActivity(self, serviceRecord, activity):
         oauth = self._getOauthClient(serviceRecord)
         response = requests.get("https://api.mapmyfitness.com/v7.1/routes/get_routes", auth=oauth)
         print (response.text)
+
+    def UploadActivity(self, serviceRecord, activity):
+        # TODO
+        pass
+
+    def DeleteCachedData(self, serviceRecord):
+        pass
+
+    def DeleteActivity(self, serviceRecord, uploadId):
+        pass

From 6d10923ec63ed0df1deb32d40116017c64a68ce5 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Tue, 5 Jan 2021 17:48:43 +0100
Subject: [PATCH 17/60] use header instead of auth

---
 .vscode/launch.json                           | 33 +++++++++++--------
 .../services/MapMyFitness/mapmyfitness.py     | 11 ++-----
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 4beae6a5d..d936d19a0 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,15 +1,20 @@
 {
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Python: Django",
-            "type": "python",
-            "request": "launch",
-            "program": "${workspaceFolder}\\manage.py",
-            "args": [
-                "runserver", "0.0.0.0:8000"
-            ],
-            "django": true
-        }
-    ]
-}
\ No newline at end of file
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Python: Sync Worker",
+      "type": "python",
+      "request": "launch",
+      "program": "${workspaceFolder}\\sync_worker.py",
+      "console": "integratedTerminal"
+    },
+    {
+      "name": "Python: Django",
+      "type": "python",
+      "request": "launch",
+      "program": "${workspaceFolder}\\manage.py",
+      "args": ["runserver", "0.0.0.0:8000"],
+      "django": true
+    }
+  ]
+}
diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 0ed09c700..faf76067a 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -119,14 +119,10 @@ def _resolveActivityType(self, actType):
 
     def DownloadActivityList(self, serviceRecord, exhaustive=False):
         logger.debug("DownloadActivityList")
-        oauth = self._getOauthClient(serviceRecord)
-
         allItems = []
-
         offset = 0
-
         while True:
-            response = requests.get("https://api.mapmyfitness.com/v7.1/workouts/get_workouts?limit=25&start_record=" + str(offset), auth=oauth)
+            response = requests.get("https://api.mapmyfitness.com/v7.1/workouts/get_workouts?limit=25&start_record=" + str(offset), headers=self._apiHeaders(serviceRecord))
             if response.status_code != 200:
                 if response.status_code == 401 or response.status_code == 403:
                     raise APIAuthorizationException("No authorization to retrieve activity list", serviceRecord)
@@ -154,9 +150,8 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
     def DownloadActivity(self, serviceRecord, activity):
         logger.debug("DownloadActivity")
         activityID = [x["ActivityID"] for x in activity.UploadedTo if x["Connection"] == serviceRecord][0]
-        print (activityID)# route id 175411456 key 2025466620
-        oauth = self._getOauthClient(serviceRecord)
-        response = requests.get("https://api.mapmyfitness.com/v7.1/routes/get_routes", auth=oauth)
+        print (activityID)
+        response = requests.get("https://api.mapmyfitness.com/v7.1/routes/get_routes", headers=self._apiHeaders(serviceRecord))
         print (response.text)
 
     def UploadActivity(self, serviceRecord, activity):

From 3040663de8aca067bafcc76c93af97500377b3c2 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Tue, 5 Jan 2021 18:02:32 +0100
Subject: [PATCH 18/60] update url according to docs

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index faf76067a..b8a857923 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -122,14 +122,16 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
         allItems = []
         offset = 0
         while True:
-            response = requests.get("https://api.mapmyfitness.com/v7.1/workouts/get_workouts?limit=25&start_record=" + str(offset), headers=self._apiHeaders(serviceRecord))
+            response = requests.get("https://api.mapmyfitness.com/v7.1/workout?limit=25&offset=" + str(offset), headers=self._apiHeaders(serviceRecord))
             if response.status_code != 200:
                 if response.status_code == 401 or response.status_code == 403:
                     raise APIAuthorizationException("No authorization to retrieve activity list", serviceRecord)
                 raise APIException("Unable to retrieve activity list " + str(response), serviceRecord)
             data = response.json()
             print(data)
+            # TODO should be ["_embedded"]["workouts"]
             allItems += data["result"]["output"]["workouts"]
+            # TODO should be ["total_count"]
             if not exhaustive or int(data["result"]["output"]["count"]) < 25:
                 break
 

From a328f4008284b2ee0ec561d613f15ede81ea23bf Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Wed, 6 Jan 2021 07:30:38 +0100
Subject: [PATCH 19/60] get activities from MMR

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index b8a857923..117e33746 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -122,22 +122,21 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
         allItems = []
         offset = 0
         while True:
-            response = requests.get("https://api.mapmyfitness.com/v7.1/workout?limit=25&offset=" + str(offset), headers=self._apiHeaders(serviceRecord))
+            response = requests.get("https://api.mapmyfitness.com/v7.1/workout?limit=25&offset=%d&user=%d" % (offset, serviceRecord.ExternalID), headers=self._apiHeaders(serviceRecord))
             if response.status_code != 200:
                 if response.status_code == 401 or response.status_code == 403:
                     raise APIAuthorizationException("No authorization to retrieve activity list", serviceRecord)
                 raise APIException("Unable to retrieve activity list " + str(response), serviceRecord)
             data = response.json()
             print(data)
-            # TODO should be ["_embedded"]["workouts"]
-            allItems += data["result"]["output"]["workouts"]
-            # TODO should be ["total_count"]
-            if not exhaustive or int(data["result"]["output"]["count"]) < 25:
+            allItems += data["_embedded"]["workouts"]
+            if not exhaustive or int(data["total_count"]) < 25:
                 break
 
         activities = []
         for act in allItems:
             activity = UploadedActivity()
+            # TODO the correct fields from new API https://developer.underarmour.com/docs/v71_Workout/
             activity.StartTime = datetime.strptime(act["workout_date"] + " " + act["workout_start_time"], "%Y-%m-%d %H:%M:%S")
             activity.EndTime = activity.StartTime + timedelta(0, round(float(act["time_taken"])))
             activity.Distance = act["distance"]

From 24505823fec4c1b853afb8f9e46d2979ae0e816a Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Wed, 6 Jan 2021 10:28:26 +0100
Subject: [PATCH 20/60] handle api auth exception the same as runkeeper etc

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 4 ++--
 tapiriik/services/api.py                       | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 117e33746..8ae0788aa 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -1,6 +1,6 @@
 from tapiriik.services.service_base import ServiceAuthenticationType, ServiceBase
 from tapiriik.services.service_record import ServiceRecord
-from tapiriik.services.api import APIException, APIAuthorizationException
+from tapiriik.services.api import APIException
 from tapiriik.services.interchange import UploadedActivity, ActivityType, WaypointType, Waypoint, Location
 from tapiriik.settings import WEB_ROOT, MAPMYFITNESS_CLIENT_KEY, MAPMYFITNESS_CLIENT_SECRET
 
@@ -125,7 +125,7 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
             response = requests.get("https://api.mapmyfitness.com/v7.1/workout?limit=25&offset=%d&user=%d" % (offset, serviceRecord.ExternalID), headers=self._apiHeaders(serviceRecord))
             if response.status_code != 200:
                 if response.status_code == 401 or response.status_code == 403:
-                    raise APIAuthorizationException("No authorization to retrieve activity list", serviceRecord)
+                    raise APIException("No authorization to retrieve activity list", block=True, user_exception=UserException(UserExceptionType.Authorization, intervention_required=True))
                 raise APIException("Unable to retrieve activity list " + str(response), serviceRecord)
             data = response.json()
             print(data)
diff --git a/tapiriik/services/api.py b/tapiriik/services/api.py
index 32b42f705..4133d472a 100644
--- a/tapiriik/services/api.py
+++ b/tapiriik/services/api.py
@@ -23,9 +23,6 @@ class ServiceWarning(ServiceException):
 class APIException(ServiceException):
     pass
 
-class APIAuthorizationException(APIException):
-    pass
-
 class APIWarning(ServiceWarning):
     pass
 

From 97f056d658afb7231fe311a646b8917a6eb9ec8c Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Wed, 6 Jan 2021 16:28:07 +0100
Subject: [PATCH 21/60] check for next

---
 .vscode/extensions.json                        | 3 ++-
 tapiriik/services/MapMyFitness/mapmyfitness.py | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index f71f5b318..80a905823 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,7 @@
 {
     "recommendations": [
         "ms-python.python",
-        "tht13.python"
+        "tht13.python",
+        "visualstudioexptteam.vscodeintellicode"
     ]
 }
\ No newline at end of file
diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 8ae0788aa..571fb2679 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -1,6 +1,6 @@
 from tapiriik.services.service_base import ServiceAuthenticationType, ServiceBase
 from tapiriik.services.service_record import ServiceRecord
-from tapiriik.services.api import APIException
+from tapiriik.services.api import APIException, UserException, UserExceptionType
 from tapiriik.services.interchange import UploadedActivity, ActivityType, WaypointType, Waypoint, Location
 from tapiriik.settings import WEB_ROOT, MAPMYFITNESS_CLIENT_KEY, MAPMYFITNESS_CLIENT_SECRET
 
@@ -121,8 +121,9 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
         logger.debug("DownloadActivityList")
         allItems = []
         offset = 0
+        next = '/v7.1/workout/?user=' + str(serviceRecord.ExternalID)
         while True:
-            response = requests.get("https://api.mapmyfitness.com/v7.1/workout?limit=25&offset=%d&user=%d" % (offset, serviceRecord.ExternalID), headers=self._apiHeaders(serviceRecord))
+            response = requests.get("https://api.mapmyfitness.com" + next, headers=self._apiHeaders(serviceRecord))
             if response.status_code != 200:
                 if response.status_code == 401 or response.status_code == 403:
                     raise APIException("No authorization to retrieve activity list", block=True, user_exception=UserException(UserExceptionType.Authorization, intervention_required=True))
@@ -130,8 +131,10 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
             data = response.json()
             print(data)
             allItems += data["_embedded"]["workouts"]
-            if not exhaustive or int(data["total_count"]) < 25:
+            next = data["_links"].get("next")
+            if not exhaustive or not next:
                 break
+            next = next[0]["href"]
 
         activities = []
         for act in allItems:

From 491d8e01c2b1735defd70de4797ac9b5cd5b9942 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Wed, 6 Jan 2021 17:24:50 +0100
Subject: [PATCH 22/60] some api updates

---
 .../services/MapMyFitness/mapmyfitness.py     | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 571fb2679..5dd0513df 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -100,6 +100,7 @@ def _getActivityTypeHierarchy(self):
         logger.debug("_getActivityTypeHierarchy")
         if hasattr(self, "_activityTypes"):
             return self._activityTypes
+        # TODO update to use new api https://developer.underarmour.com/docs/v71_Activity_Type/
         response = requests.get("https://api.mapmyfitness.com/v7.1/workouts/get_activity_types")
         data = response.json()
         self._activityTypes = {}
@@ -110,6 +111,7 @@ def _getActivityTypeHierarchy(self):
     def _resolveActivityType(self, actType):
         logger.debug("_resolveActivityType")
         self._getActivityTypeHierarchy()
+        # TODO update to use new api https://developer.underarmour.com/docs/v71_Activity_Type/
         while actType not in self._activityMappings or self._activityTypes[actType]["parent_activity_type_id"] is not None:
             actType = int(self._activityTypes[actType]["parent_activity_type_id"])
         if actType in self._activityMappings:
@@ -129,7 +131,6 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
                     raise APIException("No authorization to retrieve activity list", block=True, user_exception=UserException(UserExceptionType.Authorization, intervention_required=True))
                 raise APIException("Unable to retrieve activity list " + str(response), serviceRecord)
             data = response.json()
-            print(data)
             allItems += data["_embedded"]["workouts"]
             next = data["_links"].get("next")
             if not exhaustive or not next:
@@ -139,24 +140,22 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
         activities = []
         for act in allItems:
             activity = UploadedActivity()
-            # TODO the correct fields from new API https://developer.underarmour.com/docs/v71_Workout/
-            activity.StartTime = datetime.strptime(act["workout_date"] + " " + act["workout_start_time"], "%Y-%m-%d %H:%M:%S")
-            activity.EndTime = activity.StartTime + timedelta(0, round(float(act["time_taken"])))
-            activity.Distance = act["distance"]
-
-            activity.Type = self._resolveActivityType(int(act["activity_type_id"]))
+            activity.StartTime = datetime.strptime(act["start_datetime"], "%Y-%m-%dT%H:%M:%S%z")
+            aggregates = act["aggregates"]
+            activity.EndTime = activity.StartTime + timedelta(0, round(float(aggregates["elapsed_time_total"])))
+            activity.Distance = aggregates["distance_total"]
+            activity.Type = self._resolveActivityType(int(act["_links"]["activity_type"][0]["id"]))
+            activity.ServiceData = {"ActivityID": act["reference_key"]}
+            activity.UploadedTo = [{"Connection": serviceRecord, "ActivityID": act["reference_key"]}]
             activity.CalculateUID()
-
-            activity.UploadedTo = [{"Connection": serviceRecord, "ActivityID": act["workout_id"]}]
             activities.append(activity)
         return activities
 
     def DownloadActivity(self, serviceRecord, activity):
+        # TODO probably get rid of UploadedTo and do the same as runkeeper
         logger.debug("DownloadActivity")
         activityID = [x["ActivityID"] for x in activity.UploadedTo if x["Connection"] == serviceRecord][0]
-        print (activityID)
         response = requests.get("https://api.mapmyfitness.com/v7.1/routes/get_routes", headers=self._apiHeaders(serviceRecord))
-        print (response.text)
 
     def UploadActivity(self, serviceRecord, activity):
         # TODO

From 8bcd57cbd141a073d513859206a6256985c0ae55 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Wed, 6 Jan 2021 19:38:54 +0100
Subject: [PATCH 23/60] rename

---
 .vscode/settings.json                          |  4 ++++
 tapiriik/services/MapMyFitness/mapmyfitness.py | 11 +++++------
 2 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..cc67606f3
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+    "python.linting.pylintEnabled": true,
+    "python.linting.enabled": true
+}
\ No newline at end of file
diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 5dd0513df..c6a8240d1 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -122,20 +122,19 @@ def _resolveActivityType(self, actType):
     def DownloadActivityList(self, serviceRecord, exhaustive=False):
         logger.debug("DownloadActivityList")
         allItems = []
-        offset = 0
-        next = '/v7.1/workout/?user=' + str(serviceRecord.ExternalID)
+        nextRequest = '/v7.1/workout/?user=' + str(serviceRecord.ExternalID)
         while True:
-            response = requests.get("https://api.mapmyfitness.com" + next, headers=self._apiHeaders(serviceRecord))
+            response = requests.get("https://api.mapmyfitness.com" + nextRequest, headers=self._apiHeaders(serviceRecord))
             if response.status_code != 200:
                 if response.status_code == 401 or response.status_code == 403:
                     raise APIException("No authorization to retrieve activity list", block=True, user_exception=UserException(UserExceptionType.Authorization, intervention_required=True))
                 raise APIException("Unable to retrieve activity list " + str(response), serviceRecord)
             data = response.json()
             allItems += data["_embedded"]["workouts"]
-            next = data["_links"].get("next")
-            if not exhaustive or not next:
+            nextLink = data["_links"].get("next")
+            if not exhaustive or not nextLink:
                 break
-            next = next[0]["href"]
+            nextRequest = nextLink[0]["href"]
 
         activities = []
         for act in allItems:

From f206c56d1d9b39de4f8232a1737bb0c6a2b02216 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Wed, 6 Jan 2021 21:04:43 +0100
Subject: [PATCH 24/60] get activity hierarchy

---
 .../services/MapMyFitness/mapmyfitness.py     | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index c6a8240d1..a5a50427b 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -96,24 +96,20 @@ def RevokeAuthorization(self, serviceRecord):
         # there doesn't seem to be a way to revoke the token
         pass
 
-    def _getActivityTypeHierarchy(self):
+    def _getActivityTypeHierarchy(self, headers):
         logger.debug("_getActivityTypeHierarchy")
         if hasattr(self, "_activityTypes"):
             return self._activityTypes
-        # TODO update to use new api https://developer.underarmour.com/docs/v71_Activity_Type/
-        response = requests.get("https://api.mapmyfitness.com/v7.1/workouts/get_activity_types")
+        response = requests.get("https://api.mapmyfitness.com/v7.1/activity_type", headers=headers)
         data = response.json()
         self._activityTypes = {}
-        for actType in data["result"]["output"]["activity_types"]:
-            self._activityTypes[int(actType["activity_type_id"])] = actType
+        for actType in data["_embedded"]["activity_types"]:
+            self._activityTypes[int(actType["_links"]["root"][0]["id"])] = actType
         return self._activityTypes
 
-    def _resolveActivityType(self, actType):
+    def _resolveActivityType(self, actType, headers):
         logger.debug("_resolveActivityType")
-        self._getActivityTypeHierarchy()
-        # TODO update to use new api https://developer.underarmour.com/docs/v71_Activity_Type/
-        while actType not in self._activityMappings or self._activityTypes[actType]["parent_activity_type_id"] is not None:
-            actType = int(self._activityTypes[actType]["parent_activity_type_id"])
+        self._getActivityTypeHierarchy(headers)
         if actType in self._activityMappings:
             return self._activityMappings[actType]
         else:
@@ -122,9 +118,10 @@ def _resolveActivityType(self, actType):
     def DownloadActivityList(self, serviceRecord, exhaustive=False):
         logger.debug("DownloadActivityList")
         allItems = []
+        headers=self._apiHeaders(serviceRecord)
         nextRequest = '/v7.1/workout/?user=' + str(serviceRecord.ExternalID)
         while True:
-            response = requests.get("https://api.mapmyfitness.com" + nextRequest, headers=self._apiHeaders(serviceRecord))
+            response = requests.get("https://api.mapmyfitness.com" + nextRequest, headers=headers)
             if response.status_code != 200:
                 if response.status_code == 401 or response.status_code == 403:
                     raise APIException("No authorization to retrieve activity list", block=True, user_exception=UserException(UserExceptionType.Authorization, intervention_required=True))
@@ -143,7 +140,7 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
             aggregates = act["aggregates"]
             activity.EndTime = activity.StartTime + timedelta(0, round(float(aggregates["elapsed_time_total"])))
             activity.Distance = aggregates["distance_total"]
-            activity.Type = self._resolveActivityType(int(act["_links"]["activity_type"][0]["id"]))
+            activity.Type = self._resolveActivityType(int(act["_links"]["activity_type"][0]["id"]), headers)
             activity.ServiceData = {"ActivityID": act["reference_key"]}
             activity.UploadedTo = [{"Connection": serviceRecord, "ActivityID": act["reference_key"]}]
             activity.CalculateUID()

From 0849c3760de9457b014b7a66aecff67461db4279 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Thu, 7 Jan 2021 07:40:38 +0100
Subject: [PATCH 25/60] get parent activity type

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index a5a50427b..79a28e391 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -104,7 +104,7 @@ def _getActivityTypeHierarchy(self, headers):
         data = response.json()
         self._activityTypes = {}
         for actType in data["_embedded"]["activity_types"]:
-            self._activityTypes[int(actType["_links"]["root"][0]["id"])] = actType
+            self._activityTypes[actType["_links"]["root"][0]["id"]] = actType
         return self._activityTypes
 
     def _resolveActivityType(self, actType, headers):
@@ -112,8 +112,13 @@ def _resolveActivityType(self, actType, headers):
         self._getActivityTypeHierarchy(headers)
         if actType in self._activityMappings:
             return self._activityMappings[actType]
-        else:
-            return ActivityType.Other
+        activity = self._activityTypes[actType]
+        parentLink = activity["_links"].get("parent")
+        if parentLink is not None:
+            parentId = parentLink[0]["id"]
+            parent = self._activityMappings[parentId]
+            return self._resolveActivityType(parent, headers)
+        return ActivityType.Other
 
     def DownloadActivityList(self, serviceRecord, exhaustive=False):
         logger.debug("DownloadActivityList")
@@ -140,7 +145,8 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
             aggregates = act["aggregates"]
             activity.EndTime = activity.StartTime + timedelta(0, round(float(aggregates["elapsed_time_total"])))
             activity.Distance = aggregates["distance_total"]
-            activity.Type = self._resolveActivityType(int(act["_links"]["activity_type"][0]["id"]), headers)
+            activityTypeId = act["_links"]["activity_type"][0]["id"]
+            activity.Type = self._resolveActivityType(activityTypeId, headers)
             activity.ServiceData = {"ActivityID": act["reference_key"]}
             activity.UploadedTo = [{"Connection": serviceRecord, "ActivityID": act["reference_key"]}]
             activity.CalculateUID()

From 95ddaef9121d8c7f184b5f4ccf3bec0e90f0ca69 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Thu, 7 Jan 2021 07:40:38 +0100
Subject: [PATCH 26/60] get parent activity type

---
 .../services/MapMyFitness/mapmyfitness.py     | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index a5a50427b..67840db98 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -22,19 +22,19 @@ class MapMyFitnessService(ServiceBase):
     AuthenticationNoFrame = True
     OutstandingOAuthRequestTokens = {}
 
-    _activityMappings = {16: ActivityType.Running,
-                         11: ActivityType.Cycling,
-                         41: ActivityType.MountainBiking,
-                         9: ActivityType.Walking,
-                         24: ActivityType.Hiking,
-                         398: ActivityType.DownhillSkiing,
-                         397: ActivityType.CrossCountrySkiing,  # actually "backcountry" :S
-                         107: ActivityType.Snowboarding,
-                         86: ActivityType.Skating,  # ice skating
-                         15: ActivityType.Swimming,
-                         57: ActivityType.Rowing,  # canoe/rowing
-                         211: ActivityType.Elliptical,
-                         21: ActivityType.Other}
+    _activityMappings = {"16": ActivityType.Running,
+                         "11": ActivityType.Cycling,
+                         "41": ActivityType.MountainBiking,
+                         "9": ActivityType.Walking,
+                         "24": ActivityType.Hiking,
+                         "398": ActivityType.DownhillSkiing,
+                         "397": ActivityType.CrossCountrySkiing,  # actually "backcountry" :S
+                         "107": ActivityType.Snowboarding,
+                         "86": ActivityType.Skating,  # ice skating
+                         "15": ActivityType.Swimming,
+                         "57": ActivityType.Rowing,  # canoe/rowing
+                         "211": ActivityType.Elliptical,
+                         "21": ActivityType.Other}
     SupportedActivities = list(_activityMappings.values())
 
     def WebInit(self):
@@ -104,7 +104,7 @@ def _getActivityTypeHierarchy(self, headers):
         data = response.json()
         self._activityTypes = {}
         for actType in data["_embedded"]["activity_types"]:
-            self._activityTypes[int(actType["_links"]["root"][0]["id"])] = actType
+            self._activityTypes[actType["_links"]["self"][0]["id"]] = actType
         return self._activityTypes
 
     def _resolveActivityType(self, actType, headers):
@@ -112,8 +112,12 @@ def _resolveActivityType(self, actType, headers):
         self._getActivityTypeHierarchy(headers)
         if actType in self._activityMappings:
             return self._activityMappings[actType]
-        else:
-            return ActivityType.Other
+        activity = self._activityTypes[actType]
+        parentLink = activity["_links"].get("parent")
+        if parentLink is not None:
+            parentId = parentLink[0]["id"]
+            return self._resolveActivityType(parentId, headers)
+        return ActivityType.Other
 
     def DownloadActivityList(self, serviceRecord, exhaustive=False):
         logger.debug("DownloadActivityList")
@@ -140,8 +144,9 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
             aggregates = act["aggregates"]
             activity.EndTime = activity.StartTime + timedelta(0, round(float(aggregates["elapsed_time_total"])))
             activity.Distance = aggregates["distance_total"]
-            activity.Type = self._resolveActivityType(int(act["_links"]["activity_type"][0]["id"]), headers)
-            activity.ServiceData = {"ActivityID": act["reference_key"]}
+            activityTypeId = act["_links"]["activity_type"][0]["id"]
+            activity.Type = self._resolveActivityType(activityTypeId, headers)
+            activity.ServiceData = {"ActivityID": act["reference_key"], "activity_type": activityTypeId}
             activity.UploadedTo = [{"Connection": serviceRecord, "ActivityID": act["reference_key"]}]
             activity.CalculateUID()
             activities.append(activity)

From bee4349ec8ca926b473b59ee31ee086cf76df8e5 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Mon, 11 Jan 2021 07:36:48 +0100
Subject: [PATCH 27/60] fix some parameter mismatches

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index da3e5097d..207ae64eb 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -139,6 +139,7 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
             nextRequest = nextLink[0]["href"]
 
         activities = []
+        exclusions = []
         for act in allItems:
             activity = UploadedActivity()
             activity.StartTime = datetime.strptime(act["start_datetime"], "%Y-%m-%dT%H:%M:%S%z")
@@ -151,7 +152,7 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
             activity.UploadedTo = [{"Connection": serviceRecord, "ActivityID": act["reference_key"]}]
             activity.CalculateUID()
             activities.append(activity)
-        return activities
+        return activities, exclusions
 
     def DownloadActivity(self, serviceRecord, activity):
         # TODO probably get rid of UploadedTo and do the same as runkeeper
@@ -159,6 +160,8 @@ def DownloadActivity(self, serviceRecord, activity):
         activityID = [x["ActivityID"] for x in activity.UploadedTo if x["Connection"] == serviceRecord][0]
         response = requests.get("https://api.mapmyfitness.com/v7.1/routes/get_routes", headers=self._apiHeaders(serviceRecord))
 
+        return activity
+
     def UploadActivity(self, serviceRecord, activity):
         # TODO
         pass

From 94e9eefc6a82387fac726d19d5981ddd3d394ef8 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Mon, 11 Jan 2021 07:37:16 +0100
Subject: [PATCH 28/60] start on DownloadActivity

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 207ae64eb..9481e3b34 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -141,6 +141,7 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
         activities = []
         exclusions = []
         for act in allItems:
+            # TODO catch exception add add to exclusions
             activity = UploadedActivity()
             activity.StartTime = datetime.strptime(act["start_datetime"], "%Y-%m-%dT%H:%M:%S%z")
             aggregates = act["aggregates"]
@@ -148,17 +149,23 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
             activity.Distance = aggregates["distance_total"]
             activityTypeId = act["_links"]["activity_type"][0]["id"]
             activity.Type = self._resolveActivityType(activityTypeId, headers)
-            activity.ServiceData = {"ActivityID": act["reference_key"], "activity_type": activityTypeId}
-            activity.UploadedTo = [{"Connection": serviceRecord, "ActivityID": act["reference_key"]}]
+            activityID = act["_links"]["self"]["id"]
+            activity.ServiceData = {"ActivityID": activityID, "reference_key": act["reference_key"], "activity_type": activityTypeId}
+            activity.UploadedTo = [{"Connection": serviceRecord, "ActivityID": activityID, "reference_key": act["reference_key"], "activity_type": activityTypeId}]
             activity.CalculateUID()
             activities.append(activity)
         return activities, exclusions
 
     def DownloadActivity(self, serviceRecord, activity):
-        # TODO probably get rid of UploadedTo and do the same as runkeeper
+        # TODO get rid of UploadedTo and do the same as runkeeper
         logger.debug("DownloadActivity")
         activityID = [x["ActivityID"] for x in activity.UploadedTo if x["Connection"] == serviceRecord][0]
-        response = requests.get("https://api.mapmyfitness.com/v7.1/routes/get_routes", headers=self._apiHeaders(serviceRecord))
+        response = requests.get("https://api.mapmyfitness.com/v7.1/workout/" + activityID, headers=self._apiHeaders(serviceRecord))
+
+        activity.Notes = response["notes"] if "notes" in response else None
+        activity.Private = response["_links"]["privacy"]["id"] == "1"
+
+        # TODO do something
 
         return activity
 

From 7d2a8f6284fe2e0eb3b030d0a0a6b716da2c5c15 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Tue, 12 Jan 2021 07:38:10 +0100
Subject: [PATCH 29/60] workout properties

---
 .../services/MapMyFitness/mapmyfitness.py     | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 9481e3b34..c7bd631ac 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -117,7 +117,6 @@ def _resolveActivityType(self, actType, headers):
         if parentLink is not None:
             parentId = parentLink[0]["id"]
             return self._resolveActivityType(parentId, headers)
-            return self._resolveActivityType(parent, headers)
         return ActivityType.Other
 
     def DownloadActivityList(self, serviceRecord, exhaustive=False):
@@ -141,31 +140,49 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
         activities = []
         exclusions = []
         for act in allItems:
-            # TODO catch exception add add to exclusions
+            # TODO catch exception and add to exclusions
             activity = UploadedActivity()
+            activityID = act["_links"]["self"][0]["id"]
             activity.StartTime = datetime.strptime(act["start_datetime"], "%Y-%m-%dT%H:%M:%S%z")
+            activity.Notes = act["notes"] if "notes" in act else None
+
+            # aggregate
             aggregates = act["aggregates"]
             activity.EndTime = activity.StartTime + timedelta(0, round(float(aggregates["elapsed_time_total"])))
             activity.Distance = aggregates["distance_total"]
-            activityTypeId = act["_links"]["activity_type"][0]["id"]
-            activity.Type = self._resolveActivityType(activityTypeId, headers)
-            activityID = act["_links"]["self"]["id"]
-            activity.ServiceData = {"ActivityID": activityID, "reference_key": act["reference_key"], "activity_type": activityTypeId}
-            activity.UploadedTo = [{"Connection": serviceRecord, "ActivityID": activityID, "reference_key": act["reference_key"], "activity_type": activityTypeId}]
+            # TODO get more properties - see endomondo and strava
+
+            activityTypeLink = act["_links"]["activity_type"]
+            activityTypeID = activityTypeLink[0]["id"] if activityTypeLink is not None else None
+
+            routeLink = act["_links"].get("route")
+            routeID = routeLink[0]["id"] if routeLink is not None else None
+
+            privacyLink = act["_links"]["privacy"]
+            privacyID = privacyLink[0]["id"] if privacyLink is not None else None
+            activity.Private = privacyID == "1"
+
+            activity.Type = self._resolveActivityType(activityTypeID, headers)
+
+            activity.ServiceData = {
+                "ActivityID": activityID,
+                "activityTypeID": activityTypeID,
+                "privacyID": privacyID,
+                "routeID": routeID
+                }
+            activity.UploadedTo = [{"Connection": serviceRecord, "ActivityID": activityID}]
             activity.CalculateUID()
             activities.append(activity)
         return activities, exclusions
 
     def DownloadActivity(self, serviceRecord, activity):
         # TODO get rid of UploadedTo and do the same as runkeeper
+        # I shouldn't need to get the workout at all - I think I just need the route here - if activity.ServiceData.routeID is not None
         logger.debug("DownloadActivity")
         activityID = [x["ActivityID"] for x in activity.UploadedTo if x["Connection"] == serviceRecord][0]
         response = requests.get("https://api.mapmyfitness.com/v7.1/workout/" + activityID, headers=self._apiHeaders(serviceRecord))
 
-        activity.Notes = response["notes"] if "notes" in response else None
-        activity.Private = response["_links"]["privacy"]["id"] == "1"
-
-        # TODO do something
+        # TODO get waypoints and other data
 
         return activity
 

From 17e660255bc52a80882da37e5956e10f725f1adf Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Tue, 12 Jan 2021 09:12:22 +0100
Subject: [PATCH 30/60] something with route

---
 .../services/MapMyFitness/mapmyfitness.py     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index c7bd631ac..79245a349 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -1,7 +1,7 @@
 from tapiriik.services.service_base import ServiceAuthenticationType, ServiceBase
 from tapiriik.services.service_record import ServiceRecord
 from tapiriik.services.api import APIException, UserException, UserExceptionType
-from tapiriik.services.interchange import UploadedActivity, ActivityType, WaypointType, Waypoint, Location
+from tapiriik.services.interchange import UploadedActivity, ActivityType, WaypointType, Waypoint, Location, Lap
 from tapiriik.settings import WEB_ROOT, MAPMYFITNESS_CLIENT_KEY, MAPMYFITNESS_CLIENT_SECRET
 
 from datetime import datetime, timedelta
@@ -152,13 +152,13 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
             activity.Distance = aggregates["distance_total"]
             # TODO get more properties - see endomondo and strava
 
-            activityTypeLink = act["_links"]["activity_type"]
+            activityTypeLink = act["_links"].get("activity_type")
             activityTypeID = activityTypeLink[0]["id"] if activityTypeLink is not None else None
 
             routeLink = act["_links"].get("route")
             routeID = routeLink[0]["id"] if routeLink is not None else None
 
-            privacyLink = act["_links"]["privacy"]
+            privacyLink = act["_links"].get("privacy")
             privacyID = privacyLink[0]["id"] if privacyLink is not None else None
             activity.Private = privacyID == "1"
 
@@ -170,19 +170,22 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
                 "privacyID": privacyID,
                 "routeID": routeID
                 }
-            activity.UploadedTo = [{"Connection": serviceRecord, "ActivityID": activityID}]
             activity.CalculateUID()
             activities.append(activity)
         return activities, exclusions
 
     def DownloadActivity(self, serviceRecord, activity):
-        # TODO get rid of UploadedTo and do the same as runkeeper
         # I shouldn't need to get the workout at all - I think I just need the route here - if activity.ServiceData.routeID is not None
         logger.debug("DownloadActivity")
-        activityID = [x["ActivityID"] for x in activity.UploadedTo if x["Connection"] == serviceRecord][0]
-        response = requests.get("https://api.mapmyfitness.com/v7.1/workout/" + activityID, headers=self._apiHeaders(serviceRecord))
+        activityID = activity.ServiceData["ActivityID"]
 
-        # TODO get waypoints and other data
+        lap = Lap(stats=activity.Stats, startTime=activity.StartTime, endTime=activity.EndTime)
+        activity.Laps = [lap]
+        lap.Waypoints = []
+
+        if serviceRecord.routeID is not None:
+            response = requests.get("https://api.mapmyfitness.com/v7.1/route/" + activityID, headers=self._apiHeaders(serviceRecord))
+            # TODO add waypoints to laps
 
         return activity
 

From e2bc744799aa2b76c0d6e9846d0b5cc6fb11c396 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Tue, 12 Jan 2021 09:20:37 +0100
Subject: [PATCH 31/60] get waypoints from api

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 79245a349..75c17f98d 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -184,7 +184,7 @@ def DownloadActivity(self, serviceRecord, activity):
         lap.Waypoints = []
 
         if serviceRecord.routeID is not None:
-            response = requests.get("https://api.mapmyfitness.com/v7.1/route/" + activityID, headers=self._apiHeaders(serviceRecord))
+            response = requests.get("https://api.mapmyfitness.com/v7.1/route/" + activityID + "/?field_set=detailed", headers=self._apiHeaders(serviceRecord))
             # TODO add waypoints to laps
 
         return activity

From 6e8f61240390997d23c08476fe9b4f487929e00a Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Tue, 12 Jan 2021 21:41:52 +0100
Subject: [PATCH 32/60] download waypoints

---
 .../services/MapMyFitness/mapmyfitness.py     | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 75c17f98d..d3498f063 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -155,20 +155,16 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
             activityTypeLink = act["_links"].get("activity_type")
             activityTypeID = activityTypeLink[0]["id"] if activityTypeLink is not None else None
 
-            routeLink = act["_links"].get("route")
-            routeID = routeLink[0]["id"] if routeLink is not None else None
-
             privacyLink = act["_links"].get("privacy")
             privacyID = privacyLink[0]["id"] if privacyLink is not None else None
-            activity.Private = privacyID == "1"
+            activity.Private = privacyID == "0"
 
             activity.Type = self._resolveActivityType(activityTypeID, headers)
 
             activity.ServiceData = {
                 "ActivityID": activityID,
                 "activityTypeID": activityTypeID,
-                "privacyID": privacyID,
-                "routeID": routeID
+                "privacyID": privacyID
                 }
             activity.CalculateUID()
             activities.append(activity)
@@ -183,9 +179,26 @@ def DownloadActivity(self, serviceRecord, activity):
         activity.Laps = [lap]
         lap.Waypoints = []
 
-        if serviceRecord.routeID is not None:
-            response = requests.get("https://api.mapmyfitness.com/v7.1/route/" + activityID + "/?field_set=detailed", headers=self._apiHeaders(serviceRecord))
-            # TODO add waypoints to laps
+        response = requests.get("https://api.mapmyfitness.com/v7.1/workout/" + activityID + "/?field_set=time_series", headers=self._apiHeaders(serviceRecord))
+        data = response.json()
+
+        # add waypoints to laps
+        if "time_series" in data:
+            for pt in data["time_series"]["position"]:
+                timestamp = pt[0]
+                wp = Waypoint(activity.StartTime + timedelta(seconds=timestamp))
+
+                pos = pt[1]
+                if ("lat" in pos and "lng" in pos) or "elevation" in pos:
+                    wp.Location = Location()
+                    if "lat" in pos and "lng" in pos:
+                        wp.Location.Latitude = pos["lat"]
+                        wp.Location.Longitude = pos["lng"]
+                        activity.GPS = True
+                    if "elevation" in pos:
+                        wp.Location.Altitude = pos["elevation"]
+
+                lap.Waypoints.append(wp)
 
         return activity
 

From 083869386a3f4ca91f4b230ba606bb5d86232305 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Tue, 12 Jan 2021 22:18:02 +0100
Subject: [PATCH 33/60] check

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index d3498f063..0634b77cb 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -171,7 +171,6 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
         return activities, exclusions
 
     def DownloadActivity(self, serviceRecord, activity):
-        # I shouldn't need to get the workout at all - I think I just need the route here - if activity.ServiceData.routeID is not None
         logger.debug("DownloadActivity")
         activityID = activity.ServiceData["ActivityID"]
 
@@ -183,7 +182,7 @@ def DownloadActivity(self, serviceRecord, activity):
         data = response.json()
 
         # add waypoints to laps
-        if "time_series" in data:
+        if "time_series" in data and "position" in data["time_series"]:
             for pt in data["time_series"]["position"]:
                 timestamp = pt[0]
                 wp = Waypoint(activity.StartTime + timedelta(seconds=timestamp))

From a45573c348582ea64a332cbe99992b91946e3739 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Wed, 13 Jan 2021 15:06:18 +0100
Subject: [PATCH 34/60] mmr is not withdrawn

---
 .github/workflows/docker-kubernetes.yml | 1 -
 tapiriik/settings.py                    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-kubernetes.yml b/.github/workflows/docker-kubernetes.yml
index 63fd9518e..31db00cd8 100644
--- a/.github/workflows/docker-kubernetes.yml
+++ b/.github/workflows/docker-kubernetes.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - run
 
 jobs:
   build:
diff --git a/tapiriik/settings.py b/tapiriik/settings.py
index 1c57e171b..fc39bd435 100644
--- a/tapiriik/settings.py
+++ b/tapiriik/settings.py
@@ -250,7 +250,7 @@
 
 # Services no longer available - will be removed across the site + excluded from sync.
 # This can also be used for future services that are in development and therefore in the database.
-WITHDRAWN_SERVICES = ["mapmyfitness"]
+WITHDRAWN_SERVICES = []
 
 # Where to put per-user sync logs
 USER_SYNC_LOGS = "./"
@@ -259,7 +259,7 @@
 SITE_VER = "unknown"
 
 # Cache lots of stuff to make local debugging faster
-AGGRESSIVE_CACHE = True
+AGGRESSIVE_CACHE = False
 
 # Diagnostics auth, None = no auth
 DIAG_AUTH_TOTP_SECRET = DIAG_AUTH_PASSWORD = None

From 1b31792007f42a66c5c328cbda1d21beb8f28ce0 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Wed, 13 Jan 2021 15:09:06 +0100
Subject: [PATCH 35/60] round

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 0634b77cb..e41b9fd27 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -185,7 +185,7 @@ def DownloadActivity(self, serviceRecord, activity):
         if "time_series" in data and "position" in data["time_series"]:
             for pt in data["time_series"]["position"]:
                 timestamp = pt[0]
-                wp = Waypoint(activity.StartTime + timedelta(seconds=timestamp))
+                wp = Waypoint(activity.StartTime + timedelta(seconds=round(timestamp)))
 
                 pos = pt[1]
                 if ("lat" in pos and "lng" in pos) or "elevation" in pos:

From 58d8fb6c8cf5acb2a09c056c524365d4fe5a5735 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Thu, 14 Jan 2021 07:17:59 +0100
Subject: [PATCH 36/60] enable option to sync private activities

---
 tapiriik/web/static/js/tapiriik.js | 4 ++--
 tapiriik/web/views/settings.py     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tapiriik/web/static/js/tapiriik.js b/tapiriik/web/static/js/tapiriik.js
index df2c3e35f..0036ef78c 100644
--- a/tapiriik/web/static/js/tapiriik.js
+++ b/tapiriik/web/static/js/tapiriik.js
@@ -325,7 +325,7 @@ tapiriik.OpenServiceConfigPanel = function(svcId){
 		$("input", destRow).attr("service", i);
 		$("table", configPanel).append(destRow);
 	}
-	if (svcId == "strava" || svcId == "runkeeper" || svcId == "sporttracks" || svcId == "garminconnect" || svcId == "motivato" || svcId == "velohero")
+	if (svcId == "strava" || svcId == "runkeeper" || svcId == "mapmyfitness" || svcId == "sporttracks" || svcId == "garminconnect" || svcId == "motivato" || svcId == "velohero")
 	{
 		if (tapiriik.ServiceInfo[svcId].Config.sync_private)
 		{
@@ -877,7 +877,7 @@ tapiriik.RefreshSyncCountdown = function(){
 			sync_button_active = false;
 			if (!tapiriik.Synchronizing){
 				var waitTimeMessage = "";
-				if (tapiriik.SynchronizationWaitTime > 60) { // Otherwise you'd expect a countdown, which this is generally not.
+				if (tapiriik.SynchronizationWaitTime > 10) { // Otherwise you'd expect a countdown, which this is generally not.
 					waitTimeMessage = " (approx. " + tapiriik.FormatTimespan(tapiriik.SynchronizationWaitTime * 1000) + ")";
 				}
 				sync_state_text = "Queuing" + waitTimeMessage;
diff --git a/tapiriik/web/views/settings.py b/tapiriik/web/views/settings.py
index a7d09ed17..c39658f6a 100644
--- a/tapiriik/web/views/settings.py
+++ b/tapiriik/web/views/settings.py
@@ -12,7 +12,7 @@ def settings(request):
             {"Title": "Sync private activities",
             "Description": "By default, all activities will be synced. Unsetting this will prevent private activities being taken from this service.",
             "Field": "checkbox",
-            "Available": ["strava", "runkeeper"]
+            "Available": ["strava", "runkeeper", "mapmyfitness"]
             }
     }
     conns = User.GetConnectionRecordsByUser(request.user)

From 13568d0691617e27f3f4c17324b1da543d6d172d Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Thu, 14 Jan 2021 07:26:52 +0100
Subject: [PATCH 37/60] column header

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index e41b9fd27..7c7e7d4f3 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -17,6 +17,7 @@
 class MapMyFitnessService(ServiceBase):
     ID = "mapmyfitness"
     DisplayName = "MapMyFitness"
+    DisplayAbbreviation = "MMR"
     AuthenticationType = ServiceAuthenticationType.OAuth
     UserAuthorizationURL = None
     AuthenticationNoFrame = True

From 35a1956faadd7600ca5bafc0cd43b10173b98fba Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Thu, 14 Jan 2021 09:30:24 +0100
Subject: [PATCH 38/60] undo some stuff that didn't need to change

---
 tapiriik/settings.py               | 2 +-
 tapiriik/web/static/js/tapiriik.js | 2 +-
 tapiriik/web/views/settings.py     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tapiriik/settings.py b/tapiriik/settings.py
index fc39bd435..bf310f324 100644
--- a/tapiriik/settings.py
+++ b/tapiriik/settings.py
@@ -259,7 +259,7 @@
 SITE_VER = "unknown"
 
 # Cache lots of stuff to make local debugging faster
-AGGRESSIVE_CACHE = False
+AGGRESSIVE_CACHE = True
 
 # Diagnostics auth, None = no auth
 DIAG_AUTH_TOTP_SECRET = DIAG_AUTH_PASSWORD = None
diff --git a/tapiriik/web/static/js/tapiriik.js b/tapiriik/web/static/js/tapiriik.js
index 0036ef78c..8d80f52f4 100644
--- a/tapiriik/web/static/js/tapiriik.js
+++ b/tapiriik/web/static/js/tapiriik.js
@@ -877,7 +877,7 @@ tapiriik.RefreshSyncCountdown = function(){
 			sync_button_active = false;
 			if (!tapiriik.Synchronizing){
 				var waitTimeMessage = "";
-				if (tapiriik.SynchronizationWaitTime > 10) { // Otherwise you'd expect a countdown, which this is generally not.
+				if (tapiriik.SynchronizationWaitTime > 60) { // Otherwise you'd expect a countdown, which this is generally not.
 					waitTimeMessage = " (approx. " + tapiriik.FormatTimespan(tapiriik.SynchronizationWaitTime * 1000) + ")";
 				}
 				sync_state_text = "Queuing" + waitTimeMessage;
diff --git a/tapiriik/web/views/settings.py b/tapiriik/web/views/settings.py
index c39658f6a..a7d09ed17 100644
--- a/tapiriik/web/views/settings.py
+++ b/tapiriik/web/views/settings.py
@@ -12,7 +12,7 @@ def settings(request):
             {"Title": "Sync private activities",
             "Description": "By default, all activities will be synced. Unsetting this will prevent private activities being taken from this service.",
             "Field": "checkbox",
-            "Available": ["strava", "runkeeper", "mapmyfitness"]
+            "Available": ["strava", "runkeeper"]
             }
     }
     conns = User.GetConnectionRecordsByUser(request.user)

From 0c9d61deb6e0251c5bf8b93f863d98b7793763bf Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Thu, 14 Jan 2021 17:14:47 +0100
Subject: [PATCH 39/60] typo

---
 tapiriik/services/interchange.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tapiriik/services/interchange.py b/tapiriik/services/interchange.py
index 469b99fea..2059e78ac 100644
--- a/tapiriik/services/interchange.py
+++ b/tapiriik/services/interchange.py
@@ -245,7 +245,7 @@ def CheckTimestampSanity(self):
             raise ValueError("Activity EndTime TZ mismatch - %s master vs %s instance" % (self.TZ, self.EndTime.tzinfo))
 
         for lap in self.Laps:
-            if str(ap.StartTime.tzinfo) != str(self.TZ):
+            if str(lap.StartTime.tzinfo) != str(self.TZ):
                 raise ValueError("Lap StartTime TZ mismatch - %s master vs %s instance" % (self.TZ, lap.StartTime.tzinfo))
             if str(lap.EndTime.tzinfo) != str(self.TZ):
                 raise ValueError("Lap EndTime TZ mismatch - %s master vs %s instance" % (self.TZ, lap.EndTime.tzinfo))

From ca49d78e9174d7d1a9118e6d80f72da48c0f0d80 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Thu, 14 Jan 2021 17:18:53 +0100
Subject: [PATCH 40/60] throw exception so that it'll retry while I'm coding it

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 7c7e7d4f3..1fb301141 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -204,7 +204,7 @@ def DownloadActivity(self, serviceRecord, activity):
 
     def UploadActivity(self, serviceRecord, activity):
         # TODO
-        pass
+        raise Exception("Not implemented upload to MMR")
 
     def DeleteCachedData(self, serviceRecord):
         pass

From 6156785d74e9ed279dc54b450d62dd6847ade510 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Thu, 14 Jan 2021 17:58:54 +0100
Subject: [PATCH 41/60] set stationary and gps to prevent sanity errors

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 1fb301141..ecb76b3f8 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -182,8 +182,12 @@ def DownloadActivity(self, serviceRecord, activity):
         response = requests.get("https://api.mapmyfitness.com/v7.1/workout/" + activityID + "/?field_set=time_series", headers=self._apiHeaders(serviceRecord))
         data = response.json()
 
+        activity.GPS = False
+        activity.Stationary = True
+
         # add waypoints to laps
         if "time_series" in data and "position" in data["time_series"]:
+            activity.Stationary = False
             for pt in data["time_series"]["position"]:
                 timestamp = pt[0]
                 wp = Waypoint(activity.StartTime + timedelta(seconds=round(timestamp)))

From 3cae2c5f3c92fc59430d8d8031f6946cecde436e Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Fri, 15 Jan 2021 07:22:12 +0100
Subject: [PATCH 42/60] ignore cache exception

---
 tapiriik/sync/sync.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tapiriik/sync/sync.py b/tapiriik/sync/sync.py
index e201a46bd..81fc08109 100644
--- a/tapiriik/sync/sync.py
+++ b/tapiriik/sync/sync.py
@@ -1148,7 +1148,10 @@ def Run(self, exhaustive=False, null_next_sync_on_unlock=False, heartbeat_callba
                             db.sync_stats.update({"ActivityID": activity.UID}, {"$addToSet": {"DestinationServices": destSvc.ID, "SourceServices": activitySource.ID}, "$set": {"Distance": activity.Stats.Distance.asUnits(ActivityStatisticUnit.Meters).Value, "Timestamp": datetime.utcnow()}}, upsert=True)
 
                         if len(successful_destination_service_ids):
-                            self._pushRecentSyncActivity(full_activity, successful_destination_service_ids)
+                            try:
+                                self._pushRecentSyncActivity(full_activity, successful_destination_service_ids)
+                            except Exception as e:
+                                logger.warning("\t  Exception updating recent activity cache %s - %s" % (destSvc.ID, e))
                         del full_activity
                         processedActivities += 1
                     except ActivityShouldNotSynchronizeException:

From 8271dbbaa529c834f7f7f282423dc4b102df3645 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Wed, 20 Jan 2021 07:14:34 +0100
Subject: [PATCH 43/60] start on MMR UploadActivity - copied from endomondo

---
 tapiriik/services/Endomondo/endomondo.py      |  2 +-
 .../services/MapMyFitness/mapmyfitness.py     | 28 +++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/tapiriik/services/Endomondo/endomondo.py b/tapiriik/services/Endomondo/endomondo.py
index eeac57625..210c7840a 100644
--- a/tapiriik/services/Endomondo/endomondo.py
+++ b/tapiriik/services/Endomondo/endomondo.py
@@ -348,7 +348,7 @@ def UploadActivity(self, serviceRecord, activity):
             serviceRecord.SetConfiguration({"DeviceRegistered": True})
 
         activity_id = "tap-" + activity.UID + "-" + str(os.getpid())
-        
+
         sport = self._getSport(activity)
 
         upload_data = {
diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index ecb76b3f8..266d438b4 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -6,6 +6,9 @@
 
 from datetime import datetime, timedelta
 from urllib.parse import parse_qs, urlencode
+import json
+import os
+import pytz
 import requests
 from django.core.urlresolvers import reverse
 from requests_oauthlib import OAuth1
@@ -120,6 +123,9 @@ def _resolveActivityType(self, actType, headers):
             return self._resolveActivityType(parentId, headers)
         return ActivityType.Other
 
+    def _formatDate(self, date):
+        return datetime.strftime(date.astimezone(pytz.utc), "%Y-%m-%d %H:%M:%S UTC")
+
     def DownloadActivityList(self, serviceRecord, exhaustive=False):
         logger.debug("DownloadActivityList")
         allItems = []
@@ -207,8 +213,26 @@ def DownloadActivity(self, serviceRecord, activity):
         return activity
 
     def UploadActivity(self, serviceRecord, activity):
-        # TODO
-        raise Exception("Not implemented upload to MMR")
+
+        activity_id = "tap-" + activity.UID + "-" + str(os.getpid())
+
+        upload_data = {
+            # "device_id": device_id,
+            # "sport": sport,
+            "start_time": self._formatDate(activity.StartTime),
+            "end_time": self._formatDate(activity.EndTime),
+            "points": []
+        }
+
+        upload_resp = requests.post(
+            "https://api.mapmyfitness.com/v7.1/workout/" + activity_id,
+             headers=self._apiHeaders(serviceRecord),
+             data=json.dumps(upload_data))
+        if upload_resp.status_code != 200:
+            self._rateLimitBailout(upload_resp)
+            raise APIException("Could not upload activity %s %s" % (upload_resp.status_code, upload_resp.text))
+
+        return upload_resp.json()["id"]
 
     def DeleteCachedData(self, serviceRecord):
         pass

From ab2f66855a28aadb4b0a3509fb3f5289ac31e872 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Thu, 21 Jan 2021 07:23:08 +0100
Subject: [PATCH 44/60] some more mmr upload data

---
 .../services/MapMyFitness/mapmyfitness.py     | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 266d438b4..4c24a4159 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -214,22 +214,50 @@ def DownloadActivity(self, serviceRecord, activity):
 
     def UploadActivity(self, serviceRecord, activity):
 
+        links = {}
+
         activity_id = "tap-" + activity.UID + "-" + str(os.getpid())
 
+        privacy_option_id = "1" # TODO privacy
+        links["privacy"] = [{
+            "href": "/v7.1/privacy_option/%s/" % privacy_option_id,
+            "id": privacy_option_id
+            }]
+
+        activity_type_id = [k for k,v in self._activityMappings.items() if v == activity.Type][0]
+        if not activity_type_id:
+            activity_type_id = "1"
+        links["activity_type"] = [{
+            "href": "/v7.1/activity_type/%s/" % activity_type_id,
+            "id": activity_type_id
+            }]
+
+        # TODO agregates
+        aggregates = {
+
+        }
+
+
+
         upload_data = {
-            # "device_id": device_id,
-            # "sport": sport,
             "start_time": self._formatDate(activity.StartTime),
             "end_time": self._formatDate(activity.EndTime),
-            "points": []
+            "points": [],
+            "aggregates": aggregates,
+            "_links": links
         }
 
-        upload_resp = requests.post(
+        if activity.Name:
+            upload_data["title"] = activity.Name
+
+        if activity.Notes:
+            upload_data["notes"] = activity.Notes
+
+        upload_resp = requests.put(
             "https://api.mapmyfitness.com/v7.1/workout/" + activity_id,
              headers=self._apiHeaders(serviceRecord),
              data=json.dumps(upload_data))
         if upload_resp.status_code != 200:
-            self._rateLimitBailout(upload_resp)
             raise APIException("Could not upload activity %s %s" % (upload_resp.status_code, upload_resp.text))
 
         return upload_resp.json()["id"]

From 7801f3844ed0a0c667080b7167ea790fbf4efcdc Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Fri, 22 Jan 2021 07:22:34 +0100
Subject: [PATCH 45/60] do MMR as per the doc example

---
 .../services/MapMyFitness/mapmyfitness.py     | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 4c24a4159..0778fc328 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -123,9 +123,6 @@ def _resolveActivityType(self, actType, headers):
             return self._resolveActivityType(parentId, headers)
         return ActivityType.Other
 
-    def _formatDate(self, date):
-        return datetime.strftime(date.astimezone(pytz.utc), "%Y-%m-%d %H:%M:%S UTC")
-
     def DownloadActivityList(self, serviceRecord, exhaustive=False):
         logger.debug("DownloadActivityList")
         allItems = []
@@ -214,42 +211,30 @@ def DownloadActivity(self, serviceRecord, activity):
 
     def UploadActivity(self, serviceRecord, activity):
 
-        links = {}
-
         activity_id = "tap-" + activity.UID + "-" + str(os.getpid())
 
         privacy_option_id = "1" # TODO privacy
-        links["privacy"] = [{
-            "href": "/v7.1/privacy_option/%s/" % privacy_option_id,
-            "id": privacy_option_id
-            }]
 
         activity_type_id = [k for k,v in self._activityMappings.items() if v == activity.Type][0]
         if not activity_type_id:
             activity_type_id = "1"
-        links["activity_type"] = [{
-            "href": "/v7.1/activity_type/%s/" % activity_type_id,
-            "id": activity_type_id
-            }]
 
         # TODO agregates
         aggregates = {
 
         }
 
-
-
         upload_data = {
-            "start_time": self._formatDate(activity.StartTime),
-            "end_time": self._formatDate(activity.EndTime),
+            "start_datetime": activity.StartTime.isoformat(),
+            # TODO timezone
+            "name": activity.Name,
+            "privacy": "/v7.1/privacy_option/%s/" % privacy_option_id,
+            "activity_type": "/v7.1/activity_type/%s/" % activity_type_id,
             "points": [],
-            "aggregates": aggregates,
-            "_links": links
+            "aggregates": aggregates
+            # TODO time series
         }
 
-        if activity.Name:
-            upload_data["title"] = activity.Name
-
         if activity.Notes:
             upload_data["notes"] = activity.Notes
 

From ad54dafefda8cc56b558dc38a658a1f469223d97 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Fri, 22 Jan 2021 10:27:52 +0100
Subject: [PATCH 46/60] get upload to MMR working, with some missing data,
 mainly time series

---
 .../services/MapMyFitness/mapmyfitness.py     | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 0778fc328..e3e138d59 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -7,7 +7,6 @@
 from datetime import datetime, timedelta
 from urllib.parse import parse_qs, urlencode
 import json
-import os
 import pytz
 import requests
 from django.core.urlresolvers import reverse
@@ -152,7 +151,8 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
 
             # aggregate
             aggregates = act["aggregates"]
-            activity.EndTime = activity.StartTime + timedelta(0, round(float(aggregates["elapsed_time_total"])))
+            elapsed_time_total = aggregates["elapsed_time_total"] if "elapsed_time_total" in aggregates else "0"
+            activity.EndTime = activity.StartTime + timedelta(0, round(float(elapsed_time_total)))
             activity.Distance = aggregates["distance_total"]
             # TODO get more properties - see endomondo and strava
 
@@ -211,26 +211,25 @@ def DownloadActivity(self, serviceRecord, activity):
 
     def UploadActivity(self, serviceRecord, activity):
 
-        activity_id = "tap-" + activity.UID + "-" + str(os.getpid())
-
         privacy_option_id = "1" # TODO privacy
 
         activity_type_id = [k for k,v in self._activityMappings.items() if v == activity.Type][0]
         if not activity_type_id:
             activity_type_id = "1"
 
-        # TODO agregates
-        aggregates = {
+        elapsed_time_total = activity.EndTime - activity.StartTime
 
+        # TODO aggregates
+        aggregates = {
+            "elapsed_time_total": elapsed_time_total.seconds
         }
 
         upload_data = {
             "start_datetime": activity.StartTime.isoformat(),
-            # TODO timezone
+            "start_locale_timezone": activity.TZ.zone,
             "name": activity.Name,
             "privacy": "/v7.1/privacy_option/%s/" % privacy_option_id,
             "activity_type": "/v7.1/activity_type/%s/" % activity_type_id,
-            "points": [],
             "aggregates": aggregates
             # TODO time series
         }
@@ -238,14 +237,14 @@ def UploadActivity(self, serviceRecord, activity):
         if activity.Notes:
             upload_data["notes"] = activity.Notes
 
-        upload_resp = requests.put(
-            "https://api.mapmyfitness.com/v7.1/workout/" + activity_id,
+        upload_resp = requests.post(
+            "https://api.mapmyfitness.com/v7.1/workout/",
              headers=self._apiHeaders(serviceRecord),
              data=json.dumps(upload_data))
-        if upload_resp.status_code != 200:
+        if upload_resp.status_code != 201:
             raise APIException("Could not upload activity %s %s" % (upload_resp.status_code, upload_resp.text))
 
-        return upload_resp.json()["id"]
+        return upload_resp.json()["_links"]["self"][0]["id"]
 
     def DeleteCachedData(self, serviceRecord):
         pass

From a63982ea485d312c4eb966825c6c734cc8e37578 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Mon, 25 Jan 2021 07:10:07 +0100
Subject: [PATCH 47/60] start on time series

---
 .../services/MapMyFitness/mapmyfitness.py     | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index e3e138d59..d3ae7c248 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -219,10 +219,40 @@ def UploadActivity(self, serviceRecord, activity):
 
         elapsed_time_total = activity.EndTime - activity.StartTime
 
-        # TODO aggregates
         aggregates = {
             "elapsed_time_total": elapsed_time_total.seconds
         }
+        # TODO add more data into aggregates
+
+        position = []
+        heartrate = []
+        power = []
+        for wp in activity.GetFlatWaypoints():
+            time = wp.Timestamp - activity.StartTime
+            time = time.seconds
+            if wp.Location:
+                pt = [time]
+                pos = {}
+                if wp.Location.Latitude is not None and wp.Location.Longitude is not None:
+                    pos["lat"] = wp.Location.Latitude
+                    pos["lng"] = wp.Location.Longitude
+                if wp.Location.Altitude is not None:
+                    pos["elevation"] = wp.Location.Altitude
+                pt[1] = pos
+                position += pt
+            if wp.HR is not None:
+                pt = [time, round(wp.HR)]
+                heartrate += pt
+            if wp.Power is not None:
+                pt = [time, round(wp.Power)]
+                power += pt
+
+        time_series = {
+            "position": position,
+            "heartrate": heartrate,
+            "power": power
+        }
+        # TODO add more data into time series
 
         upload_data = {
             "start_datetime": activity.StartTime.isoformat(),
@@ -230,8 +260,8 @@ def UploadActivity(self, serviceRecord, activity):
             "name": activity.Name,
             "privacy": "/v7.1/privacy_option/%s/" % privacy_option_id,
             "activity_type": "/v7.1/activity_type/%s/" % activity_type_id,
-            "aggregates": aggregates
-            # TODO time series
+            "aggregates": aggregates,
+            "time_series": time_series
         }
 
         if activity.Notes:

From 4e019de45a96470f3b4537b716d4e4e759b559b3 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Mon, 25 Jan 2021 17:08:31 +0100
Subject: [PATCH 48/60] add distance, speed, cadence

---
 .../services/MapMyFitness/mapmyfitness.py     | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index d3ae7c248..7ebeb1d90 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -227,6 +227,9 @@ def UploadActivity(self, serviceRecord, activity):
         position = []
         heartrate = []
         power = []
+        distance = []
+        speed = []
+        cadence = []
         for wp in activity.GetFlatWaypoints():
             time = wp.Timestamp - activity.StartTime
             time = time.seconds
@@ -246,13 +249,27 @@ def UploadActivity(self, serviceRecord, activity):
             if wp.Power is not None:
                 pt = [time, round(wp.Power)]
                 power += pt
+            if wp.Distance is not None:
+                pt = [time, round(wp.Distance)]
+                distance += pt
+            if wp.Speed is not None:
+                pt = [time, round(wp.Speed)]
+                speed += pt
+            if wp.Cadence is not None:
+                pt = [time, round(wp.Cadence)]
+                cadence += pt
+            elif wp.RunCadence is not None:
+                pt = [time, round(wp.RunCadence)]
+                cadence += pt
 
         time_series = {
             "position": position,
             "heartrate": heartrate,
-            "power": power
+            "power": power,
+            "distance": distance,
+            "speed": speed,
+            "cadence": cadence
         }
-        # TODO add more data into time series
 
         upload_data = {
             "start_datetime": activity.StartTime.isoformat(),

From 4f4000d37fb0a909e12665261ba82aa60fa9f348 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Mon, 25 Jan 2021 17:44:30 +0100
Subject: [PATCH 49/60] more data

---
 .../services/MapMyFitness/mapmyfitness.py     | 74 ++++++++++++++++---
 1 file changed, 62 insertions(+), 12 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 7ebeb1d90..93d802327 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -1,7 +1,7 @@
 from tapiriik.services.service_base import ServiceAuthenticationType, ServiceBase
 from tapiriik.services.service_record import ServiceRecord
 from tapiriik.services.api import APIException, UserException, UserExceptionType
-from tapiriik.services.interchange import UploadedActivity, ActivityType, WaypointType, Waypoint, Location, Lap
+from tapiriik.services.interchange import UploadedActivity, ActivityType, ActivityStatisticUnit, WaypointType, Waypoint, Location, Lap
 from tapiriik.settings import WEB_ROOT, MAPMYFITNESS_CLIENT_KEY, MAPMYFITNESS_CLIENT_SECRET
 
 from datetime import datetime, timedelta
@@ -211,7 +211,10 @@ def DownloadActivity(self, serviceRecord, activity):
 
     def UploadActivity(self, serviceRecord, activity):
 
-        privacy_option_id = "1" # TODO privacy
+        if activity.Private:
+            privacy_option_id = "0"
+        else:
+            privacy_option_id = "3"
 
         activity_type_id = [k for k,v in self._activityMappings.items() if v == activity.Type][0]
         if not activity_type_id:
@@ -222,8 +225,56 @@ def UploadActivity(self, serviceRecord, activity):
         aggregates = {
             "elapsed_time_total": elapsed_time_total.seconds
         }
-        # TODO add more data into aggregates
 
+        if activity.Stats.Distance.Value is not None:
+            aggregates["distance_total"] = activity.Stats.Distance.asUnits(ActivityStatisticUnit.Kilometers).Value
+
+        if activity.Stats.TimerTime.Value is not None:
+            aggregates["active_time_total"] = activity.Stats.TimerTime.asUnits(ActivityStatisticUnit.Seconds).Value
+        elif activity.Stats.MovingTime.Value is not None:
+            aggregates["active_time_total"] = activity.Stats.MovingTime.asUnits(ActivityStatisticUnit.Seconds).Value
+        else:
+            aggregates["active_time_total"] = (activity.EndTime - activity.StartTime).total_seconds()
+
+        speed_stats = activity.Stats.Speed.asUnits(ActivityStatisticUnit.KilometersPerHour)
+        if speed_stats.Average is not None:
+            aggregates["speed_avg"] = speed_stats.Average
+        if speed_stats.Min is not None:
+            aggregates["speed_min"] = speed_stats.Min
+        if speed_stats.Max is not None:
+            aggregates["speed_max"] = speed_stats.Max
+
+        hr_stats = activity.Stats.HR.asUnits(ActivityStatisticUnit.BeatsPerMinute)
+        if hr_stats.Average is not None:
+            aggregates["heart_rate_avg"] = hr_stats.Average
+        if hr_stats.Min is not None:
+            aggregates["heart_rate_max"] = hr_stats.Min
+        if hr_stats.Max is not None:
+            aggregates["heart_rate_max"] = hr_stats.Max
+
+        if activity.Stats.Power.Average is not None:
+            aggregates["power_avg"] = activity.Stats.Power.asUnits(ActivityStatisticUnit.Watts).Average
+        if activity.Stats.Power.Min is not None:
+            aggregates["power_min"] = activity.Stats.Power.asUnits(ActivityStatisticUnit.Watts).Min
+        if activity.Stats.Power.Max is not None:
+            aggregates["power_max"] = activity.Stats.Power.asUnits(ActivityStatisticUnit.Watts).Max
+
+        if activity.Stats.Cadence.Average is not None:
+            aggregates["cadence_avg"] = activity.Stats.Cadence.asUnits(ActivityStatisticUnit.RevolutionsPerMinute).Average
+        elif activity.Stats.RunCadence.Average is not None:
+            aggregates["cadence_avg"] = activity.Stats.RunCadence.asUnits(ActivityStatisticUnit.StepsPerMinute).Average
+
+        if activity.Stats.Cadence.Min is not None:
+            aggregates["cadence_min"] = activity.Stats.Cadence.asUnits(ActivityStatisticUnit.RevolutionsPerMinute).Min
+        elif activity.Stats.RunCadence.Min is not None:
+            aggregates["cadence_min"] = activity.Stats.RunCadence.asUnits(ActivityStatisticUnit.StepsPerMinute).Min
+
+        if activity.Stats.Cadence.Max is not None:
+            aggregates["cadence_max"] = activity.Stats.Cadence.asUnits(ActivityStatisticUnit.RevolutionsPerMinute).Max
+        elif activity.Stats.RunCadence.Max is not None:
+            aggregates["cadence_max"] = activity.Stats.RunCadence.asUnits(ActivityStatisticUnit.StepsPerMinute).Max
+
+        # time series
         position = []
         heartrate = []
         power = []
@@ -234,33 +285,32 @@ def UploadActivity(self, serviceRecord, activity):
             time = wp.Timestamp - activity.StartTime
             time = time.seconds
             if wp.Location:
-                pt = [time]
                 pos = {}
                 if wp.Location.Latitude is not None and wp.Location.Longitude is not None:
                     pos["lat"] = wp.Location.Latitude
                     pos["lng"] = wp.Location.Longitude
                 if wp.Location.Altitude is not None:
                     pos["elevation"] = wp.Location.Altitude
-                pt[1] = pos
-                position += pt
+                pt = [time, pos]
+                position.append(pt)
             if wp.HR is not None:
                 pt = [time, round(wp.HR)]
-                heartrate += pt
+                heartrate.append(pt)
             if wp.Power is not None:
                 pt = [time, round(wp.Power)]
-                power += pt
+                power.append(pt)
             if wp.Distance is not None:
                 pt = [time, round(wp.Distance)]
-                distance += pt
+                distance.append(pt)
             if wp.Speed is not None:
                 pt = [time, round(wp.Speed)]
-                speed += pt
+                speed.append(pt)
             if wp.Cadence is not None:
                 pt = [time, round(wp.Cadence)]
-                cadence += pt
+                cadence.append(pt)
             elif wp.RunCadence is not None:
                 pt = [time, round(wp.RunCadence)]
-                cadence += pt
+                cadence.append(pt)
 
         time_series = {
             "position": position,

From 47e223e4a6929a05f0d4fe7f8031a1568cca7246 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Tue, 26 Jan 2021 07:27:13 +0100
Subject: [PATCH 50/60] get more properties from the activity

---
 .../services/MapMyFitness/mapmyfitness.py     | 40 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 93d802327..50c3cd6d4 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -1,7 +1,7 @@
 from tapiriik.services.service_base import ServiceAuthenticationType, ServiceBase
 from tapiriik.services.service_record import ServiceRecord
 from tapiriik.services.api import APIException, UserException, UserExceptionType
-from tapiriik.services.interchange import UploadedActivity, ActivityType, ActivityStatisticUnit, WaypointType, Waypoint, Location, Lap
+from tapiriik.services.interchange import UploadedActivity, ActivityType, ActivityStatistic, ActivityStatisticUnit, WaypointType, Waypoint, Location, Lap
 from tapiriik.settings import WEB_ROOT, MAPMYFITNESS_CLIENT_KEY, MAPMYFITNESS_CLIENT_SECRET
 
 from datetime import datetime, timedelta
@@ -153,8 +153,44 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
             aggregates = act["aggregates"]
             elapsed_time_total = aggregates["elapsed_time_total"] if "elapsed_time_total" in aggregates else "0"
             activity.EndTime = activity.StartTime + timedelta(0, round(float(elapsed_time_total)))
+            activity.Stats.TimerTime = elapsed_time_total
+            activity.Stats.MovingTime = elapsed_time_total
+            if "active_time_total" in aggregates:
+                activity.Stats.MovingTime = ActivityStatistic(ActivityStatisticUnit.Seconds, value=float(aggregates["active_time_total"]))
+
             activity.Distance = aggregates["distance_total"]
-            # TODO get more properties - see endomondo and strava
+            if "distance_total" in aggregates:
+                activity.Stats.Distance = ActivityStatistic(ActivityStatisticUnit.Kilometers, value=float(aggregates["distance_total"]))
+
+            # activity.Stats.Speed = ActivityStatistic(ActivityStatisticUnit.KilometersPerHour)
+            if "speed_min" in aggregates:
+                activity.Stats.Speed.Min = float(aggregates["speed_min"])
+            if "speed_max" in aggregates:
+                activity.Stats.Speed.Max = float(aggregates["speed_max"])
+            if "speed_avg" in aggregates:
+                activity.Stats.Speed.Average = float(aggregates["speed_avg"])
+
+            if "heart_rate_min" in aggregates:
+                activity.Stats.HR.update(ActivityStatistic(ActivityStatisticUnit.BeatsPerMinute, min=float(aggregates["heart_rate_min"])))
+            if "heart_rate_max" in aggregates:
+                activity.Stats.HR.update(ActivityStatistic(ActivityStatisticUnit.BeatsPerMinute, max=float(aggregates["heart_rate_max"])))
+            if "heart_rate_avg" in aggregates:
+                activity.Stats.HR = ActivityStatistic(ActivityStatisticUnit.BeatsPerMinute, avg=float(aggregates["heart_rate_avg"]))
+
+            if "cadence_min" in aggregates:
+                activity.Stats.Cadence.update(ActivityStatistic(ActivityStatisticUnit.RevolutionsPerMinute, min=int(aggregates["cadence_min"])))
+            if "cadence_max" in aggregates:
+                activity.Stats.Cadence.update(ActivityStatistic(ActivityStatisticUnit.RevolutionsPerMinute, max=int(aggregates["cadence_max"])))
+            if "cadence_avg" in aggregates:
+                activity.Stats.Cadence = ActivityStatistic(ActivityStatisticUnit.RevolutionsPerMinute, avg=int(aggregates["cadence_avg"]))
+
+            if "power_min" in aggregates:
+                activity.Stats.Power.update(ActivityStatistic(ActivityStatisticUnit.Watts, min=int(aggregates["power_min"])))
+            if "power_max" in aggregates:
+                activity.Stats.Power.update(ActivityStatistic(ActivityStatisticUnit.Watts, max=int(aggregates["power_max"])))
+            if "power_avg" in aggregates:
+                activity.Stats.Power = ActivityStatistic(ActivityStatisticUnit.Watts, avg=int(aggregates["power_avg"]))
+
 
             activityTypeLink = act["_links"].get("activity_type")
             activityTypeID = activityTypeLink[0]["id"] if activityTypeLink is not None else None

From 24c051969d9370834e35c74c2941beb5262d0a89 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Tue, 26 Jan 2021 07:28:05 +0100
Subject: [PATCH 51/60] only add non-empty lists to time series

---
 .../services/MapMyFitness/mapmyfitness.py     | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 50c3cd6d4..954f34100 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -348,14 +348,19 @@ def UploadActivity(self, serviceRecord, activity):
                 pt = [time, round(wp.RunCadence)]
                 cadence.append(pt)
 
-        time_series = {
-            "position": position,
-            "heartrate": heartrate,
-            "power": power,
-            "distance": distance,
-            "speed": speed,
-            "cadence": cadence
-        }
+        time_series = {}
+        if position:
+            time_series["position"] = position
+        if heartrate:
+            time_series["heartrate"] = heartrate
+        if power:
+            time_series["power"] = power
+        if distance:
+            time_series["distance"] = distance
+        if speed:
+            time_series["speed"] = speed
+        if cadence:
+            time_series["cadence"] = cadence
 
         upload_data = {
             "start_datetime": activity.StartTime.isoformat(),

From bc195d7723b051546b4b4d57f939655397c7a829 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Tue, 26 Jan 2021 20:46:13 +0100
Subject: [PATCH 52/60] fix units

---
 .../services/MapMyFitness/mapmyfitness.py     | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 954f34100..0aac55710 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -153,16 +153,15 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
             aggregates = act["aggregates"]
             elapsed_time_total = aggregates["elapsed_time_total"] if "elapsed_time_total" in aggregates else "0"
             activity.EndTime = activity.StartTime + timedelta(0, round(float(elapsed_time_total)))
-            activity.Stats.TimerTime = elapsed_time_total
-            activity.Stats.MovingTime = elapsed_time_total
+            activity.Stats.TimerTime  = ActivityStatistic(ActivityStatisticUnit.Seconds, value=float(elapsed_time_total))
+            activity.Stats.MovingTime = ActivityStatistic(ActivityStatisticUnit.Seconds, value=float(elapsed_time_total))
             if "active_time_total" in aggregates:
                 activity.Stats.MovingTime = ActivityStatistic(ActivityStatisticUnit.Seconds, value=float(aggregates["active_time_total"]))
 
-            activity.Distance = aggregates["distance_total"]
             if "distance_total" in aggregates:
+                activity.Distance = aggregates["distance_total"]
                 activity.Stats.Distance = ActivityStatistic(ActivityStatisticUnit.Kilometers, value=float(aggregates["distance_total"]))
 
-            # activity.Stats.Speed = ActivityStatistic(ActivityStatisticUnit.KilometersPerHour)
             if "speed_min" in aggregates:
                 activity.Stats.Speed.Min = float(aggregates["speed_min"])
             if "speed_max" in aggregates:
@@ -170,12 +169,12 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
             if "speed_avg" in aggregates:
                 activity.Stats.Speed.Average = float(aggregates["speed_avg"])
 
-            if "heart_rate_min" in aggregates:
-                activity.Stats.HR.update(ActivityStatistic(ActivityStatisticUnit.BeatsPerMinute, min=float(aggregates["heart_rate_min"])))
-            if "heart_rate_max" in aggregates:
-                activity.Stats.HR.update(ActivityStatistic(ActivityStatisticUnit.BeatsPerMinute, max=float(aggregates["heart_rate_max"])))
-            if "heart_rate_avg" in aggregates:
-                activity.Stats.HR = ActivityStatistic(ActivityStatisticUnit.BeatsPerMinute, avg=float(aggregates["heart_rate_avg"]))
+            if "heartrate_min" in aggregates:
+                activity.Stats.HR.update(ActivityStatistic(ActivityStatisticUnit.BeatsPerMinute, min=float(aggregates["heartrate_min"])))
+            if "heartrate_max" in aggregates:
+                activity.Stats.HR.update(ActivityStatistic(ActivityStatisticUnit.BeatsPerMinute, max=float(aggregates["heartrate_max"])))
+            if "heartrate_avg" in aggregates:
+                activity.Stats.HR = ActivityStatistic(ActivityStatisticUnit.BeatsPerMinute, avg=float(aggregates["heartrate_avg"]))
 
             if "cadence_min" in aggregates:
                 activity.Stats.Cadence.update(ActivityStatistic(ActivityStatisticUnit.RevolutionsPerMinute, min=int(aggregates["cadence_min"])))
@@ -263,7 +262,7 @@ def UploadActivity(self, serviceRecord, activity):
         }
 
         if activity.Stats.Distance.Value is not None:
-            aggregates["distance_total"] = activity.Stats.Distance.asUnits(ActivityStatisticUnit.Kilometers).Value
+            aggregates["distance_total"] = activity.Stats.Distance.asUnits(ActivityStatisticUnit.Meters).Value
 
         if activity.Stats.TimerTime.Value is not None:
             aggregates["active_time_total"] = activity.Stats.TimerTime.asUnits(ActivityStatisticUnit.Seconds).Value
@@ -272,7 +271,7 @@ def UploadActivity(self, serviceRecord, activity):
         else:
             aggregates["active_time_total"] = (activity.EndTime - activity.StartTime).total_seconds()
 
-        speed_stats = activity.Stats.Speed.asUnits(ActivityStatisticUnit.KilometersPerHour)
+        speed_stats = activity.Stats.Speed.asUnits(ActivityStatisticUnit.MetersPerSecond)
         if speed_stats.Average is not None:
             aggregates["speed_avg"] = speed_stats.Average
         if speed_stats.Min is not None:

From 3534413b60df3729497e78de23abbd38c7aad97e Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Wed, 27 Jan 2021 07:23:41 +0100
Subject: [PATCH 53/60] update MMR logo

---
 .../web/static/img/services/mapmyfitness.png  | Bin 2266 -> 2408 bytes
 .../static/img/services/mapmyfitness_l.png    | Bin 2977 -> 5314 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tapiriik/web/static/img/services/mapmyfitness.png b/tapiriik/web/static/img/services/mapmyfitness.png
index 575f2892ead244e2fc24e423380ffe809b8ce3b4..d23b934c26d8ca8f1cd50ceb028bd0b354c39d28 100644
GIT binary patch
delta 2397
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
P00000NkvXXu0mjfTQ0Rc

literal 2266
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
V_^7nHJ7o56gUt$NR?(yP{1-W^v)BLt

diff --git a/tapiriik/web/static/img/services/mapmyfitness_l.png b/tapiriik/web/static/img/services/mapmyfitness_l.png
index 236e21cfb45c6f38687c61cc8ea8fbe1678e8ae2..410186d1b68035bd8b0060f45adb925880991f47 100644
GIT binary patch
literal 5314
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

literal 2977
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


From ed6f643c4d73fe9e276d70cd2d32815898c32203 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Wed, 27 Jan 2021 08:46:54 +0100
Subject: [PATCH 54/60] make the image by 50% width of original

---
 .../web/static/img/services/mapmyfitness.png  | Bin 2408 -> 2646 bytes
 .../static/img/services/mapmyfitness_l.png    | Bin 5314 -> 5143 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tapiriik/web/static/img/services/mapmyfitness.png b/tapiriik/web/static/img/services/mapmyfitness.png
index d23b934c26d8ca8f1cd50ceb028bd0b354c39d28..9dbadac480106c1e05c058c4ff766b594b468fd2 100644
GIT binary patch
delta 2601
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
LNkvXXu0mjfn^Xd=

delta 2361
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

diff --git a/tapiriik/web/static/img/services/mapmyfitness_l.png b/tapiriik/web/static/img/services/mapmyfitness_l.png
index 410186d1b68035bd8b0060f45adb925880991f47..70a639f08ccea07f9887d0e661303de029bde816 100644
GIT binary patch
literal 5143
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

literal 5314
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


From 83d4f8aeb66bddf8a118a245b4e9b448a49675d2 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Thu, 28 Jan 2021 08:38:09 +0100
Subject: [PATCH 55/60] add a new service label

---
 tapiriik/services/MapMyFitness/mapmyfitness.py |   1 +
 tapiriik/web/static/css/style.css              |   8 ++++++++
 tapiriik/web/static/img/services/new.png       | Bin 0 -> 3704 bytes
 tapiriik/web/templates/service-button.html     |   3 +++
 4 files changed, 12 insertions(+)
 create mode 100644 tapiriik/web/static/img/services/new.png

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 0aac55710..dd873eb7e 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -24,6 +24,7 @@ class MapMyFitnessService(ServiceBase):
     UserAuthorizationURL = None
     AuthenticationNoFrame = True
     OutstandingOAuthRequestTokens = {}
+    IsNew = True
 
     _activityMappings = {"16": ActivityType.Running,
                          "11": ActivityType.Cycling,
diff --git a/tapiriik/web/static/css/style.css b/tapiriik/web/static/css/style.css
index 184181b40..eb5ff5cd1 100644
--- a/tapiriik/web/static/css/style.css
+++ b/tapiriik/web/static/css/style.css
@@ -609,6 +609,14 @@ p.infotip .close:hover {
 	vertical-align: middle;
 }
 
+.service .button .newOverlay {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 64px;
+    height: 64px;
+}
+
 .service .status {
 	display: inline-block;
 	max-height:1em;
diff --git a/tapiriik/web/static/img/services/new.png b/tapiriik/web/static/img/services/new.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c0b0efbcffc5a61de2d414ff03fac606f939424
GIT binary patch
literal 3704
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
WqFDk7NC>?E0000<MNUMnLSTY|M99(r

literal 0
HcmV?d00001

diff --git a/tapiriik/web/templates/service-button.html b/tapiriik/web/templates/service-button.html
index 97acff65d..c4dbfcf1b 100644
--- a/tapiriik/web/templates/service-button.html
+++ b/tapiriik/web/templates/service-button.html
@@ -9,6 +9,9 @@
 		{% endif %}
 			<div class="button">
 				<div class="icon"><img lgsrc="{{ STATIC_URL }}img/services/{{ provider.ID }}_l.png" src="{{ STATIC_URL }}img/services/{{ provider.ID }}.png" alt="{{ provider.DisplayName }}"/>Sync with {{ provider.DisplayName }}</div>
+				{% if provider.IsNew %}
+					<img src="{{ STATIC_URL }}img/services/new.png" alt="new" class="newOverlay">
+				{% endif %}
 			</div>
 		{% if not user or provider.ID not in user.ConnectedServices|svc_ids %}
 			{% if provider.ID not in config.disabled_services %}

From eca94f4532ed652a881fd669835600156a2510b7 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Fri, 29 Jan 2021 07:25:00 +0100
Subject: [PATCH 56/60] error handling

---
 tapiriik/web/static/js/tapiriik.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tapiriik/web/static/js/tapiriik.js b/tapiriik/web/static/js/tapiriik.js
index 8d80f52f4..a4075e8a1 100644
--- a/tapiriik/web/static/js/tapiriik.js
+++ b/tapiriik/web/static/js/tapiriik.js
@@ -884,9 +884,13 @@ tapiriik.RefreshSyncCountdown = function(){
 				sync_button_queuing = true;
 			} else {
 				sync_button_engaged = true;
-				var progress = "";
 				if (tapiriik.SynchronizationStep == "list") {
-					sync_state_text = "Checking " + tapiriik.ServiceInfo[tapiriik.SynchronizationProgress].DisplayName;
+					var progress = tapiriik.ServiceInfo[tapiriik.SynchronizationProgress];
+					if(progress) {
+						sync_state_text = "Checking " + progress.DisplayName;
+					} else {
+						sync_state_text = "Checking";
+					}
 				} else {
 					sync_state_text = Math.round(tapiriik.SynchronizationProgress*100) + "% complete";
 				}

From 15e15598efef3859e5022f4a9287e5a8aa6543a8 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Fri, 29 Jan 2021 17:26:13 +0100
Subject: [PATCH 57/60] remove excessive logging

---
 tapiriik/services/MapMyFitness/mapmyfitness.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index dd873eb7e..5e9402bb2 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -42,7 +42,6 @@ class MapMyFitnessService(ServiceBase):
     SupportedActivities = list(_activityMappings.values())
 
     def WebInit(self):
-        logger.debug("WebInit")
         redirect_uri = WEB_ROOT + reverse("oauth_return", kwargs={"service": "mapmyfitness"})
         params = {'client_id': MAPMYFITNESS_CLIENT_KEY,
                   'response_type': 'code',
@@ -51,7 +50,6 @@ def WebInit(self):
             "https://api.mapmyfitness.com/v7.1/oauth2/authorize/?" + urlencode(params)
 
     def GenerateUserAuthorizationURL(self, session, level=None):
-        logger.debug("GenerateUserAuthorizationURL")
         oauth = OAuth1(MAPMYFITNESS_CLIENT_KEY, client_secret=MAPMYFITNESS_CLIENT_SECRET)
         response = requests.post("https://api.mapmyfitness.com/v7.1/oauth2/request_token", auth=oauth)
         credentials = parse_qs(response.text)
@@ -61,19 +59,15 @@ def GenerateUserAuthorizationURL(self, session, level=None):
         return "https://api.mapmyfitness.com/v7.1/oauth2/authorize?" + urlencode(reqObj)
 
     def _apiHeaders(self, serviceRecord):
-        logger.debug("_apiHeaders")
         return {"Authorization": "Bearer " + serviceRecord.Authorization["Token"],
                 "Accept-Charset": "UTF-8"}
 
     def _getUserId(self, serviceRecord):
-        logger.debug("_getUserId")
         response = requests.get("https://api.mapmyfitness.com/v7.1/user/self", headers=self._apiHeaders(serviceRecord))
-        logger.debug("_getUserId response=%s" % response)
         responseData = response.json()
         return responseData["id"]
 
     def RetrieveAuthorizationToken(self, req, level):
-        logger.debug("RetrieveAuthorizationToken")
         from tapiriik.services import Service
 
         code = req.GET.get("code")
@@ -101,7 +95,6 @@ def RevokeAuthorization(self, serviceRecord):
         pass
 
     def _getActivityTypeHierarchy(self, headers):
-        logger.debug("_getActivityTypeHierarchy")
         if hasattr(self, "_activityTypes"):
             return self._activityTypes
         response = requests.get("https://api.mapmyfitness.com/v7.1/activity_type", headers=headers)
@@ -112,7 +105,6 @@ def _getActivityTypeHierarchy(self, headers):
         return self._activityTypes
 
     def _resolveActivityType(self, actType, headers):
-        logger.debug("_resolveActivityType")
         self._getActivityTypeHierarchy(headers)
         if actType in self._activityMappings:
             return self._activityMappings[actType]
@@ -211,8 +203,8 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
         return activities, exclusions
 
     def DownloadActivity(self, serviceRecord, activity):
-        logger.debug("DownloadActivity")
         activityID = activity.ServiceData["ActivityID"]
+        logger.debug("DownloadActivity %s" % activityID)
 
         lap = Lap(stats=activity.Stats, startTime=activity.StartTime, endTime=activity.EndTime)
         activity.Laps = [lap]

From acff50533b1c0cee2454a8f7c81cdbcf1f2b8eb5 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Mon, 1 Feb 2021 07:17:27 +0100
Subject: [PATCH 58/60] add MMR to list of services on site

---
 tapiriik/web/templates/dashboard.html | 2 +-
 tapiriik/web/templates/site.html      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tapiriik/web/templates/dashboard.html b/tapiriik/web/templates/dashboard.html
index 07d524f33..4687f35c6 100644
--- a/tapiriik/web/templates/dashboard.html
+++ b/tapiriik/web/templates/dashboard.html
@@ -76,7 +76,7 @@ <h1>Substituting user</h1>
 	{% endfor %}
 
 {% else %}
-<p class="splashPreamble">siiink.com synchronizes your fitness activities between Strava, SportTracks, RideWithGPS and Dropbox<br/>
+<p class="splashPreamble">siiink.com synchronizes your fitness activities between Strava, MapMyFitness, SportTracks, RideWithGPS and Dropbox<br/>
 <b>More coming soon!</b><br />
 (your heart rate, cadence, power, and temperature data syncs too)</p>
 
diff --git a/tapiriik/web/templates/site.html b/tapiriik/web/templates/site.html
index 2932435a2..2f82fce3f 100644
--- a/tapiriik/web/templates/site.html
+++ b/tapiriik/web/templates/site.html
@@ -14,7 +14,7 @@
     </script>
 
     <meta http-equiv="Content-Type" value="text/html; charset=UTF-8">
-    <meta name="Description" content="Automatically synchronize your fitness activities between Garmin Connect, Runkeeper, Strava and more.">
+    <meta name="Description" content="Automatically synchronize your fitness activities between Strava, MapMyFitness (MapMyRun, MapMyRide, MapMyWalk), Dropbox and more.">
     <meta name="Keywords" content="automatic, synchronize, sync, update, copy, transfer, download, back up, export, fitness, garmin, garmin connect, runkeeper, strava, endomondo, sporttracks, trainingpeaks, ridewithgps, ride with gps, training peaks, dropbox, trainerroad, motivato, velohero, epson, runsense, path, track, heart rate, free, service, gpx, tcx, health, data, service, cycling, running, swimming, walking, what other activities can I put here?, underwater basket weaving, why are you reading the SEO keywords anyways, move along, nothing to see here">
 
     {% stylesheet 'tapiriik-css' %}

From 6b8ee635d5633f09bd7d7e97031e4eb914a47843 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Tue, 2 Feb 2021 09:13:56 +0100
Subject: [PATCH 59/60] mmr distance is meters

---
 tapiriik/auth/credential_storage.py            | 1 -
 tapiriik/services/MapMyFitness/mapmyfitness.py | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tapiriik/auth/credential_storage.py b/tapiriik/auth/credential_storage.py
index c4223a466..c4ddbdb17 100644
--- a/tapiriik/auth/credential_storage.py
+++ b/tapiriik/auth/credential_storage.py
@@ -7,7 +7,6 @@
 
 #### note about tapiriik and credential storage ####
 # Some services require a username and password for every action - so they need to be stored in recoverable form
-# (namely: Garmin Connect's current "API")
 # I've done my best to mitigate the risk that these credentials ever be compromised, but the risk can never be eliminated
 # If you're not comfortable with it, you can opt to not have your credentials stored, instead entering them on every sync
 
diff --git a/tapiriik/services/MapMyFitness/mapmyfitness.py b/tapiriik/services/MapMyFitness/mapmyfitness.py
index 5e9402bb2..5617299ba 100644
--- a/tapiriik/services/MapMyFitness/mapmyfitness.py
+++ b/tapiriik/services/MapMyFitness/mapmyfitness.py
@@ -152,8 +152,7 @@ def DownloadActivityList(self, serviceRecord, exhaustive=False):
                 activity.Stats.MovingTime = ActivityStatistic(ActivityStatisticUnit.Seconds, value=float(aggregates["active_time_total"]))
 
             if "distance_total" in aggregates:
-                activity.Distance = aggregates["distance_total"]
-                activity.Stats.Distance = ActivityStatistic(ActivityStatisticUnit.Kilometers, value=float(aggregates["distance_total"]))
+                activity.Stats.Distance = ActivityStatistic(ActivityStatisticUnit.Meters, value=float(aggregates["distance_total"]))
 
             if "speed_min" in aggregates:
                 activity.Stats.Speed.Min = float(aggregates["speed_min"])

From ed9f8584ec49d3fea87ab3ffe55a18dfb906ffb4 Mon Sep 17 00:00:00 2001
From: Neil Boyd <NeilBoyd@gmail.com>
Date: Wed, 3 Feb 2021 06:47:45 +0100
Subject: [PATCH 60/60] remove recommended extension

---
 .vscode/extensions.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 80a905823..b1fe0fc7a 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,7 +1,6 @@
 {
     "recommendations": [
         "ms-python.python",
-        "tht13.python",
         "visualstudioexptteam.vscodeintellicode"
     ]
 }
\ No newline at end of file