diff --git a/routes/weather.ts b/routes/weather.ts index 6af3023..b682a1e 100644 --- a/routes/weather.ts +++ b/routes/weather.ts @@ -89,7 +89,7 @@ async function getLocalWateringData( coordinates: GeoCoordinates ): Promise< Wat * @return The TimeData for the specified coordinates. */ function getTimeData( coordinates: GeoCoordinates ): TimeData { - const timezone = moment().tz( geoTZ( coordinates[ 0 ], coordinates[ 1 ] ) ).utcOffset(); + const timezone = moment().tz( geoTZ( coordinates[ 0 ], coordinates[ 1 ] )[ 0 ] ).utcOffset(); const tzOffset: number = getTimezone( timezone, true ); // Calculate sunrise and sunset since Weather Underground does not provide it diff --git a/server.ts b/server.ts index deaa1c0..6989dc5 100644 --- a/server.ts +++ b/server.ts @@ -1,6 +1,6 @@ +import { config } from "dotenv" import * as express from "express"; import * as cors from "cors"; -import * as dotenv from "dotenv"; import * as weather from "./routes/weather"; import * as local from "./routes/local"; @@ -13,13 +13,6 @@ let host = process.env.HOST || "127.0.0.1", export let pws = process.env.PWS || "none"; export const app = express(); -if ( !process.env.HOST || !process.env.PORT || !process.env.LOCAL_PWS ) { - dotenv.config(); - host = process.env.HOST || host; - port = parseInt( process.env.PORT ) || port; - pws = process.env.PWS || pws; -} - // Handle requests matching /weatherID.py where ID corresponds to the // weather adjustment method selector. // This endpoint is considered deprecated and supported for prior firmware