fix typescript errors

lib/components/map/enhanced-stop-marker.tsx

@@ -120,6 +120,7 @@ class EnhancedStopMarker extends Component<Props> {
       setViewedStop,
       stop
     } = this.props
+    if (stop.lat === undefined || stop.lon === undefined) return null
     const { id, lat, lon } = stop
     const displayedStopId = coreUtils.itinerary.getDisplayedStopId(stop)
     if (!displayedStopId) return null
@@ -140,6 +141,7 @@ class EnhancedStopMarker extends Component<Props> {
           activeStopId !== stop.id && (
             <BaseMapStyled.MapOverlayPopup id={activeContentId}>
               <StopPopup
+                // @ts-expect-error The lat and lon are checked for above, but TS doesn't detect this
                 entity={stop}
                 setLocation={setLocation}
                 setViewedStop={setViewedStop}

lib/components/util/types.ts

@@ -2,6 +2,7 @@ import {
   Agency,
   MapLocationActionArg,
   Route,
+  Station,
   Stop
 } from '@opentripplanner/types'
 
@@ -93,6 +94,7 @@ export interface PatternDayStopTimes extends PatternStopTimes {
 
 export interface VehicleRental {
   errorsByNetwork: { [key: string]: { message?: string; severity?: string } }
+  stations: Station[]
   systemInformationDataByNetwork: {
     [key: string]: { message?: string; severity?: string }
   }

lib/components/viewers/amenities-panel.tsx

@@ -8,6 +8,7 @@ import React, { Component, Suspense } from 'react'
 import styled from 'styled-components'
 
 import { ComponentContext } from '../../util/contexts'
+import { StopData } from '../util/types'
 
 import RelatedPanel from './related-panel'
 
@@ -35,11 +36,7 @@ const parkAndRideMarker = (
 type Props = {
   configCompanies: ConfiguredCompany[]
   intl: IntlShape
-  stopData: Stop & {
-    bikeRental: any
-    parkAndRideLocations: any
-    vehicleRental: any
-  }
+  stopData: StopData
 }
 type State = {
   expanded: boolean