@vcmap/viewshed 2.0.8 → 2.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/viewshed",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "Tool to simulate a \"viewer\" and their field of vision from a certain standpoint in the map. It allows the user to see which areas and buildings can or can't be seen from a specific standpoint, regarding different viewing distances, viewers' sizes and orientations.Th",
   "type": "module",
   "main": "src/index.js",
@@ -48,8 +48,8 @@
   "prettier": "@vcsuite/eslint-config/prettier.js",
   "peerDependencies": {
     "@vcmap-cesium/engine": "^4.0.3",
-    "@vcmap/core": "^5.1.0",
-    "@vcmap/ui": "^5.1.0",
+    "@vcmap/core": "^5.1.4",
+    "@vcmap/ui": "^5.1.5",
     "ol": "^7.5.2",
     "vue": "~2.7.3",
     "vuetify": "~2.6.7"

package/src/viewshedCategory.js

@@ -5,6 +5,7 @@ import {
   createListImportAction,
   createSupportedMapMappingFunction,
   downloadText,
+  NotificationType,
 } from '@vcmap/ui';
 import { name } from '../package.json';
 import Viewshed from './viewshed.js';
@@ -142,16 +143,52 @@ export async function createCategory(app) {
   const { action: importAction, destroy: destroyImportAction } =
     createListImportAction(
       async (files) => {
-        await Promise.all(
+        const { vueI18n } = app;
+        const results = await Promise.all(
           files.map(async (file) => {
             const text = await file.text();
-            const viewshedOptions = JSON.parse(text);
-            viewshedOptions.forEach((options) => {
-              const viewshed = new Viewshed(options);
-              category.collection.add(viewshed);
-            });
+            try {
+              const parsedOptions = JSON.parse(text);
+              return parsedOptions.map((options) => new Viewshed(options));
+            } catch (e) {
+              app.notifier.add({
+                type: NotificationType.ERROR,
+                message: vueI18n.t('components.import.failure', {
+                  fileName: file.name,
+                }),
+              });
+            }
+            return [];
           }),
         );
+
+        const viewshedsToImport = results.flat();
+        const imported = viewshedsToImport
+          .map((v) => category.collection.add(v))
+          .filter((id) => id != null);
+        const importedDelta = viewshedsToImport.length - imported.length;
+        if (importedDelta > 0) {
+          app.notifier.add({
+            type: NotificationType.WARNING,
+            message: vueI18n.t('components.import.addFailure', [importedDelta]),
+          });
+          return false;
+        }
+        if (imported.length > 0) {
+          app.notifier.add({
+            type: NotificationType.SUCCESS,
+            message: vueI18n.t('components.import.featuresAdded', [
+              imported.length,
+            ]),
+          });
+        } else {
+          app.notifier.add({
+            type: NotificationType.ERROR,
+            message: vueI18n.t('components.import.nothingAdded'),
+          });
+          return false;
+        }
+        return true;
       },
       app.windowManager,
       name,