pre-load wfo point info for regional and travel cities

server/scripts/data/travelcities.js

@@ -4,120 +4,240 @@ const TravelCities = [
 		Name: 'Atlanta',
 		Latitude: 33.749,
 		Longitude: -84.388,
+		point: {
+			x: 50,
+			y: 86,
+			wfo: 'FFC',
+		},
 	},
 	{
 		Name: 'Boston',
 		Latitude: 42.3584,
 		Longitude: -71.0598,
+		point: {
+			x: 71,
+			y: 90,
+			wfo: 'BOX',
+		},
 	},
 	{
 		Name: 'Chicago',
 		Latitude: 41.9796,
 		Longitude: -87.9045,
+		point: {
+			x: 65,
+			y: 76,
+			wfo: 'LOT',
+		},
 	},
 	{
 		Name: 'Cleveland',
 		Latitude: 41.4995,
 		Longitude: -81.6954,
+		point: {
+			x: 82,
+			y: 64,
+			wfo: 'CLE',
+		},
 	},
 	{
 		Name: 'Dallas',
 		Latitude: 32.8959,
 		Longitude: -97.0372,
+		point: {
+			x: 79,
+			y: 108,
+			wfo: 'FWD',
+		},
 	},
 	{
 		Name: 'Denver',
 		Latitude: 39.7391,
 		Longitude: -104.9847,
+		point: {
+			x: 62,
+			y: 60,
+			wfo: 'BOU',
+		},
 	},
 	{
 		Name: 'Detroit',
 		Latitude: 42.3314,
 		Longitude: -83.0457,
+		point: {
+			x: 65,
+			y: 33,
+			wfo: 'DTX',
+		},
 	},
 	{
 		Name: 'Hartford',
 		Latitude: 41.7637,
 		Longitude: -72.6851,
+		point: {
+			x: 21,
+			y: 54,
+			wfo: 'BOX',
+		},
 	},
 	{
 		Name: 'Houston',
 		Latitude: 29.7633,
 		Longitude: -95.3633,
+		point: {
+			x: 65,
+			y: 97,
+			wfo: 'HGX',
+		},
 	},
 	{
 		Name: 'Indianapolis',
 		Latitude: 39.7684,
 		Longitude: -86.158,
+		point: {
+			x: 57,
+			y: 68,
+			wfo: 'IND',
+		},
 	},
 	{
 		Name: 'Los Angeles',
 		Latitude: 34.0522,
 		Longitude: -118.2437,
+		point: {
+			x: 154,
+			y: 44,
+			wfo: 'LOX',
+		},
 	},
 	{
 		Name: 'Miami',
 		Latitude: 25.7743,
 		Longitude: -80.1937,
+		point: {
+			x: 109,
+			y: 50,
+			wfo: 'MFL',
+		},
 	},
 	{
 		Name: 'Minneapolis',
 		Latitude: 44.98,
 		Longitude: -93.2638,
+		point: {
+			x: 107,
+			y: 71,
+			wfo: 'MPX',
+		},
 	},
 	{
 		Name: 'New York',
 		Latitude: 40.7142,
 		Longitude: -74.0059,
+		point: {
+			x: 32,
+			y: 34,
+			wfo: 'OKX',
+		},
 	},
 	{
 		Name: 'Norfolk',
 		Latitude: 36.8468,
 		Longitude: -76.2852,
+		point: {
+			x: 89,
+			y: 51,
+			wfo: 'AKQ',
+		},
 	},
 	{
 		Name: 'Orlando',
 		Latitude: 28.5383,
 		Longitude: -81.3792,
+		point: {
+			x: 26,
+			y: 68,
+			wfo: 'MLB',
+		},
 	},
 	{
 		Name: 'Philadelphia',
 		Latitude: 39.9523,
 		Longitude: -75.1638,
+		point: {
+			x: 49,
+			y: 75,
+			wfo: 'PHI',
+		},
 	},
 	{
 		Name: 'Pittsburgh',
 		Latitude: 40.4406,
 		Longitude: -79.9959,
+		point: {
+			x: 77,
+			y: 65,
+			wfo: 'PBZ',
+		},
 	},
 	{
 		Name: 'St. Louis',
 		Latitude: 38.6273,
 		Longitude: -90.1979,
+		point: {
+			x: 94,
+			y: 73,
+			wfo: 'LSX',
+		},
 	},
 	{
 		Name: 'San Francisco',
 		Latitude: 37.7749,
 		Longitude: -122.4194,
+		point: {
+			x: 85,
+			y: 105,
+			wfo: 'MTR',
+		},
 	},
 	{
 		Name: 'Seattle',
 		Latitude: 47.6062,
 		Longitude: -122.3321,
+		point: {
+			x: 124,
+			y: 67,
+			wfo: 'SEW',
+		},
 	},
 	{
 		Name: 'Syracuse',
 		Latitude: 43.0481,
 		Longitude: -76.1474,
+		point: {
+			x: 51,
+			y: 98,
+			wfo: 'BGM',
+		},
 	},
 	{
 		Name: 'Tampa',
 		Latitude: 27.9475,
 		Longitude: -82.4584,
+		point: {
+			x: 70,
+			y: 96,
+			wfo: 'TBW',
+		},
 	},
 	{
 		Name: 'Washington DC',
 		Latitude: 38.8951,
 		Longitude: -77.0364,
+		point: {
+			x: 97,
+			y: 71,
+			wfo: 'LWX',
+		},
 	},
 ];

