More robust hooking into Activity/Segment map

Poll/wait until the needed components are in place.

Author: liskin

common.js

@@ -0,0 +1,29 @@
+/*
+ * Map switcher for Strava website.
+ *
+ * Copyright © 2016 Tomáš Janoušek.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+const MapSwitcher = {
+	sleep(ms) {
+		return new Promise(resolve => setTimeout(resolve, ms));
+	},
+
+	async wait(what) {
+		for (let tries = 0, delay = 100; tries < 60; ++tries, delay = Math.min(delay * 2, 1000)) {
+			const got = what();
+			if (got)
+				return got;
+
+			await this.sleep(delay);
+		}
+
+		throw new Error(`timeout ${what}`);
+	},
+};

fix-mapbox.js

@@ -113,29 +113,13 @@ document.arrive(".mapboxgl-map", {onceOnly: false, existing: true, fireOnAttribu
 		return found ? found[1] : null;
 	}
 
-	function sleep(ms) {
-		return new Promise(resolve => setTimeout(resolve, ms));
-	}
-
-	async function wait(what) {
-		for (let tries = 0, delay = 100; tries < 60; ++tries, delay = Math.min(delay * 2, 1000)) {
-			const got = what();
-			if (got)
-				return got;
-
-			await sleep(delay);
-		}
-
-		throw new Error(`timeout ${what}`);
-	}
-
 	async function patchReactMapbox(mapbox) {
-		const map = await wait(function () {
+		const map = await MapSwitcher.wait(function () {
 			let map = null;
 			mapbox.return.memoizedProps.mapboxRef((m) => (map = m, m));
 			return map;
 		});
-		await wait(() => map.getLayer("global-heatmap") || map.getLayer("personal-heatmap"));
+		await MapSwitcher.wait(() => map.getLayer("global-heatmap") || map.getLayer("personal-heatmap"));
 
 		function setMapType(t) {
 			if (t && !AdditionalMapLayers[t])

fix.js

@@ -11,8 +11,10 @@
  */
 
 document.arrive(".leaflet-container", {onceOnly: false, existing: true, fireOnAttributesModification: true}, function () {
-	if (this.mapSwitcherDone) return;
-	this.mapSwitcherDone = true;
+	const leafletContainer = this;
+
+	if (leafletContainer.mapSwitcherDone) return;
+	leafletContainer.mapSwitcherDone = true;
 
 	function tileLayer(l) {
 		var r = L.tileLayer(l.url, l.opts);
@@ -50,8 +52,10 @@ document.arrive(".leaflet-container", {onceOnly: false, existing: true, fireOnAt
 		};
 	Object.entries(AdditionalMapLayers).forEach(([type, l]) => layerNames[type] = l.name);
 
-	var activityOpts = jQuery('#map-type-control .options', this);
-	if (activityOpts.length) {
+	MapSwitcher.wait(function () {
+		const q = jQuery('#map-type-control .options', leafletContainer);
+		return q.length ? q : null;
+	}).then(function (activityOpts) {
 		Strava.Maps.CustomControlView.prototype.handleMapTypeSelector = function (t) {
 			const type = this.$$(t.target).data("map-type-id");
 			const selected = this.$("#selected-map");
@@ -108,10 +112,12 @@ document.arrive(".leaflet-container", {onceOnly: false, existing: true, fireOnAt
 			activityOpts.removeClass("open-menu");
 			activityOpts.parent().removeClass("active");
 		}
-	}
+	});
 
-	var explorerMapFilters = jQuery('#segment-map-filters form');
-	if (explorerMapFilters.length) {
+	MapSwitcher.wait(function () {
+		const q = jQuery('#segment-map-filters form');
+		return q.length ? q : null;
+	}).then(function (explorerMapFilters) {
 		var once = false;
 		function explorerFound(e) {
 			if (once)
@@ -160,5 +166,5 @@ document.arrive(".leaflet-container", {onceOnly: false, existing: true, fireOnAt
 			Strava.Explorer.Navigation.prototype.navigate = old_navigate;
 		};
 		explorerMapFilters.trigger('submit');
-	}
+	});
 });

load.js

@@ -45,6 +45,7 @@
 
 	loadJQuery().then(() => Promise.all([
 		getScript(getURL('arrive.min.js')),
+		getScript(getURL('common.js')),
 		getScript(getURL('layers.js')),
 		getScript(getURL('donation.js')),
 		ignoreError(loadGoogleMaps().then(() => Promise.all([

manifest.json

@@ -26,6 +26,7 @@
     "3rd/leaflet-pegman.min.css",
     "3rd/leaflet-pegman.min.js",
     "arrive.min.js",
+    "common.js",
     "donation.js",
     "fix-mapbox.js",
     "fix.js",