@vcmap/ui 5.0.0-rc.14 → 5.0.0-rc.15

package/README.md

@@ -83,7 +83,7 @@ how safe it is to start developing with these components.
 - oblique RC
 - FeatureProvider BETA
 - ClassRegistry BETA
-- Editor TODO
+- Editor BETA
 
 ### @vcmap/ui
 - contentTree API BETA [CONTENT_TREE](documentation/CONTENT_TREE.md) // TODO doc
@@ -92,12 +92,14 @@ how safe it is to start developing with these components.
 - OrientationTools BETA
 - ActionConcept BETA [ACTIONS](documentation/ACTIONS.md)
 - PluginConcept RC [Plugin API](https://github.com/virtualcitySYSTEMS/map-plugin-cli)
-- SEARCH API TODO
+- SEARCH API BETA [SEARCH](documentation/SEARCH.md)
 - I18n API RC [INTERNATIONALIZATION](documentation/INTERNATIONALIZATION.md).
 - Components API RC [CATEGORIES](documentation/CATEGORIES.md).
 - Context Menu API RC [CONTEXT_MENU](documentation/CONTEXT_MENU.md) 
 - FeatureInfo RC [FEATURE_INFO](documentation/FEATURE_INFO.md)
 - [State & Application Link](documentation/STATE.md) RC
+- [Help Concept](documentation/HELP.md) RC
+- Copyright RC [ATTRIBUTIONS](documentation/ATTRIBUTIONS.md)
 
 ##### components
 - VcsTextField BETA
@@ -133,46 +135,46 @@ how safe it is to start developing with these components.
 ### Ui
 - Responsive View / mobile view DONE
 - Toolbar DONE
-- Search API + UI Prio 2
+- Search API + UI DONE
 - Overlay API Support  Prio 3
 - i18n DONE.
 - FeatureInfo Concept/API (Balloon) DONE
   - Context API DONE
   - Hierachy B3dm
 - Legend Concept/API DONE
-- Copyright/Attributions Concept / API  Prio 2
+- Copyright/Attributions Concept / API  DONE
 - Ui Configuration (title/themes, usw, projectInfo/Impressum/usw. ) / API  DONE
-- Help Concept / Beispielhaft implementieren  Prio 2
+- Help Concept / Beispielhaft implementieren  DONE
 - Components Concept/Categories / API DONE.
 - Notification Concept Prio 2
 
 ### Plugins
-| Plugin      | Dev Prio | Proj Prio
-| :----: | :----:| :----: |
-|Drawing (WIP)| 1 | 1|
-|Measurement| 1| 1|
-|PDF Export (WIP)|  1| 1|
-|Search Nominatim| 2| 1|
-|SwipeTool| 2| 1|
-|Shadow |  4| 1|
-|Planning|  4| 1|
-|MultiView |  4| 1|
-|Create Link DONE| 1|1|
-|HeightProfile |  4| 2|
-|Flight |  4| 2|
-|Export |  4| 2|
-|ViewShed |  4| 2|
-|TransparentTerrain |  4| 3|
-|Walkmode|  4| 3|
-|Publisher Integration Plugin|  3| 3|
-|ClippingTool |  4| 3|
-|AttributeEditor |  4| 3|
-|Query |  4| 3|
-|Positiondisplay|  2| 4|
-|Locator ? |  4| 4|
-|DisplayQuality |  4| 4|
-|Search esri |  4| 4|
-|Search WFS |  4| 4|
+|            Plugin            | Dev Prio | Proj Prio |
+|:----------------------------:|:--------:|:---------:|
+|        Drawing (WIP)         |    1     |     1     |
+|         Measurement          |    1     |     1     |
+|      PDF Export (DONE)       |    1     |     1     |
+|   Search Nominatim (DONE)    |    2     |     1     |
+|          SwipeTool           |    2     |     1     |
+|            Shadow            |    4     |     1     |
+|           Planning           |    4     |     1     |
+|          MultiView           |    4     |     1     |
+|      Create Link (DONE)      |    1     |     1     |
+|        HeightProfile         |    4     |     2     |
+|            Flight            |    4     |     2     |
+|            Export            |    4     |     2     |
+|           ViewShed           |    4     |     2     |
+|      TransparentTerrain      |    4     |     3     |
+|           Walkmode           |    4     |     3     |
+| Publisher Integration Plugin |    3     |     3     |
+|         ClippingTool         |    4     |     3     |
+|       AttributeEditor        |    4     |     3     |
+|            Query             |    4     |     3     |
+|       Positiondisplay        |    2     |     4     |
+|          Locator ?           |    4     |     4     |
+|        DisplayQuality        |    4     |     4     |
+|         Search esri          |    4     |     4     |
+|          Search WFS          |    4     |     4     |
 
 
 # Getting started

package/build/build.js

@@ -92,6 +92,9 @@ console.log('Building app');
 await build({
   configFile: './build/commonViteConfig.js',
   base: './',
+  define: {
+    'process.env.NODE_ENV': '"production"',
+  },
   build: {
     minify: true,
     emptyOutDir: true,
@@ -117,6 +120,9 @@ await Promise.all(Object.entries(libraryBuildOptions).map(async ([key, value]) =
     esbuild: {
       minify: true,
     },
+    define: {
+      'process.env.NODE_ENV': '"production"',
+    },
     build: {
       write: false,
       emptyOutDir: false,
@@ -137,6 +143,9 @@ await Promise.all(Object.entries(libraryBuildOptions).map(async ([key, value]) =
 
   const libraryEntryConfig = {
     configFile: false,
+    define: {
+      'process.env.NODE_ENV': '"production"',
+    },
     build: {
       emptyOutDir: false,
       lib: {

package/build/buildHelpers.js

@@ -189,32 +189,34 @@ export async function buildPluginsForPreview(baseConfig = {}, minify = true) {
         },
       },
     };
-    await fs.promises.mkdir(path.join(process.cwd(), 'dist', 'plugins', plugin), { recursive: true });
+    const distPath = path.join(process.cwd(), 'dist', 'plugins', plugin);
+    if (!fs.existsSync(distPath)) {
+      await fs.promises.mkdir(distPath, { recursive: true });
+    }
     await buildLibrary(pluginConfig, `plugins/${plugin}`, 'index', '', true);
   });
 
-  promises.push(...dependentPlugins.flatMap((pluginName) => {
+  promises.push(...dependentPlugins.map(async (pluginName) => {
     let scope = '';
     let name = pluginName;
     if (pluginName.startsWith('@')) {
       [scope, name] = pluginName.split('/');
     }
 
-    const copyPromises = [fs.promises.cp(
+    await fs.promises.cp(
       path.join(pluginsDirectory, 'node_modules', scope, name, 'dist'),
       path.join(process.cwd(), 'dist', 'plugins', scope, name),
-      { recursive: true },
-    )];
+      { 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'))) {
-      copyPromises.push(fs.promises.cp(
+      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 },
-      ));
+        { recursive: true, force: true },
+      );
     }
-    return copyPromises;
   }));
-
   await Promise.all(promises);
 }

package/build/commonViteConfig.js

@@ -2,8 +2,6 @@
 import path from 'path';
 import { defineConfig } from 'vite';
 import { createVuePlugin } from 'vite-plugin-vue2';
-import Components from 'unplugin-vue-components/vite';
-import { VuetifyResolver } from 'unplugin-vue-components/resolvers';
 import { libraries } from './buildHelpers.js';
 
 const configMain = defineConfig({
@@ -15,16 +13,11 @@ const configMain = defineConfig({
     },
     dedupe: Object.keys(libraries),
   },
+  define: {
+    'process.env.NODE_ENV': '"development"',
+  },
   plugins: [
     createVuePlugin(),
-    Components({
-      resolvers: [
-        VuetifyResolver(),
-      ],
-      dirs: ['src'],
-      include: [],
-      exclude: [],
-    }),
   ],
   css: {
     preprocessorOptions: {

package/config/base.config.json

@@ -683,16 +683,16 @@
       "tilesetOptions": {
         "skipLevelOfDetail": true
       },
-      "copyright": {
-        "provider": "Berlin Partner für Wirtschaft und Technologie",
-        "url": "https://www.berlin-partner.de",
-        "year": "2020"
-      },
       "exclusiveGroups": [
         "bldg"
       ],
       "properties": {
-        "title": "3D-Mesh 2020"
+        "title": "3D-Mesh 2020",
+        "attributions": {
+          "provider": "Berlin Partner für Wirtschaft und Technologie",
+          "url": "https://www.berlin-partner.de",
+          "year": "2020"
+        }
       }
     },
     {
@@ -779,11 +779,6 @@
       "tilingSchema": "mercator",
       "opacity": "1",
       "hiddenObjectIds": [],
-      "copyright": {
-        "provider": "Geoportal Berlin / Luftbild 2015, OpenStreetMap contributors",
-        "url": "http://www.stadtentwicklung.berlin.de/geoinformation/fis-broker/",
-        "year": "2018"
-      },
       "exclusiveGroups": [
         "base"
       ],
@@ -792,7 +787,12 @@
         "256"
       ],
       "properties": {
-        "title": "Aerial Image (2015)"
+        "title": "Aerial Image (2015)",
+        "attributions": {
+          "provider": "Geoportal Berlin / Luftbild 2015, OpenStreetMap contributors",
+          "url": "http://www.stadtentwicklung.berlin.de/geoinformation/fis-broker/",
+          "year": "2018"
+        }
       }
     },
     {
@@ -821,11 +821,6 @@
       },
       "opacity": "1",
       "hiddenObjectIds": [],
-      "copyright": {
-        "provider": "OpenStreetMap contributors",
-        "url": "http://www.openstreetmap.org/",
-        "year": "2019"
-      },
       "numberOfLevelZeroTilesX": 1,
       "numberOfLevelZeroTilesY": 1,
       "exclusiveGroups": [
@@ -833,7 +828,12 @@
       ],
       "properties": {
         "title": "OpenStreetMap",
-        "showInOverviewMap": true
+        "showInOverviewMap": true,
+        "attributions": {
+          "provider": "OpenStreetMap contributors",
+          "url": "http://www.openstreetmap.org/",
+          "year": "2019"
+        }
       }
     },
     {
@@ -1146,17 +1146,19 @@
           "projection": {
             "epsg": "25833",
             "proj4": "+proj=utm +zone=33 +ellps=GRS80 +units=m +no_defs"
-          },
-          "copyright": {
-            "provider": "Berlin Partner / Senat von Berlin",
-            "url": "https://www.berlin-partner.de",
-            "year": "2020"
           }
         }
       ],
       "maxZoom": 7,
       "minZoom": 3,
-      "hideLevels": null
+      "hideLevels": null,
+      "properties:": {
+        "attributions": {
+          "provider": "Berlin Partner / Senat von Berlin",
+          "url": "https://www.berlin-partner.de",
+          "year": "2020"
+        }
+      }
     }
   ],
   "plugins": [

package/config/dev.config.json

@@ -399,6 +399,14 @@
     {
       "name": "@vcmap/hello-world",
       "entry": "plugins/@vcmap/hello-world/index.js"
+    },
+    {
+      "name": "@vcmap/print",
+      "entry": "plugins/@vcmap/print/index.js"
+    },
+    {
+      "name": "@vcmap/search-nominatim",
+      "entry": "plugins/@vcmap/search-nominatim/index.js"
     }
   ],
   "uiConfig": [

package/config/www.config.json

@@ -338,7 +338,13 @@
   "maps": [
     {
       "type": "OpenlayersMap",
-      "name": "ol3"
+      "name": "ol3",
+      "properties": {
+        "attributions": {
+          "provider": "Open Layers",
+          "url": "https://openlayers.org/"
+        }
+      }
     },
     {
       "type": "CesiumMap",
@@ -353,12 +359,30 @@
       "fogDensity": 0.0002,
       "fogDensityMobile": 0.0004,
       "fogScreenSpaceError": 2,
-      "fogScreenSpaceErrorMobile": 4
+      "fogScreenSpaceErrorMobile": 4,
+      "properties": {
+        "attributions": {
+          "provider": "Cesium",
+          "url": "https://www.cesium.com/"
+        }
+      }
     },
     {
       "type": "ObliqueMap",
       "name": "Oblique Map",
-      "defaultCollectionName": "Schrägluftbilder 2020"
+      "defaultCollectionName": "Schrägluftbilder 2020",
+      "properties": {
+        "attributions": [
+          {
+            "provider": "Open Layers",
+            "url": "https://openlayers.org/"
+          },
+          {
+            "provider": "VCS",
+            "url": "https://vc.systems/en/"
+          }
+        ]
+      }
     }
   ],
   "layers": [
@@ -378,7 +402,7 @@
     {
       "type": "CesiumTilesetLayer",
       "name": "Summer Trees",
-      "url": "https://www.virtualcitymap.de/datasource-data/f764ffb4-723d-429f-b797-5ca4c1061201/tileset.json",
+      "url": "https://www.virtualcitymap.de/datasource-data/c8e48290-c1f3-491a-98a6-24ee1e0116d1/tileset.json",
       "activeOnStartup": false,
       "screenSpaceError": 16,
       "screenSpaceErrorMobile": 32,
@@ -391,7 +415,7 @@
       "type": "TerrainLayer",
       "name": "GermanyBaseTerrain",
       "url": "https://www.virtualcitymap.de/datasource-data/globalterrain_5_9",
-      "activeOnStartup": false,
+      "activeOnStartup": true,
       "requestVertexNormals": true,
       "exclusiveGroups": [
         "terrain"
@@ -403,8 +427,8 @@
     {
       "type": "CesiumTilesetLayer",
       "name": "Berlin - LOD2",
-      "url": "https://www.virtualcitymap.de/datasource-data/72fa3c14-03bc-4c26-a4ac-8c6dec37e65a/tileset.json",
-      "activeOnStartup": false,
+      "url": "https://www.virtualcitymap.de/datasource-data/1da2e8e4-4e3b-4b15-a91b-7bfa967a8c11/tileset.json",
+      "activeOnStartup": true,
       "screenSpaceError": 16,
       "screenSpaceErrorMobile": 32,
       "exclusiveGroups": [
@@ -455,7 +479,7 @@
     {
       "type": "CesiumTilesetLayer",
       "name": "Berlin LOD2 - Textured",
-      "url": "https://www.virtualcitymap.de/datasource-data/698513e2-a34c-4f38-bb93-629ff4c9e0c0",
+      "url": "https://www.virtualcitymap.de/datasource-data/2c9e783d-3e17-40f4-b4d5-6cf9591dcb1f/tileset.json",
       "activeOnStartup": false,
       "screenSpaceError": 16,
       "screenSpaceErrorMobile": 32,
@@ -486,7 +510,12 @@
       },
       "properties": {
         "title": "Planwerk Innere Stadt",
-        "featureInfo": "tableBuildings"
+        "featureInfo": "tableBuildings",
+        "attributions": {
+          "provider": "Senatsverwaltung für Stadtentwicklung, Bauen und Wohnen",
+          "url": "https://www.stadtentwicklung.berlin.de/planen/stadtmodelle/de/digitale_innenstadt/3d/index.shtml",
+          "year": "2021"
+        }
       }
     },
     {
@@ -554,7 +583,7 @@
       "type": "CesiumTilesetLayer",
       "name": "Mesh Classification Layer",
       "url": "https://www.virtualcitymap.de/datasource-data/DEMO-Lindau/berlin_2D/tileset.json",
-      "activeOnStartup": true,
+      "activeOnStartup": false,
       "screenSpaceError": 16,
       "screenSpaceErrorMobile": 32,
       "style": "dummyClassificationStyle",
@@ -617,7 +646,12 @@
       "numberOfLevelZeroTilesY": 1,
       "properties": {
         "title": "Openstreetmap",
-        "showInOverviewMap": true
+        "showInOverviewMap": true,
+        "attributions": {
+          "provider": "OpenStreetMap contributors",
+          "url": "https://www.openstreetmap.org/",
+          "year": "2018"
+        }
       }
     },
     {
@@ -646,14 +680,19 @@
       "tilingSchema": "mercator",
       "opacity": 0.9,
       "properties": {
-        "title": "True Orthophoto 2020"
+        "title": "True Orthophoto 2020",
+        "attributions": {
+          "provider": "Berlin Partner für Wirtschaft und Technologie",
+          "url": "https://www.berlin-partner.de",
+          "year": "2020"
+        }
       }
     },
     {
       "type": "CesiumTilesetLayer",
       "name": "mesh_surface",
       "url": "https://a.3d.blc.shc.eu/WAB/base_layer/cesium_mesh_2020/",
-      "activeOnStartup": true,
+      "activeOnStartup": false,
       "allowPicking": false,
       "screenSpaceError": 16,
       "screenSpaceErrorMobile": 32,
@@ -665,7 +704,12 @@
         "terrain"
       ],
       "properties": {
-        "title": "3D-Mesh 2020"
+        "title": "3D-Mesh 2020",
+        "attributions": {
+          "provider": "Berlin Partner für Wirtschaft und Technologie",
+          "url": "https://www.berlin-partner.de",
+          "year": "2020"
+        }
       }
     },
     {
@@ -724,7 +768,13 @@
       "properties": {
         "title": "Fließgeschwindigkeit, seltenes Ereignis (HQ100)",
         "defaultViewpoint": "soest",
-        "featureInfo": "waterspeed"
+        "featureInfo": "waterspeed",
+        "legend": [{
+          "type": "ImageLegendItem",
+          "tooltip": "Fließgeschwindigkeit",
+          "src": "https://sgx.geodatenzentrum.de/wms_starkregen__sess-1426bd3e-179d-49b1-b0dd-2994524ac2a8?format=image%2Fpng&layer=fliessgeschwindigkeiten_selten&sld_version=1.1.0&request=GetLegendGraphic&service=WMS&version=1.1.1&styles=",
+          "popoutBtn": true
+        }]
       }
     },
     {
@@ -756,7 +806,13 @@
       "properties": {
         "title": "Wasserhöhen, seltenes Ereignis (HQ100)",
         "defaultViewpoint": "soest",
-        "featureInfo": "waterheight"
+        "featureInfo": "waterheight",
+        "legend": [{
+          "type": "ImageLegendItem",
+          "tooltip": "Fließgeschwindigkeit",
+          "src": "https://sgx.geodatenzentrum.de/wms_starkregen__sess-1426bd3e-179d-49b1-b0dd-2994524ac2a8?format=image%2Fpng&layer=wasserhoehen_selten&sld_version=1.1.0&request=GetLegendGraphic&service=WMS&version=1.1.1&styles=",
+          "popoutBtn": true
+        }]
       }
     },
     {
@@ -853,7 +909,14 @@
         }
       ],
       "maxZoom": 7,
-      "minZoom": 0
+      "minZoom": 0,
+      "properties": {
+        "attributions": {
+          "provider": "Berlin Partner für Wirtschaft und Technologie",
+          "url": "https://www.berlin-partner.de",
+          "year": "2020"
+        }
+      }
     }
   ],
   "styles": [
@@ -1228,5 +1291,27 @@
       "name": "thematic.waterareas2",
       "layerName": "festgesetzte Überschwemmungsgebiete"
     }
+  ],
+  "plugins": [
+    {
+      "name": "@vcmap/print",
+      "entry": "plugins/@vcmap/print/index.js",
+      "contactDetails": {
+        "department": "Entwicklung",
+        "name": "Virtual City Systems",
+        "streetAddress": "Tauentzienstr. 7 b/c",
+        "zipAndCity": "10789 Berlin",
+        "country": "Germany",
+        "mail": "info@vc.systems",
+        "phone": "+49 (0) 30 . 8904 . 871 . 0",
+        "fax": "+49 (0) 30 . 8904 . 871 . 0"
+      }
+    }
+  ],
+  "plugins": [
+    {
+      "name": "@vcmap/search-nominatim",
+      "entry": "plugins/@vcmap/search-nominatim/index.js"
+    }
   ]
 }