@opengeoweb/webmap-react 9.22.0 → 9.24.0

package/index.esm.js

@@ -60,51 +60,53 @@ var en = {
 	"webmap-react-point": "Point",
 	"webmap-react-polygon": "Polygon",
 	"webmap-react-box": "Box",
-	"webmap-react-linestring": "LineString"
+	"webmap-react-linestring": "LineString",
+	"webmap-react-delete": "Delete"
 };
 var fi = {
-	"webmap-react-event": "ei käännetty",
-	"webmap-react-sent": "ei käännetty",
-	"webmap-react-utc": "ei käännetty",
-	"webmap-react-expires": "ei käännetty",
-	"webmap-react-sender": "ei käännetty",
-	"webmap-react-identifier": "ei käännetty",
-	"webmap-react-no-layers": "ei käännetty",
-	"webmap-react-legend": "ei käännetty",
-	"webmap-react-title": "ei käännetty",
-	"webmap-react-name": "ei käännetty",
-	"webmap-react-service": "ei käännetty",
-	"webmap-react-abstract": "ei käännetty",
-	"webmap-react-dimensions": "ei käännetty",
-	"webmap-react-styles": "ei käännetty",
-	"webmap-react-bounding-box": "ei käännetty",
-	"webmap-react-groups": "ei käännetty",
-	"webmap-react-keywords": "ei käännetty",
-	"webmap-react-zoom-reset": "ei käännetty",
-	"webmap-react-zoom-in": "ei käännetty",
-	"webmap-react-zoom-out": "ei käännetty",
-	"webmap-react-show": "ei käännetty",
-	"webmap-react-click-disconnect": "ei käännetty",
-	"webmap-react-click-connect": "ei käännetty",
-	"webmap-react-layer-info": "ei käännetty",
-	"webmap-react-vertical-level": "ei käännetty",
-	"webmap-react-hpa": "ei käännetty",
-	"webmap-react-ensemble-member": "ei käännetty",
-	"webmap-react-member": "ei käännetty",
-	"webmap-react-probability": "ei käännetty",
-	"webmap-react-percent": "ei käännetty",
-	"webmap-react-level": "ei käännetty",
-	"webmap-react-west": "ei käännetty",
-	"webmap-react-east": "ei käännetty",
-	"webmap-react-north": "ei käännetty",
-	"webmap-react-south": "ei käännetty",
-	"webmap-react-new-linestring-created": "ei käännetty",
-	"webmap-react-new-feature": "ei käännetty",
-	"webmap-react-new-point": "ei käännetty",
-	"webmap-react-point": "ei käännetty",
-	"webmap-react-polygon": "ei käännetty",
-	"webmap-react-box": "ei käännetty",
-	"webmap-react-linestring": "ei käännetty"
+	"webmap-react-event": "tapahtuma:",
+	"webmap-react-sent": "Lähetetty:",
+	"webmap-react-utc": "UTC",
+	"webmap-react-expires": "Vanhentunut",
+	"webmap-react-sender": "Lähettäjä:",
+	"webmap-react-identifier": "Tunniste",
+	"webmap-react-no-layers": "Ei karttatasoja",
+	"webmap-react-legend": "Selite",
+	"webmap-react-title": "Titteli",
+	"webmap-react-name": "Nimi",
+	"webmap-react-service": "Palvelu",
+	"webmap-react-abstract": "Tiivistelmä",
+	"webmap-react-dimensions": "Dimensiot",
+	"webmap-react-styles": "Tyylit",
+	"webmap-react-bounding-box": "Rajaava-alue",
+	"webmap-react-groups": "Ryhmät",
+	"webmap-react-keywords": "Avainsanat",
+	"webmap-react-zoom-reset": "Resetoi zoom",
+	"webmap-react-zoom-in": "Zoomaa sisään",
+	"webmap-react-zoom-out": "Zoomaa ulos",
+	"webmap-react-show": "Näytä",
+	"webmap-react-click-disconnect": "Irroita karttataso napsauttamalla",
+	"webmap-react-click-connect": "Yhdistä karttataso napsauttamalla",
+	"webmap-react-layer-info": "Karttatason tiedot",
+	"webmap-react-vertical-level": "pystytaso",
+	"webmap-react-hpa": "hPa",
+	"webmap-react-ensemble-member": "Yhdistelmämallijäsen",
+	"webmap-react-member": "jäsen",
+	"webmap-react-probability": "Todennäköisyys",
+	"webmap-react-percent": "%",
+	"webmap-react-level": "Taso",
+	"webmap-react-west": "länsi",
+	"webmap-react-east": "itä",
+	"webmap-react-north": "pohjoinen",
+	"webmap-react-south": "etelä",
+	"webmap-react-new-linestring-created": "Viivajonoon luotiin uusi piste",
+	"webmap-react-new-feature": "uusi kohde luotu",
+	"webmap-react-new-point": "uusi piste luotu",
+	"webmap-react-point": "Piste",
+	"webmap-react-polygon": "Monikulmio",
+	"webmap-react-box": "Laatikko",
+	"webmap-react-linestring": "Viivajono",
+	"webmap-react-delete": "Poista"
 };
 var no = {
 	"webmap-react-event": "hendelse:",
@@ -148,7 +150,8 @@ var no = {
 	"webmap-react-point": "Punkt",
 	"webmap-react-polygon": "Polygon",
 	"webmap-react-box": "Boks",
-	"webmap-react-linestring": "Linje"
+	"webmap-react-linestring": "Linje",
+	"webmap-react-delete": "Fjerne"
 };
 var nl = {
 	"webmap-react-event": "event:",
@@ -192,7 +195,8 @@ var nl = {
 	"webmap-react-point": "Punt",
 	"webmap-react-polygon": "Polygoon",
 	"webmap-react-box": "Rechthoek",
-	"webmap-react-linestring": "Lijn"
+	"webmap-react-linestring": "Lijn",
+	"webmap-react-delete": "Verwijder"
 };
 var webmapReactTranslations = {
 	en: en,
@@ -6132,7 +6136,7 @@ const getIcon = selectionType => {
 const defaultPoint = {
   drawModeId: 'drawtools-point',
   value: DRAWMODE.POINT,
-  title: 'Point',
+  title: `${WEBMAP_REACT_NAMESPACE}:webmap-react-point`,
   shape: emptyPoint,
   isSelectable: true,
   selectionType: 'point'
@@ -6140,7 +6144,7 @@ const defaultPoint = {
 const defaultPolygon = {
   drawModeId: 'drawtools-polygon',
   value: DRAWMODE.POLYGON,
-  title: 'Polygon',
+  title: `${WEBMAP_REACT_NAMESPACE}:webmap-react-polygon`,
   shape: emptyPolygon,
   isSelectable: true,
   selectionType: 'poly'
@@ -6148,7 +6152,7 @@ const defaultPolygon = {
 const defaultBox = {
   drawModeId: 'drawtools-box',
   value: DRAWMODE.BOX,
-  title: 'Box',
+  title: `${WEBMAP_REACT_NAMESPACE}:webmap-react-box`,
   shape: emptyBox,
   isSelectable: true,
   selectionType: 'box'
@@ -6156,7 +6160,7 @@ const defaultBox = {
 const defaultLineString = {
   drawModeId: 'drawtools-linestring',
   value: DRAWMODE.LINESTRING,
-  title: 'LineString',
+  title: `${WEBMAP_REACT_NAMESPACE}:webmap-react-linestring`,
   shape: emptyLineString,
   isSelectable: true,
   selectionType: 'linestring'
@@ -6164,7 +6168,7 @@ const defaultLineString = {
 const defaultDelete = {
   drawModeId: 'drawtools-delete',
   value: 'DELETE',
-  title: 'Delete',
+  title: `${WEBMAP_REACT_NAMESPACE}:webmap-react-delete`,
   shape: emptyGeoJSON,
   isSelectable: false,
   selectionType: 'delete'
@@ -9814,26 +9818,49 @@ class ReactMapView extends React.Component {
       currentChildren: []
     };
     this.refetchTimer = null;
-    this.onStartRefetchTimer = () => {
+    /**
+     * Last epoch time the map was visible in millisecs. Null if the map is currently visible.
+     */
+    this.lastVisible = null;
+    this.handleVisibilityChange = () => {
+      const {
+        shouldAutoFetch
+      } = this.props;
+      const autoFetchInterval = Number(shouldAutoFetch); // Default true -> 1 minute
+      const autoFetchIntervalMilliSeconds = Math.abs(autoFetchInterval) * MINUTE_TO_MILLISECOND;
+      if (document.visibilityState === 'visible') {
+        if (this.lastVisible &&
+        // skip if last visibility change was within 1 minute (or the autoFetchInterval)
+        new Date().getTime() - this.lastVisible > autoFetchIntervalMilliSeconds) {
+          this.onStartRefetchTimer(true);
+        }
+        this.lastVisible = null;
+      } else {
+        this.lastVisible = new Date().getTime();
+        this.clearRefetchTimer();
+      }
+    };
+    /**
+     * Start the refetch timer
+     * @param force - Force a fetch and wmLayer parse immediately
+     */
+    this.onStartRefetchTimer = force => {
       const {
         shouldAutoFetch
       } = this.props;
-      /* TODO, Maarten Plieger, 2021-09-02, https://gitlab.com/opengeoweb/opengeoweb/-/issues/1159:
+      /* TODO, Maarten Plieger, 2021-09-02
         This causes many issues, we should improve the update strategy.
         Certain presets have >20 layers. This causes 20 times parsing the GetCapabilities for a minor update of the store.
       */
       this.clearRefetchTimer();
       const autoFetchInterval = Number(shouldAutoFetch); // Default true -> 1 minute
-      this.refetchTimer = setInterval(() => {
+      const refetch = () => {
         const {
           mapId
         } = this.props;
         const wmjsMap = webmapUtils.getWMJSMapById(mapId);
-        if (!wmjsMap) {
-          return;
-        }
-        const layers = wmjsMap.getLayers();
-        layers.forEach(layer => {
+        const layers = wmjsMap === null || wmjsMap === void 0 ? void 0 : wmjsMap.getLayers();
+        layers === null || layers === void 0 ? void 0 : layers.forEach(layer => {
           if (layer.enabled !== false) {
             parseWMJSLayer(layer, true).then(wmLayer => {
               const {
@@ -9850,7 +9877,11 @@ class ReactMapView extends React.Component {
             });
           }
         });
-      }, Math.abs(autoFetchInterval) * MINUTE_TO_MILLISECOND);
+      };
+      this.refetchTimer = setInterval(refetch, Math.abs(autoFetchInterval) * MINUTE_TO_MILLISECOND);
+      if (force) {
+        refetch();
+      }
     };
     this.clearRefetchTimer = () => {
       if (this.refetchTimer) {
@@ -9865,6 +9896,7 @@ class ReactMapView extends React.Component {
     this.drawDebounced = debounce(600, this.drawDebounced);
     this.updateWMJSMapProps = this.updateWMJSMapProps.bind(this);
     this.mountWMJSMap = this.mountWMJSMap.bind(this);
+    this.handleVisibilityChange = this.handleVisibilityChange.bind(this);
     this.onAfterSetBBoxListener = this.onAfterSetBBoxListener.bind(this);
     this.onUpdateBBoxListener = this.onUpdateBBoxListener.bind(this);
     this.onDimChangeListener = this.onDimChangeListener.bind(this);
@@ -9885,6 +9917,7 @@ class ReactMapView extends React.Component {
     this.mountWMJSMap();
     if (shouldAutoFetch) {
       this.onStartRefetchTimer();
+      document.addEventListener('visibilitychange', this.handleVisibilityChange);
     }
     onWMJSMount(mapId);
   }
@@ -9898,6 +9931,7 @@ class ReactMapView extends React.Component {
     } = this.props;
     window.removeEventListener('resize', this.handleWindowResize);
     this.clearRefetchTimer();
+    document.removeEventListener('visibilitychange', this.handleVisibilityChange);
     webmapUtils.unRegisterWMJSMap(mapId);
     /* Reset adaguc properties */
     this.adaguc.initialized = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap-react",
-  "version": "9.22.0",
+  "version": "9.24.0",
   "description": "GeoWeb react wrapper for webmap",
   "license": "Apache-2.0",
   "repository": {

package/src/lib/components/ReactMapView/ReactMapView.d.ts

@@ -22,6 +22,10 @@ export declare class ReactMapView extends React.Component<ReactMapViewProps, Rea
     adagucContainerRef: React.RefObject<HTMLDivElement>;
     adagucWebMapJSRef: React.RefObject<HTMLDivElement>;
     refetchTimer: NodeJS.Timeout | number | null;
+    /**
+     * Last epoch time the map was visible in millisecs. Null if the map is currently visible.
+     */
+    lastVisible: number | null;
     static defaultProps: {
         srs: string;
         bbox: {
@@ -47,7 +51,12 @@ export declare class ReactMapView extends React.Component<ReactMapViewProps, Rea
     onDimChangeListener(): void;
     onAfterSetBBoxListener(): void;
     onUpdateBBoxListener(newBbox: WMBBOX): void;
-    onStartRefetchTimer: () => void;
+    handleVisibilityChange: () => void;
+    /**
+     * Start the refetch timer
+     * @param force - Force a fetch and wmLayer parse immediately
+     */
+    onStartRefetchTimer: (force?: boolean) => void;
     clearRefetchTimer: () => void;
     updateWMJSMapProps(prevProps: ReactMapViewProps, props: ReactMapViewProps): void;
     drawDebounced(): void;

package/src/lib/components/ReactMapView/ReactMapView.spec.d.ts

@@ -1 +1,2 @@
+export declare const SECOND_TO_MILLISECOND = 1000;
 export declare const mockGeoJSON: GeoJSON.FeatureCollection;