Fix coordinates panel ordering

ndsev · Jan 24, 2025 · ac31970 · ac31970
1 parent caecb53
commit ac31970
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/erdblick_app/app/coordinates.panel.component.ts b/erdblick_app/app/coordinates.panel.component.ts
@@ -6,6 +6,7 @@ import {CesiumMath} from "./cesium";
 import {ClipboardService} from "./clipboard.service";
 import {coreLib} from "./wasm";
 import {InspectionService} from "./inspection.service";
+import {KeyValue} from "@angular/common";
 
 interface PanelOption {
     name: string,
@@ -37,15 +38,15 @@ interface PanelOption {
                             <span *ngFor="let component of coords.value" class="coord-span">{{ component }}</span>
                         </div>
                     </ng-container>
-                    <ng-container *ngFor="let tileId of mapgetTileIds | keyvalue">
+                    <ng-container *ngFor="let tileId of mapgetTileIds | keyvalue: compareLevels">
                         <div *ngIf="isSelectedOption(tileId.key)" class="coordinates-entry">
                             <span class="name-span"
                                   (click)="clipboardService.copyToClipboard(tileId.value.toString())">{{ tileId.key }}
                                 :</span>
                             <span class="coord-span">{{ tileId.value }}</span>
                         </div>
                     </ng-container>
-                    <ng-container *ngFor="let tileId of auxiliaryTileIds | keyvalue">
+                    <ng-container *ngFor="let tileId of auxiliaryTileIds | keyvalue: compareLevels">
                         <div *ngIf="isSelectedOption(tileId.key)" class="coordinates-entry">
                             <span class="name-span"
                                   (click)="clipboardService.copyToClipboard(tileId.value.toString())">{{ tileId.key }}
@@ -227,4 +228,11 @@ export class CoordinatesPanelComponent {
             return array;
         }, new Array<string>()));
     }
+
+    compareLevels(a: KeyValue<string, bigint> , b: KeyValue<string, bigint>): number {
+        const aLevel = parseInt(a.key.match(/\d+/)?.[0] ?? '0', 10);
+        const bLevel = parseInt(b.key.match(/\d+/)?.[0] ?? '0', 10);
+
+        return aLevel - bLevel;
+    }
 }
diff --git a/erdblick_app/styles.scss b/erdblick_app/styles.scss
@@ -923,7 +923,7 @@ body {
       padding-bottom: 0;
       gap: 0.5em;
       overflow-y: auto;
-      max-width: calc(100vw - 25em);
+      max-width: calc(100vw - 35em);
       align-items: center;
 
       & > .coordinates-entry:nth-child(1) {