@vcmap/ui 5.0.0-rc.8 → 5.0.0

package/build/generateOLLib.js

@@ -3,7 +3,7 @@ import path from 'path';
 import { spawn } from 'child_process';
 
 const isWindows = process.platform.indexOf('win') === 0;
-const sourceDir = path.join('node_modules', 'ol', 'src');
+const sourceDir = path.join('node_modules', 'ol');
 
 /**
  * Parse the JSDoc output.
@@ -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,10 +175,10 @@ function generateExports(symbols) {
     }
   });
   const source = Object.keys(imports)
-    .map(line => line.replace('from \'ol/', 'from \'ol/src/'))
-    .map(line => line.replace('from \'ol\'', 'from \'ol/src/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/src/index.js';\n`;
+  return `${source}\nexport * from 'ol/index.js';\n`;
 }
 
 /**

package/build/getPluginProxies.js

@@ -1,6 +1,10 @@
 /* eslint import/no-extraneous-dependencies: ["error", { "devDependencies": false }] */
 import path from 'path';
-import { getPluginDirectory, getPluginNames } from './buildHelpers.js';
+import {
+  getInlinePlugins,
+  getPluginDirectory,
+  getPluginNames,
+} from './buildHelpers.js';
 
 /**
  * Determines the proxy setting to serve plugins referrenced in the package.json in the plugins directory
@@ -8,7 +12,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,7 +27,32 @@ export default async function getPluginProxies(target = 'http://localhost:8080',
       rewrite: (route) => {
         const rest = route.replace(new RegExp(`^/plugins/${plugin}/`), '');
         const file = rest || 'index.js';
-        return path.posix.join(path.relative(root, pluginsDir), 'node_modules', plugin, production ? 'dist' : 'src', file);
+        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,
+        );
+      },
+    };
+  });
+
+  const inlinePlugins = await getInlinePlugins();
+
+  inlinePlugins.forEach((inlinePlugin) => {
+    proxies[`/plugins/${inlinePlugin}/index.js`] = {
+      target,
+      rewrite: (route) => {
+        return route.replace('index.js', 'src/index.js');
       },
     };
   });

package/build/info/conf.json

@@ -1,21 +1,23 @@
 {
-    "opts": {
-        "recurse": true,
-        "template": "build/info"
-    },
-    "tags": {
-        "allowUnknownTags": true
-    },
-    "source": {
-        "includePattern": "\\.js$"
-    },
-    "plugins": [
-        "jsdoc-plugin-typescript",
-        "build/info/api-plugin",
-        "build/info/define-plugin",
-        "build/info/virtual-plugin"
-    ],
-    "typescript": {
-      "moduleRoot": "node_modules/ol/src"
-    }
+  "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

@@ -27,12 +27,16 @@ exports.publish = function publish(data) {
         if (this?.meta?.code?.name) {
           if (this.meta.code.name === 'module.exports') {
             this.exports = 'default';
-          } else if (this.meta.code.name.startsWith('exports.')) {
+          } else if (String(this.meta.code.name).startsWith('exports.')) {
             this.exports = this.meta.code.name.replace(/exports./, '');
           }
         }
         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,16 +1,29 @@
 {
+  "name": "VC Map HOSTING",
+  "_id": "vcmap-aerowest-hosting",
+  "description": "AEROWEST DEMO (Standard Hosting Layout)",
   "mapcontainer": "vcs_map_container",
-  "locale": "de",
-  "availableLocales": [
-    "de",
-    "en"
-  ],
-  "startingViewPointName": "Start",
+  "startingViewpointName": "Start",
   "startingMapName": "Cesium Map",
   "projection": {
     "epsg": "25832",
     "proj4": "+proj=utm +zone=32 +ellps=GRS80 +units=m +no_defs"
   },
+  "i18n": [
+    {
+      "name": "Aerowest",
+      "de": {
+        "footer": {
+          "title": "test"
+        }
+      },
+      "en": {
+        "footer": {
+          "title": "entest"
+        }
+      }
+    }
+  ],
   "maps": [
     {
       "name": "Cesium Map",
@@ -39,14 +52,13 @@
       "activeOnStartup": true,
       "screenSpaceError": 16,
       "screenSpaceErrorMobile": 32,
-      "exclusiveGroups": [
-        "3D"
-      ],
+      "exclusiveGroups": ["3D"],
       "copyright": {
         "provider": "Fachbereich Geodaten und Verkehrsanlagen Osnabrück"
       },
       "properties": {
-        "title": "Gebäude"
+        "title": "Gebäude",
+        "featureInfo": "vcsContent"
       }
     },
     {
@@ -71,9 +83,7 @@
         "url": "",
         "year": ""
       },
-      "exclusiveGroups": [
-        "3D"
-      ],
+      "exclusiveGroups": ["3D"],
       "properties": {
         "title": "3D-Mesh 2020"
       }
@@ -90,9 +100,7 @@
         "year": ""
       },
       "opacity": "",
-      "exclusiveGroups": [
-        "Basemaps"
-      ],
+      "exclusiveGroups": ["Basemaps"],
       "properties": {
         "title": "Openstreetmap"
       }
@@ -104,9 +112,7 @@
       "datasourceId": "L9iqEkcipH5yYidLJ",
       "extent": {
         "coordinates": [
-          7.92113060202822,
-          52.21502758354121,
-          8.18761427766629,
+          7.92113060202822, 52.21502758354121, 8.18761427766629,
           52.34298961990562
         ],
         "projection": {
@@ -124,13 +130,8 @@
         "year": ""
       },
       "opacity": "",
-      "exclusiveGroups": [
-        "Basemaps"
-      ],
-      "tileSize": [
-        "256",
-        "256"
-      ],
+      "exclusiveGroups": ["Basemaps"],
+      "tileSize": ["256", "256"],
       "properties": {
         "title": "Orthophoto 2019"
       }
@@ -143,9 +144,7 @@
       "activeOnStartup": false,
       "extent": {
         "coordinates": [
-          426560.8185735654,
-          5784184.146308786,
-          444530.61425307946,
+          426560.8185735654, 5784184.146308786, 444530.61425307946,
           5798050.352349459
         ],
         "projection": {
@@ -157,7 +156,6 @@
       "layers": "web",
       "parameters": "format=image/png",
       "maxLevel": 21,
-      "featureInfo": null,
       "tilingSchema": "geographic",
       "hiddenObjectIds": [],
       "copyright": {
@@ -165,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",
@@ -189,9 +185,7 @@
         "url": "",
         "year": ""
       },
-      "exclusiveGroups": [
-        "3D"
-      ],
+      "exclusiveGroups": ["3D"],
       "properties": {
         "title": "3D-Mesh 2019"
       }
@@ -209,9 +203,7 @@
         "url": "",
         "year": ""
       },
-      "exclusiveGroups": [
-        "Terrain"
-      ],
+      "exclusiveGroups": ["Terrain"],
       "properties": {
         "title": "Gelände"
       }
@@ -224,9 +216,7 @@
       "activeOnStartup": true,
       "extent": {
         "coordinates": [
-          7.92113060202822,
-          52.21502758354121,
-          8.18761427766629,
+          7.92113060202822, 52.21502758354121, 8.18761427766629,
           52.34298961990562
         ],
         "projection": {
@@ -238,10 +228,7 @@
       "maxLevel": 21,
       "tilingSchema": "mercator",
       "opacity": "1",
-      "tileSize": [
-        256,
-        256
-      ],
+      "tileSize": [256, 256],
       "properties": {
         "title": "True Orthophoto 2020"
       }
@@ -249,17 +236,13 @@
   ],
   "viewpoints": [
     {
-      "type": "ViewPoint",
+      "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,
@@ -375,5 +358,15 @@
       "collectionName": "Schrägluftbilder 2019"
     }
   ],
-  "plugins": []
+  "plugins": [],
+  "uiConfig": [
+    {
+      "name": "primaryColor",
+      "value": "#232D52"
+    },
+    {
+      "name": "logo",
+      "value": "data:image/png;base64,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"
+    }
+  ]
 }