server/scripts/modules/regionalforecast.js

@@ -65,13 +65,12 @@ class RegionalForecast extends WeatherDisplay {
 		// get regional forecasts and observations (the two are intertwined due to the design of api.weather.gov)
 		const regionalDataAll = await Promise.all(regionalCities.map(async (city) => {
 			try {
-				// get the point first, then break down into forecast and observations
-				const point = await utils.weather.getPoint(city.lat, city.lon);
+				if (!city.point) throw new Error('No pre-loaded point');
 
 				// start off the observation task
-				const observationPromise = RegionalForecast.getRegionalObservation(point, city);
+				const observationPromise = RegionalForecast.getRegionalObservation(city.point, city);
 
-				const forecast = await utils.fetch.json(point.properties.forecast);
+				const forecast = await utils.fetch.json(`https://api.weather.gov/gridpoints/${city.point.wfo}/${city.point.x},${city.point.y}/forecast`);
 
 				// get XY on map for city
 				const cityXY = RegionalForecast.getXYForCity(city, minMaxLatLon.maxLat, minMaxLatLon.minLon, weatherParameters.state);
@@ -142,7 +141,7 @@ class RegionalForecast extends WeatherDisplay {
 	static async getRegionalObservation(point, city) {
 		try {
 			// get stations
-			const stations = await utils.fetch.json(point.properties.observationStations);
+			const stations = await utils.fetch.json(`https://api.weather.gov/gridpoints/${city.point.wfo}/${city.point.x},${city.point.y}/stations`);
 
 			// get the first station
 			const station = stations.features[0].id;

server/scripts/modules/travelforecast.js

@@ -29,8 +29,8 @@ class TravelForecast extends WeatherDisplay {
 		const forecastPromises = TravelCities.map(async (city) => {
 			try {
 				// get point then forecast
-				const point = await utils.weather.getPoint(city.Latitude, city.Longitude);
-				const forecast = await utils.fetch.json(point.properties.forecast);
+				if (!city.point) throw new Error('No pre-loaded point');
+				const forecast = await utils.fetch.json(`https://api.weather.gov/gridpoints/${city.point.wfo}/${city.point.x},${city.point.y}/forecast`);
 				// determine today or tomorrow (shift periods by 1 if tomorrow)
 				const todayShift = forecast.properties.periods[0].isDaytime ? 0 : 1;
 				// return a pared-down forecast