Made search by gas name case insensitive

jirkapok · Mar 6, 2024 · d5a50c3 · d5a50c3
1 parent 4c75b65
commit d5a50c3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/projects/scuba-physics/src/lib/Gases.spec.ts b/projects/scuba-physics/src/lib/Gases.spec.ts
@@ -198,9 +198,9 @@ describe('Gases', () => {
         });
 
         describe('By name', () => {
-            it('IS case sensitive', () => {
+            it('IS NOT case sensitive', () => {
                 const found = StandardGases.byName('OXYGEN');
-                expect(found).toBeNull();
+                expect(found).not.toBeNull();
             });
 
             it('Oxygen', () => {

diff --git a/projects/scuba-physics/src/lib/StandardGases.ts b/projects/scuba-physics/src/lib/StandardGases.ts
@@ -1,5 +1,6 @@
 import { Precision } from './precision';
 import { Gas } from './Gases';
+import _ from 'lodash';
 
 export class StandardGases {
     /** Relative partial pressure of oxygen in air at surface */
@@ -123,11 +124,15 @@ export class StandardGases {
         return `${prefix} ${percentO2.toString()}/${percentHe.toString()}`;
     }
 
-    // TODO consider to make it case insensitive
-    /** Case sensitive search. If nothing found returns null */
+    /** Case insensitive search. If nothing found returns null */
     public static byName(name: string): Gas | null {
-        if (StandardGases.map.has(name)) {
-            const found = StandardGases.map.get(name);
+        const keys = [...StandardGases.map.keys()];
+        const foundKey = _(keys)
+            .filter((k) => k.toLowerCase() === name.toLowerCase())
+            .first();
+
+        if (foundKey) {
+            const found = StandardGases.map.get(foundKey);
             return found ?? null;
         }