Merge pull request #505 from HSLdevcom/DT-6951

DT-6951 Fix stop monitor crashing when incorrect url

Author: Antiik91

src/ui/Monitor.tsx

@@ -10,6 +10,7 @@ import { ConfigContext, MonitorContext } from '../contexts';
 import { stopsAndStationsFromViews } from '../util/monitorUtils';
 import { getStopIcon } from '../util/stopCardUtil';
 import MonitorMapContainer from '../MonitorMapContainer';
+import NoMonitorsFound from './NoMonitorsFound';
 
 const getWindowDimensions = () => {
   const { innerWidth: width, innerHeight: height } = window;
@@ -126,9 +127,25 @@ const Monitor: FC<IProps> = ({
       });
     })
     .flat();
-  stopsForMap.forEach(c => {
-    c.coords.flat();
-  });
+
+  if (!stopsForMap.length) {
+    return (
+      <div
+        style={style}
+        className={cx('main-content-container', {
+          preview: isPreview,
+          portrait: !isLandscapeByLayout,
+        })}
+        onMouseMove={() => {
+          setShowOverlay(true);
+          clearTimeout(to);
+          to = setTimeout(() => setShowOverlay(false), 3000);
+        }}
+      >
+        <NoMonitorsFound />
+      </div>
+    );
+  }
   return (
     <div
       style={style}

src/ui/MonitorTitleBar.tsx

@@ -26,11 +26,11 @@ const MonitorTitlebar: FC<IProps> = ({
   const lat =
     view.type === 'map'
       ? view.stops[0].coords[0]
-      : view.columns.left.stops[0].lat;
+      : view.columns.left.stops[0]?.lat;
   const lon =
     view.type === 'map'
       ? view.stops[0].coords[1]
-      : view.columns.left.stops[0].lon;
+      : view.columns.left.stops[0]?.lon;
 
   const showWeather = !isMultiDisplay && isLandscape && lat && lon;