@vcmap/ui 6.2.0-rc.1 → 6.2.0-rc.2

package/build/build.js

@@ -1,6 +1,9 @@
-import path from 'path';
-import fs from 'fs';
-import { readFile, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { existsSync } from 'node:fs';
+import { readFile, writeFile, cp, readdir, rm, mkdir } from 'node:fs/promises';
+import { exec } from 'node:child_process';
+import { promisify } from 'node:util';
+import { fileURLToPath } from 'node:url';
 import { build } from 'vite';
 import { v4 as uuid } from 'uuid';
 
@@ -16,6 +19,7 @@ import {
   libraries,
 } from './buildHelpers.js';
 
+const execPromise = promisify(exec);
 /**
  * @typedef {Object} LibraryBuildOption
  * @property {string} lib
@@ -55,6 +59,9 @@ function hashLibraries() {
     '@vcmap/core': {
       entry: path.join('lib', 'core.js'),
       rollupOptions: {
+        output: {
+          manualChunks: () => 'core.js', // this is needed, otherwise vitejs will create multiple chunks.
+        },
         plugins: [vcsOl()],
       },
     },
@@ -125,10 +132,10 @@ const distFolder = path.join(process.cwd(), 'dist');
 const assetsFolder = path.join(distFolder, 'assets');
 
 /** Cleaning/recreating Dist Folder */
-if (await fs.existsSync(distFolder)) {
-  await fs.promises.rm(distFolder, { recursive: true });
+if (existsSync(distFolder)) {
+  await rm(distFolder, { recursive: true });
 }
-await fs.promises.mkdir(assetsFolder, { recursive: true });
+await mkdir(assetsFolder, { recursive: true });
 
 /**
  * Prepare and Copy Public folder to dist Folder. This Process will also hash the static files using a MD5 File hash.
@@ -196,7 +203,7 @@ for await (const filePath of getFilesInDirectory(publicAssetsFolder)) {
 }
 
 for await (const [originalFilePath, newFilePath] of filesToCopy) {
-  await fs.promises.cp(originalFilePath, newFilePath);
+  await cp(originalFilePath, newFilePath);
 }
 
 console.log('Building app');
@@ -215,6 +222,9 @@ const match = indexHTMLContent.match(scriptRegex);
 if (match && match[1]) {
   let scriptContent = match[1].trim();
   scriptContent = scriptContent.replace(/@vcmap\/ui/, './ui.js');
+  scriptContent = `${scriptContent}
+  window.vcs.workerBase = './assets/core-workers/';
+  `;
   await writeFile(path.join(assetsFolder, 'start.js'), scriptContent, {
     encoding: 'utf8',
   });
@@ -312,6 +322,41 @@ await Promise.all(
     await build(libraryEntryConfig);
   }),
 );
+
+/**
+ * copy and hash the core workers
+ */
+console.log('Hashing core workers');
+async function hashWorkers() {
+  const coreFileUrl = await import.meta.resolve('@vcmap/core');
+  const corePath = path.join(path.dirname(fileURLToPath(coreFileUrl)), '..');
+  const coreWorkerDirectory = path.join(corePath, 'dist', 'src', 'workers');
+  if (!existsSync(coreWorkerDirectory)) {
+    console.log('Found unbuilt core workers, building them');
+    await execPromise('npm run build', { cwd: corePath });
+  }
+  const workers = await readdir(coreWorkerDirectory);
+  await Promise.all(
+    workers.map(async (worker) => {
+      if (worker.endsWith('.js')) {
+        const workerPath = path.join(coreWorkerDirectory, worker);
+        const hash = uuid().substring(0, 8);
+        const newWorkerPath = path.join(
+          assetsFolder,
+          'core-workers',
+          `${worker}-${hash}.js`,
+        );
+        await cp(workerPath, newWorkerPath);
+        await writeFile(
+          path.join(assetsFolder, 'core-workers', worker),
+          `import './${worker}-${hash}.js';`,
+        );
+      }
+    }),
+  );
+}
+await hashWorkers();
+
 /**
  * Copy Cesium Static Assets to the dist/assets folder
  */

package/config/dev.config.json

@@ -4,6 +4,10 @@
   "description": "module containing dev configs and examples",
   "startingViewpointName": "potsdamer_platz",
   "featureInfo": [
+    {
+      "type": "IframeWmsFeatureInfoView",
+      "name": "testIframeWMS"
+    },
     {
       "type": "BalloonFeatureInfoView",
       "name": "genericBalloon",
@@ -471,6 +475,21 @@
         ]
       }
     },
+    {
+      "name": "testWmsHtmlFeatureInfo",
+      "type": "WMSLayer",
+      "url": "https://geoservices.bayern.de/od/wms/atkis/v1/freizeitwege",
+      "activeOnStartup": false,
+      "layers": "by_fzw_bfr",
+      "parameters": "TRANSPARENT=TRUE&format=image/png&transparent=true",
+      "featureInfo": { "responseType": "text/html" },
+      "tilingSchema": "geographic",
+      "zIndex": 13,
+      "properties": {
+        "featureInfo": "testIframeWMS",
+        "title": "Test WMS text/html FeatureInfo"
+      }
+    },
     {
       "name": "wmsStadtstruktur",
       "type": "WMSLayer",
@@ -827,6 +846,11 @@
       "type": "LayerContentTreeItem",
       "layerName": "FlatGeobufLayer"
     },
+    {
+      "name": "testWmsHtmlFeatureInfo",
+      "type": "LayerContentTreeItem",
+      "layerName": "testWmsHtmlFeatureInfo"
+    },
     {
       "name": "building.myTest",
       "type": "ContentTreeItem",
@@ -867,6 +891,10 @@
       "name": "hideObliqueFooter",
       "value": true
     },
+    {
+      "name": "autoCloseLegend",
+      "value": true
+    },
     {
       "name": "appTitle",
       "value": "DEV"

package/config/pano.config.json

@@ -0,0 +1,420 @@
+{
+  "_id": "27f8d0f3-73de-4815-8473-1bb5f994d974",
+  "name": "Panoramademo_LHH",
+  "contentTree": [
+    {
+      "name": "pano",
+      "type": "NodeContentTreeItem",
+      "title": "Panorama Data",
+      "initOpen": true,
+      "weight": 1
+    },
+    {
+      "name": "pano.dataset1",
+      "type": "LayerContentTreeItem",
+      "layerName": "HannoverV13"
+    },
+    {
+      "name": "pano.dataset2",
+      "type": "LayerContentTreeItem",
+      "layerName": "HannoverV14"
+    },
+    {
+      "type": "LayerContentTreeItem",
+      "name": "Stadtmodell.Gebauede_LLH",
+      "layerName": "Gebauede_LLH"
+    },
+    {
+      "type": "LayerContentTreeItem",
+      "name": "Stadtmodell.Kunst_LHH",
+      "layerName": "Kunst_LHH"
+    },
+    {
+      "type": "LayerContentTreeItem",
+      "name": "Stadtmodell.Kugel Beaume",
+      "layerName": "Kugel Beaume"
+    },
+    {
+      "type": "LayerContentTreeItem",
+      "name": "Stadtmodell.Gelände",
+      "layerName": "Gelände"
+    },
+    {
+      "type": "LayerContentTreeItem",
+      "name": "Scan.Pointcloud_Data",
+      "layerName": "Pointcloud_Data"
+    },
+    {
+      "type": "NodeContentTreeItem",
+      "name": "Scan",
+      "title": "Befahrungsdaten",
+      "initOpen": true
+    },
+    {
+      "type": "NodeContentTreeItem",
+      "name": "Stadtmodell",
+      "title": "3D Stadtmodell",
+      "initOpen": true
+    },
+    {
+      "type": "LayerContentTreeItem",
+      "name": "Basiskarten.Terrain_Image",
+      "layerName": "Terrain_Image"
+    },
+    {
+      "type": "LayerContentTreeItem",
+      "name": "Basiskarten.OpenStreetMapLayer",
+      "layerName": "OpenStreetMapLayer"
+    },
+    {
+      "type": "NodeContentTreeItem",
+      "name": "Basiskarten",
+      "title": "Basiskarten",
+      "initOpen": true
+    }
+  ],
+  "featureInfo": [
+    {
+      "type": "BalloonFeatureInfoView",
+      "name": "Building_info",
+      "attributeKeys": ["Adresse", "gml_id"]
+    },
+    {
+      "type": "BalloonFeatureInfoView",
+      "name": "Kugel Baum",
+      "attributeKeys": ["baumhoehe"]
+    }
+  ],
+  "flights": [],
+  "hiddenObjects": [],
+  "i18n": [],
+  "layers": [
+    {
+      "type": "TerrainLayer",
+      "name": "Gelände",
+      "properties": {
+        "attributions": {
+          "provider": "LH Hannover - Geoinformation",
+          "url": "",
+          "year": 2025
+        },
+        "title": "Geländemodell"
+      },
+      "activeOnStartup": true,
+      "url": "https://demo.virtualcitymap.de/datasource-data/c65244e3-0860-47f3-b382-57a7d33a2581/",
+      "extent": {
+        "coordinates": [
+          9.73114013671875, 52.36289978027344, 9.744873046875, 52.37251281738281
+        ],
+        "projection": {
+          "type": "Projection",
+          "epsg": "EPSG:4326"
+        },
+        "type": "Extent"
+      },
+      "datasourceId": "c65244e3-0860-47f3-b382-57a7d33a2581",
+      "zIndex": 0
+    },
+    {
+      "type": "OpenStreetMapLayer",
+      "name": "OpenStreetMapLayer",
+      "properties": {
+        "attributions": {
+          "provider": "OpenStreetMap contributors",
+          "url": "http://www.openstreetmap.org/",
+          "year": "2025"
+        },
+        "showInOverviewMap": true,
+        "title": "Open Street Map"
+      },
+      "activeOnStartup": true,
+      "zIndex": 0
+    },
+    {
+      "type": "TMSLayer",
+      "name": "Terrain_Image",
+      "properties": {
+        "attributions": {
+          "provider": "LH Hannover - Geoinformation",
+          "url": "",
+          "year": 2025
+        },
+        "title": "Orthofoto"
+      },
+      "activeOnStartup": true,
+      "url": "https://demo.virtualcitymap.de/datasource-data/20e0b107-17e7-46d6-876f-07e3c54fd107/",
+      "extent": {
+        "coordinates": [
+          9.73135348054305, 52.36323195355867, 9.74471966259939,
+          52.37230382014246
+        ],
+        "projection": {
+          "type": "Projection",
+          "epsg": "EPSG:4326"
+        },
+        "type": "Extent"
+      },
+      "datasourceId": "20e0b107-17e7-46d6-876f-07e3c54fd107",
+      "minLevel": 14,
+      "format": "png",
+      "zIndex": 0
+    },
+    {
+      "type": "CesiumTilesetLayer",
+      "name": "Kunst_LHH",
+      "properties": {
+        "defaultViewpoint": "Kunst",
+        "attributions": {
+          "provider": "LH Hannover - Geoinformation",
+          "url": "",
+          "year": 2025
+        },
+        "title": "Kunstobjekte"
+      },
+      "activeOnStartup": true,
+      "url": "https://demo.virtualcitymap.de/datasource-data/88403a53-e3c8-4eb9-b510-bc982ba03bc9/tileset.json",
+      "extent": {
+        "coordinates": [
+          9.733886703948508, 52.36633299737816, 9.739379879513546,
+          52.371826115647416
+        ],
+        "projection": {
+          "type": "Projection",
+          "epsg": "EPSG:4326"
+        },
+        "type": "Extent"
+      },
+      "datasourceId": "88403a53-e3c8-4eb9-b510-bc982ba03bc9",
+      "tilesetOptions": {
+        "useSRGBColorFactors": true
+      },
+      "zIndex": 0
+    },
+    {
+      "type": "CesiumTilesetLayer",
+      "name": "Gebauede_LLH",
+      "properties": {
+        "featureInfo": "Building_info",
+        "attributions": {
+          "provider": "LH Hannover - Geoinformation",
+          "url": "",
+          "year": 2025
+        },
+        "title": "Gebäude"
+      },
+      "activeOnStartup": true,
+      "url": "https://demo.virtualcitymap.de/datasource-data/e1976b1d-6bb6-48a1-96ea-425384666138/tileset.json",
+      "extent": {
+        "coordinates": [
+          9.72839352838347, 52.36083982181312, 9.75036617334784,
+          52.37731929121245
+        ],
+        "projection": {
+          "type": "Projection",
+          "epsg": "EPSG:4326"
+        },
+        "type": "Extent"
+      },
+      "datasourceId": "e1976b1d-6bb6-48a1-96ea-425384666138",
+      "tilesetOptions": {
+        "useSRGBColorFactors": true
+      },
+      "zIndex": 0
+    },
+    {
+      "type": "CesiumTilesetLayer",
+      "name": "Kugel Beaume",
+      "properties": {
+        "featureInfo": "Kugel Baum",
+        "title": "Bäume"
+      },
+      "activeOnStartup": true,
+      "url": "https://demo.virtualcitymap.de/datasource-data/c5cd63b7-29de-40fd-a04a-a29696fc965b/tileset.json",
+      "extent": {
+        "coordinates": [
+          9.72839352838347, 52.36083982181312, 9.744872997782803,
+          52.37731929121245
+        ],
+        "projection": {
+          "type": "Projection",
+          "epsg": "EPSG:4326"
+        },
+        "type": "Extent"
+      },
+      "datasourceId": "c5cd63b7-29de-40fd-a04a-a29696fc965b",
+      "tilesetOptions": {
+        "useSRGBColorFactors": true
+      },
+      "zIndex": 0
+    },
+    {
+      "type": "PointCloudLayer",
+      "name": "Pointcloud_Data",
+      "properties": {
+        "title": "Laserscan-Punktwolke",
+        "attributions": {
+          "provider": "LH Hannover (Testdaten zu Entwicklungszwecken)",
+          "url": "",
+          "year": 2025
+        }
+      },
+      "url": "https://demo.virtualcitymap.de/datasource-data/777237e0-dc0a-4504-a844-afb64f9212d2/tileset.json",
+      "extent": {
+        "coordinates": [
+          9.732694422208846, 52.36247033672282, 9.752475282831645,
+          52.37744115375963
+        ],
+        "projection": {
+          "type": "Projection",
+          "epsg": "EPSG:4326"
+        },
+        "type": "Extent"
+      },
+      "datasourceId": "777237e0-dc0a-4504-a844-afb64f9212d2",
+      "pointSize": 2,
+      "zIndex": 0
+    },
+    {
+      "type": "PanoramaDatasetLayer",
+      "name": "HannoverV14",
+      "activeOnStartup": true,
+      "url": "https://demo.virtualcitymap.de/panorama/data/v14/images.fgb",
+      "cameraOffset": -2.1,
+      "properties": {
+        "title": "Hannover Daten V14"
+      }
+    },
+    {
+      "type": "PanoramaDatasetLayer",
+      "name": "HannoverV13",
+      "activeOnStartup": false,
+      "url": "https://demo.virtualcitymap.de/panorama/data/v13/images.fgb",
+      "cameraOffset": -2.1,
+      "properties": {
+        "title": "Hannover Daten V13"
+      }
+    }
+  ],
+  "maps": [
+    {
+      "type": "OpenlayersMap",
+      "name": "OpenlayersMap"
+    },
+    {
+      "type": "CesiumMap",
+      "name": "CesiumMap"
+    },
+    {
+      "type": "PanoramaMap",
+      "name": "PanoramaMap"
+    }
+  ],
+  "obliqueCollections": [],
+  "plugins": [
+    {
+      "name": "@vcmap-show-case/panorama-inspector",
+      "entry": "plugins/@vcmap-show-case/panorama-inspector/index.js"
+    },
+    {
+      "name": "@vcmap/create-link",
+      "entry": "plugins/@vcmap/create-link/index.js"
+    },
+    {
+      "city": null,
+      "state": null,
+      "name": "@vcmap/search-nominatim",
+      "entry": "plugins/@vcmap/search-nominatim/index.js"
+    },
+    {
+      "name": "@vcmap/print",
+      "entry": "plugins/@vcmap/print/index.js"
+    },
+    {
+      "name": "@vcmap/shadow",
+      "entry": "plugins/@vcmap/shadow/index.js"
+    },
+    {
+      "name": "@vcmap/measurement",
+      "entry": "plugins/@vcmap/measurement/index.js"
+    },
+    {
+      "name": "@vcmap/walk",
+      "entry": "plugins/@vcmap/walk/index.js"
+    },
+    {
+      "name": "@vcmap/search-coordinate",
+      "entry": "plugins/@vcmap/search-coordinate/index.js",
+      "searchProjections": [
+        {
+          "epsg": "EPSG:25832",
+          "proj4": "+proj=utm +zone=32 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs +type=crs"
+        }
+      ]
+    },
+    {
+      "name": "@vcmap/draw",
+      "entry": "plugins/@vcmap/draw/index.js"
+    },
+    {
+      "name": "@vcmap/pointcloud-settings",
+      "entry": "plugins/@vcmap/pointcloud-settings/index.js"
+    }
+  ],
+  "startingMapName": "CesiumMap",
+  "styles": [
+    {
+      "type": "DeclarativeStyleItem",
+      "name": "intensity",
+      "declarativeStyle": {
+        "show": "true",
+        "color": "rgb(${Intensity}/257, ${Intensity}/257, ${Intensity}/257)",
+        "pointSize": "2"
+      }
+    }
+  ],
+  "uiConfig": [
+    {
+      "name": "appTitle",
+      "value": "DEMO Panorama"
+    },
+    {
+      "name": "headerTitle",
+      "value": "Demo Panorama"
+    }
+  ],
+  "vectorClusterGroups": [],
+  "viewpoints": [
+    {
+      "type": "Viewpoint",
+      "name": "Kunst",
+      "distance": 37.1721884629748,
+      "cameraPosition": [
+        9.736114904098732, 52.36848977267614, 60.20617058926811
+      ],
+      "groundPosition": [
+        9.736517443940901, 52.36827002205658, 54.54373608825821
+      ],
+      "heading": 131.72771325898321,
+      "pitch": -8.762135964144017,
+      "roll": 0.00001959494173351084,
+      "animate": true
+    },
+    {
+      "type": "Viewpoint",
+      "name": "Start Point",
+      "distance": 489.3150364707677,
+      "cameraPosition": [
+        9.743161660772566, 52.362903159886756, 323.7221569463293
+      ],
+      "groundPosition": [
+        9.73969022302837, 52.36589028700907, 53.504530065585534
+      ],
+      "heading": 324.5723838829471,
+      "pitch": -33.52240613812991,
+      "roll": 0.0009117948138611088,
+      "animate": false
+    }
+  ],
+  "startingViewpointName": "Start Point",
+  "description": "Demo"
+}

package/config/projects.config.json

@@ -23,6 +23,11 @@
           "name": "VC Map Demo",
           "description": "VC Map Demo www.virtualcitymap.de",
           "modules": ["config/www.config.json"]
+        },
+        {
+          "name": "Hannover Panorama Map",
+          "description": "Hannover Panorama Map",
+          "modules": ["config/pano.config.json"]
         }
       ],
       "modules": [

package/dist/assets/cesium/Workers/{chunk-P6TRGU3S.js → chunk-2PFJ45KC.js}

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 1.121.2
+ * Version 1.121.3
  *
  * Copyright 2011-2022 Cesium Contributors
  *
@@ -25,7 +25,7 @@
 
 import {
   defined_default
-} from "./chunk-YCDZX5LS.js";
+} from "./chunk-LWN2B3KW.js";
 
 // packages/engine/Source/Core/DeveloperError.js
 function DeveloperError(message) {

package/dist/assets/cesium/Workers/{chunk-7ZZ5LMZY.js → chunk-35ALNMG5.js}

@@ -1,7 +1,7 @@
 /**
  * @license
  * Cesium - https://github.com/CesiumGS/cesium
- * Version 1.121.2
+ * Version 1.121.3
  *
  * Copyright 2011-2022 Cesium Contributors
  *
@@ -25,56 +25,56 @@
 
 import {
   AttributeCompression_default
-} from "./chunk-LJ2JQHJT.js";
+} from "./chunk-ZXOK77EW.js";
 import {
   EncodedCartesian3_default
-} from "./chunk-NGZJIN5Z.js";
+} from "./chunk-ADDGROZ6.js";
 import {
   IntersectionTests_default
-} from "./chunk-QQOZO7KO.js";
+} from "./chunk-JX4A2BCF.js";
 import {
   Plane_default
-} from "./chunk-EDLRS3AW.js";
+} from "./chunk-RQ4F6YFU.js";
 import {
   IndexDatatype_default
-} from "./chunk-C4WPMOKT.js";
+} from "./chunk-BABDQOWA.js";
 import {
   GeometryAttribute_default,
   GeometryType_default,
   Geometry_default,
   PrimitiveType_default
-} from "./chunk-JXVLNVXC.js";
+} from "./chunk-CMCR2ZK4.js";
 import {
   BoundingSphere_default,
   GeographicProjection_default,
   Intersect_default
-} from "./chunk-KHZNBFOH.js";
+} from "./chunk-KFHZFU5O.js";
 import {
   Cartesian4_default,
   Matrix4_default
-} from "./chunk-6SQMLVGV.js";
+} from "./chunk-X3EPFVG3.js";
 import {
   ComponentDatatype_default
-} from "./chunk-XIUSRWL6.js";
+} from "./chunk-K6PDUSH6.js";
 import {
   Cartesian2_default,
   Cartesian3_default,
   Cartographic_default,
   Matrix3_default
-} from "./chunk-FFLMY4TE.js";
+} from "./chunk-YDEBBUNQ.js";
 import {
   Math_default
-} from "./chunk-WGDFYAGC.js";
+} from "./chunk-6RAEC3AW.js";
 import {
   defaultValue_default
-} from "./chunk-U5HSOKPQ.js";
+} from "./chunk-KYGXRFA6.js";
 import {
   Check_default,
   DeveloperError_default
-} from "./chunk-P6TRGU3S.js";
+} from "./chunk-2PFJ45KC.js";
 import {
   defined_default
-} from "./chunk-YCDZX5LS.js";
+} from "./chunk-LWN2B3KW.js";
 
 // packages/engine/Source/Core/barycentricCoordinates.js
 var scratchCartesian1 = new Cartesian3_default();