More typescript

Author: schtibe

packages/viewer/src/modules/map/components/CompareSlider.vue

@@ -98,10 +98,10 @@ function registerRenderingEvents(layerId: string, layerUuid: string) {
     // context to ensure it is also cut correctly upon activating the compare slider
     // or loading a new COG layer on top.
     layer?.once('prerender', (event) => {
-        if (shouldUseWebGlContext.value && event.context) {
-            ;(event.context as WebGLRenderingContext).clear(
+        if (event.context && useWebGLContext(event.context)) {
+            event.context.clear(
                 // sorry
-                (event.context as WebGLRenderingContext).COLOR_BUFFER_BIT
+                event.context.COLOR_BUFFER_BIT
             )
         }
     })
@@ -159,29 +159,37 @@ function onPreRender2d(event: RenderEvent, context: CanvasRenderingContext2D) {
     context.clip()
 }
 
+function useWebGLContext(
+    context: WebGLRenderingContext | CanvasRenderingContext2D
+): context is WebGLRenderingContext {
+    return shouldUseWebGlContext.value
+}
+
 function onPreRender(event: RenderEvent) {
     const context = event.context
 
     if (!context) {
         return
     }
 
-    if (shouldUseWebGlContext.value) {
-        onPreRenderWebGL(event, context as WebGLRenderingContext)
+    if (useWebGLContext(context)) {
+        onPreRenderWebGL(event, context)
     } else {
-        onPreRender2d(event, context as CanvasRenderingContext2D)
+        onPreRender2d(event, context)
     }
 }
 
 function onPostRender(event: RenderEvent) {
     const context = event.context
 
-    // probably could do some generic magic here
-    if (shouldUseWebGlContext.value) {
-        const _context = context as WebGLRenderingContext
-        _context.disable(_context.SCISSOR_TEST)
+    if (!context) {
+        return
+    }
+
+    if (useWebGLContext(context)) {
+        context.disable(context.SCISSOR_TEST)
     } else {
-        ;(context as CanvasRenderingContext2D).restore()
+        context.restore()
     }
 }
 

packages/viewer/src/utils/__tests__/kmlUtils.spec.ts

@@ -18,7 +18,7 @@ import {
     parseIconUrl,
     parseKml,
 } from '@/utils/kmlUtils'
-import type EditableFeature from '@/api/features/EditableFeature.class'
+import type { EditableFeature } from '@/api/features.api'
 
 describe('Test KML utils', () => {
     describe('get KML Extent', () => {
@@ -148,8 +148,8 @@ describe('Test KML utils', () => {
             const olFeatures: OLFeature[] = parseKml(
                 kmlLayer,
                 WEBMERCATOR,
-                resolution,
-                fakeIconSets
+                fakeIconSets,
+                resolution
             )
             features = olFeatures.map((f) => {
                 const ef = f.get('editableFeature')

packages/viewer/src/utils/__tests__/legacyKmlUtils.spec.ts

@@ -5,7 +5,6 @@ import { resolve } from 'path'
 import { beforeEach, describe, expect, it } from 'vitest'
 import type { default as OLFeature } from 'ol/Feature'
 
-import EditableFeature, { EditableFeatureTypes } from '@/api/features/EditableFeature.class'
 import type { DrawingIconSet } from '@/api/icon.api'
 import { getServiceKmlBaseUrl } from '@/config/baseUrl.config'
 import {
@@ -20,6 +19,7 @@ import {
     YELLOW,
 } from '@/utils/featureStyleUtils'
 import { parseKml } from '@/utils/kmlUtils'
+import { EditableFeatureTypes, type EditableFeature } from '@/api/features.api'
 
 const fakeDefaultIconSet: DrawingIconSet = {
     name: 'default',
@@ -89,11 +89,13 @@ function performStandardChecks(
     expect(feature).toBeDefined()
     expect(feature!.coordinates).toBeDefined()
     expect(feature!.coordinates).to.have.length.greaterThan(0)
-    if (feature!.coordinates!.length === 1) {
-        expect(feature!.coordinates![0]).to.have.length(expectedCoordinateCount)
+
+    if (feature!.coordinates.length === 1) {
+        expect(feature!.coordinates[0]).to.have.length(expectedCoordinateCount)
     } else {
         expect(feature!.coordinates).to.have.length(expectedCoordinateCount)
     }
+
     expect(feature!.title).to.be.equal(expectedTitle)
     expect(feature!.description).to.equal(expectedDescription)
     expect(feature!.featureType).to.be.equal(expectedFeatureType)
@@ -113,7 +115,7 @@ describe('Validate deserialization of the mf-geoadmin3 viewer kml format', () =>
             kmlData: kml,
         })
         const resolution = 12345
-        const olFeatures: OLFeature[] = parseKml(kmlLayer, WEBMERCATOR, resolution, fakeIconSets)
+        const olFeatures: OLFeature[] = parseKml(kmlLayer, WEBMERCATOR, fakeIconSets, resolution)
         features = olFeatures.map((f) => f.get('editableFeature'))
     })
     describe('icon parsing', () => {