-
-
-
- );
- } else {
- return (
-
-
-
-
-
-
-
-
-
-
-
- {t("panel")}
-
-
-
-
-
-
-
-
-
- {t("reportOutage")}
-
-
-
-
-
- );
- }
+ return (
+
-
-
-
-
-
-
-
-
- {t("reportOutage")}
-
-
+
+
+
+ );
};
export default Home;
diff --git a/frontend/src/pages/streetMap/StreetMap.page.tsx b/frontend/src/pages/streetMap/StreetMap.page.tsx
index 53ea183..ddf4493 100644
--- a/frontend/src/pages/streetMap/StreetMap.page.tsx
+++ b/frontend/src/pages/streetMap/StreetMap.page.tsx
@@ -1,20 +1,12 @@
-import React, { useRef, useState, useEffect } from "react";
-import L, { latLng } from "leaflet";
+import React, {useRef, useState} from "react";
+import L from "leaflet";
import bolt from "../../assets/img/electricity.png";
import "./StreetMap.css";
-import {
- MapContainer,
- TileLayer,
- useMapEvent,
- ZoomControl,
- Tooltip,
- Marker,
- useMapEvents,
-} from "react-leaflet";
-import { useRecoilState, useRecoilValue } from "recoil";
-import { Modal } from "../../modals/Modals";
+import {MapContainer, Marker, TileLayer, Tooltip, useMapEvent, useMapEvents, ZoomControl,} from "react-leaflet";
+import {useRecoilState, useRecoilValue} from "recoil";
+import {Modal} from "../../modals/Modals";
import LanguageSelect from "../../languageSelect";
-import { panneBtnState, zoomLevelState } from "../../atoms";
+import {panneBtnState, zoomLevelState} from "../../atoms";
import AlertService from "../../services/api/AlertService";
import CityService from "../../services/api/CityService";
@@ -53,7 +45,8 @@ const StreetMap = (props: any) => {
const lat = queryParams.get("lat");
const long = queryParams.get("long");
const myCities: any = useRecoilValue(CityService.getCities)?.data;
- let centerOn: any = [myCities[7]['longitude'], myCities[7]['lattitude']];
+ // Is myCities is empty, center the map on Yaoundé
+ let centerOn: any = myCities.length > 0 ? [myCities[7]['longitude'], myCities[7]['lattitude']] : [3.854859686578735, 11.500525735864192];
if (lat && long) {
const lat_f = parseFloat(lat)
const long_f = parseFloat(long)
@@ -77,7 +70,7 @@ const StreetMap = (props: any) => {
if (qCount.has(quarterName)) {
qCount.get(quarterName)['occurrence'] += 1;
} else {
- qCount.set(quarterName, { ...quarter, 'occurrence': 1 });
+ qCount.set(quarterName, {...quarter, 'occurrence': 1});
}
});
@@ -87,36 +80,36 @@ const StreetMap = (props: any) => {
return (