updates

Author: sirmmo

src/app/Services/API/Requests/index.ts

@@ -749,4 +749,10 @@ export class RequestApi extends Http {
   };
 
   public getForecastAttribute = (attribute, params = {}) => {};
+
+  public getAppVersion = () => {
+    const ret = this.instance.get<any>(
+      `${BACKEND_API_URL}/coverages/configuration-parameters?offset=0&limit=100`,
+    );
+  };
 }

src/app/components/Map/DynamicStationsLayer.tsx

@@ -37,25 +37,28 @@ export const DynamicStationsLayer = (props: any) => {
       // @ts-ignore
       context.map.getPane('stationssel').style.zIndex = zIndex;
 
+      let ln = url.split('/')[4];
+
+      const vtlstyles = {};
+      vtlstyles[ln] = (properties, zoom, geometryDimension) => {
+        let opacity = 0.9;
+        let color = data === 'future' ? '#abb2b9' : '#464b52';
+        // console.log(zoom, color, opacity)
+        return {
+          color: color,
+          weight: data === 'future' ? 2 : 4,
+          radius: data === 'future' ? 5 : 10,
+          fill: true,
+          fillOpacity: 0.7,
+          opacity: opacity,
+        };
+      };
+
       // @ts-ignore
       let vectorLayer = L.vectorGrid.protobuf(url, {
         interactive: true,
         pane: 'stationssel',
-        vectorTileLayerStyles: {
-          stationssel: (properties, zoom, geometryDimension) => {
-            let opacity = 0.9;
-            let color = data === 'future' ? '#abb2b9' : '#464b52';
-            // console.log(zoom, color, opacity)
-            return {
-              color: color,
-              weight: data === 'future' ? 2 : 4,
-              radius: data === 'future' ? 5 : 10,
-              fill: true,
-              fillOpacity: 0.7,
-              opacity: opacity,
-            };
-          },
-        },
+        vectorTileLayerStyles: vtlstyles,
       });
 
       context.map.addLayer(vectorLayer);
@@ -79,6 +82,8 @@ export const DynamicStationsLayer = (props: any) => {
     context.map,
     selectCallback,
     url,
+    zIndex,
+    data,
   ]);
 
   return (

src/app/components/Map/StationsLayer.tsx

@@ -13,15 +13,8 @@ import { PopupStyle } from './styles';
 
 export const StationsLayer = (props: any) => {
   const { selected_map } = useSelector((state: any) => state.map);
-  const {
-    selectCallback,
-    selectedPoint,
-    openCharts,
-    zIndex,
-    variable,
-    data,
-    url,
-  } = props;
+  const { selectCallback, selectedPoint, openCharts, zIndex, variable, data } =
+    props;
   const map = useMap();
   const context = useLeafletContext();
   // console.log(context.map.latLngToLayerPoint(selectedPoint.latlng))

src/app/components/Map/index.tsx

@@ -310,7 +310,7 @@ const Map = (props: MapProps) => {
           precision={layerConf.data_precision}
         />
       </CustomControlMap>
-      {!isMobile && (
+      {!isMobile && currentMap.op !== 'screenshot' && (
         <MousePositionComponent
           position={'bottomright'}
           customComponent={
@@ -333,39 +333,35 @@ const Map = (props: MapProps) => {
       </CustomControlMap>
       {/*<BaseLayerControl/>*/}
 
-      <LayersControl position="topright">
-        <LayersControl.BaseLayer checked name="OpenStreetMap">
-          <TileLayer
-            url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-            attribution='&copy; <a target="_blank" rel="noopener" href="http://osm.org/copyright">OpenStreetMap</a> contributors'
-          />
-        </LayersControl.BaseLayer>
-        <LayersControl.BaseLayer name="Sentinel 2">
-          <TileLayer
-            url="https://tiles.maps.eox.at/wmts?layer=s2cloudless-2021_3857&style=default&tilematrixset=GoogleMapsCompatible&Service=WMTS&Request=GetTile&Version=1.0.0&Format=image%2Fjpeg&TileMatrix={z}&TileCol={x}&TileRow={y}"
-            attribution='&copy; <a target="_blank" rel="noopener" href="https://tiles.maps.eox.at/">Sentinel-2 cloudless</a> by EOX'
-          />
-        </LayersControl.BaseLayer>
-        <LayersControl.BaseLayer name="OpenTopoMap">
-          <TileLayer
-            url="https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png"
-            attribution='map data: © <a href="https://openstreetmap.org/copyright">OpenStreetMap</a> contributors, <a href="http://viewfinderpanoramas.org">SRTM</a> | map style: © <a href="https://opentopomap.org">OpenTopoMap</a> (<a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA</a>)'
-          />
-        </LayersControl.BaseLayer>
-      </LayersControl>
-      <StationsLayer
-        data={data}
-        variable={currentMap.climatological_variable}
-        url={currentMap.observation_stations_vector_tile_layer_url}
-        zIndex={550}
-      ></StationsLayer>
+      {currentMap.op !== 'screenshot' ? (
+        <LayersControl position="topright">
+          <LayersControl.BaseLayer checked name="OpenStreetMap">
+            <TileLayer
+              url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+              attribution='&copy; <a target="_blank" rel="noopener" href="http://osm.org/copyright">OpenStreetMap</a> contributors'
+            />
+          </LayersControl.BaseLayer>
+          <LayersControl.BaseLayer name="Sentinel 2">
+            <TileLayer
+              url="https://tiles.maps.eox.at/wmts?layer=s2cloudless-2021_3857&style=default&tilematrixset=GoogleMapsCompatible&Service=WMTS&Request=GetTile&Version=1.0.0&Format=image%2Fjpeg&TileMatrix={z}&TileCol={x}&TileRow={y}"
+              attribution='&copy; <a target="_blank" rel="noopener" href="https://tiles.maps.eox.at/">Sentinel-2 cloudless</a> by EOX'
+            />
+          </LayersControl.BaseLayer>
+          <LayersControl.BaseLayer name="OpenTopoMap">
+            <TileLayer
+              url="https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png"
+              attribution='map data: © <a href="https://openstreetmap.org/copyright">OpenStreetMap</a> contributors, <a href="http://viewfinderpanoramas.org">SRTM</a> | map style: © <a href="https://opentopomap.org">OpenTopoMap</a> (<a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA</a>)'
+            />
+          </LayersControl.BaseLayer>
+        </LayersControl>
+      ) : (
+        <></>
+      )}
+      <StationsLayer data={data} zIndex={550}></StationsLayer>
       <DynamicStationsLayer
         data={data}
         variable={currentMap.climatological_variable}
-        url={currentMap.observation_stations_vector_tile_layer_url?.replace(
-          'http://localhost:5001',
-          'https://arpav.geobeyond.dev',
-        )}
+        url={layerConf.observation_stations_vector_tile_layer_url}
         zIndex={575}
       ></DynamicStationsLayer>
       <VectorWrapperLayer

src/app/components/MapMenuBar/index.tsx

@@ -328,7 +328,7 @@ export function MapMenuBar(props: MapMenuBar) {
       showModal.current = false;
       console.log('activatingCV', value, combinations[value]);
       setActiveCombinations(combinations[value]);
-      localCM.current = toDefault(combinations[value + '::thirty_year']);
+      localCM.current = toDefault(combinations[value + '::30yr']);
       setCurrentMap(localCM.current);
     } else {
       const steps = [
@@ -471,7 +471,7 @@ export function MapMenuBar(props: MapMenuBar) {
     - ${labelFor(localCM.current.aggregation_period)}
     - ${labelFor(localCM.current.measure)}
     ${localCM.current.time_window &&
-        localCM.current.aggregation_period === 'thirty_year'
+        localCM.current.aggregation_period === '30yr'
         ? ' - ' + labelFor(localCM.current.time_window)
         : ''
       }

src/app/components/TimeSeriesDialog/DownloadForm.tsx

@@ -151,7 +151,7 @@ export const DownloadForm = props => {
         : null,
       data.current?.series?.filter(
         x =>
-          'station' in x.info &&
+          x.info.dataset_type === 'observation' &&
           x.info.processing_method === filter.current.sensorSmoothing,
       )[0],
     ];