diff --git a/api/lib/connection-pool.ts b/api/lib/connection-pool.ts index 0156bb84d3..4c5da26178 100644 --- a/api/lib/connection-pool.ts +++ b/api/lib/connection-pool.ts @@ -231,7 +231,12 @@ export default class ConnectionPool extends Map-------<6: entity>-<2: mod1>-<2: mod2> +// Context: +// 0: Reality +// 1: Exercise +// 2: Simulation + +const symbolsets: Array<{ + id: string; + name: string; +}> = []; + +const symbols: Array<{ + id: string, + name: string, + remarks: string, + symbolset: string, +}> = []; + + +for (const symbolset of Object.keys(ms2525e)) { + symbolsets.push({ + id: symbolset, + name: ms2525e[symbolset].name + }); + + for (const mainIcon of ms2525e[symbolset].mainIcon) { + let name = mainIcon.Entity + if (mainIcon["Entity Type"]) { + name += ` - ${mainIcon["Entity Type"]}`; + } + + if (mainIcon["Entity Subtype"]) { + name += ` - ${mainIcon["Entity Subtype"]}`; + } + + symbols.push({ + id: mainIcon.Code, + name, + remarks: mainIcon.Remarks || '', + symbolset + }); + } +} + export default async function router(schema: Schema, config: Config) { const types = await CoTTypes.default.load(); await schema.get('/type/cot', { - name: 'List Types', - group: 'COTTypes', + name: '2525B/ CoT Types', + group: 'Symbology', description: 'Get Type', query: Type.Object({ filter: Type.String({ @@ -46,8 +92,8 @@ export default async function router(schema: Schema, config: Config) { }); await schema.get('/type/cot/:type', { - name: 'Get Type', - group: 'COTTypes', + name: '2525B/ CoT Type', + group: 'Symbology', description: 'Get Type', params: Type.Object({ type: Type.String() @@ -90,4 +136,40 @@ export default async function router(schema: Schema, config: Config) { Err.respond(err, res); } }); + + await schema.get('/type/2525e', { + name: '2525E Types', + group: 'Symbology', + description: 'Get Type', + query: Type.Object({ + filter: Type.String({ + default: '', + }), + }), + res: Type.Object({ + symbolsets: Type.Array(Type.Object({ + id: Type.String(), + name: Type.String(), + })), + items: Type.Array(Type.Object({ + id: Type.String(), + name: Type.String(), + remarks: Type.String(), + symbolset: Type.String(), + })), + }) + }, async (req, res) => { + try { + await Auth.is_auth(config, req); + + res.json({ + symbolsets, + items: symbols.filter((symbol) => { + return symbol.name.toLowerCase().includes(req.query.filter.toLowerCase()) + }) + }); + } catch (err) { + Err.respond(err, res); + } + }); } diff --git a/api/web/package-lock.json b/api/web/package-lock.json index 77977683f1..e09ad8b218 100644 --- a/api/web/package-lock.json +++ b/api/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "@tak-ps/CloudTAK.web", - "version": "12.12.0", + "version": "12.12.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@tak-ps/CloudTAK.web", - "version": "12.12.0", + "version": "12.12.1", "dependencies": { "@react-hookz/deep-equal": "^3.0.3", "@tabler/core": "^1.4.0", @@ -1141,9 +1141,9 @@ } }, "node_modules/@maplibre/vt-pbf": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@maplibre/vt-pbf/-/vt-pbf-4.0.3.tgz", - "integrity": "sha512-YsW99BwnT+ukJRkseBcLuZHfITB4puJoxnqPVjo72rhW/TaawVYsgQHcqWLzTxqknttYoDpgyERzWSa/XrETdA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@maplibre/vt-pbf/-/vt-pbf-4.1.0.tgz", + "integrity": "sha512-9LjFAoWtxdGRns8RK9vG3Fcw/fb3eHMxvAn2jffwn3jnVO1k49VOv6+FEza70rK7WzF8GnBiKa0K39RyfevKUw==", "license": "MIT", "dependencies": { "@mapbox/point-geometry": "^1.1.0", @@ -2046,9 +2046,9 @@ } }, "node_modules/@tak-ps/node-cot": { - "version": "14.15.0", - "resolved": "https://registry.npmjs.org/@tak-ps/node-cot/-/node-cot-14.15.0.tgz", - "integrity": "sha512-SmxFd/2DQvqi5BmlSXGUS9UrmNoTVTlugunVXGxGsnrEOLGG1t+31gqSNSBckyhvvRwWS8b5Pgv9YFf5TC7AMg==", + "version": "14.16.0", + "resolved": "https://registry.npmjs.org/@tak-ps/node-cot/-/node-cot-14.16.0.tgz", + "integrity": "sha512-8Bmn80oiSTDQR25/QHx7poQylZ26lovXnP+zeX/XIMMVq4xJSDVcKFtspPKDkbeONTdlg80zKopi4QRi6FL+Pg==", "license": "MIT", "dependencies": { "@openaddresses/batch-error": "^2.4.0", @@ -2068,6 +2068,7 @@ "geomagnetism": "^0.2.0", "json-diff-ts": "^4.0.1", "mil-std-2525": "^0.2.8", + "milstandard-e": "^0.2.14", "milsymbol": "^3.0.2", "node-stream-zip": "^1.15.0", "protobufjs": "^7.3.0", @@ -2136,13 +2137,13 @@ } }, "node_modules/@turf/area": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/area/-/area-7.3.0.tgz", - "integrity": "sha512-N1feXkRzwiNakzloykPWwTBmZcmHFfL/raGMwJmZ9QoHQZqDNVFrI0bmuX8hALUJ8jzpt/c/91M1CIuRMF9vIw==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/area/-/area-7.3.1.tgz", + "integrity": "sha512-9nSiwt4zB5QDMcSoTxF28WpK1f741MNKcpUJDiHVRX08CZ4qfGWGV9ZIPQ8TVEn5RE4LyYkFuQ47Z9pdEUZE9Q==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", - "@turf/meta": "7.3.0", + "@turf/helpers": "7.3.1", + "@turf/meta": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2151,13 +2152,13 @@ } }, "node_modules/@turf/bbox": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/bbox/-/bbox-7.3.0.tgz", - "integrity": "sha512-EC5GSUJlhXSiCVCEmgCSheZYm0s1ouKzUNqeEOsEYlqTbMAZ19RWgsg/xH2tjnuUw2JP9eGAUzQnCFX6JEV53w==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/bbox/-/bbox-7.3.1.tgz", + "integrity": "sha512-/IyMKoS7P9B0ch5PIlQ6gMfoE8gRr48+cSbzlyexvEjuDuaAV1VURjH1jAthS0ipFG8RrFxFJKnp7TLL1Skong==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", - "@turf/meta": "7.3.0", + "@turf/helpers": "7.3.1", + "@turf/meta": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2166,12 +2167,12 @@ } }, "node_modules/@turf/bbox-polygon": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/bbox-polygon/-/bbox-polygon-7.3.0.tgz", - "integrity": "sha512-ITtYx64WRzuEo71Nu/ZGxTrJSN9EarUWKxDo2zMza22AG42pZjDVpehA9wRLmHn/tybbWSF4D/gyk1hd8hlXug==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/bbox-polygon/-/bbox-polygon-7.3.1.tgz", + "integrity": "sha512-2NvwPfuRtwJk7w5HIC/Knei3mUXrVT+t/0FB1zStgDbakmXrqKISaftlIh4YTOVlUsVnvq0tggjFMLZ/Xxo+lQ==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", + "@turf/helpers": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2180,13 +2181,13 @@ } }, "node_modules/@turf/boolean-point-in-polygon": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-7.3.0.tgz", - "integrity": "sha512-zTVCH77sRJyzUPWVmoS/UCl4pDmChSpNhoVA+BC9XDGkLuBSKhAvK7hcOn/KF55z7RgbvQFNNR2lRqmQUi/OFg==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-7.3.1.tgz", + "integrity": "sha512-BUPW63vE43LctwkgannjmEFTX1KFR/18SS7WzFahJWK1ZoP0s1jrfxGX+pi0BH/3Dd9mA71hkGKDDnj1Ndcz0g==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", - "@turf/invariant": "7.3.0", + "@turf/helpers": "7.3.1", + "@turf/invariant": "7.3.1", "@types/geojson": "^7946.0.10", "point-in-polygon-hao": "^1.1.0", "tslib": "^2.8.1" @@ -2196,13 +2197,13 @@ } }, "node_modules/@turf/boolean-point-on-line": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/boolean-point-on-line/-/boolean-point-on-line-7.3.0.tgz", - "integrity": "sha512-K4PxA23/pxqmv5roUxKnLm+mY92DWUVfjv+6SzrNBymHQOjDoDp/RcpTHHFM3koaUJiQx7MZ8txus5kkw+mDOA==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/boolean-point-on-line/-/boolean-point-on-line-7.3.1.tgz", + "integrity": "sha512-8Hywuv7XFpSc8nfH0BJBtt+XTcJ7OjfjpX2Sz+ty8gyiY/2nCLLqq6amu3ebr67ruqZTDpPNQoGGUbUePjF3rA==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", - "@turf/invariant": "7.3.0", + "@turf/helpers": "7.3.1", + "@turf/invariant": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2211,15 +2212,15 @@ } }, "node_modules/@turf/boolean-touches": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/boolean-touches/-/boolean-touches-7.3.0.tgz", - "integrity": "sha512-5fgNlOd15eSI75zvGq3RrYlRaDyzvpEZxFrXjyRRQV8ks6VShU7HVl+rjBD8evFOigE0uApSpKGtsDk6wiN8cA==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/boolean-touches/-/boolean-touches-7.3.1.tgz", + "integrity": "sha512-XqrQzYGTakoTWeTWT274pfObpbIpAM7L8CzGUa04rJD0l3bv3VK4TUw0v6+bywi5ea6TnJzvOzgvzTb1DtvBKA==", "license": "MIT", "dependencies": { - "@turf/boolean-point-in-polygon": "7.3.0", - "@turf/boolean-point-on-line": "7.3.0", - "@turf/helpers": "7.3.0", - "@turf/invariant": "7.3.0", + "@turf/boolean-point-in-polygon": "7.3.1", + "@turf/boolean-point-on-line": "7.3.1", + "@turf/helpers": "7.3.1", + "@turf/invariant": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2228,16 +2229,16 @@ } }, "node_modules/@turf/boolean-within": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/boolean-within/-/boolean-within-7.3.0.tgz", - "integrity": "sha512-rGhKc/F4l/MI61OvZtCp8rB0Dr2ekuBNFXHlovFEKfn9z3Q5k5uananoK+Gma/w1XmVasut6Z1S3xLC8QOmnDg==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/boolean-within/-/boolean-within-7.3.1.tgz", + "integrity": "sha512-oxP4VU81RRCf59TXCBhVWEyJ5Lsr+wrqvqSAFxyBuur5oLmBqZdYyvL7FQJmYvG0uOxX7ohyHmSJMaTe4EhGDA==", "license": "MIT", "dependencies": { - "@turf/bbox": "7.3.0", - "@turf/boolean-point-in-polygon": "7.3.0", - "@turf/boolean-point-on-line": "7.3.0", - "@turf/helpers": "7.3.0", - "@turf/invariant": "7.3.0", + "@turf/bbox": "7.3.1", + "@turf/boolean-point-in-polygon": "7.3.1", + "@turf/boolean-point-on-line": "7.3.1", + "@turf/helpers": "7.3.1", + "@turf/invariant": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2246,13 +2247,13 @@ } }, "node_modules/@turf/center": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/center/-/center-7.3.0.tgz", - "integrity": "sha512-OrXgY9Hz9qnfhuEUrB2PHJnyiC0T1al292ZNTvG382G9ZdjUTRhzz4ajT5a4Mtar/QF+p2KwN8SiFlB2H2N7oQ==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/center/-/center-7.3.1.tgz", + "integrity": "sha512-czqNKLGGdik3phYsWCK5SHKBRkDulUArMlG4v62IQcNcRFq9MbOGqyN21GSshSMO792ynDeWzdXdcKmycQ14Yg==", "license": "MIT", "dependencies": { - "@turf/bbox": "7.3.0", - "@turf/helpers": "7.3.0", + "@turf/bbox": "7.3.1", + "@turf/helpers": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2261,13 +2262,13 @@ } }, "node_modules/@turf/centroid": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/centroid/-/centroid-7.3.0.tgz", - "integrity": "sha512-6skXlwv6fCkdKsrkniizpEuC1IsAYQEyZG4XIzK5d3FGQTM/lVInLQP+wd9I6FLtW8b/6UbZcIjSU9wP/MMbTA==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/centroid/-/centroid-7.3.1.tgz", + "integrity": "sha512-hRnsDdVBH4pX9mAjYympb2q5W8TCMUMNEjcRrAF7HTCyjIuRmjJf8vUtlzf7TTn9RXbsvPc1vtm3kLw20Jm8DQ==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", - "@turf/meta": "7.3.0", + "@turf/helpers": "7.3.1", + "@turf/meta": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2276,13 +2277,13 @@ } }, "node_modules/@turf/circle": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/circle/-/circle-7.3.0.tgz", - "integrity": "sha512-aOkYxDABFyv9qtz8vB2GyYF6kmROgplnaR1IHpWSfHnoFH3/2mIlhhGdY17x+FSN4b7SYLskKRDSCTG4p90VEA==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/circle/-/circle-7.3.1.tgz", + "integrity": "sha512-UY2OM1OK7IuyrtN3YE8026ZM3xM9VIkqZ0vRZln8g33D0AogrJVJ/I9T81/VpRPlxTnrbDpzQxJQBH+3vPG/Ow==", "license": "MIT", "dependencies": { - "@turf/destination": "7.3.0", - "@turf/helpers": "7.3.0", + "@turf/destination": "7.3.1", + "@turf/helpers": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2291,12 +2292,12 @@ } }, "node_modules/@turf/clone": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/clone/-/clone-7.3.0.tgz", - "integrity": "sha512-mf6TFxrNrNs64hyXjkFqhEXi3m+0WduQ8Ixqh4VcHV7LdkXg+rW0CxuSGoOlLgjYa6iscHoGCycOrTDyYyD6EA==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/clone/-/clone-7.3.1.tgz", + "integrity": "sha512-r7xDOfw9ohA7PhZW+8X9RMsO4szB4YqkhEROaELJyLtQ1bo8VNFtndpZdE6YHQpD7Pjlvlb6i99q8w1QLisEPg==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", + "@turf/helpers": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2305,13 +2306,13 @@ } }, "node_modules/@turf/destination": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/destination/-/destination-7.3.0.tgz", - "integrity": "sha512-N3K/zs8htrLkJ43qvaaDupL7ePMuAuQ9lSuV4q0CmaeqhKUhrpyGbXEu68uUPHpEALC/Ozp8nFtkmizbRBy+QA==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/destination/-/destination-7.3.1.tgz", + "integrity": "sha512-yyiJtbQJ4AB9Ny/FKDDNuWI9Sg4Jtd2PMpQPqOV3AFq8NNkg0xJSNmDHDxupb3oPqPWYPxyfVI3tBoF+Xhhoig==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", - "@turf/invariant": "7.3.0", + "@turf/helpers": "7.3.1", + "@turf/invariant": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2320,13 +2321,13 @@ } }, "node_modules/@turf/distance": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/distance/-/distance-7.3.0.tgz", - "integrity": "sha512-8FXmJxL8s80v7ZRRgCGNK6ufVlehhsBRxlV2rBiMQTC4nWfYNGVV42OFf17HlK2Mlbllv3Cp1jY3Ecu7fOdjxg==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/distance/-/distance-7.3.1.tgz", + "integrity": "sha512-DK//doTGgYYjBkcWUywAe7wbZYcdP97hdEJ6rXYVYRoULwGGR3lhY96GNjozg6gaW9q2eSNYnZLpcL5iFVHqgw==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", - "@turf/invariant": "7.3.0", + "@turf/helpers": "7.3.1", + "@turf/invariant": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2335,16 +2336,16 @@ } }, "node_modules/@turf/ellipse": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/ellipse/-/ellipse-7.3.0.tgz", - "integrity": "sha512-9w62TQuso3TeIAtyZ8mDi1GQBqXvLlssRlEE6dZFyE7ekwzRtaxezRyfTjk/aPD4FV5W7nk8YjVtaEkrZ9zkmg==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/ellipse/-/ellipse-7.3.1.tgz", + "integrity": "sha512-tcGbS+U7EktZg+UJad17LRU+8C067XDWdmURPCmycaib2zRxeNrImh2Y/589us6wsldlYYoBYRxDY/c1oxIUCA==", "license": "MIT", "dependencies": { - "@turf/destination": "7.3.0", - "@turf/distance": "7.3.0", - "@turf/helpers": "7.3.0", - "@turf/invariant": "7.3.0", - "@turf/transform-rotate": "7.3.0", + "@turf/destination": "7.3.1", + "@turf/distance": "7.3.1", + "@turf/helpers": "7.3.1", + "@turf/invariant": "7.3.1", + "@turf/transform-rotate": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2353,14 +2354,14 @@ } }, "node_modules/@turf/envelope": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/envelope/-/envelope-7.3.0.tgz", - "integrity": "sha512-0pkFaRfEaknmsaQ2M9FmogWmBgP4NJU5HXReiF5PcpIxbNWfGoxDcw+1USTQJRHRNbP8PRnh0xRwt6WZQCXaeQ==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/envelope/-/envelope-7.3.1.tgz", + "integrity": "sha512-Sp3ct/LpWyHN5tTfPOcKXFoVDI1QH9BXtQ+aQzABFp3U5nY2Sz8LFg8SeFQm3K7PpoCnUwSfwDFA4aa+z+4l1g==", "license": "MIT", "dependencies": { - "@turf/bbox": "7.3.0", - "@turf/bbox-polygon": "7.3.0", - "@turf/helpers": "7.3.0", + "@turf/bbox": "7.3.1", + "@turf/bbox-polygon": "7.3.1", + "@turf/helpers": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2369,13 +2370,13 @@ } }, "node_modules/@turf/explode": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/explode/-/explode-7.3.0.tgz", - "integrity": "sha512-oFnJbJz6rWSSnPUMSfGmSi7hYB8kx9TL8lc0naLwnmqmFkGEdYp98E9hhhIog5nl7XOw+maQjUj6g5NenR8AHw==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/explode/-/explode-7.3.1.tgz", + "integrity": "sha512-H0Q8NnmrPoWKhsYYmVmkuT5F4t50N53ByGBf6Ys1n5B9YrFyrT+/aLDXF2C05r+QnW8nFtkM4lFG3ZSBHiq4Xg==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", - "@turf/meta": "7.3.0", + "@turf/helpers": "7.3.1", + "@turf/meta": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2384,9 +2385,9 @@ } }, "node_modules/@turf/helpers": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.3.0.tgz", - "integrity": "sha512-5kWdgwI6e2vGbkt2qOD+Z2BiKQ7dfKN/PtWRLCpvzyOO59rk19R53CHi8nUT/Y1vQLgWmT6eNpiKwsWwPZGIdg==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/helpers/-/helpers-7.3.1.tgz", + "integrity": "sha512-zkL34JVhi5XhsuMEO0MUTIIFEJ8yiW1InMu4hu/oRqamlY4mMoZql0viEmH6Dafh/p+zOl8OYvMJ3Vm3rFshgg==", "license": "MIT", "dependencies": { "@types/geojson": "^7946.0.10", @@ -2397,12 +2398,12 @@ } }, "node_modules/@turf/invariant": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-7.3.0.tgz", - "integrity": "sha512-AmDFmdhpbLZv0zlI4EF4bVFE0iYmKcOBI2m8DTcFFUQDRusgjc+NLCnX1RIENfYyeI2FKHg84E9vSt6XytUDvw==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/invariant/-/invariant-7.3.1.tgz", + "integrity": "sha512-IdZJfDjIDCLH+Gu2yLFoSM7H23sdetIo5t4ET1/25X8gi3GE2XSqbZwaGjuZgNh02nisBewLqNiJs2bo+hrqZA==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", + "@turf/helpers": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2411,14 +2412,14 @@ } }, "node_modules/@turf/length": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/length/-/length-7.3.0.tgz", - "integrity": "sha512-vZjSEPC5lM3tBB7RaiXVujvSe62jxaAHYl9E+yd4Egcv/zOKkFlK26j+1mtSyDwKE/r7nE4gd34KpT9k889vjA==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/length/-/length-7.3.1.tgz", + "integrity": "sha512-QOr4qS3yi6qWIfQ/KLcy4rDLdemGCYpqz2YDh29R46seE+arSvlBI0KXvI36rPzgEMcUbQuVQyO65sOSqPaEjQ==", "license": "MIT", "dependencies": { - "@turf/distance": "7.3.0", - "@turf/helpers": "7.3.0", - "@turf/meta": "7.3.0", + "@turf/distance": "7.3.1", + "@turf/helpers": "7.3.1", + "@turf/meta": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2427,14 +2428,14 @@ } }, "node_modules/@turf/line-arc": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/line-arc/-/line-arc-7.3.0.tgz", - "integrity": "sha512-mClyl2eFWUQFEYsQGc+ml9aJC917dELAvVvvNyIKuI4T6lUkzpfRE8478dky+9Hw/5biDREJqdnIsZOWKYbtFg==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/line-arc/-/line-arc-7.3.1.tgz", + "integrity": "sha512-QSuVP0YWcfl76QjPb5Y2GJqXnziSJ2AuaJm5RKEFt5ELugXdEcHkRtydkGov+ZRPmI93jVmXoEE0UXwQx7aYHA==", "license": "MIT", "dependencies": { - "@turf/circle": "7.3.0", - "@turf/destination": "7.3.0", - "@turf/helpers": "7.3.0", + "@turf/circle": "7.3.1", + "@turf/destination": "7.3.1", + "@turf/helpers": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2443,12 +2444,12 @@ } }, "node_modules/@turf/meta": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-7.3.0.tgz", - "integrity": "sha512-fTLqdQqRm8qA2zHHUbBMY++YT9LDQejLG7OD70XF2dwg9nPiF9mUxO7nrsDp2IY8vNmH9OTAiMtlIjb0ssYccg==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/meta/-/meta-7.3.1.tgz", + "integrity": "sha512-NWsfOE5RVtWpLQNkfOF/RrYvLRPwwruxhZUV0UFIzHqfiRJ50aO9Y6uLY4bwCUe2TumLJQSR4yaoA72Rmr2mnQ==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", + "@turf/helpers": "7.3.1", "@types/geojson": "^7946.0.10" }, "funding": { @@ -2456,15 +2457,15 @@ } }, "node_modules/@turf/nearest-point": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/nearest-point/-/nearest-point-7.3.0.tgz", - "integrity": "sha512-EGfucsrDrcBuZ9YSD3djPBBpYEoX6S/VLDANEuku7OPmCd5UVyjKWBswFW1DKrksh+Cx5ZmSeCk9tz+RVPjJNw==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/nearest-point/-/nearest-point-7.3.1.tgz", + "integrity": "sha512-hLKGFzwAEop5z04X5BeurJvz0oVPHQX0rjeL3v83kgIjR/eavQucXKO3XkJBoF1AaT9Dv0mgB8rmj/qrwroWgg==", "license": "MIT", "dependencies": { - "@turf/clone": "7.3.0", - "@turf/distance": "7.3.0", - "@turf/helpers": "7.3.0", - "@turf/meta": "7.3.0", + "@turf/clone": "7.3.1", + "@turf/distance": "7.3.1", + "@turf/helpers": "7.3.1", + "@turf/meta": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2473,16 +2474,16 @@ } }, "node_modules/@turf/point-on-feature": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/point-on-feature/-/point-on-feature-7.3.0.tgz", - "integrity": "sha512-B2MepPZTt5J/2iz75wa47HTOGV0ChAwy/hcl9EVMm0f9prcz33nYPqRu5iXfqGTQTw0jkIl5PESUkYbd7HERTQ==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/point-on-feature/-/point-on-feature-7.3.1.tgz", + "integrity": "sha512-uX15wjujBMeMKAN7OLK4RV6KCLxsoQiFRB9kMtbTeZj13mDo+Bz5SyNN+M2AXqrdsQI9+4h0UTwu3EjcXj/nEw==", "license": "MIT", "dependencies": { - "@turf/boolean-point-in-polygon": "7.3.0", - "@turf/center": "7.3.0", - "@turf/explode": "7.3.0", - "@turf/helpers": "7.3.0", - "@turf/nearest-point": "7.3.0", + "@turf/boolean-point-in-polygon": "7.3.1", + "@turf/center": "7.3.1", + "@turf/explode": "7.3.1", + "@turf/helpers": "7.3.1", + "@turf/nearest-point": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2491,13 +2492,13 @@ } }, "node_modules/@turf/rhumb-bearing": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/rhumb-bearing/-/rhumb-bearing-7.3.0.tgz", - "integrity": "sha512-xrHGmEEjTHkWh3b68569ESxe+4F2Y0cLDe3Qf7S2ZNm9TTGQ4bgUfpsOTq0snTo00Ss/H+hGBZA5nJe2+il3GA==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/rhumb-bearing/-/rhumb-bearing-7.3.1.tgz", + "integrity": "sha512-GA/EUSOMapLp6qK5kOX+PkFg2MMUHzUSm/jVezv6Fted0dAlCgXHOrKgLm0tN8PqbH7Oj9xQhv9+3/1ze7W8YA==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", - "@turf/invariant": "7.3.0", + "@turf/helpers": "7.3.1", + "@turf/invariant": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2506,13 +2507,13 @@ } }, "node_modules/@turf/rhumb-destination": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/rhumb-destination/-/rhumb-destination-7.3.0.tgz", - "integrity": "sha512-Xt/JXB0JtXvTUq9kP+s3HJhsTrJCTVnl5hmNMUV7HvUxEnMcImFfFHc8GCBjXEMx8dqEK0OtRLZTqHl558v8Qg==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/rhumb-destination/-/rhumb-destination-7.3.1.tgz", + "integrity": "sha512-HjtAFr5DTISUn9b4oaZpX79tYl72r4EyAj40HKwjQeV6KkwIe5/h4zryOSEpnvAK2Gnkmu1GxYeTGfM5z3J9JA==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", - "@turf/invariant": "7.3.0", + "@turf/helpers": "7.3.1", + "@turf/invariant": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2521,13 +2522,13 @@ } }, "node_modules/@turf/rhumb-distance": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/rhumb-distance/-/rhumb-distance-7.3.0.tgz", - "integrity": "sha512-j4WPrgvKOw1AwhD4os1k7Mtv3F58QRHlLLLm+WBnMeu8AaXyJPwwxy2SfhB4tm6uEZCErR9daRGZNOn2RV6PfQ==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/rhumb-distance/-/rhumb-distance-7.3.1.tgz", + "integrity": "sha512-9ZvXU0ii2aywdphLhiawl3uxMEHucMmXCBiRj3WhmssTY9CZkFii9iImbJEqz5glxh6/gzXDcz1CCFQUdNP2xA==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", - "@turf/invariant": "7.3.0", + "@turf/helpers": "7.3.1", + "@turf/invariant": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2536,16 +2537,16 @@ } }, "node_modules/@turf/sector": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/sector/-/sector-7.3.0.tgz", - "integrity": "sha512-Kah3Vffri+wzbx8oc6QCp1wZyzPIWkUaUtMfdWXVB7VW3yIduD6AGQPWWsAnlRtNrJFAZtzRzJ15dHmZnWAP/A==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/sector/-/sector-7.3.1.tgz", + "integrity": "sha512-3BYJk7pQaqVr1Ji1ors6FUnhCJVHuobNf4bYW2yAUW1rxL+snuo6aTCsu39hpkwLj4BBknYt5w4MIOy5b8+QKg==", "license": "MIT", "dependencies": { - "@turf/circle": "7.3.0", - "@turf/helpers": "7.3.0", - "@turf/invariant": "7.3.0", - "@turf/line-arc": "7.3.0", - "@turf/meta": "7.3.0", + "@turf/circle": "7.3.1", + "@turf/helpers": "7.3.1", + "@turf/invariant": "7.3.1", + "@turf/line-arc": "7.3.1", + "@turf/meta": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2554,19 +2555,19 @@ } }, "node_modules/@turf/transform-rotate": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/transform-rotate/-/transform-rotate-7.3.0.tgz", - "integrity": "sha512-DAllZaae7LJ5KPYaCNztEwKcu+7PudHuAFcvNTxl3gIaVqvtOe2PuCH0Tdp95Zkvw8BOXxJzwEMMP0qCR22gkQ==", - "license": "MIT", - "dependencies": { - "@turf/centroid": "7.3.0", - "@turf/clone": "7.3.0", - "@turf/helpers": "7.3.0", - "@turf/invariant": "7.3.0", - "@turf/meta": "7.3.0", - "@turf/rhumb-bearing": "7.3.0", - "@turf/rhumb-destination": "7.3.0", - "@turf/rhumb-distance": "7.3.0", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/transform-rotate/-/transform-rotate-7.3.1.tgz", + "integrity": "sha512-KAYebOkk7IT2j7S8M+ZxDAmyqeni9ZZGU9ouD6mvd/hTpDOlGG+ORRmg312RxG0NiThzCHLyeG1Nea1nEud6bg==", + "license": "MIT", + "dependencies": { + "@turf/centroid": "7.3.1", + "@turf/clone": "7.3.1", + "@turf/helpers": "7.3.1", + "@turf/invariant": "7.3.1", + "@turf/meta": "7.3.1", + "@turf/rhumb-bearing": "7.3.1", + "@turf/rhumb-destination": "7.3.1", + "@turf/rhumb-distance": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -2575,13 +2576,13 @@ } }, "node_modules/@turf/truncate": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/@turf/truncate/-/truncate-7.3.0.tgz", - "integrity": "sha512-Y0Xzl74CgZEeWydQn3+5p3Vd3HWP1w8+IWi/cYO6OeXyda/EeegUTvqzosfr29YV1nSNLQ5Q8/xYlxzjZ6P7pw==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/@turf/truncate/-/truncate-7.3.1.tgz", + "integrity": "sha512-rcXHM2m17hyKoW1dJpOvTgUUWFOKluTKKsoLmhEE6aRAYwtuVetkcInt4qBtS1bv7MaL//glbvq0kdEGR0YaOA==", "license": "MIT", "dependencies": { - "@turf/helpers": "7.3.0", - "@turf/meta": "7.3.0", + "@turf/helpers": "7.3.1", + "@turf/meta": "7.3.1", "@types/geojson": "^7946.0.10", "tslib": "^2.8.1" }, @@ -3510,12 +3511,12 @@ } }, "node_modules/@vueuse/rxjs": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/@vueuse/rxjs/-/rxjs-14.0.0.tgz", - "integrity": "sha512-3PcbDPDoMrirqCAkyqs59MGUSaqtWUzzrwv6EL4yGFw7r3ZZ8olv59BRromd4nfzybtjaETrkSAUYz6YdBQ2dQ==", + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/@vueuse/rxjs/-/rxjs-14.1.0.tgz", + "integrity": "sha512-g/tZS++oS1/xhtpsdh9JYPB6QvdBKajcMM23KycDr8EPIV3sVeEvH1Yu7+iH6XpA0Py/pkWWTxan2+a6lWFJXw==", "license": "MIT", "dependencies": { - "@vueuse/shared": "14.0.0" + "@vueuse/shared": "14.1.0" }, "funding": { "url": "https://github.com/sponsors/antfu" @@ -3526,9 +3527,9 @@ } }, "node_modules/@vueuse/rxjs/node_modules/@vueuse/shared": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-14.0.0.tgz", - "integrity": "sha512-mTCA0uczBgurRlwVaQHfG0Ja7UdGe4g9mwffiJmvLiTtp1G4AQyIjej6si/k8c8pUwTfVpNufck+23gXptPAkw==", + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-14.1.0.tgz", + "integrity": "sha512-EcKxtYvn6gx1F8z9J5/rsg3+lTQnvOruQd8fUecW99DCK04BkWD7z5KQ/wTAx+DazyoEE9dJt/zV8OIEQbM6kw==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/antfu" @@ -6282,6 +6283,12 @@ "integrity": "sha512-DAPfpAdUm0PyVSi50ScjROgrdloUtw6HFpTEu6ljnK3Bw4GLLjTYNlKdram9+tR1Hq7COkI0R4OMaZAA2/++5Q==", "license": "MIT" }, + "node_modules/milstandard-e": { + "version": "0.2.14", + "resolved": "https://registry.npmjs.org/milstandard-e/-/milstandard-e-0.2.14.tgz", + "integrity": "sha512-DUL1SzdcdW4ZkgLr7zcXdUcIjsfaHXzuRGUqIyz+UblQxnG6b7yZT63LEQMTorYSKxygiOCZ0fCrdz7rf6GxSQ==", + "license": "MIT" + }, "node_modules/milsymbol": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/milsymbol/-/milsymbol-3.0.3.tgz", @@ -6859,9 +6866,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz", - "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz", + "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==", "dev": true, "license": "MIT", "dependencies": { @@ -8063,9 +8070,9 @@ } }, "node_modules/superjson": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.5.tgz", - "integrity": "sha512-zWPTX96LVsA/eVYnqOM2+ofcdPqdS1dAF1LN4TS2/MWuUpfitd9ctTa87wt4xrYnZnkLtS69xpBdSxVBP5Rm6w==", + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.6.tgz", + "integrity": "sha512-H+ue8Zo4vJmV2nRjpx86P35lzwDT3nItnIsocgumgr0hHMQ+ZGq5vrERg9kJBo5AWGmxZDhzDo+WVIJqkB0cGA==", "license": "MIT", "dependencies": { "copy-anything": "^4" diff --git a/api/web/src/components/CloudTAK/util/FeatureIcon.vue b/api/web/src/components/CloudTAK/util/FeatureIcon.vue index ed288771ee..7f48cadac4 100644 --- a/api/web/src/components/CloudTAK/util/FeatureIcon.vue +++ b/api/web/src/components/CloudTAK/util/FeatureIcon.vue @@ -95,6 +95,7 @@ const supportedIcon = computed(() => { return props.feature.properties.type; } else { const icon = mapStore.map.getImage(props.feature.properties.icon) + if (icon) { return props.feature.properties.icon; } else { diff --git a/api/web/src/components/CloudTAK/util/PropertyType.vue b/api/web/src/components/CloudTAK/util/PropertyType.vue index 36aad3e6d2..c460b94257 100644 --- a/api/web/src/components/CloudTAK/util/PropertyType.vue +++ b/api/web/src/components/CloudTAK/util/PropertyType.vue @@ -54,59 +54,131 @@