updated requirements and setups so the data files can be accessed whe…

…n installed
lifewatch · Oct 28, 2021 · 6b59a3d · 6b59a3d
1 parent 12fa2ce
commit 6b59a3d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/bpnsdata/meetnet_vlaamse_banken.py b/bpnsdata/meetnet_vlaamse_banken.py
@@ -139,8 +139,11 @@ def get_catalog(self):
             unique_locations = available_data.id_location.unique()
             for b in catalogue['Locations']:
                 if b['ID'] in unique_locations:
-                    buoys.loc[len(buoys)] = b['ID'], b['Name'][1]['Message'], b['Description'][1]['Message'], \
-                                            shapely.wkt.loads(b['PositionWKT'])
+                    idx = len(buoys)
+                    buoys.loc[idx, 'geometry'] = shapely.wkt.loads(b['PositionWKT'])
+                    buoys.loc[idx, ['id_location', 'name', 'type']] = b['ID'], b['Name'][1]['Message'],\
+                                                                      b['Description'][1]['Message']
+
         return buoys.merge(available_data, on='id_location')
 
     def get_data(self, ids, start_time, end_time):

diff --git a/requirements.txt b/requirements.txt
@@ -40,7 +40,7 @@ xarray==0.19.0
 # rasterio==1.2.3 # Installed as dependency for contextily
 # requests==2.26.0 # Installed as dependency for erddapy, owslib, contextily
 # sgp4==2.20 # Installed as dependency for skyfield
-# shapely==1.7.1 # Installed as dependency for geopandas
+# shapely==1.8.0 # Installed as dependency for geopandas
 # six==1.16.0 # Installed as dependency for fiona, python-dateutil, cycler, munch
 # snuggs==1.4.7 # Installed as dependency for rasterio
 # urllib3==1.26.7 # Installed as dependency for requests

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = bpnsdata
-version = 0.1.0
+version = 0.1.1
 author = Clea Parcerisas
 author_email = [email protected]
 description = Add BPNS sea test_data to a geodataframe

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 import setuptools
 
 setuptools.setup(name='bpnsdata',
-                 version='0.1.0',
+                 version='0.1.1',
                  description='Add BPNS sea test_data to a geodataframe',
                  author='Clea Parcerisas',
                  author_email='[email protected]',