Merge pull request #2371 from okauppinen/describe-layer-response

Describe layer response
oskariorg · Aug 14, 2023 · aa625af · aa625af
2 parents 171f88a + b30333c
commit aa625af
Show file tree

Hide file tree

Showing 43 changed files with 308 additions and 577 deletions.
diff --git a/bundles/framework/featuredata2/Flyout.js b/bundles/framework/featuredata2/Flyout.js
@@ -781,7 +781,7 @@ Oskari.clazz.define(
             const inputlayer = this.instance.getSandbox().findMapLayerFromAllAvailable(inputid);
             let message;
             if (inputlayer && inputlayer.getLayerType().toUpperCase() === 'WFS') {
-                const noData = inputlayer.getWpsLayerParams().no_data;
+                const noData = inputlayer.getWpsLayerParams().noDataValue;
                 if (noData) {
                     message = this.instance.loc('gridFooter.noDataCommonMessage') + ' (' + noData + ').';
                     const locales = Object.values(layer.getPropertyLabels());

diff --git a/bundles/framework/myplaces3/MyPlacesLayerControls.jsx b/bundles/framework/myplaces3/MyPlacesLayerControls.jsx
@@ -30,7 +30,7 @@ const Content = styled('div')`
     max-width: 500px;
 `;
 
-const getDefaultCategoryId = categories => categories.find(cat => cat.isDefault).categoryId;
+const getDefaultCategoryId = categories => categories.find(cat => cat.isDefault)?.categoryId;
 const DeletePlaces = ({
     categories,
     selectedCategoryId,

diff --git a/bundles/framework/myplaces3/request/EditCategoryRequest.js b/bundles/framework/myplaces3/request/EditCategoryRequest.js
@@ -27,7 +27,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.request.EditCategoryRe
         },
         /**
          * @method getId
-         * @return {Number} id of category to be edited
+         * @return {Number || String} id or layerId of category to be edited
          */
         getId: function () {
             return this._categoryId;

diff --git a/bundles/framework/myplaces3/request/EditRequestHandler.js b/bundles/framework/myplaces3/request/EditRequestHandler.js
@@ -1,3 +1,4 @@
+import { getCategoryId } from '../service/LayerHelper';
 /**
  * @class Oskari.mapframework.bundle.myplaces3.request.EditRequestHandler
  * Handles sequests for a saved "my place" or my places categorires to be opened for editing
@@ -59,7 +60,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.request.EditRequestHan
             handler.deletePlace(id);
         },
         _handleEditCategory: function (sandbox, request) {
-            const id = request.getId();
+            const id = getCategoryId(request.getId());
             this.log.debug('edit requested for category ' + id);
             const handler = this.instance.getMyPlacesHandler();
             if (!handler) {
@@ -72,7 +73,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.request.EditRequestHan
             this.log.warn(`Delete requested for category: ${id}. This handler doesn't ask for move places or confirm. Skipping!`);
         },
         _handlePublishCategory: function (sandbox, request) {
-            const id = request.getId();
+            const id = getCategoryId(request.getId());
             this.log.debug('(un/)publish requested for category ' + id);
             const service = this.instance.getService();
             if (!service) {

diff --git a/bundles/framework/myplaces3/request/PublishCategoryRequest.js b/bundles/framework/myplaces3/request/PublishCategoryRequest.js
@@ -37,7 +37,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.request.PublishCategor
         },
         /**
          * @method getId
-         * @return {Number} id of category to be edited
+         * @return {Number || String} id or layerId to be edited
          */
         isPublic: function () {
             return this._isPublic;

diff --git a/bundles/framework/myplaces3/service/LayerHelper.js b/bundles/framework/myplaces3/service/LayerHelper.js
@@ -15,6 +15,6 @@ export const layerToCategory = (layer) => {
         categoryId: getCategoryId(layerId),
         layerId,
         name: layer.getName(),
-        isDefault: !!layer.getOptions().isDefault
+        isDefault: layer.isDefault()
     };
 };
diff --git a/bundles/framework/myplaces3/service/MyPlacesService.js b/bundles/framework/myplaces3/service/MyPlacesService.js
@@ -157,15 +157,13 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplaces3.service.MyPlacesServic
             }
         },
         _updateLayer: function (layerJson) {
-            const { id, locale, options } = layerJson;
+            const { id } = layerJson;
             const layer = this.mapLayerService.findMapLayer(id);
             if (!layer) {
                 this.log.warn('tried to update layer which does not exist, id: ' + id);
                 return;
             }
-            layer.setLocale(locale);
-            layer.setOptions(options);
-            layer.setStylesFromOptions(options);
+            layer.handleUpdatedLayer(layerJson);
             const evt = Oskari.eventBuilder('MapLayerEvent')(id, 'update');
             this.sandbox.notifyAll(evt);
             if (this.sandbox.isLayerAlreadySelected(id)) {

diff --git a/bundles/framework/myplacesimport/PersonalDataUserLayersTab.js b/bundles/framework/myplacesimport/PersonalDataUserLayersTab.js
@@ -14,7 +14,7 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplacesimport.PersonalDataUserL
         this.loc = Oskari.getMsg.bind(null, 'MyPlacesImport');
         this.layerMetaType = 'USERLAYER';
         this.visibleFields = [
-            'name', 'description', 'source', 'edit', 'remove'
+            'name', 'desc', 'source', 'edit', 'remove'
         ];
         this.grid = undefined;
         this.container = undefined;
@@ -149,11 +149,9 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplacesimport.PersonalDataUserL
                     return;
                 }
                 gridModel.addData({
-                    'id': layer.getId(),
-                    'name': Oskari.util.sanitize(layer.getName()),
-                    'description': Oskari.util.sanitize(layer.getDescription()),
-                    'source': Oskari.util.sanitize(layer.getSource()),
-                    'isBase': layer.isBaseLayer()
+                    id: layer.getId(),
+                    isBase: layer.isBaseLayer(),
+                    ...layer.getLocaleValues()
                 });
                 layersAdded.push(layer.getId());
             });

diff --git a/bundles/framework/myplacesimport/UserLayersList.jsx b/bundles/framework/myplacesimport/UserLayersList.jsx
@@ -25,8 +25,8 @@ export const UserLayersList = ({ data = [], controller, loading }) => {
         },
         {
             align: 'left',
-            title: <Message messageKey='tab.grid.description' />,
-            dataIndex: 'description',
+            title: <Message messageKey='tab.grid.desc' />,
+            dataIndex: 'desc',
             sorter: getSorterFor('description')
         },
         {
@@ -72,12 +72,9 @@ export const UserLayersList = ({ data = [], controller, loading }) => {
         <Table
             columns={columnSettings}
             dataSource={data.map(item => ({
-                ...item,
                 key: item.getId(),
-                name: Oskari.util.sanitize(item.getName()),
-                description: Oskari.util.sanitize(item.getDescription()),
-                source: Oskari.util.sanitize(item.getSource()),
-                created: item.getCreated()
+                created: item.getCreated(),
+                ...item.getLocaleValues()
             }))}
             pagination={false}
             loading={loading}

diff --git a/bundles/framework/myplacesimport/resources/locale/de.js b/bundles/framework/myplacesimport/resources/locale/de.js
@@ -45,7 +45,7 @@ Oskari.registerLocalization(
             "title": "Datensatz",
             "grid": {
                 "name": "Name",
-                "description": "Beschreibung",
+                "desc": "Beschreibung",
                 "source": "Datenquelle",
                 "remove": "Löschen",
                 "removeButton": "Löschen"

diff --git a/bundles/framework/myplacesimport/resources/locale/en.js b/bundles/framework/myplacesimport/resources/locale/en.js
@@ -60,7 +60,7 @@ Oskari.registerLocalization(
             "deleteLayer": "Delete map layer",
             "grid": {
                 "name": "Name",
-                "description": "Description",
+                "desc": "Description",
                 "source": "Data source",
                 "edit": "Edit",
                 "editButton": "Edit",

diff --git a/bundles/framework/myplacesimport/resources/locale/es.js b/bundles/framework/myplacesimport/resources/locale/es.js
@@ -45,7 +45,7 @@ Oskari.registerLocalization(
             "title": "Conjuntos de datos",
             "grid": {
                 "name": "Nombre",
-                "description": "Descripción",
+                "desc": "Descripción",
                 "source": "Fuente de datos",
                 "remove": "Borrar",
                 "removeButton": "Borrar"

diff --git a/bundles/framework/myplacesimport/resources/locale/et.js b/bundles/framework/myplacesimport/resources/locale/et.js
@@ -45,7 +45,7 @@ Oskari.registerLocalization(
             "title": "Andmestikud",
             "grid": {
                 "name": "Nimi",
-                "description": "Kirjeldus",
+                "desc": "Kirjeldus",
                 "source": "Andmeallikas",
                 "remove": "Kustuta",
                 "removeButton": "Kustuta"

diff --git a/bundles/framework/myplacesimport/resources/locale/fi.js b/bundles/framework/myplacesimport/resources/locale/fi.js
@@ -59,7 +59,7 @@ Oskari.registerLocalization(
             "deleteLayer": "Poista karttataso",
             "grid": {
                 "name": "Nimi",
-                "description": "Kuvaus",
+                "desc": "Kuvaus",
                 "source": "Tietolähde",
                 "edit": "Muokkaa",
                 "editButton": "Muokkaa",

diff --git a/bundles/framework/myplacesimport/resources/locale/fr.js b/bundles/framework/myplacesimport/resources/locale/fr.js
@@ -50,7 +50,7 @@ Oskari.registerLocalization(
             "deleteLayer": "Supprimer la couche cartographique",
             "grid": {
                 "name": "Nom",
-                "description": "Description",
+                "desc": "Description",
                 "source": "Source des données",
                 "edit": "Modifier",
                 "editButton": "Modifier",

diff --git a/bundles/framework/myplacesimport/resources/locale/is.js b/bundles/framework/myplacesimport/resources/locale/is.js
@@ -29,7 +29,7 @@ Oskari.registerLocalization(
             "title": "Gagnasett",
             "grid": {
                 "name": "Nafn",
-                "description": "Lýsing",
+                "desc": "Lýsing",
                 "source": "Gagnagjafi",
                 "remove": "Eyða",
                 "removeButton": "Eyða"

diff --git a/bundles/framework/myplacesimport/resources/locale/it.js b/bundles/framework/myplacesimport/resources/locale/it.js
@@ -45,7 +45,7 @@ Oskari.registerLocalization(
             "title": "Datasets",
             "grid": {
                 "name": "Nome",
-                "description": "Descrizione",
+                "desc": "Descrizione",
                 "source": "Sorgente del dato",
                 "remove": "Elimina",
                 "removeButton": "Elimina"

diff --git a/bundles/framework/myplacesimport/resources/locale/nb.js b/bundles/framework/myplacesimport/resources/locale/nb.js
@@ -45,7 +45,7 @@ Oskari.registerLocalization(
             "title": "Datasett",
             "grid": {
                 "name": "Navn",
-                "description": "Beskrivelse",
+                "desc": "Beskrivelse",
                 "source": "Datakilde",
                 "remove": "Slett",
                 "removeButton": "Slett"

diff --git a/bundles/framework/myplacesimport/resources/locale/nl.js b/bundles/framework/myplacesimport/resources/locale/nl.js
@@ -45,7 +45,7 @@ Oskari.registerLocalization(
             "title": "Datasets",
             "grid": {
                 "name": "Naam",
-                "description": "Beschrijving",
+                "desc": "Beschrijving",
                 "source": "Gegevensbron",
                 "remove": "Verwijderen",
                 "removeButton": "Verwijderen"

diff --git a/bundles/framework/myplacesimport/resources/locale/ru.js b/bundles/framework/myplacesimport/resources/locale/ru.js
@@ -50,7 +50,7 @@ Oskari.registerLocalization(
             "deleteLayer": "Стереть слой карты",
             "grid": {
                 "name": "Название",
-                "description": "Описание",
+                "desc": "Описание",
                 "source": "Источник данных",
                 "edit": "Редактировать",
                 "editButton": "Редактировать",

diff --git a/bundles/framework/myplacesimport/resources/locale/sk.js b/bundles/framework/myplacesimport/resources/locale/sk.js
@@ -45,7 +45,7 @@ Oskari.registerLocalization(
             "title": "Datasety",
             "grid": {
                 "name": "Názov",
-                "description": "Popis",
+                "desc": "Popis",
                 "source": "Zdroj údajov",
                 "remove": "Vymazať",
                 "removeButton": "Vymazať"

diff --git a/bundles/framework/myplacesimport/resources/locale/sl.js b/bundles/framework/myplacesimport/resources/locale/sl.js
@@ -45,7 +45,7 @@ Oskari.registerLocalization(
             "title": "Nabor podatkov",
             "grid": {
                 "name": "Ime",
-                "description": "Opis",
+                "desc": "Opis",
                 "source": "Vir podatkov",
                 "remove": "Briši",
                 "removeButton": "Briši"

diff --git a/bundles/framework/myplacesimport/resources/locale/sv.js b/bundles/framework/myplacesimport/resources/locale/sv.js
@@ -60,7 +60,7 @@ Oskari.registerLocalization(
             "deleteLayer": "Ta bort kartlagret",
             "grid": {
                 "name": "Namn",
-                "description": "Beskrivning",
+                "desc": "Beskrivning",
                 "source": "Datakälla",
                 "edit": "Redigera",
                 "editButton": "Redigera",

diff --git a/bundles/framework/myplacesimport/service/MyPlacesImportService.js b/bundles/framework/myplacesimport/service/MyPlacesImportService.js
@@ -199,15 +199,13 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplacesimport.MyPlacesImportSer
      * @param {Object} updatedLayer
      */
     updateLayer: function (updatedLayer) {
-        const { id, locale, options } = updatedLayer;
+        const { id } = updatedLayer;
         const layer = this.instance.getMapLayerService().findMapLayer(id);
         if (!layer) {
             this.log.error('Could not find layer for update with id:' + id);
             return;
         }
-        layer.setLocale(locale);
-        layer.setOptions(options);
-        layer.setStylesFromOptions(options);
+        layer.handleUpdatedLayer(updatedLayer);
         const sandbox = this.instance.getSandbox();
         const evt = Oskari.eventBuilder('MapLayerEvent')(id, 'update');
         sandbox.notifyAll(evt);
@@ -287,12 +285,6 @@ Oskari.clazz.define('Oskari.mapframework.bundle.myplacesimport.MyPlacesImportSer
         // There might be other userlayer typed layers in maplayerservice from link parameters that might NOT be this users layers.
         // This is used to filter out other users shared layers when listing layers on the My Data functionality.
         mapLayer.markAsInternalDownloadSource();
-        // Add organization and groups for users own datasets (otherwise left empty/data from baselayer)
-        mapLayer.setOrganizationName(this.instance.loc('layer.organization'));
-        mapLayer.setGroups([{
-            id: this.groupId,
-            name: this.instance.loc('layer.inspire')
-        }]);
         // Add the layer to the map layer service
         mapLayerService.addLayer(mapLayer, skipEvent);
         if (typeof cb === 'function') {

diff --git a/bundles/mapping/mapmodule/domain/AbstractLayer.js b/bundles/mapping/mapmodule/domain/AbstractLayer.js
@@ -141,6 +141,7 @@ Oskari.clazz.define(
             unsupported: null // {UnsupportedLayerReason} most severe reason if unsupported
         };
         this._describeLayerStatus = DESCRIBE_LAYER.UNDEFINED;
+        this._describeLayerInfo = null;
     }, {
         /**
          * @method setId
@@ -1289,6 +1290,12 @@ Oskari.clazz.define(
         },
         handleDescribeLayer: function (info) {
             // to override in AbstarctVectorLayer
+        },
+        getDescribeLayerInfo: function () {
+            return this._describeLayerInfo;
+        },
+        setDescribeLayerInfo: function (info) {
+            this._describeLayerInfo = info;
         }
     }
 );
diff --git a/bundles/mapping/mapmodule/domain/AbstractVectorLayer.js b/bundles/mapping/mapmodule/domain/AbstractVectorLayer.js
@@ -1,12 +1,13 @@
-import { VectorStyle, createDefaultStyle, DEFAULT_STYLE_NAME, parseStylesFromOptions } from './VectorStyle';
+import { VectorStyle, createDefaultStyle, DEFAULT_STYLE_NAME } from './VectorStyle';
 
 const AbstractLayer = Oskari.clazz.get('Oskari.mapframework.domain.AbstractLayer');
 
 export class AbstractVectorLayer extends AbstractLayer {
     constructor () {
         super(...arguments);
-        this.hoverOptions = null;
+        this._hoverOptions = null;
         this._storedStyleName = null;
+        this._controlData = {};
     }
 
     /* override */
@@ -45,20 +46,26 @@ export class AbstractVectorLayer extends AbstractLayer {
         return this._currentStyle;
     }
 
+    /* override */
+    getStyleType () {
+        return this._controlData.styleType;
+    }
+
+    /* override */
     getLegendImage () {
         return null;
     }
 
     setHoverOptions (options) {
-        this.hoverOptions = options;
+        this._hoverOptions = options;
     }
 
     getHoverOptions () {
-        return this.hoverOptions;
+        return this._hoverOptions;
     }
 
     handleDescribeLayer (info) {
-        const { styles = [] } = info;
+        const { styles = [], controlData = {}, hover } = info;
         const vs = styles.map(s => new VectorStyle(s));
         if (vs.length) {
             // override all styles as create map layer if there were any
@@ -68,16 +75,8 @@ export class AbstractVectorLayer extends AbstractLayer {
             // request notifies change
             Oskari.getSandbox().postRequestByName('ChangeMapLayerStyleRequest', [this.getId(), this._storedStyleName]);
         }
-    }
-
-    // For user data layers
-    setStylesFromOptions (options) {
-        const styles = parseStylesFromOptions(options);
-        this.setStyles(styles);
-        // Remove styles from options to be sure that VectorStyle is used
-        delete options.styles;
-        // update current style
-        this.selectStyle(this.getCurrentStyle().getName());
+        this._controlData = controlData;
+        this._hoverOptions = hover;
     }
 
     removeStyle (name) {
@@ -104,7 +103,7 @@ export class AbstractVectorLayer extends AbstractLayer {
      *  @return {Number} Distance between features in pixels
      */
     getClusteringDistance () {
-        return this.getOptions().clusteringDistance;
+        return this._controlData.clusteringDistance;
     }
 
     /**
@@ -113,7 +112,7 @@ export class AbstractVectorLayer extends AbstractLayer {
      *  @return {Number} Distance between features in pixels
      */
     setClusteringDistance (distance) {
-        this.getOptions().clusteringDistance = distance;
+        this._controlData.clusteringDistance = distance;
     }
 }