From c8119718dc0971648c01c003e95d9c4389e7bce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Bo=C2=89=C2=89es?= <fboes@3960.org>
Date: Wed, 8 May 2024 09:25:58 +0200
Subject: [PATCH] Prioriting waypoints in GeoJson

---
 dist/Export/GeoJson.js | 6 ++++++
 dist/Web/App.js        | 1 +
 src/Export/GeoJson.ts  | 8 +++++++-
 src/Web/App.ts         | 1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/dist/Export/GeoJson.js b/dist/Export/GeoJson.js
index bc3ecce..ea1ae68 100644
--- a/dist/Export/GeoJson.js
+++ b/dist/Export/GeoJson.js
@@ -75,6 +75,7 @@ export class GeoJson {
                     "marker-color": c.type === MissionCheckpoint.TYPE_ORIGIN || c.type === MissionCheckpoint.TYPE_DESTINATION
                         ? "#5e6eba"
                         : "#555555",
+                    "symbol-sort-key": 0,
                 },
             };
         });
@@ -92,6 +93,7 @@ export class GeoJson {
                 direction: mission.origin_dir,
                 frequency: undefined,
                 "marker-symbol": "af-large_airport",
+                "symbol-sort-key": 1,
             },
         });
         this.features.push({
@@ -108,6 +110,7 @@ export class GeoJson {
                 direction: mission.destination_dir,
                 frequency: undefined,
                 "marker-symbol": "af-large_airport",
+                "symbol-sort-key": 1,
             },
         });
         this.drawLine(this.getLineCoordinates(mission));
@@ -129,6 +132,7 @@ export class GeoJson {
                     direction: undefined,
                     frequency: undefined,
                     "marker-symbol": "dot-10",
+                    "symbol-sort-key": 2,
                 },
             },
             {
@@ -145,6 +149,7 @@ export class GeoJson {
                     direction: undefined,
                     frequency: undefined,
                     "marker-symbol": "dot-10",
+                    "symbol-sort-key": 2,
                     stroke: "#FF1493",
                 },
             },
@@ -165,6 +170,7 @@ export class GeoJson {
                     direction: undefined,
                     frequency: undefined,
                     "marker-symbol": "dot-10",
+                    "symbol-sort-key": 2,
                 },
             },
         ];
diff --git a/dist/Web/App.js b/dist/Web/App.js
index b34c25c..aff9d81 100644
--- a/dist/Web/App.js
+++ b/dist/Web/App.js
@@ -452,6 +452,7 @@ export class App {
                     "text-offset": [0, 0.5],
                     "text-anchor": "top",
                     "text-size": 12,
+                    "symbol-sort-key": ["get", "symbol-sort-key"],
                 },
                 paint: {
                     "icon-color": "#FF1493",
diff --git a/src/Export/GeoJson.ts b/src/Export/GeoJson.ts
index 60fcc78..087be78 100644
--- a/src/Export/GeoJson.ts
+++ b/src/Export/GeoJson.ts
@@ -102,6 +102,7 @@ export class GeoJson implements GeoJSON.FeatureCollection {
             c.type === MissionCheckpoint.TYPE_ORIGIN || c.type === MissionCheckpoint.TYPE_DESTINATION
               ? "#5e6eba"
               : "#555555",
+          "symbol-sort-key": 0,
         },
       };
     });
@@ -120,6 +121,7 @@ export class GeoJson implements GeoJSON.FeatureCollection {
         direction: mission.origin_dir,
         frequency: undefined,
         "marker-symbol": "af-large_airport",
+        "symbol-sort-key": 1,
       },
     });
 
@@ -137,6 +139,7 @@ export class GeoJson implements GeoJSON.FeatureCollection {
         direction: mission.destination_dir,
         frequency: undefined,
         "marker-symbol": "af-large_airport",
+        "symbol-sort-key": 1,
       },
     });
 
@@ -160,7 +163,8 @@ export class GeoJson implements GeoJSON.FeatureCollection {
           direction: undefined,
           frequency: undefined,
           "marker-symbol": "dot-10",
-        },
+          "symbol-sort-key": 2,
+      },
       },
       {
         type: "Feature",
@@ -176,6 +180,7 @@ export class GeoJson implements GeoJSON.FeatureCollection {
           direction: undefined,
           frequency: undefined,
           "marker-symbol": "dot-10",
+          "symbol-sort-key": 2,
           stroke: "#FF1493",
         },
       },
@@ -196,6 +201,7 @@ export class GeoJson implements GeoJSON.FeatureCollection {
           direction: undefined,
           frequency: undefined,
           "marker-symbol": "dot-10",
+          "symbol-sort-key": 2,
         },
       },
     ];
diff --git a/src/Web/App.ts b/src/Web/App.ts
index 4a743e9..89ca879 100644
--- a/src/Web/App.ts
+++ b/src/Web/App.ts
@@ -520,6 +520,7 @@ export class App {
           "text-offset": [0, 0.5],
           "text-anchor": "top",
           "text-size": 12,
+          "symbol-sort-key": ["get", "symbol-sort-key"],
         },
         paint: {
           "icon-color": "#FF1493",