Merge pull request #4 from watergis/update-npm-package

updated npm packages and removed mapbox specified code

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: 12.x
+        node-version: 16.x
     - run: npm ci
     - name: build
       run: |

.github/workflows/deploy-ghpages.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: 12.x
+        node-version: 16.x
     - run: npm ci
       env:
         NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/npm-publish.yml

@@ -15,7 +15,7 @@ jobs:
       # Setup .npmrc file to publish to GitHub Packages
       - uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 16.x
           registry-url: https://registry.npmjs.org/
           # Defaults to the user or organization that owns the workflow file
           scope: '@watergis'
@@ -32,7 +32,7 @@ jobs:
       # Setup .npmrc file to publish to GitHub Packages
       - uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 16.x
           registry-url: https://npm.pkg.github.com/
           # Defaults to the user or organization that owns the workflow file
           scope: '@watergis'

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: 12.x
+        node-version: 16.x
     - run: npm ci 
       env:
         CI: true

docs/bundle.js.LICENSE.txt

@@ -0,0 +1 @@
+/*! https://mths.be/punycode v1.3.2 by @mathias */

docs/index.ts

@@ -10,7 +10,7 @@ import '../css/styles.css';
         zoom: 12,
         hash:true,
     });
-    map.addControl(new maplibregl.NavigationControl(), 'top-right');
+    map.addControl(new maplibregl.NavigationControl({}), 'top-right');
 
     map.on('load', function() {
         const targets = {

docs/index2.html

@@ -25,7 +25,7 @@
                 zoom: 12,
                 hash:true,
             });
-            map.addControl(new maplibregl.NavigationControl(), 'top-right');
+            map.addControl(new maplibregl.NavigationControl({}), 'top-right');
             map.on('load', function() {
                 const targets = {
                     'pipeline': 'Pipeline',

lib/legend-control.ts

@@ -1,4 +1,4 @@
-import maplibregl, { accessToken, baseApiUrl, IControl, Map as MaplibreMap } from "maplibre-gl";
+import { ControlPosition, IControl, LayerSpecification, Map as MaplibreMap } from "maplibre-gl";
 import LegendSymbol from '@watergis/legend-symbol';
 import axios from 'axios';
 
@@ -8,7 +8,6 @@ export type LegendOptions = {
     showCheckbox: boolean;
     reverseOrder: boolean;
     onlyRendered: boolean;
-    accesstoken?: string;
     title?: string;
 }
 
@@ -38,7 +37,6 @@ export default class MaplibreLegendControl implements IControl
         showCheckbox: true,
         reverseOrder: true,
         onlyRendered: true,
-        accesstoken: undefined,
         title: undefined,
     };
     private sprite = {
@@ -56,7 +54,7 @@ export default class MaplibreLegendControl implements IControl
       this.onDocumentClick = this.onDocumentClick.bind(this);
     }
 
-    public getDefaultPosition(): string
+    public getDefaultPosition(): ControlPosition
     {
         const defaultPosition = "top-right";
         return defaultPosition;
@@ -84,7 +82,7 @@ export default class MaplibreLegendControl implements IControl
      * @param layer mapboxgl.Layer object
      * @returns HTMLElement | undefined return TD Element
      */
-    private createLayerCheckbox(layer: maplibregl.Layer): HTMLElement | undefined
+    private createLayerCheckbox(layer: LayerSpecification): HTMLElement | undefined
     {
         if (!this.options.showCheckbox) return;
         const this_ = this;
@@ -130,7 +128,7 @@ export default class MaplibreLegendControl implements IControl
      * @param layer mapboxgl.Layer object
      * @returns HTMLElement | undefined return TR Element
      */
-    private getLayerLegend(layer: maplibregl.Layer): HTMLElement | undefined
+    private getLayerLegend(layer: LayerSpecification): HTMLElement | undefined
     {
         const map = this.map;
         const zoom = map?.getZoom();
@@ -357,17 +355,9 @@ export default class MaplibreLegendControl implements IControl
             if (map.loaded()) {
                 const style = map.getStyle();
                 let styleUrl = style.sprite;
-                let strToken = '';
-                if (styleUrl && styleUrl.includes('mapbox://')){
-                    styleUrl = styleUrl
-                    .replace(/mapbox:\/\//g, baseApiUrl)
-                    .replace(/sprites/g,'/styles/v1');
-                    styleUrl = `${styleUrl}/sprite`;
-                    strToken = `?access_token=${this.options.accesstoken || accessToken}`;
-                }
                 const promise = Promise.all([
-                    this.loadImage(`${styleUrl}@2x.png${strToken}`),
-                    this.loadJson(`${styleUrl}.json${strToken}`),
+                    this.loadImage(`${styleUrl}@2x.png`),
+                    this.loadJson(`${styleUrl}.json`),
                 ]);
                 await promise.then(([image, json]) => {this.setSprite(image, json)});
                 this.updateLegendControl();