diff --git a/api/web/src/components/CloudTAK/Map.vue b/api/web/src/components/CloudTAK/Map.vue index 75640d386..cfbb804b7 100644 --- a/api/web/src/components/CloudTAK/Map.vue +++ b/api/web/src/components/CloudTAK/Map.vue @@ -459,11 +459,11 @@ @@ -614,7 +614,7 @@ export default { this.$emit('err', new Error(evt.message)); }); - window.addEventListener('resize', (evt) => { + window.addEventListener('resize', () => { this.height = window.innerHeight; this.width = window.innerWidth; }); diff --git a/api/web/src/stores/cots.ts b/api/web/src/stores/cots.ts index d8a91d7e0..0bc0ff15a 100644 --- a/api/web/src/stores/cots.ts +++ b/api/web/src/stores/cots.ts @@ -174,7 +174,7 @@ export const useCOTStore = defineStore('cots', { if (this.cots.has(cot.id)) { diff.update.push({ - id: render.id, + id: String(render.id), addOrUpdateProperties: Object.keys(render.properties).map((key) => { return { key, value: render.properties[key] } }), diff --git a/api/web/src/stores/cots/cot.ts b/api/web/src/stores/cots/cot.ts index db1eae4b1..2bcc260df 100644 --- a/api/web/src/stores/cots/cot.ts +++ b/api/web/src/stores/cots/cot.ts @@ -4,7 +4,10 @@ import pointOnFeature from '@turf/point-on-feature'; import moment from 'moment'; import type { Static } from '@sinclair/typebox'; import type { Feature } from './../../types.ts' -import type { Feature as GeoJSONFeature } from 'geojson' +import type { + Feature as GeoJSONFeature, + Geometry as GeoJSONGeometry, +} from 'geojson' export default class COT implements Feature { id: string; @@ -25,8 +28,8 @@ export default class COT implements Feature { * The slimmer we can get the Features, the better * This returns the minium feature we need to actually style the COT in the vector tiles */ - as_rendered(): GeoJSONFeature { - const feat: GeoJSONFeature = { + as_rendered(): GeoJSONFeature> { + const feat: GeoJSONFeature> = { id: this.id, type: this.type, properties: { @@ -36,6 +39,8 @@ export default class COT implements Feature { geometry: this.geometry }; + if (!feat.properties) feat.properties = {}; + if (this.properties.fill !== undefined) feat.properties.fill = this.properties.fill; if (this.properties['fill-opacity'] !== undefined)