switched strava to proxied service (fixes #532)

FreemapSlovakia · Sep 21, 2020 · 375bdd9 · 375bdd9
1 parent d8894f3
commit 375bdd9
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 56 deletions.
diff --git a/src/actions/mapActions.ts b/src/actions/mapActions.ts
@@ -26,5 +26,3 @@ export const mapSetOverlayOpacity = createAction('MAP_SET_OVERLAY_OPACITY')<{
 export const mapSetOverlayPaneOpacity = createAction(
   'MAP_SET_OVERLAY_PANE_OPACITY',
 )<number>();
-
-export const mapSetStravaAuth = createAction('MAP_SET_STRAVA_AUTH')<boolean>();
diff --git a/src/components/MapSwitchButton.tsx b/src/components/MapSwitchButton.tsx
@@ -27,7 +27,6 @@ const MapSwitchButtonInt: React.FC<Props> = ({
   expertMode,
   zoom,
   pictureFilterIsActive,
-  stravaAuth,
   onMapRefocus,
   language,
 }) => {
@@ -57,14 +56,7 @@ const MapSwitchButtonInt: React.FC<Props> = ({
   );
 
   const handleOverlaySelect = useCallback(
-    (overlay: any, e: React.SyntheticEvent<any>) => {
-      const { dataset } = e.target as HTMLElement;
-
-      if (dataset && dataset.strava) {
-        window.open('https://www.strava.com/heatmap');
-        return;
-      }
-
+    (overlay: any) => {
       const s = new Set(overlays);
 
       if (s.has(overlay)) {
@@ -207,7 +199,7 @@ const MapSwitchButtonInt: React.FC<Props> = ({
                   !showOnlyInExpertMode || expertMode,
               )
               .filter(({ adminOnly }) => isAdmin || !adminOnly)
-              .map(({ type, icon, minZoom, key, strava }) => (
+              .map(({ type, icon, minZoom, key }) => (
                 <MenuItem
                   key={type}
                   eventKey={type}
@@ -228,8 +220,7 @@ const MapSwitchButtonInt: React.FC<Props> = ({
                   <span
                     style={{
                       textDecoration:
-                        (minZoom !== undefined && zoom < minZoom) ||
-                        (strava && !stravaAuth)
+                        minZoom !== undefined && zoom < minZoom
                           ? 'line-through'
                           : 'none',
                     }}
@@ -250,17 +241,6 @@ const MapSwitchButtonInt: React.FC<Props> = ({
                       />
                     </>
                   )}
-                  {strava && !stravaAuth && (
-                    <>
-                      {' '}
-                      <FontAwesomeIcon
-                        data-strava
-                        icon="exclamation-triangle"
-                        title={t('mapLayers.missingStravaAuth')}
-                        className="text-warning"
-                      />
-                    </>
-                  )}
                   {type === 'I' && pictureFilterIsActive && (
                     <>
                       {' '}
@@ -289,7 +269,6 @@ const mapStateToProps = (state: RootState) => ({
     (key) => state.gallery.filter[key],
   ),
   isAdmin: !!(state.auth.user && state.auth.user.isAdmin),
-  stravaAuth: state.map.stravaAuth,
   language: state.l10n.language,
 });
 

diff --git a/src/index.tsx b/src/index.tsx
@@ -15,7 +15,6 @@ import {
   setEmbedFeatures,
 } from 'fm3/actions/mainActions';
 // import { errorSetError } from 'fm3/actions/errorActions';
-import { mapSetStravaAuth } from 'fm3/actions/mapActions';
 import { l10nSetChosenLanguage } from 'fm3/actions/l10nActions';
 
 import { history } from 'fm3/historyHolder';
@@ -65,8 +64,6 @@ attachOsmLoginMessageHandler(store);
 
 store.dispatch(enableUpdatingUrl());
 
-checkStravaAuth();
-
 render(
   <Provider store={store}>
     <ErrorCatcher>
@@ -117,14 +114,3 @@ window.addEventListener('message', (e: MessageEvent) => {
 store.dispatch(authCheckLogin());
 
 attachKeyboardHandler(store);
-
-function checkStravaAuth() {
-  const img = new Image();
-
-  img.onload = () => {
-    store.dispatch(mapSetStravaAuth(true));
-  };
-
-  img.src =
-    'https://heatmap-external-a.strava.com/tiles-auth/both/bluered/16/36718/22612.png';
-}
diff --git a/src/mapDefinitions.ts b/src/mapDefinitions.ts
@@ -265,7 +265,7 @@ export const overlayLayers: LayerDef[] = [
   ...['both', 'ride', 'run', 'water', 'winter'].map((type, i) => ({
     type: `s${i}`,
     icon: 'scribd', // TODO use correct logo
-    url: `//heatmap-external-{s}.strava.com/tiles-auth/${type}/bluered/{z}/{x}/{y}.png?px=256`,
+    url: `//strava-heatmap.tiles.freemap.sk/${type}/bluered/{z}/{x}/{y}.png?px=256`,
     attribution: [STRAVA_ATTR],
     minZoom: 0,
     maxNativeZoom: 16,

diff --git a/src/reducers/mapReducer.ts b/src/reducers/mapReducer.ts
@@ -5,15 +5,13 @@ import {
   mapReset,
   mapSetOverlayOpacity,
   mapSetOverlayPaneOpacity,
-  mapSetStravaAuth,
 } from 'fm3/actions/mapActions';
 import { RootAction } from 'fm3/actions';
 import { authSetUser } from 'fm3/actions/authActions';
 import { selectFeature, setAppState, Selection } from 'fm3/actions/mainActions';
 import { mapsDataLoaded } from 'fm3/actions/mapsActions';
 
 export interface MapState extends MapStateBase {
-  stravaAuth: boolean;
   selection: Selection | null;
   removeGalleryOverlayOnGalleryToolQuit: boolean;
   gpsTracked: boolean;
@@ -27,7 +25,6 @@ const initialState: MapState = {
   overlays: [],
   overlayOpacity: {},
   overlayPaneOpacity: 0.75,
-  stravaAuth: false,
   selection: null,
   removeGalleryOverlayOnGalleryToolQuit: false,
   gpsTracked: false,
@@ -97,10 +94,6 @@ export const mapReducer = createReducer<MapState, RootAction>(initialState)
         }
       : state;
   })
-  .handleAction(mapSetStravaAuth, (state, action) => ({
-    ...state,
-    stravaAuth: action.payload,
-  }))
   .handleAction(selectFeature, (state, action) => {
     const currentSelection = state.selection;
     const nextSelection = action.payload;

diff --git a/src/translations/cs.tsx b/src/translations/cs.tsx
@@ -977,8 +977,6 @@ export default {
   },
 
   mapLayers: {
-    missingStravaAuth:
-      'Prosím přihlašte se nejprve na strava.com/heatmap (klikněte na vykřičník) a následně obnovte tuto stránku.',
     layers: 'Vrstvy',
     photoFilterWarning: 'Filtr fotografií je aktivní',
     minZoomWarning: 'Dostupné až od přiblížení {minZoom}',

diff --git a/src/translations/en.tsx b/src/translations/en.tsx
@@ -976,8 +976,6 @@ export default {
   },
 
   mapLayers: {
-    missingStravaAuth:
-      'Please log-in on strava.com/heatmap first (click on the exclamation mark) and then reload this page.',
     layers: 'Map layers',
     photoFilterWarning: 'Photo filtering is active',
     minZoomWarning: 'Accessible from zoom {minZoom}',

diff --git a/src/translations/hu.tsx b/src/translations/hu.tsx
@@ -986,8 +986,6 @@ export default {
   },
 
   mapLayers: {
-    missingStravaAuth:
-      'Először jelentkezzék be a www.strava.com/heatmap oldalon, majd frissítse az oldalt.',
     layers: 'Térképrétegek',
     photoFilterWarning: 'A fényképszűrés aktív',
     minZoomWarning: 'A {minZoom} nagyítási szinttől látható.',

diff --git a/src/translations/sk.tsx b/src/translations/sk.tsx
@@ -986,8 +986,6 @@ export default {
   },
 
   mapLayers: {
-    missingStravaAuth:
-      'Prosím prihláste sa najprv na strava.com/heatmap (kliknite na výkričník) a následne obnovte túto stránku.',
     layers: 'Vrstvy',
     photoFilterWarning: 'Filter fotografií je aktívny',
     minZoomWarning: 'Dostupné až od priblíženia {minZoom}',