refactor: Use nominatim module

Signed-off-by: Tim Hårek Andreassen <[email protected]>

Author: timharek

deno.lock

@@ -1,3 +1,7 @@
 export { format } from 'jsr:@std/datetime@^0.218.2';
 export * as Colors from 'jsr:@std/fmt@^0.218.2/colors';
 export { Command, CompletionsCommand } from 'jsr:@cliffy/command@1.0.0-rc.4';
+export {
+  coordinatesFromLocationName,
+  locationFromCoordinates,
+} from 'jsr:@timharek/nominatim@1.0.0';

deps.ts

@@ -1,6 +1,5 @@
 /**
- * Access Yr's weather API and Nominatim's names API for getting weather details
- * about a specific location.
+ * Access Yr's weather API for getting weather forecast about a specific location.
  *
  * ## Example for current weather
  *
@@ -25,6 +24,5 @@
  * @module
  */
 
-export { Nominatim } from './src/nominatim.ts';
 export { Yr } from './src/yr.ts';
 export { getCurrent, getForecast } from './src/util.ts';

mod.ts

@@ -1,4 +1,4 @@
-import { Nominatim } from './nominatim.ts';
+import { coordinatesFromLocationName } from '../deps.ts';
 import { Forecast, TimeseriesMinified, Yr } from './yr.ts';
 
 /**
@@ -32,7 +32,7 @@ export async function _fetch<T>(url: string | URL): Promise<T> {
 export async function getCurrent(
   locationName: string,
 ): Promise<TimeseriesMinified> {
-  const { lat, lng } = await Nominatim.getCoordinatesFromName(locationName);
+  const { lat, lng } = await coordinatesFromLocationName(locationName);
   const url = Yr.getUrl(lat, lng);
 
   const yrResponse = await _fetch<Yr.IWeather>(url);
@@ -52,7 +52,7 @@ export async function getForecast(
   locationName: string,
   interval = 1,
 ): Promise<Forecast> {
-  const { lat, lng } = await Nominatim.getCoordinatesFromName(locationName);
+  const { lat, lng } = await coordinatesFromLocationName(locationName);
   const url = Yr.getUrl(lat, lng);
 
   const yrResponse = await _fetch<Yr.IWeather>(url);
@@ -70,7 +70,7 @@ export async function getForecast(
 export async function getTomorrow(
   locationName: string,
 ): Promise<Forecast> {
-  const { lat, lng } = await Nominatim.getCoordinatesFromName(locationName);
+  const { lat, lng } = await coordinatesFromLocationName(locationName);
   const url = Yr.getUrl(lat, lng);
 
   const yrResponse: Yr.IWeather = await _fetch(url);

src/nominatim.ts

@@ -1,5 +1,4 @@
-import { format as formatDate } from '../deps.ts';
-import { Nominatim } from './nominatim.ts';
+import { format as formatDate, locationFromCoordinates } from '../deps.ts';
 import { cleanForecast, getEarliestTimeseries, getUrl } from './util.ts';
 
 export interface TimeseriesMinified {
@@ -26,10 +25,11 @@ async function getCurrent(
     weatherData,
   );
   const earliestTimeseries: Yr.ITimeseries = getEarliestTimeseries(timeseries);
-  const location_name = await Nominatim.getNameFromCoordinates(coordinates);
+  const location = await locationFromCoordinates(coordinates);
+  const locationName = location?.city ?? location?.village;
 
   return {
-    location_name,
+    location_name: locationName,
     ...getSimpleTimeseries(earliestTimeseries, units),
   } as TimeseriesMinified;
 }
@@ -77,7 +77,8 @@ async function getForecast(
     weatherData,
   );
   const { time: closestTime } = getEarliestTimeseries(timeseries);
-  const location_name = await Nominatim.getNameFromCoordinates(coordinates);
+  const location = await locationFromCoordinates(coordinates);
+  const locationName = location?.city ?? location?.village;
 
   const resultArray = weatherData.properties.timeseries.map((entry) => {
     const { data: { next_1_hours: nextHour }, time } = entry;
@@ -91,7 +92,7 @@ async function getForecast(
     : cleanForecast(resultArray);
 
   return {
-    location_name,
+    location_name: locationName ?? '',
     array,
   };
 }