Revise earth switch detection logic. Closes openscd#459

danyill · Dec 29, 2021 · 43d0467 · 43d0467
1 parent 9944b49
commit 43d0467
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/wizards/conductingequipment.ts b/src/wizards/conductingequipment.ts
@@ -51,7 +51,9 @@ const types: Partial<Record<string, string>> = {
 
 function typeStr(condEq: Element): string {
   return condEq.getAttribute('type') === 'DIS' &&
-    condEq.querySelector('Terminal')?.getAttribute('cNodeName') === 'grounded'
+    Array.from(condEq.querySelectorAll('Terminal'))
+      .map(t => t.getAttribute('cNodeName'))
+      .includes('grounded')
     ? 'ERS'
     : condEq.getAttribute('type') ?? '';
 }

diff --git a/src/zeroline/foundation.ts b/src/zeroline/foundation.ts
@@ -226,7 +226,9 @@ export function getIcon(condEq: Element): TemplateResult {
 function typeStr(condEq: Element): string {
   if (
     condEq.getAttribute('type') === 'DIS' &&
-    condEq.querySelector('Terminal')?.getAttribute('cNodeName') === 'grounded'
+      Array.from(condEq.querySelectorAll('Terminal'))
+        .map(t => t.getAttribute('cNodeName'))
+        .includes('grounded')
   ) {
     return 'ERS';
   } else {