Fix CoT filtering

dfpc-coe · Oct 17, 2024 · 1f8bb40 · 1f8bb40
1 parent 330394a
commit 1f8bb40
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 53 deletions.
diff --git a/api/lib/sprites.ts b/api/lib/sprites.ts
@@ -8,6 +8,7 @@ const SpriteSmith = promisify(spritesmith.run);
 
 type SpriteConfig = {
     name?: string;
+    useDataAlt?: boolean;
 };
 
 export default async function(icons: Array<Static<typeof IconResponse>>, config: SpriteConfig = {}) {
@@ -16,7 +17,7 @@ export default async function(icons: Array<Static<typeof IconResponse>>, config:
             return new Vinyl({
                 // @ts-expect-error Deal with indexing issue on icon
                 path: config.name ? icon[config.name] + '.png' : icon.path.replace(/.*?\//, ''),
-                contents: Buffer.from(icon.data, 'base64'),
+                contents: Buffer.from(config.useDataAlt && icon.data_alt ? icon.data_alt : icon.data, 'base64'),
             })
         })
     });

diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/routes/connection-layer-cot.ts b/api/routes/connection-layer-cot.ts
@@ -75,7 +75,7 @@ export default async function router(schema: Schema, config: Config) {
             }
 
             const errors: Array<Static<typeof LayerError>> = [];
-            const cots = [];
+            let cots = [];
             for (const feat of req.body.features) {
                 try {
                     cots.push(CoT.from_geojson(feat))
@@ -129,16 +129,17 @@ export default async function router(schema: Schema, config: Config) {
                         existMap.set(String(feat.id), feat);
                     }
 
-
-                    for (const cot of cots) {
+                    cots = cots.filter((cot) => {
                         const exist = existMap.get(cot.uid());
                         if (exist && data.mission_diff) {
                             const b = CoT.from_geojson(exist);
-                            if (!cot.isDiff(b)) continue;
+                            if (!cot.isDiff(b)) return false;
                         }
 
                         cot.addDest({ mission: data.name, path: `layer-${layer.id}`, after: '' });
-                    }
+
+                        return true;
+                    })
                 } else {
                     for (const cot of cots) {
                         cot.addDest({ mission: data.name });