From b91e38401f4abed392644d6abe7a35d3de626477 Mon Sep 17 00:00:00 2001
From: AlixH <alixhumbert@gmail.com>
Date: Mon, 22 Nov 2021 16:22:19 +0100
Subject: [PATCH] Removed closest stations filter

---
 .../list/ChargingStations.tsx                 | 19 ++++++-------------
 .../list/ChargingStationsFilters.tsx          | 15 +--------------
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/src/screens/charging-stations/list/ChargingStations.tsx b/src/screens/charging-stations/list/ChargingStations.tsx
index bd0120da4..b80f8d90e 100644
--- a/src/screens/charging-stations/list/ChargingStations.tsx
+++ b/src/screens/charging-stations/list/ChargingStations.tsx
@@ -92,7 +92,7 @@ export default class ChargingStations extends BaseAutoRefreshScreen<Props, State
     this.siteArea = Utils.getParamFromNavigation(route, 'siteArea', null) as unknown as SiteArea;
     // Enable swipe for opening sidebar
     this.parent = navigation.getParent();
-    this.parent.setOptions({
+    this.parent?.setOptions({
       swipeEnabled: !this.siteArea
     });
     // Bind the back button to the onBack method (Android)
@@ -105,7 +105,7 @@ export default class ChargingStations extends BaseAutoRefreshScreen<Props, State
     // Unbind the back button and reset its default behavior (Android)
     this.backHandler.remove();
     // Disable swipe for opening sidebar
-    this.parent.setOptions({
+    this.parent?.setOptions({
       swipeEnabled: false
     });
   }
@@ -115,7 +115,7 @@ export default class ChargingStations extends BaseAutoRefreshScreen<Props, State
     this.backHandler = BackHandler.addEventListener('hardwareBackPress', this.onBack.bind(this));
     this.refresh();
     // Enable swipe for opening sidebar
-    this.parent.setOptions({
+    this.parent?.setOptions({
       swipeEnabled: !this.siteArea
     });
   }
@@ -124,7 +124,7 @@ export default class ChargingStations extends BaseAutoRefreshScreen<Props, State
     // Unbind the back button and reset its default behavior (Android)
     this.backHandler.remove();
     // Disable swipe for opening sidebar
-    this.parent.setOptions({
+    this.parent?.setOptions({
       swipeEnabled: false
     });
   }
@@ -143,24 +143,17 @@ export default class ChargingStations extends BaseAutoRefreshScreen<Props, State
       GlobalFilters.ONLY_AVAILABLE_CHARGING_STATIONS
     )) as ChargePointStatus;
     const connectorType = await SecuredStorage.loadFilterValue(centralServerProvider.getUserInfo(), GlobalFilters.CONNECTOR_TYPES);
-    const location = Utils.convertToBoolean(
-      await SecuredStorage.loadFilterValue(centralServerProvider.getUserInfo(), GlobalFilters.LOCATION)
-    );
     this.setState({
-      initialFilters: { connectorStatus, connectorType, location: location ?? true },
-      filters: { connectorStatus, connectorType, location: location ?? true }
+      initialFilters: { connectorStatus, connectorType, location: true },
+      filters: { connectorStatus, connectorType, location: true }
     });
   }
 
   public async getCurrentLocation(): Promise<Location> {
-    const { filters } = this.state;
     // Get the current location
     let currentLocation = (await LocationManager.getInstance()).getLocation();
     this.locationEnabled = !!currentLocation;
     // Bypass location
-    if (!filters.location) {
-      currentLocation = null;
-    }
     return currentLocation;
   }
 
diff --git a/src/screens/charging-stations/list/ChargingStationsFilters.tsx b/src/screens/charging-stations/list/ChargingStationsFilters.tsx
index dd0270693..9042fbbce 100644
--- a/src/screens/charging-stations/list/ChargingStationsFilters.tsx
+++ b/src/screens/charging-stations/list/ChargingStationsFilters.tsx
@@ -24,7 +24,6 @@ interface State extends ScreenFiltersState {
 }
 
 export interface ChargingStationsFiltersDef {
-  location?: boolean;
   connectorStatus?: ChargePointStatus;
   connectorType?: string;
 }
@@ -58,7 +57,7 @@ export default class ChargingStationsFilters extends ScreenFilters {
   };
 
   public render = () => {
-    const { initialFilters, locationEnabled } = this.props;
+    const { initialFilters } = this.props;
     const { filters } = this.state;
     const style = computeStyleSheet();
     const controlStyle = computeControlStyleSheet();
@@ -81,18 +80,6 @@ export default class ChargingStationsFilters extends ScreenFilters {
             ) => this.addVisibleFilter(onlyAvailableChargingStationSwitchFilterControlComponent)}
           />
           <Animatable.View style={style.filtersHidden} ref={this.setExpandableView}>
-            {locationEnabled && (
-              <LocationSwitchFilterControlComponent
-                filterID={'location'}
-                internalFilterID={GlobalFilters.LOCATION}
-                initialValue={filters.hasOwnProperty('location') ? filters.location : initialFilters.location}
-                label={I18n.t('general.location')}
-                onFilterChanged={async (id: string, value: boolean) => this.getFilterVisibleContainerComponent().setFilter(id, value)}
-                ref={async (locationSwitchFilterControlComponent: LocationSwitchFilterControlComponent) =>
-                  this.addVisibleFilter(locationSwitchFilterControlComponent)
-                }
-              />
-            )}
             <ConnectorTypeFilterControlComponent
               filterID={'connectorType'}
               internalFilterID={GlobalFilters.CONNECTOR_TYPES}