@eeacms/volto-eea-map 0.1.22 → 0.1.24

package/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [0.1.24](https://github.com/eea/volto-eea-map/compare/0.1.23...0.1.24) - 21 September 2022
+
+#### :hammer_and_wrench: Others
+
+- remove renderer module [andreiggr - [`d55e99c`](https://github.com/eea/volto-eea-map/commit/d55e99c189b79727f6e076ded737b920bead4c7d)]
+- map layer proper url [andreiggr - [`297186d`](https://github.com/eea/volto-eea-map/commit/297186daeb52c7a01f134bd4c2f0ed778aa01238)]
+### [0.1.23](https://github.com/eea/volto-eea-map/compare/0.1.22...0.1.23) - 15 September 2022
+
+#### :hammer_and_wrench: Others
+
+- lint fix [andreiggr - [`403512e`](https://github.com/eea/volto-eea-map/commit/403512e1e354a333b71797cd4bf9bdcfb96e7134)]
+- fix print sizes [andreiggr - [`c75b290`](https://github.com/eea/volto-eea-map/commit/c75b29014ca606af6ea54f003db08aad764532ab)]
 ### [0.1.22](https://github.com/eea/volto-eea-map/compare/0.1.21...0.1.22) - 13 September 2022
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-map",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "description": "@eeacms/volto-eea-map: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -23,7 +23,7 @@
   "dependencies": {
     "@eeacms/volto-embed": "4.0.2",
     "@plone/scripts": "*",
-    "esri-loader": "3.5.0",
+    "esri-loader": "3.6.0",
     "lodash": "4.17.21",
     "react-querybuilder": "4.2.3",
     "volto-slate": "*"

package/src/components/Webmap.jsx

@@ -75,7 +75,7 @@ const Webmap = (props) => {
     }
   }, [setModules, options]);
 
-  // eslint-disable-next-line no-unused-vars
+  //eslint-disable-next-line no-unused-vars
   const esri = React.useMemo(() => {
     if (Object.keys(modules).length === 0) return {};
     const {
@@ -94,21 +94,26 @@ const Webmap = (props) => {
       map_layers && map_layers.length > 0
         ? map_layers
             .filter(({ map_service_url, layer }) => map_service_url && layer)
-            .map(({ map_service_url, layer, query = '' }) => {
-              const url = `${map_service_url}/${layer}`;
+            .map(({ map_service_url, layer, fullLayer, query = '' }, index) => {
+              const url = `${map_service_url}/${layer?.id}`;
               let mapLayer;
               switch (layer.type) {
                 case 'Raster Layer':
                   mapLayer = new MapImageLayer({
                     url: map_service_url,
+                    minScale: layer?.minScale,
+                    maxScale: layer?.maxScale,
                   });
                   break;
                 case 'Feature Layer':
                   mapLayer = new FeatureLayer({
+                    layerId: layer.id,
                     url,
                     definitionExpression: query
                       ? formatQuery(query, 'sql')
                       : '',
+                    minScale: layer?.minScale,
+                    maxScale: layer?.maxScale,
                   });
                   break;
                 case 'Group Layer':
@@ -124,7 +129,6 @@ const Webmap = (props) => {
       basemap: base_layer || 'hybrid',
       layers,
     });
-
     const view = new MapView({
       container: mapRef.current,
       map,
@@ -204,8 +208,10 @@ const Webmap = (props) => {
     }
 
     if (layers && layers.length > 0) {
-      view.whenLayerView(layers[0]).then((layerView) => {
-        layerView.watch('updating', (val) => {});
+      layers.forEach((layer) => {
+        view.whenLayerView(layer).then((layerView) => {
+          layerView.watch('updating', (val) => {});
+        });
       });
     }
     return { view, map };

package/src/components/widgets/LayerSelectWidget.jsx

@@ -135,6 +135,7 @@ const LayerSelectWidget = (props) => {
     onChange(id, {
       ...value,
       layer,
+      fullLayer,
       fields: fullLayer.fields,
       map_service_url: serviceUrl,
       available_layers: availableLayers,

package/src/components/widgets/LegendWidget.jsx

@@ -78,6 +78,7 @@ const LayerLegend = ({ data, show_viewer }) => {
               <span key={i} style={{ display: 'flex', alignItems: 'center' }}>
                 <img
                   alt="alt"
+                  className="layer-legend-item-color"
                   src={`data:image/png;base64,${item.imageData}`}
                 />
                 <span style={{ fontSize: '13px', marginLeft: '5px' }}>

package/src/styles/map.css

@@ -196,3 +196,10 @@
     transform: translate3d(0, 0, 0);
   }
 }
+
+@media print {
+  .layer-legend-item-color {
+    max-width: 0.2cm;
+    height: 0.2cm;
+  }
+}