UI: Updated unit definition

1 year ago · 2e65c79184
7 changed files with 40 additions and 64 deletions
--- a/ui-ngx/src/app/core/services/unit.service.ts
+++ b/ui-ngx/src/app/core/services/unit.service.ts
@ -44,10 +44,8 @@ export class UnitService {
      takeUntilDestroyed()
    ).subscribe(() => {
      this.converter = getUnitConverter(this.translate);
-      console.warn(this.converter?.listUnits());
-      console.warn(this.converter?.listUnits('temperature'));
-      console.warn(this.converter?.listUnits('temperature', UnitSystem.METRIC));
-      console.warn(this.converter?.listUnits(null, UnitSystem.IMPERIAL));
+      console.warn(this.converter.listUnits());
+      console.warn(this.converter.listUnits(null, UnitSystem.IMPERIAL));
    });
  }

--- a/ui-ngx/src/app/shared/components/unit-input.component.ts
+++ b/ui-ngx/src/app/shared/components/unit-input.component.ts
@ -31,7 +31,7 @@ import {
 } from '@angular/core';
 import { ControlValueAccessor, FormBuilder, FormControl, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
 import { Observable, of, shareReplay } from 'rxjs';
-import { AllMeasures, searchUnits, TbUnit, UnitInfo, UnitsType, UnitSystem } from '@shared/models/unit.models';
+import { AllMeasures, TbUnit, UnitInfo, UnitsType, UnitSystem } from '@shared/models/unit.models';
 import { map, mergeMap } from 'rxjs/operators';
 import { UnitService } from '@core/services/unit.service';
 import { TbPopoverService } from '@shared/components/popover.service';
@ -247,9 +247,13 @@ export class UnitInputComponent implements ControlValueAccessor, OnInit, OnChang
  private searchUnit(units: Array<[AllMeasures, Array<UnitInfo>]>, searchText?: string): Array<[AllMeasures, Array<UnitInfo>]> {
    if (isNotEmptyStr(searchText)) {
      const filterValue = searchText.trim().toUpperCase()
-      return units
-        .map(measure => [measure[0], searchUnits(measure[1], filterValue)] as [AllMeasures, UnitInfo[]])
-        .filter((measure) => measure[1].length > 0);
+      return units.reduce((result: Array<[AllMeasures, Array<UnitInfo>]>, [measure, unitInfos]) => {
+        const filteredUnits = unitInfos.filter(unit => unit.searchText.toUpperCase().includes(filterValue));
+        if (filteredUnits.length > 0) {
+          result.push([measure, filteredUnits]);
+        }
+        return result;
+      }, []);
    }
    return units;
  }
--- a/ui-ngx/src/app/shared/models/unit.models.ts
+++ b/ui-ngx/src/app/shared/models/unit.models.ts
@ -83,6 +83,7 @@ import radioactivity, { RadioactivityUnits } from '@shared/models/units/radioact
 import radioactivityConcentration, {
  RadioactivityConcentrationUnits
 } from '@shared/models/units/radioactivity-concentration';
+import reciprocalLength, { ReciprocalLengthUnits } from '@shared/models/units/reciprocal-length';
 import resistance, { ResistanceUnits } from '@shared/models/units/resistance';
 import reynoldsNumber, { ReynoldsNumberUnits } from '@shared/models/units/reynolds-number';
 import signalLevel, { SignalLevelUnits } from '@shared/models/units/signal-level';
@ -103,7 +104,6 @@ import voltage, { VoltageUnits } from '@shared/models/units/voltage';
 import volume, { VolumeUnits } from '@shared/models/units/volume';
 import volumeFlow, { VolumeFlowUnits } from '@shared/models/units/volume-flow';
 import { TranslateService } from '@ngx-translate/core';
-import reciprocalLength, { ReciprocalLengthUnits } from '@shared/models/units/reciprocal-length';

 export type AllMeasuresUnits =
  | AbsorbedDoseRateUnits
@ -388,6 +388,7 @@ export interface UnitInfo {
  system: UnitSystem;
  name: string;
  tags: string[];
+  searchText: string;
 }

 export enum UnitSystem {
@ -423,43 +424,21 @@ export interface TbMeasureUnits<TUnits extends string> {
  units?: Partial<Record<TUnits, Unit>>;
 }

-export interface Conversion<TMeasures extends string, TUnits extends string> {
-  abbr: TUnits;
-  measure: TMeasures;
+export interface UnitCacheInfo {
  system: UnitSystem;
+  measure: AllMeasures;
  unit: Unit;
+  abbr: AllMeasuresUnits;
+  searchText: string;
 }

-export type UnitCache = Map<string, {
-    system: UnitSystem;
-    measure: AllMeasures;
-    unit: Unit;
-    abbr: AllMeasuresUnits;
-  }
->;
-
-const searchUnitTags = (unit: UnitInfo, searchText: string): boolean =>
-  !!unit.tags.find(t => t.toUpperCase().includes(searchText));
-
-export const searchUnits = (_units: Array<UnitInfo>, searchText: string): Array<UnitInfo> => _units.filter(
-    u => u.abbr.toUpperCase().includes(searchText) ||
-      u.name.toUpperCase().includes(searchText) ||
-      searchUnitTags(u, searchText)
-);
+export type UnitCache = Map<AllMeasuresUnits | string, UnitCacheInfo>;

 type Entries<T, S extends keyof T> = [S, T[keyof T]];

 export class Converter {
  private readonly measureData: Record<AllMeasures, TbMeasure<AllMeasuresUnits>>;
-  private unitCache: Map<
-    string,
-    {
-      system: UnitSystem;
-      measure: AllMeasures;
-      unit: Unit;
-      abbr: AllMeasuresUnits;
-    }
-  >;
+  private unitCache: UnitCache;

  constructor(
    measures: Record<AllMeasures, TbMeasure<AllMeasuresUnits>>,
@ -534,7 +513,7 @@ export class Converter {
    return null;
  }

-  getUnit(abbr: AllMeasuresUnits | string): Conversion<AllMeasures, AllMeasuresUnits> | null {
+  getUnit(abbr: AllMeasuresUnits | string): UnitCacheInfo | null {
    return this.unitCache.get(abbr) ?? null;
  }

@ -565,22 +544,15 @@ export class Converter {
          continue;
        }

-        for (const [abbr, unit] of Object.entries(units) as [AllMeasuresUnits, Unit][]) {
-          results.push(
-            this.describeUnit({
-              abbr,
-              measure: name as AllMeasures,
-              system,
-              unit,
-            })
-          );
+        for (const abbr of Object.keys(units) as AllMeasuresUnits[]) {
+          results.push(this.describe(abbr));
        }
      }
    }
    return results;
  }

-  unitsGroupByMeasure(measureName?: AllMeasures, unitSystem?: UnitSystem): UnitInfoGroupByMeasure<AllMeasures> | never {
+  unitsGroupByMeasure(measureName?: AllMeasures, unitSystem?: UnitSystem): UnitInfoGroupByMeasure<AllMeasures> {
    const results: UnitInfoGroupByMeasure<AllMeasures> = {};

    const measures = measureName
@ -604,28 +576,22 @@ export class Converter {
          continue;
        }

-        for (const [abbr, unit] of Object.entries(units) as [AllMeasuresUnits, Unit][]) {
-          results[name].push(
-            this.describeUnit({
-              abbr,
-              measure: name as AllMeasures,
-              system,
-              unit,
-            })
-          );
+        for (const abbr of Object.keys(units) as AllMeasuresUnits[]) {
+          results[name].push(this.describe(abbr));
        }
      }
    }
    return results;
  }

-  private describeUnit(unit: Conversion<AllMeasures, AllMeasuresUnits>): UnitInfo {
+  private describeUnit(unit: UnitCacheInfo): UnitInfo {
    return {
      abbr: unit.abbr,
      measure: unit.measure,
      system: unit.system,
      name: unit.unit.name,
-      tags: unit.unit.tags
+      tags: unit.unit.tags,
+      searchText: unit.searchText
    };
  }

@ -671,6 +637,7 @@ function buildUnitCache(measures: Record<AllMeasures, TbMeasure<AllMeasuresUnits
          measure: measureName,
          system: systemName,
          abbr: testAbbr,
+          searchText: unit.tags.join(';').toUpperCase(),
          unit,
        });
      }
--- a/ui-ngx/src/app/shared/models/units/acceleration.ts
+++ b/ui-ngx/src/app/shared/models/units/acceleration.ts
@ -16,7 +16,7 @@

 import { TbMeasure, TbMeasureUnits } from '@shared/models/unit.models';

-export type AccelerationMetricUnits = 'G' | 'm/s²' | 'km/h²' | 'Gal';
+export type AccelerationMetricUnits = 'g₀' | 'm/s²' | 'km/h²' | 'Gal';
 export type AccelerationImperialUnits = 'ft/s²';

 export type AccelerationUnits = AccelerationMetricUnits | AccelerationImperialUnits;
@ -24,7 +24,7 @@ export type AccelerationUnits = AccelerationMetricUnits | AccelerationImperialUn
 const METRIC: TbMeasureUnits<AccelerationMetricUnits> = {
  ratio: 3.28084,
  units: {
-    G: {
+    'g₀': {
      name: 'unit.g-force',
      tags: ['gravity', 'load'],
      to_anchor: 9.80665,
--- a/ui-ngx/src/app/shared/models/units/length.ts
+++ b/ui-ngx/src/app/shared/models/units/length.ts
@ -27,6 +27,7 @@ export type LengthImperialUnits =
  | 'fathom'
  | 'mi'
  | 'nmi'
+  | 'pouce'
  | 'thou'
  | 'barleycorn'
  | 'hand'
@ -122,6 +123,11 @@ const IMPERIAL: TbMeasureUnits<LengthImperialUnits> = {
      tags: ['level', 'height', 'distance', 'width', 'gap', 'depth', 'nautical mile'],
      to_anchor: 6076.12,
    },
+    pouce: {
+      name: 'unit.paris-inch',
+      tags: ['level', 'height', 'distance', 'width', 'gap', 'depth', 'nautical mile'],
+      to_anchor: 1.0657,
+    },
    thou: {
      name: 'unit.thou',
      tags: ['measurement'],
--- a/ui-ngx/src/app/shared/models/units/logarithmic-ratio.ts
+++ b/ui-ngx/src/app/shared/models/units/logarithmic-ratio.ts
@ -16,7 +16,7 @@

 import { TbMeasure, TbMeasureUnits } from '@shared/models/unit.models';

-export type LogarithmicRatioUnits = 'dB' | 'B' | 'Np';
+export type LogarithmicRatioUnits = 'dB' | 'bel' | 'Np';

 const METRIC: TbMeasureUnits<LogarithmicRatioUnits> = {
  units: {
@ -25,7 +25,7 @@ const METRIC: TbMeasureUnits<LogarithmicRatioUnits> = {
      tags: ['noise level', 'sound level', 'volume', 'acoustics'],
      to_anchor: 1,
    },
-    B: {
+    bel: {
      name: 'unit.bel',
      tags: ['power ratio', 'intensity ratio'],
      to_anchor: 10,
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@ -6376,7 +6376,8 @@
        "rotation-per-minute": "Rotation per minute",
        "degrees-brix": "Degrees Brix",
        "katal": "Katal",
-        "katal-per-cubic-metre": "Katal per Cubic Metre"
+        "katal-per-cubic-metre": "Katal per Cubic Metre",
+        "paris-inch": "Paris inch"
    },
    "user": {
        "user": "User",