update

Author: sirmmo

src/app/components/Map/TWLSample.tsx

@@ -125,6 +125,14 @@ export const TWLSample = (props: any) => {
           url.searchParams.get('op') === 'screenshot'
         ) {
           setIsSh(true);
+          if (url.searchParams.has('year')) {
+            const y = url.searchParams.get('year');
+            if (y) {
+              setTimeout(() => {
+                setCurrYear(parseInt(y), mode);
+              }, 1250);
+            }
+          }
         } else {
           if (!yearSet) {
             let dt = new Date(+cdata.time).getFullYear();

src/app/components/MapSearch/index.tsx

@@ -421,18 +421,17 @@ export const MapPopup: React.FunctionComponent<MapPopupProps> = props => {
     let atv = 0;
     let url = new URL(window.location.href);
     let yrparam = url.searchParams.get('year');
-    let yrfield = document.getElementsByClassName('timecontrol-date');
-    let yrstring =
-      data === 'forecast' ? '2035' : (new Date().getFullYear() - 1).toString();
-    if (yrfield.length > 0) {
-      yrstring = yrfield[0].textContent!;
-    } else if (yrparam) {
+    let yrstring: string | null | undefined = null;
+
+    if (yrparam) {
       yrstring = yrparam;
     }
     try {
-      yr = parseInt(yrstring, 10);
-      if (isNaN(yr))
-        yr = data === 'forecast' ? 2035 : new Date().getFullYear() - 1;
+      if (yrstring) {
+        yr = parseInt(yrstring, 10);
+        if (isNaN(yr))
+          yr = data === 'forecast' ? 2035 : new Date().getFullYear() - 1;
+      }
     } catch (ex) {
       yr = data === 'forecast' ? 2035 : new Date().getFullYear() - 1;
     }

src/app/pages/MapPage/index.tsx

@@ -485,12 +485,12 @@ export function MapPage(props: MapPageProps) {
   useEffect(() => {
     let year = '';
     try {
-      year =
-        currentMap.aggregation_period === 'annual'
-          ? new Date((mapRef.current as any).timeDimension?.getCurrentTime())
-            .getFullYear()
-            .toString()
-          : '';
+      let url = new URL(window.location.href);
+      if (url.searchParams.has('year')) {
+        //@ts-ignore
+        year = url.searchParams.get('year');
+      }
+
       console.log('showing year', year);
     } catch (e) {
       // console.log('no year');
@@ -585,8 +585,7 @@ export function MapPage(props: MapPageProps) {
     let year = '';
     if (yrparam) {
       year = yrparam;
-    }
-    try {
+    } else {
       year =
         currentMap.aggregation_period === 'annual' ||
           currentMap.aggregation_period === 'test'
@@ -597,8 +596,6 @@ export function MapPage(props: MapPageProps) {
               .toString()
           : '';
       console.log('showing year', year);
-    } catch (e) {
-      // console.log('no year');
     }
 
     setInProgress(true);