nakarte

commit ce1ecbb33ac3ae40d12f6daf2ddd766b3cb36cca
parent f81c177969a72d7c5df00bf8e609f19e617dce8b
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Tue,  4 Aug 2020 08:57:12 +0300

tracks: fix regexes

Diffstat:
M
src/lib/leaflet.control.track-list/lib/services/endomondo.js
 | 
4
++--
M
src/lib/leaflet.control.track-list/lib/services/etomesto.js
 | 
2
+-
M
src/lib/leaflet.control.track-list/lib/services/garmin.js
 | 
4
++--
M
src/lib/leaflet.control.track-list/lib/services/movescount.js
 | 
4
++--
M
src/lib/leaflet.control.track-list/lib/services/osm.js
 | 
2
+-
M
src/lib/leaflet.control.track-list/lib/services/sportstracker.js
 | 
2
+-

6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/lib/leaflet.control.track-list/lib/services/endomondo.js b/src/lib/leaflet.control.track-list/lib/services/endomondo.js
@@ -3,8 +3,8 @@ import urlViaCorsProxy from '~/lib/CORSProxy';
 
 class Endomondo extends BaseService {
     urlRegexps = [
-        /^https:\/\/www\.endomondo\.com\/users\/(\d+)\/workouts\/(\d+)/u,
-        /^https:\/\/www\.endomondo\.com\/workouts\/(\d+)\/(\d+)/u
+        /^https?:\/\/(?:www\.)?endomondo\.com\/users\/(\d+)\/workouts\/(\d+)/u,
+        /^https?:\/\/(?:www\.)?endomondo\.com\/workouts\/(\d+)\/(\d+)/u
     ];
 
     isOurUrl() {
diff --git a/src/lib/leaflet.control.track-list/lib/services/etomesto.js b/src/lib/leaflet.control.track-list/lib/services/etomesto.js
@@ -3,7 +3,7 @@ import BaseService from './baseService';
 import parseGpx from '../parsers/gpx';
 
 class Etomesto extends BaseService {
-    urlRe = /^https?:\/\/www\.etomesto\.ru\/track([a-z0-9]+)/u;
+    urlRe = /^https?:\/\/(?:www\.)?etomesto\.ru\/track([a-z0-9]+)/u;
 
     getTrackId() {
         const m = this.urlRe.exec(this.origUrl);
diff --git a/src/lib/leaflet.control.track-list/lib/services/garmin.js b/src/lib/leaflet.control.track-list/lib/services/garmin.js
@@ -8,7 +8,7 @@ class GarminBase extends BaseService {
 }
 
 class GarminRoute extends GarminBase {
-    urlRe = /^https?:\/\/connect.garmin.com\/modern\/course\/(\d+)/u;
+    urlRe = /^https?:\/\/connect\.garmin\.com\/modern\/course\/(\d+)/u;
 
     requestOptions() {
         const m = this.urlRe.exec(this.origUrl);
@@ -47,7 +47,7 @@ class GarminRoute extends GarminBase {
 }
 
 class GarminActivity extends GarminBase {
-    urlRe = /^https?:\/\/connect.garmin.com\/modern\/activity\/(\d+)/u;
+    urlRe = /^https?:\/\/connect\.garmin\.com\/modern\/activity\/(\d+)/u;
 
     requestOptions() {
         const m = this.urlRe.exec(this.origUrl);
diff --git a/src/lib/leaflet.control.track-list/lib/services/movescount.js b/src/lib/leaflet.control.track-list/lib/services/movescount.js
@@ -8,7 +8,7 @@ class MovescountBase extends BaseService {
 }
 
 class MovescountRoute extends MovescountBase {
-    urlRe = /^https?:\/\/www.movescount.com\/([a-z]{2}\/)?map.*[?&]route=(\d+)/u;
+    urlRe = /^https?:\/\/(?:www\.)?movescount\.com\/([a-z]{2}\/)?map.*[?&]route=(\d+)/u;
 
     requestOptions() {
         const m = this.urlRe.exec(this.origUrl);
@@ -59,7 +59,7 @@ class MovescountRoute extends MovescountBase {
 }
 
 class MovescountMove extends MovescountBase {
-    urlRe = /^https?:\/\/www.movescount.com\/([a-z]{2}\/)?moves\/move(\d+)/u;
+    urlRe = /^https?:\/\/(?:www\.)?movescount\.com\/([a-z]{2}\/)?moves\/move(\d+)/u;
 
     requestOptions() {
         const m = this.urlRe.exec(this.origUrl);
diff --git a/src/lib/leaflet.control.track-list/lib/services/osm.js b/src/lib/leaflet.control.track-list/lib/services/osm.js
@@ -3,7 +3,7 @@ import BaseService from './baseService';
 import parseGpx from '../parsers/gpx';
 
 class Osm extends BaseService {
-    urlRe = /^https?:\/\/www\.openstreetmap\.org\/user\/(?:.*)\/traces\/(\d+)/u;
+    urlRe = /^https?:\/\/(?:www\.)?openstreetmap\.org\/user\/(?:.*)\/traces\/(\d+)/u;
 
     getTrackId() {
         const m = this.urlRe.exec(this.origUrl);
diff --git a/src/lib/leaflet.control.track-list/lib/services/sportstracker.js b/src/lib/leaflet.control.track-list/lib/services/sportstracker.js
@@ -9,7 +9,7 @@ class SportsTrackerBase extends BaseService {
 }
 
 class SportsTrackerActivity extends SportsTrackerBase {
-    urlRe = /^https?:\/\/(www.)?sports-tracker.com\/workout\/([^/]+)\/([a-z0-9]+)/u;
+    urlRe = /^https?:\/\/(www\.)?sports-tracker\.com\/workout\/([^/]+)\/([a-z0-9]+)/u;
 
     requestOptions() {
         const m = this.urlRe.exec(this.origUrl);