@vcmap/ui 5.0.0-rc.23 → 5.0.0-rc.24

package/build/buildHelpers.js

@@ -10,7 +10,11 @@ import { fileURLToPath } from 'url';
  * @returns {string}
  */
 export function getProjectPath(...pathSegments) {
-  return path.join(path.dirname(fileURLToPath(import.meta.url)), '..', ...pathSegments);
+  return path.join(
+    path.dirname(fileURLToPath(import.meta.url)),
+    '..',
+    ...pathSegments,
+  );
 }
 
 /**
@@ -27,19 +31,23 @@ export function getPluginDirectory() {
  */
 export async function getPluginNames() {
   const pluginsDir = getPluginDirectory();
-  const packageJsonContent = await fs.promises.readFile(path.join(pluginsDir, 'package.json'));
-  const {
-    dependencies: plugins,
-    optionalDependencies: internalPlugins,
-  } = JSON.parse(packageJsonContent.toString());
+  const packageJsonContent = await fs.promises.readFile(
+    path.join(pluginsDir, 'package.json'),
+  );
+  const { dependencies: plugins, optionalDependencies: internalPlugins } =
+    JSON.parse(packageJsonContent.toString());
   const pluginNames = plugins ? Object.keys(plugins) : [];
-  if (internalPlugins) { // internal plugins are mapped as optional dependencies only add them, if they exist
-    Object.keys(internalPlugins)
-      .forEach((internalPlugin) => {
-        if (fs.existsSync(path.join(pluginsDir, 'node_modules', ...internalPlugin.split('/')))) {
-          pluginNames.push(internalPlugin);
-        }
-      });
+  if (internalPlugins) {
+    // internal plugins are mapped as optional dependencies only add them, if they exist
+    Object.keys(internalPlugins).forEach((internalPlugin) => {
+      if (
+        fs.existsSync(
+          path.join(pluginsDir, 'node_modules', ...internalPlugin.split('/')),
+        )
+      ) {
+        pluginNames.push(internalPlugin);
+      }
+    });
   }
   return pluginNames;
 }
@@ -49,9 +57,12 @@ export async function getPluginNames() {
  */
 export async function getInlinePlugins() {
   const pluginsDirectory = getPluginDirectory();
-  const dirs = await fs.promises.readdir(pluginsDirectory, { withFileTypes: true });
-  const topLevelDirs = dirs
-    .filter(d => d.isDirectory() && d.name !== 'node_modules');
+  const dirs = await fs.promises.readdir(pluginsDirectory, {
+    withFileTypes: true,
+  });
+  const topLevelDirs = dirs.filter(
+    (d) => d.isDirectory() && d.name !== 'node_modules',
+  );
   const plugins = [];
   const scopes = [];
   topLevelDirs.forEach((d) => {
@@ -62,14 +73,19 @@ export async function getInlinePlugins() {
     }
   });
 
-  await Promise.all(scopes.map(async (scope) => {
-    const scopeDirs = await fs.promises.readdir(path.join(pluginsDirectory, scope), { withFileTypes: true });
-    scopeDirs
-      .filter(d => d.isDirectory() && d.name !== 'node_modules')
-      .forEach((d) => {
-        plugins.push(`${scope}/${d.name}`);
-      });
-  }));
+  await Promise.all(
+    scopes.map(async (scope) => {
+      const scopeDirs = await fs.promises.readdir(
+        path.join(pluginsDirectory, scope),
+        { withFileTypes: true },
+      );
+      scopeDirs
+        .filter((d) => d.isDirectory() && d.name !== 'node_modules')
+        .forEach((d) => {
+          plugins.push(`${scope}/${d.name}`);
+        });
+    }),
+  );
 
   return plugins;
 }
@@ -84,7 +100,13 @@ export async function getInlinePlugins() {
  * @param {boolean} [base64Css = false] inline css. must be true for plugins
  * @returns {Promise<void>}
  */
-export async function buildLibrary(libraryConfig, outputFolder, library, hash = '', base64Css = false) {
+export async function buildLibrary(
+  libraryConfig,
+  outputFolder,
+  library,
+  hash = '',
+  base64Css = false,
+) {
   // Base64 contains the characters '+', '/', and '=', which have a reserved meaning in URLs.
   // Base64url solves this by replacing '+' with '-' and '/' with '_'.
   // See https://stackoverflow.com/a/55389212
@@ -110,16 +132,34 @@ function loadCss(href) {
     let css = false;
     if (output[1] && output[1].type === 'asset') {
       if (base64Css) {
-        css = `data:text/css;base64,${Buffer.from(output[1].source).toString('base64url')}`;
+        css = `data:text/css;base64,${Buffer.from(output[1].source).toString(
+          'base64url',
+        )}`;
       } else {
-        await fs.promises.writeFile(path.join(process.cwd(), 'dist', outputFolder, `${library}${addedHash}.css`), output[1].source);
+        await fs.promises.writeFile(
+          path.join(
+            process.cwd(),
+            'dist',
+            outputFolder,
+            `${library}${addedHash}.css`,
+          ),
+          output[1].source,
+        );
         css = `./${outputFolder}/${library}${addedHash}.css`;
       }
     }
     if (output[0] && output[0].type === 'chunk') {
       let code = css ? `${cssInjectorCode} await loadCss('${css}');` : '';
       code += output[0].code;
-      await fs.promises.writeFile(path.join(process.cwd(), 'dist', outputFolder, `${library}${addedHash}.js`), code);
+      await fs.promises.writeFile(
+        path.join(
+          process.cwd(),
+          'dist',
+          outputFolder,
+          `${library}${addedHash}.js`,
+        ),
+        code,
+      );
     }
   };
 
@@ -132,7 +172,9 @@ function loadCss(href) {
     libraryBuilds.prependListener('event', async (event) => {
       // debounce
       if (event.code === 'BUNDLE_END') {
-        const res = await event.result.generate(libraryConfig?.build?.rollupOptions?.output ?? {});
+        const res = await event.result.generate(
+          libraryConfig?.build?.rollupOptions?.output ?? {},
+        );
         await write(res.output);
       }
     });
@@ -172,7 +214,9 @@ export async function buildPluginsForPreview(baseConfig = {}, minify = true) {
       const libraryPath = path.join('dist', 'assets', `${value}.js`);
       const pluginPath = path.join(process.cwd(), `dist/plugins/${plugin}/`);
       const relativePath = path.relative(pluginPath, libraryPath);
-      relativePluginPaths[key] = relativePath.split(path.sep).join(path.posix.sep);
+      relativePluginPaths[key] = relativePath
+        .split(path.sep)
+        .join(path.posix.sep);
     });
 
     const pluginConfig = {
@@ -204,27 +248,52 @@ export async function buildPluginsForPreview(baseConfig = {}, minify = true) {
     await buildLibrary(pluginConfig, `plugins/${plugin}`, 'index', '', true);
   });
 
-  promises.push(...dependentPlugins.map(async (pluginName) => {
-    let scope = '';
-    let name = pluginName;
-    if (pluginName.startsWith('@')) {
-      [scope, name] = pluginName.split('/');
-    }
-
-    await fs.promises.cp(
-      path.join(pluginsDirectory, 'node_modules', scope, name, 'dist'),
-      path.join(process.cwd(), 'dist', 'plugins', scope, name),
-      { recursive: true, force: true },
-    );
+  promises.push(
+    ...dependentPlugins.map(async (pluginName) => {
+      let scope = '';
+      let name = pluginName;
+      if (pluginName.startsWith('@')) {
+        [scope, name] = pluginName.split('/');
+      }
 
-    // must be copied one after the other to avoid race conditions
-    if (fs.existsSync(path.join(pluginsDirectory, 'node_modules', scope, name, 'plugin-assets'))) {
       await fs.promises.cp(
-        path.join(pluginsDirectory, 'node_modules', scope, name, 'plugin-assets'),
-        path.join(process.cwd(), 'dist', 'plugins', scope, name, 'plugin-assets'),
+        path.join(pluginsDirectory, 'node_modules', scope, name, 'dist'),
+        path.join(process.cwd(), 'dist', 'plugins', scope, name),
         { recursive: true, force: true },
       );
-    }
-  }));
+
+      // must be copied one after the other to avoid race conditions
+      if (
+        fs.existsSync(
+          path.join(
+            pluginsDirectory,
+            'node_modules',
+            scope,
+            name,
+            'plugin-assets',
+          ),
+        )
+      ) {
+        await fs.promises.cp(
+          path.join(
+            pluginsDirectory,
+            'node_modules',
+            scope,
+            name,
+            'plugin-assets',
+          ),
+          path.join(
+            process.cwd(),
+            'dist',
+            'plugins',
+            scope,
+            name,
+            'plugin-assets',
+          ),
+          { recursive: true, force: true },
+        );
+      }
+    }),
+  );
   await Promise.all(promises);
 }

package/build/buildPreview.js

@@ -5,10 +5,13 @@ import { buildPluginsForPreview, getProjectPath } from './buildHelpers.js';
 
 console.log('Building Plugins');
 await Promise.all([
-  buildPluginsForPreview({
-    configFile: './build/commonViteConfig.js',
-    plugins: [vcsOl()],
-  }, true),
+  buildPluginsForPreview(
+    {
+      configFile: './build/commonViteConfig.js',
+      plugins: [vcsOl()],
+    },
+    true,
+  ),
   fs.promises.cp(
     getProjectPath('app.config.json'),
     path.join(process.cwd(), 'dist', 'app.config.json'),

package/build/commonViteConfig.js

@@ -17,9 +17,7 @@ const configMain = defineConfig({
   define: {
     'process.env.NODE_ENV': '"development"',
   },
-  plugins: [
-    createVuePlugin(),
-  ],
+  plugins: [createVuePlugin()],
   css: {
     preprocessorOptions: {
       sass: {

package/build/determineHost.js

@@ -7,8 +7,14 @@ import os from 'os';
  */
 export function determineHostIpFromInterfaces() {
   const interFace = Object.values(os.networkInterfaces())
-    .flatMap(nInterface => nInterface ?? [])
-    .find(detail => detail && detail.address && !detail.internal && detail.family === 'IPv4');
+    .flatMap((nInterface) => nInterface ?? [])
+    .find(
+      (detail) =>
+        detail &&
+        detail.address &&
+        !detail.internal &&
+        detail.family === 'IPv4',
+    );
   return interFace?.address ?? null;
 }
 
@@ -18,7 +24,11 @@ export function determineHostIpFromInterfaces() {
  * @param {string} [defaultHost='127.0.0.1']
  * @returns {string}
  */
-export function determineHostFromArgv(defaultPort = 8080, defaultHttps = false, defaultHost = '127.0.0.1') {
+export function determineHostFromArgv(
+  defaultPort = 8080,
+  defaultHttps = false,
+  defaultHost = '127.0.0.1',
+) {
   let port = defaultPort;
   const portIndex = process.argv.indexOf('--port');
   if (portIndex > -1 && process.argv.length > portIndex + 1) {
@@ -36,7 +46,10 @@ export function determineHostFromArgv(defaultPort = 8080, defaultHttps = false,
   const hostIndex = process.argv.indexOf('--host');
   let host = defaultHost;
   if (hostIndex > -1) {
-    if (process.argv.length > hostIndex + 1 && !process.argv[hostIndex + 1].startsWith('-')) {
+    if (
+      process.argv.length > hostIndex + 1 &&
+      !process.argv[hostIndex + 1].startsWith('-')
+    ) {
       host = process.argv[hostIndex + 1];
     } else {
       host = determineHostIpFromInterfaces() ?? host;

package/build/generateOLLib.js

@@ -19,13 +19,13 @@ function parseOutput(output) {
   try {
     info = JSON.parse(String(output));
   } catch (err) {
-    throw new Error(`Failed to parse output as JSON: ${ output}`);
+    throw new Error(`Failed to parse output as JSON: ${output}`);
   }
   if (!Array.isArray(info.symbols)) {
-    throw new Error(`Expected symbols array: ${ output}`);
+    throw new Error(`Expected symbols array: ${output}`);
   }
   if (!Array.isArray(info.defines)) {
-    throw new Error(`Expected defines array: ${ output}`);
+    throw new Error(`Expected defines array: ${output}`);
   }
 
   return info;
@@ -41,9 +41,7 @@ function getBinaryPath(binaryName) {
 
   const expectedPaths = [
     path.join('node_modules', '.bin', binary),
-    path.resolve(
-      path.join('node_modules', 'jsdoc', '.bin', binary),
-    ),
+    path.resolve(path.join('node_modules', 'jsdoc', '.bin', binary)),
   ];
 
   for (let i = 0; i < expectedPaths.length; i++) {
@@ -54,7 +52,7 @@ function getBinaryPath(binaryName) {
   }
 
   throw Error(
-    `JsDoc binary was not found in any of the expected paths: ${ expectedPaths}`,
+    `JsDoc binary was not found in any of the expected paths: ${expectedPaths}`,
   );
 }
 
@@ -64,11 +62,7 @@ function getBinaryPath(binaryName) {
  *     If provided with an empty list of paths, resolves with null.
  */
 function spawnJSDoc() {
-  const jsdocConfig = path.join(
-    'build',
-    'info',
-    'conf.json',
-  );
+  const jsdocConfig = path.join('build', 'info', 'conf.json');
 
   return new Promise((resolve, reject) => {
     let output = '';
@@ -108,7 +102,7 @@ function spawnJSDoc() {
 async function getSymbols() {
   const info = await spawnJSDoc();
   return info.symbols.filter(
-    symbol => symbol.kind !== 'member' || symbol.exports,
+    (symbol) => symbol.kind !== 'member' || symbol.exports,
   );
 }
 
@@ -131,7 +125,10 @@ function getImport(symbol, member) {
     from = defaultExport[0].replace(/^module:/, '');
     importName = 'default';
     exportName = from.replace(/[./]+/g, '$');
-  } else if (namedExport.length > 1 && (member || (symbol.exports && symbol.exports !== 'default'))) {
+  } else if (
+    namedExport.length > 1 &&
+    (member || (symbol.exports && symbol.exports !== 'default'))
+  ) {
     from = namedExport[0].replace(/^module:/, '');
     importName = member || symbol.exports;
     exportName = `${from.replace(/[./]+/g, '$')}$${importName}`;
@@ -178,8 +175,8 @@ function generateExports(symbols) {
     }
   });
   const source = Object.keys(imports)
-    .map(line => line.replace('from \'ol/', 'from \'ol/'))
-    .map(line => line.replace('from \'ol\'', 'from \'ol/index.js\''))
+    .map((line) => line.replace("from 'ol/", "from 'ol/"))
+    .map((line) => line.replace("from 'ol'", "from 'ol/index.js'"))
     .join('\n');
   return `${source}\nexport * from 'ol/index.js';\n`;
 }

package/build/getPluginProxies.js

@@ -8,7 +8,10 @@ import { getPluginDirectory, getPluginNames } from './buildHelpers.js';
  * @param {boolean} [production=false]
  * @returns {Promise<Record<string, string | import("vite").ProxyOptions>>}
  */
-export default async function getPluginProxies(target = 'http://localhost:8080', production = false) {
+export default async function getPluginProxies(
+  target = 'http://localhost:8080',
+  production = false,
+) {
   const root = process.cwd();
   const pluginsDir = getPluginDirectory();
   const plugins = await getPluginNames();
@@ -20,11 +23,21 @@ export default async function getPluginProxies(target = 'http://localhost:8080',
       rewrite: (route) => {
         const rest = route.replace(new RegExp(`^/plugins/${plugin}/`), '');
         const file = rest || 'index.js';
-        const pluginDir = path.posix.join(path.relative(root, pluginsDir), 'node_modules', plugin);
+        const pluginDir = path.posix.join(
+          path.relative(root, pluginsDir),
+          'node_modules',
+          plugin,
+        );
         if (/plugin-assets\//.test(file)) {
           return path.posix.join(pluginDir, file);
         }
-        return path.posix.join(path.relative(root, pluginsDir), 'node_modules', plugin, production ? 'dist' : 'src', file);
+        return path.posix.join(
+          path.relative(root, pluginsDir),
+          'node_modules',
+          plugin,
+          production ? 'dist' : 'src',
+          file,
+        );
       },
     };
   });

package/build/info/conf.json

@@ -1,23 +1,23 @@
 {
-    "opts": {
-        "recurse": true,
-        "template": "build/info"
-    },
-    "tags": {
-        "allowUnknownTags": true
-    },
-    "source": {
-        "includePattern": "\\.js$",
-        "exclude": ["dist"]
-    },
-    "plugins": [
-        "jsdoc-plugin-intersection",
-        "jsdoc-plugin-typescript",
-        "build/info/api-plugin",
-        "build/info/define-plugin",
-        "build/info/virtual-plugin"
-    ],
-    "typescript": {
-      "moduleRoot": "node_modules/ol"
-    }
+  "opts": {
+    "recurse": true,
+    "template": "build/info"
+  },
+  "tags": {
+    "allowUnknownTags": true
+  },
+  "source": {
+    "includePattern": "\\.js$",
+    "exclude": ["dist"]
+  },
+  "plugins": [
+    "jsdoc-plugin-intersection",
+    "jsdoc-plugin-typescript",
+    "build/info/api-plugin",
+    "build/info/define-plugin",
+    "build/info/virtual-plugin"
+  ],
+  "typescript": {
+    "moduleRoot": "node_modules/ol"
+  }
 }

package/build/info/publish.js

@@ -32,7 +32,11 @@ exports.publish = function publish(data) {
           }
         }
         if (this.kind === 'class') {
-          if (!('extends' in this) || typeof this.api === 'boolean' || this.exports) {
+          if (
+            !('extends' in this) ||
+            typeof this.api === 'boolean' ||
+            this.exports
+          ) {
             classes[this.longname] = this;
             return true;
           }
@@ -68,7 +72,7 @@ exports.publish = function publish(data) {
         assert.strictEqual(
           doc.inherited,
           true,
-          `Unexpected export on private class: ${ doc.longname}`,
+          `Unexpected export on private class: ${doc.longname}`,
         );
         include = false;
       }
@@ -83,7 +87,10 @@ exports.publish = function publish(data) {
           path: path.join(doc.meta.path, doc.meta.filename),
           default: doc.define.default,
         });
-      } else if (doc.kind === 'typedef' || (doc.isEnum === true && !doc.exports)) {
+      } else if (
+        doc.kind === 'typedef' ||
+        (doc.isEnum === true && !doc.exports)
+      ) {
         typedefs.push({
           name: doc.longname,
           types: getTypes(doc.type.names),
@@ -144,7 +151,11 @@ exports.publish = function publish(data) {
         }
 
         // eslint-disable-next-line no-nested-ternary
-        const target = isExterns ? externs : (doc.api || doc.exports) ? symbols : base;
+        const target = isExterns
+          ? externs
+          : doc.api || doc.exports
+          ? symbols
+          : base;
         const existingSymbol = symbolsByName[symbol.name];
         if (existingSymbol) {
           const idx = target.indexOf(existingSymbol);

package/config/aerowest.config.json

@@ -1,5 +1,6 @@
 {
   "name": "VC Map HOSTING",
+  "_id": "vcmap-aerowest-hosting",
   "description": "AEROWEST DEMO (Standard Hosting Layout)",
   "mapcontainer": "vcs_map_container",
   "startingViewpointName": "Start",
@@ -10,6 +11,7 @@
   },
   "i18n": [
     {
+      "name": "Aerowest",
       "de": {
         "footer": {
           "title": "test"
@@ -50,9 +52,7 @@
       "activeOnStartup": true,
       "screenSpaceError": 16,
       "screenSpaceErrorMobile": 32,
-      "exclusiveGroups": [
-        "3D"
-      ],
+      "exclusiveGroups": ["3D"],
       "copyright": {
         "provider": "Fachbereich Geodaten und Verkehrsanlagen Osnabrück"
       },
@@ -83,9 +83,7 @@
         "url": "",
         "year": ""
       },
-      "exclusiveGroups": [
-        "3D"
-      ],
+      "exclusiveGroups": ["3D"],
       "properties": {
         "title": "3D-Mesh 2020"
       }
@@ -102,9 +100,7 @@
         "year": ""
       },
       "opacity": "",
-      "exclusiveGroups": [
-        "Basemaps"
-      ],
+      "exclusiveGroups": ["Basemaps"],
       "properties": {
         "title": "Openstreetmap"
       }
@@ -116,9 +112,7 @@
       "datasourceId": "L9iqEkcipH5yYidLJ",
       "extent": {
         "coordinates": [
-          7.92113060202822,
-          52.21502758354121,
-          8.18761427766629,
+          7.92113060202822, 52.21502758354121, 8.18761427766629,
           52.34298961990562
         ],
         "projection": {
@@ -136,13 +130,8 @@
         "year": ""
       },
       "opacity": "",
-      "exclusiveGroups": [
-        "Basemaps"
-      ],
-      "tileSize": [
-        "256",
-        "256"
-      ],
+      "exclusiveGroups": ["Basemaps"],
+      "tileSize": ["256", "256"],
       "properties": {
         "title": "Orthophoto 2019"
       }
@@ -155,9 +144,7 @@
       "activeOnStartup": false,
       "extent": {
         "coordinates": [
-          426560.8185735654,
-          5784184.146308786,
-          444530.61425307946,
+          426560.8185735654, 5784184.146308786, 444530.61425307946,
           5798050.352349459
         ],
         "projection": {
@@ -176,9 +163,7 @@
         "url": "http://www.bkg.bund.de",
         "year": "2017"
       },
-      "exclusiveGroups": [
-        "Basemaps"
-      ],
+      "exclusiveGroups": ["Basemaps"],
       "properties": {
         "title": "TopPlus",
         "infoUrl": "https://sg.geodatenzentrum.de/web_public/Datenquellen_TopPlus_Open.pdf",
@@ -200,9 +185,7 @@
         "url": "",
         "year": ""
       },
-      "exclusiveGroups": [
-        "3D"
-      ],
+      "exclusiveGroups": ["3D"],
       "properties": {
         "title": "3D-Mesh 2019"
       }
@@ -220,9 +203,7 @@
         "url": "",
         "year": ""
       },
-      "exclusiveGroups": [
-        "Terrain"
-      ],
+      "exclusiveGroups": ["Terrain"],
       "properties": {
         "title": "Gelände"
       }
@@ -235,9 +216,7 @@
       "activeOnStartup": true,
       "extent": {
         "coordinates": [
-          7.92113060202822,
-          52.21502758354121,
-          8.18761427766629,
+          7.92113060202822, 52.21502758354121, 8.18761427766629,
           52.34298961990562
         ],
         "projection": {
@@ -249,10 +228,7 @@
       "maxLevel": 21,
       "tilingSchema": "mercator",
       "opacity": "1",
-      "tileSize": [
-        256,
-        256
-      ],
+      "tileSize": [256, 256],
       "properties": {
         "title": "True Orthophoto 2020"
       }
@@ -263,14 +239,10 @@
       "type": "Viewpoint",
       "name": "Start",
       "cameraPosition": [
-        8.046797238330019,
-        52.27362585615231,
-        242.4832526493178
+        8.046797238330019, 52.27362585615231, 242.4832526493178
       ],
       "groundPosition": [
-        8.043161301432999,
-        52.27676705393965,
-        64.31275844568864
+        8.043161301432999, 52.27676705393965, 64.31275844568864
       ],
       "distance": 464.23586534868116,
       "heading": 324.6256963730798,