Fix sonar cloud issues

swisstopo · Dec 4, 2024 · d6446a8 · d6446a8
1 parent 6670268
commit d6446a8
Show file tree

Hide file tree

Showing 2 changed files with 96 additions and 91 deletions.
diff --git a/ui/src/query/objectInformation.ts b/ui/src/query/objectInformation.ts
@@ -1,81 +1,84 @@
-import {JulianDate, VoxelCell} from 'cesium';
-import {PickableVoxelPrimitive} from '../layers/helpers';
-import {getValueOrUndefined} from '../cesiumutils';
-import i18next from 'i18next';
-import {formatCartesian3AsLv95} from '../projection';
-import {voxelLayerToFilter} from '../layertree';
-
-export function extractPrimitiveAttributes(primitive): [string, number][] {
-  const data: [string, number][] = [];
-  let propertyNames: string[] = primitive.getPropertyIds();
-  const length = propertyNames.length;
-  const properties = primitive.tileset.properties;
-  const propsOrder = properties && properties.propsOrder ? properties.propsOrder : [];
-  propertyNames = sortPropertyNames(propertyNames, propsOrder);
-  for (let i = 0; i < length; ++i) {
-    const key = propertyNames[i];
-    const value = primitive.getProperty(key);
-    if (typeof value === 'number' || !!value) {
-      data.push([key, value]);
-    }
-  }
-  return data;
-}
-
-export function extractVoxelAttributes(voxelCell: VoxelCell): [string, number | string][] {
-  const cellCenter = voxelCell.orientedBoundingBox.center;
-  const propertyNames: string[] = voxelCell.getNames();
-  const primitive: PickableVoxelPrimitive = voxelCell.primitive;
-  const layer = primitive.layer;
-  const attributes: [string, number][] = propertyNames.map(name => {
-    const value = voxelCell.getProperty(name);
-    if (layer && voxelLayerToFilter[layer]) {
-      const filters = voxelLayerToFilter[layer];
-      if (name === filters.lithologyDataName) {
-        const label = filters.lithology.find(f => f.index === value[0])?.label;
-        return [
-            i18next.t('vox_filter_lithology'),
-            label ? i18next.t(label) : i18next.t('vox_filter_undefined_lithology')
-        ];
-      }
-      if (name === filters.conductivityDataName) {
-        const valueOrUndefined = value[0] <= -9999 ? i18next.t('vox_filter_undefined_lithology') : value;
-        return [i18next.t('vox_filter_hydraulic_conductivity'), valueOrUndefined];
-      }
-    }
-    if (name === 'Temp_C') {
-      return [i18next.t('vox_temperature'), value];
-    }
-    return [name, value];
-  });
-  return [...attributes, [i18next.t('vox_cell_center'), formatCartesian3AsLv95(cellCenter).join(', ')]];
-}
-
-export function isPickable(object) {
-  if (object.tileset) {
-    return object.tileset.pickable;
-  } else if (!(object instanceof VoxelCell) && object.primitive && object.primitive.allowPicking !== undefined) {
-    return object.primitive.allowPicking;
-  } else if (object instanceof VoxelCell) {
-    const voxelPrimitive: PickableVoxelPrimitive = object.primitive;
-    return voxelPrimitive && voxelPrimitive.pickable;
-  } else {
-    return object.id && getValueOrUndefined(object.id?.properties?.type) === 'point';
-  }
-}
-
-export function extractEntitiesAttributes(entity) {
-  if (!entity.properties) return;
-  return {id: entity.id, ...entity.properties.getValue(JulianDate.fromDate(new Date()))};
-}
-
-export function sortPropertyNames(propertyNames: string[], propertiesOrder: string[] = []): string[] {
-  const lowerPriorityProps = propertyNames
-    .filter(prop => !propertiesOrder.includes(prop))
-    .sort((left, right) => {
-      const titleLeft = left.toLowerCase();
-      const titleRight = right.toLowerCase();
-      return titleLeft > titleRight ? 1 : titleLeft < titleRight ? -1 : 0;
-    });
-  return [...propertiesOrder, ...lowerPriorityProps];
-}
+import {JulianDate, VoxelCell} from 'cesium';
+import {PickableVoxelPrimitive} from '../layers/helpers';
+import {getValueOrUndefined} from '../cesiumutils';
+import i18next from 'i18next';
+import {formatCartesian3AsLv95} from '../projection';
+import {voxelLayerToFilter} from '../layertree';
+
+export function extractPrimitiveAttributes(primitive): [string, number][] {
+  const data: [string, number][] = [];
+  let propertyNames: string[] = primitive.getPropertyIds();
+  const length = propertyNames.length;
+  const properties = primitive.tileset.properties;
+  const propsOrder = properties && properties.propsOrder ? properties.propsOrder : [];
+  propertyNames = sortPropertyNames(propertyNames, propsOrder);
+  for (let i = 0; i < length; ++i) {
+    const key = propertyNames[i];
+    const value = primitive.getProperty(key);
+    if (typeof value === 'number' || !!value) {
+      data.push([key, value]);
+    }
+  }
+  return data;
+}
+
+export function extractVoxelAttributes(voxelCell: VoxelCell): [string, number | string][] {
+  const cellCenter = voxelCell.orientedBoundingBox.center;
+  const propertyNames: string[] = voxelCell.getNames();
+  const primitive: PickableVoxelPrimitive = voxelCell.primitive;
+  const layer = primitive.layer;
+  const attributes: [string, number][] = propertyNames.map(name => {
+    const value = voxelCell.getProperty(name);
+    if (layer && voxelLayerToFilter[layer]) {
+      const filters = voxelLayerToFilter[layer];
+      if (name === filters.lithologyDataName) {
+        const label = filters.lithology.find(f => f.index === value[0])?.label;
+        return [
+            i18next.t('vox_filter_lithology'),
+            label ? i18next.t(label) : i18next.t('vox_filter_undefined_lithology')
+        ];
+      }
+      if (name === filters.conductivityDataName) {
+        const valueOrUndefined = value[0] <= -9999 ? i18next.t('vox_filter_undefined_lithology') : value;
+        return [i18next.t('vox_filter_hydraulic_conductivity'), valueOrUndefined];
+      }
+    }
+    if (name === 'Temp_C') {
+      return [i18next.t('vox_temperature'), value];
+    }
+    return [name, value];
+  });
+  return [...attributes, [i18next.t('vox_cell_center'), formatCartesian3AsLv95(cellCenter).join(', ')]];
+}
+
+export function isPickable(object) {
+  if (object.tileset) {
+    return object.tileset.pickable;
+  } else if (!(object instanceof VoxelCell) && object.primitive && object.primitive.allowPicking !== undefined) {
+    return object.primitive.allowPicking;
+  } else if (object instanceof VoxelCell) {
+    const voxelPrimitive: PickableVoxelPrimitive = object.primitive;
+    return voxelPrimitive && voxelPrimitive.pickable;
+  } else {
+    return object.id && getValueOrUndefined(object.id?.properties?.type) === 'point';
+  }
+}
+
+export function extractEntitiesAttributes(entity) {
+  if (!entity.properties) return;
+  return {id: entity.id, ...entity.properties.getValue(JulianDate.fromDate(new Date()))};
+}
+
+export function sortPropertyNames(propertyNames: string[], propertiesOrder: string[] = []): string[] {
+  const lowerPriorityProps = propertyNames
+    .filter(prop => !propertiesOrder.includes(prop))
+    .sort((left, right) => {
+      const titleLeft = left.toLowerCase();
+      const titleRight = right.toLowerCase();
+      if (titleLeft === titleRight) {
+        return 0;
+      }
+      return titleLeft > titleRight ? 1 : -1;
+    });
+  return [...propertiesOrder, ...lowerPriorityProps];
+}
diff --git a/ui/src/toolbox/ngm-geometries-simple-list.ts b/ui/src/toolbox/ngm-geometries-simple-list.ts
@@ -74,6 +74,16 @@ export default class NgmGeometriesSimpleList extends LitElementI18n {
 
     actionMenuTemplate(geom: NgmGeometry) {
         if (this.viewMode) return '';
+        const editButton = this.noEditMode ? '' : html`
+                        <div class="item ${classMap({'disabled': !geom.editable})}"
+                             @click=${() => ToolboxStore.setOpenedGeometryOptions({id: geom.id!, editing: true})}>
+                            ${i18next.t('tbx_edit_btn')}
+                        </div>`;
+      const copyButton = this.noEditMode ? '' : html`
+                    <div class="item ${classMap({'disabled': !geom.copyable})}"
+                         @click=${() => ToolboxStore.nextGeometryAction({id: geom.id!, action: 'copy'})}>
+                        ${i18next.t('tbx_copy_btn')}
+                    </div>`
         return html`
             <div class="menu">
                 ${this.hideMapInteractionButtons ? '' : html`
@@ -85,17 +95,9 @@ export default class NgmGeometriesSimpleList extends LitElementI18n {
                          @click=${() => ToolboxStore.setOpenedGeometryOptions({id: geom.id!})}>
                         ${i18next.t('tbx_info_btn')}
                     </div>
-                    ${this.noEditMode ? '' : html`
-                        <div class="item ${classMap({'disabled': !geom.editable})}"
-                             @click=${() => ToolboxStore.setOpenedGeometryOptions({id: geom.id!, editing: true})}>
-                            ${i18next.t('tbx_edit_btn')}
-                        </div>`}
+                    ${editButton}
                 `}
-                ${this.noEditMode ? '' : html`
-                    <div class="item ${classMap({'disabled': !geom.copyable})}"
-                         @click=${() => ToolboxStore.nextGeometryAction({id: geom.id!, action: 'copy'})}>
-                        ${i18next.t('tbx_copy_btn')}
-                    </div>`}
+                ${copyButton}
                 ${(geom.type === 'line') ? html`
                     <div class="item"
                          @click=${() => ToolboxStore.nextGeometryAction({id: geom.id!, action: 'profile'})}>