CI: Update to node 20

qgis · Dec 12, 2024 · 903818b · 903818b
1 parent 1a67820
commit 903818b
Show file tree

Hide file tree

Showing 6 changed files with 241 additions and 63 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Use Node.js
         uses: actions/[email protected]
         with:
-          node-version: '18.x'
+          node-version: '20.x'
 
       - name: Install all required dependencies
         run: yarn install

diff --git a/index.html b/index.html
@@ -5,7 +5,7 @@
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimal-ui" />
         <meta name="HandheldFriendly" content="true" />
-        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="mobile-web-app-capable" content="yes" />
         <title>QGIS Web Client 2</title>
         <link rel="stylesheet" type="text/css" href="assets/css/qwc2.css" />
         <link rel="stylesheet" type="text/css" href="assets/css/colorschemes.css" />
@@ -56,7 +56,9 @@
             document.getElementById('splash').style.display = 'none';
         }, false);
         </script>
-        <script type="text/javascript" src="api_examples.js"></script>
+        <!--<script type="text/javascript" src="api_examples.js"></script>-->
+        <!--<script type="text/javascript" src="editcommitplugin.js"></script>-->
+        <script type="text/javascript" src="ccc.js"></script>
     </head>
     <body>
         <div id="splash"><div class="lds-dual-ring"></div></div>

diff --git a/js/appConfig.js b/js/appConfig.js
@@ -31,6 +31,7 @@ import LayerTreePlugin from 'qwc2/plugins/LayerTree';
 import LocateButtonPlugin from 'qwc2/plugins/LocateButton';
 import LoginUserPlugin from 'qwc2/plugins/LoginUser';
 import MapPlugin from 'qwc2/plugins/Map';
+import Map3DPlugin from 'qwc2/plugins/Map3D';
 import MapComparePlugin from 'qwc2/plugins/MapCompare';
 import MapCopyrightPlugin from 'qwc2/plugins/MapCopyright';
 import MapExportPlugin from 'qwc2/plugins/MapExport';
@@ -104,6 +105,7 @@ export default {
             LayerTreePlugin: LayerTreePlugin,
             LocateButtonPlugin: LocateButtonPlugin,
             LoginUserPlugin: LoginUserPlugin,
+            Map3DPlugin: Map3DPlugin,
             MapComparePlugin: MapComparePlugin,
             MapCopyrightPlugin: MapCopyrightPlugin,
             MapExportPlugin: MapExportPlugin,

diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
         "prod": "npm run tsupdate && npm run themesconfig && npm run iconfont && webpack --mode production --progress",
         "start": "npm run tsupdate && npm run themesconfig && npm run iconfont && webpack serve --mode development --progress --host 0.0.0.0 --port 8081",
         "iconfont": "node qwc2/scripts/makeIconkit.js",
-        "themesconfig": "node qwc2/scripts/themesConfig.js",
+        "themesconfig": "node qwc2/scripts/themesConfig.js || :",
         "tsupdate": "node qwc2/scripts/updateTranslations.js",
         "plugindoc": "node qwc2/scripts/gen-plugin-docs.js",
         "build": "npm run prod",

diff --git a/static/api_examples.js b/static/api_examples.js
@@ -57,11 +57,16 @@ function zoomtohb(ev) {
     window.qwc2.zoomToExtent([2682576, 1247916, 2683339, 1248222], "EPSG:2056");
 }
 function drawpoint(ev) {
-    window.qwc2.drawGeometry("Point", "Draw a point", function(result, crs) { console.log(result); console.log(crs); }, {drawMultiple: true});
+    window.qwc2.drawGeometry("Point", "Draw a point", function(result, crs) { console.log(result); console.log(crs); }, {
+        snapping: true,
+        snappingActive: true,
+        drawMultiple: true
+    });
 }
 function drawline(ev) {
     window.qwc2.drawGeometry("LineString", "Draw a line", function(result, crs) { console.log(result); console.log(crs); }, {
         snapping: true,
+        snappingActive: true,
         drawMultiple: true,
         initialFeatures: [{
             type: "Feature",