Merge pull request #40 from efvik/main

Wave spectra indexing fix

metocean_api/ts/aux_funcs.py

@@ -207,11 +207,13 @@ def get_near_coord(infile, lon, lat, product):
             station = __distance_2points(ds.latitude.values,ds.longitude.values,lat,lon).argmin()
             lon_near = ds.longitude.values[0,station]
             lat_near = ds.latitude.values[0,station]
+            station += 1 # station labels are 1-indexed
             return {'x':station}, lon_near, lat_near
         elif product == "NORAC_wave_spec":
             station = __distance_2points(ds.latitude.values,ds.longitude.values,lat,lon).argmin()
             lon_near = ds.longitude.values[0,station]
             lat_near = ds.latitude.values[0,station]
+            station += 1 # station labels are 1-indexed
             return {'station':station}, lon_near, lat_near
         else:
             raise ValueError(f'Product not found {product}')

metocean_api/ts/read_metno.py

@@ -354,8 +354,8 @@ def nora3_wave_spec(ts: TimeSeries, save_csv=False, save_nc=False, use_cache=Fal
     # merge temp files and create combined result
     with xr.open_mfdataset(tempfiles) as ds:
         da = ds["SPEC"]
-        da.attrs["longitude"] = float(ds["longitude"][0].values)
-        da.attrs["latitude"] = float(ds["latitude"][0].values)
+        da.attrs["longitude"] = lon_near
+        da.attrs["latitude"] = lat_near
 
     if save_csv:
         s = da.shape
@@ -407,8 +407,8 @@ def norac_wave_spec(ts: TimeSeries, save_csv=False, save_nc=False, use_cache=Fal
     # merge temp files and create combined result
     with xr.open_mfdataset(tempfiles) as ds:
         da = ds["efth"]
-        da.attrs["longitude"] = float(ds["longitude"][0].values)
-        da.attrs["latitude"] = float(ds["latitude"][0].values)
+        da.attrs["longitude"] = lon_near
+        da.attrs["latitude"] = lat_near
 
     if save_csv:
         s = da.shape