fix: make equipmentMap more generic

Signed-off-by: LE SAULNIER Kevin <[email protected]>

demo/src/App.jsx

@@ -13,7 +13,7 @@ import {
     StyledEngineProvider,
 } from '@mui/material/styles';
 
-import MapEquipments from './map-viewer/map-equipments';
+import DemoMapEquipments from './map-viewer/map-equipments';
 
 import sposdata from './map-viewer/data/spos.json';
 import lposdata from './map-viewer/data/lpos.json';
@@ -68,7 +68,7 @@ function App() {
     geoData.setSubstationPositions(sposdata);
     geoData.setLinePositions(lposdata);
 
-    const mapEquipments = new MapEquipments(smapdata, lmapdata);
+    const mapEquipments = new DemoMapEquipments(smapdata, lmapdata);
 
     useEffect(() => {
         const handleContextmenu = (e) => {

demo/src/map-viewer/map-equipments.js

@@ -5,8 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { MapEquipmentsBase } from '../../../src';
-export default class MapEquipments extends MapEquipmentsBase {
+import { MapEquipments } from '../../../src';
+export default class DemoMapEquipments extends MapEquipments {
     initEquipments(smapdata, lmapdata) {
         this.updateSubstations(smapdata, true);
         this.updateLines(lmapdata, true);

src/components/network-map-viewer/network/map-equipments.js

@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2022, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+export class MapEquipments {
+    substations = [];
+
+    substationsById = new Map();
+
+    lines = [];
+
+    linesById = new Map();
+
+    hvdcLines = [];
+
+    hvdcLinesById = new Map();
+
+    voltageLevels = [];
+
+    voltageLevelsById = new Map();
+
+    nominalVoltages = [];
+
+    intlRef = undefined;
+
+    constructor() {
+        // dummy constructor, to make children classes constructors happy
+    }
+
+    getVoltageLevels() {
+        return this.voltageLevels;
+    }
+
+    getVoltageLevel(id) {
+        return this.voltageLevelsById.get(id);
+    }
+
+    getSubstations() {
+        return this.substations;
+    }
+
+    getSubstation(id) {
+        return this.substationsById.get(id);
+    }
+
+    getNominalVoltages() {
+        return this.nominalVoltages;
+    }
+
+    getLines() {
+        return this.lines;
+    }
+
+    getLine(id) {
+        return this.linesById.get(id);
+    }
+
+    getHvdcLines() {
+        return this.hvdcLines;
+    }
+
+    getHvdcLine(id) {
+        return this.hvdcLinesById.get(id);
+    }
+}

src/components/network-map-viewer/network/network-map.jsx

@@ -23,7 +23,7 @@ import { SubstationLayer } from './substation-layer';
 import { getNominalVoltageColor } from '../../../utils/colors';
 import { RunningStatus } from '../utils/running-status';
 import { Button, useTheme } from '@mui/material';
-import { MapEquipmentsBase } from './map-equipments-base';
+import { MapEquipments } from './map-equipments';
 import { useNameOrId } from '../utils/equipmentInfosHandler';
 import { Map, NavigationControl, useControl } from 'react-map-gl';
 import { MapboxOverlay } from '@deck.gl/mapbox';
@@ -535,7 +535,7 @@ NetworkMap.defaultProps = {
 };
 
 NetworkMap.propTypes = {
-    mapEquipments: PropTypes.instanceOf(MapEquipmentsBase),
+    mapEquipments: PropTypes.instanceOf(MapEquipments),
     geoData: PropTypes.instanceOf(GeoData),
     filteredNominalVoltages: PropTypes.array,
     labelsZoomThreshold: PropTypes.number.isRequired,