Merge pull request #194 from gtt-project/ftr/update-dependencies

Ftr/update dependencies

package.json

@@ -20,24 +20,24 @@
   },
   "homepage": "https://github.com/gtt-project/redmine_gtt#readme",
   "dependencies": {
-    "@juggle/resize-observer": "^3.3.1",
-    "@material-design-icons/font": "^0.11.8",
+    "@juggle/resize-observer": "^3.4.0",
+    "@material-design-icons/font": "^0.12.1",
     "geojson": "^0.5.0",
-    "ol": "^6.14.1",
-    "ol-ext": "^3.2.22"
+    "ol": "^6.15.1",
+    "ol-ext": "^3.2.30"
   },
   "devDependencies": {
-    "@types/geojson": "^7946.0.8",
+    "@types/geojson": "^7946.0.10",
     "@types/jquery": "^3.5.14",
     "@types/jqueryui": "^1.12.16",
     "@types/ol-ext": "npm:@siedlerchr/types-ol-ext",
-    "css-loader": "^5.1.1",
-    "sass": "^1.32.8",
-    "sass-loader": "^11.0.1",
-    "style-loader": "^2.0.0",
-    "ts-loader": "^8.0.17",
-    "typescript": "^4.2.3",
-    "webpack": "^5.24.4",
-    "webpack-cli": "^4.5.0"
+    "css-loader": "^6.7.1",
+    "sass": "^1.54.9",
+    "sass-loader": "^13.0.2",
+    "style-loader": "^3.3.1",
+    "ts-loader": "^9.3.1",
+    "typescript": "^4.8.3",
+    "webpack": "^5.74.0",
+    "webpack-cli": "^4.10.0"
   }
 }

src/components/gtt-client.ts

@@ -64,7 +64,7 @@ interface FilterOption {
 
 interface TileLayerSource {
   layer: typeof Tile
-  source: typeof OSM | typeof XYZ
+  source: typeof OSM | typeof XYZ | typeof TileWMS
 }
 
 interface ImageLayerSource {
@@ -174,7 +174,7 @@ export class GttClient {
         if (tileLayerSource) {
           const l = new (tileLayerSource.layer)({
             visible: false,
-            source: new (tileLayerSource.source)(layer.options)
+            source: new (tileLayerSource.source)(layer.options as any)
           })
 
           l.set('lid', layer.id)
@@ -463,7 +463,7 @@ export class GttClient {
     })
     mainbar.addControl(editbar)
 
-    types.forEach((type, idx) => {
+    types.forEach((type: any, idx) => {
       const draw = new Draw({
         type: type,
         source: this.vector.getSource()