Refactor code to filter lines and HVDC lines based on selected polygon

powsybl · Mar 21, 2024 · 711cf6e · 711cf6e
1 parent e79bd9c
commit 711cf6e
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 36 deletions.
diff --git a/demo/src/App.jsx b/demo/src/App.jsx
@@ -135,23 +135,9 @@ function App() {
                             }}
                             mapLibrary={'cartonolabel'}
                             mapTheme={'dark'}
-                            onFeaturesChanged={(features) => {
-                                console.log(
-                                    'debug',
-                                    'polygon features:',
-                                    features
-                                );
+                            filtredNominalVoltages={[380.0, 225.0, 110.0]}
+                            onFeaturesChanged={() => {
                                 networkMapRef.current.computeSelectedSubstation();
-                                // console.log(
-                                //     'debug',
-                                //     'selected substation:',
-                                //     networkMapRef.current.getSelectedSubstation()
-                                // );
-                                // console.log(
-                                //     'debug',
-                                //     'selected voltage level:',
-                                //     networkMapRef.current.getSelectedVoltageLevel()
-                                // );
                                 console.log(
                                     'debug',
                                     'selected lines:',

diff --git a/src/components/network-map-viewer/network/network-map.jsx b/src/components/network-map-viewer/network/network-map.jsx
@@ -617,21 +617,66 @@ const NetworkMap = forwardRef((props, ref) => {
         return layers.find((layer) => layer.id === layerId);
     }
 
+    function getSelectedLinesInPolygon(
+        network,
+        lines,
+        geoData,
+        polygonCoordinates
+    ) {
+        const selectedLines = lines.filter((line) => {
+            try {
+                const linePos = geoData.getLinePositions(network, line);
+                if (!linePos) {
+                    return false;
+                }
+
+                return (
+                    booleanPointInPolygon(linePos[0], polygonCoordinates) &&
+                    booleanPointInPolygon(linePos[1], polygonCoordinates)
+                );
+            } catch (error) {
+                console.error('debug', 'error', error);
+                return false;
+            }
+        });
+
+        return selectedLines;
+    }
     const getSelectedLines = () => {
-        console.log('debug', 'getSelectedLines');
-        console.log('debug', 'lines', props.mapEquipments?.lines);
+        const lines = props.mapEquipments?.lines ?? [];
+
         console.log('debug', 'layer', getLayerById(layers, LINE_LAYER_PREFIX));
-        console.log(
-            'debug',
-            'getLinesFromSubstation',
-            getLinesFromSubstation(selectedSubstation)
+        //check if polygon is defined correctly
+        const firstPolygonFeatures = Object.values(features)[0];
+        const polygonCoordinates = firstPolygonFeatures?.geometry;
+        if (!polygonCoordinates || polygonCoordinates.coordinates < 3) {
+            return [];
+        }
+        //for each line, check if it is in the polygon
+        return getSelectedLinesInPolygon(
+            props.mapEquipments,
+            lines,
+            props.geoData,
+            polygonCoordinates
         );
-        return props.mapEquipments?.lines ?? [];
     };
     const getSelectedHVDCLines = () => {
-        console.log('debug', 'getSelectedHVDCLines');
         console.log('debug', 'hvdcLines', props.mapEquipments?.hvdcLines);
-        return props.mapEquipments?.hvdcLines ?? [];
+        const hvdcLines = props.mapEquipments?.hvdcLines ?? [];
+
+        //check if polygon is defined correctly
+        const firstPolygonFeatures = Object.values(features)[0];
+        const polygonCoordinates = firstPolygonFeatures?.geometry;
+        if (!polygonCoordinates || polygonCoordinates.coordinates < 3) {
+            return [];
+        }
+        //for each line, check if it is in the polygon
+        return getSelectedLinesInPolygon(
+            props.mapEquipments,
+            hvdcLines,
+            props.geoData,
+            polygonCoordinates
+        );
     };
 
     useImperativeHandle(ref, () => ({
@@ -871,14 +916,3 @@ function getVoltageLevelFromSubstation(substations) {
         })
         .flat();
 }
-
-function getLinesFromSubstation(substations) {
-    if (!substations) {
-        return [];
-    }
-    return substations
-        .map((substation) => {
-            return substation.substation.lines;
-        })
-        .flat();
-}