Prioriting waypoints in GeoJson

fboes · May 8, 2024 · c811971 · c811971
1 parent f803ff1
commit c811971
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -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",