ellipsis 3.1.38__tar.gz → 3.1.40__tar.gz

{ellipsis-3.1.38 → ellipsis-3.1.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.38
+Version: 3.1.40
 Summary: Package to interact with the Ellipsis API
 Home-page: https://github.com/ellipsis-drive-internal/python-package
 Author: Daniel van der Maas

{ellipsis-3.1.38 → ellipsis-3.1.40}/ellipsis/__init__.py

@@ -7,7 +7,7 @@ from ellipsis import path
 from ellipsis import view
 from ellipsis import util
 
-__version__ = '3.1.38'
+__version__ = '3.1.40'
 
 
 

{ellipsis-3.1.38 → ellipsis-3.1.40}/ellipsis/apiManager.py

@@ -33,7 +33,7 @@ def get(url, body = None, token = None, crash = True, parseJson = True):
     
     for k in body.keys():
         if type(body[k]) != type('x') :
-            body[k] = json.dumps(body[k])
+            body[k] = json.dumps(body[k]).replace(' ','')
 
 
     body = urllib.parse.urlencode(body)

{ellipsis-3.1.38 → ellipsis-3.1.40}/ellipsis/path/raster/timestamp/root.py

@@ -182,6 +182,14 @@ def getValuesAlongLine(pathId, timestampId, line, token = None, epsg = 4326):
     memfile.close()
     return values
 
+def getLocationInfo(pathId, timestampId, locations, epsg = 4326, token= None)
+    pathId = sanitize.validUuid('pathId', pathId, True)
+    timestampId = sanitize.validUuid('timestampId', timestampId, True)
+    token = sanitize.validString('token', token, False)
+    epsg = sanitize.validInt('epsg', epsg, True)
+    body = {'locations':locations,'epsg':epsg}
+    r = apiManager.post('/path/' + pathId + '/raster/timestamp/' + timestampId + '/location', body, token)
+    return r
 
     
 def getRaster(pathId, timestampId, extent, token = None, showProgress = True, epsg = 4326, reproject = False, threads = None, style = None):

{ellipsis-3.1.38 → ellipsis-3.1.40}/ellipsis/path/root.py

@@ -39,8 +39,8 @@ def search(pathTypes = ['raster', 'vector', 'file', 'folder'] ,root=None, text=N
         'resolution': resolution,
         'date':date
     }
+
     def f(body):
-        print('body', body)
         return apiManager.get('/path', body, token)
     
     r = recurse(f, body, listAll)

{ellipsis-3.1.38 → ellipsis-3.1.40}/ellipsis/path/vector/timestamp/feature/series/root.py

@@ -68,7 +68,7 @@ def add(pathId, timestampId, seriesData, token, featureId=None, showProgress = T
         else:
            raise  ValueError('date column must be of type datetime')
     else:
-           raise  ValueError('seriesData must have a column datetime of type datetime')
+           raise  ValueError('seriesData must have a column date of type datetime')
 
     if not 'featureId' in seriesData.columns:
         raise ValueError(

{ellipsis-3.1.38 → ellipsis-3.1.40}/ellipsis/path/vector/timestamp/order/root.py

@@ -6,15 +6,16 @@ def get(token):
     r = apiManager.get('/path/vector/timestamp/order', None, token)
     return r
 
-def add(pathId, timestampId, token, extent = None, uploadId = None):
+def add(pathId, timestampId, token, extent = None, fileFormat = 'geojson'):
     
     token = sanitize.validString('token', token, True)
     pathId = sanitize.validUuid('pathId', pathId, True)
     timestampId = sanitize.validUuid('timestampId', timestampId, True)
     extent = sanitize.validBounds('extent', extent, False)
-    uploadId = sanitize.validUuid('uploadId', uploadId, False)
+    token = sanitize.validString('fileFormat', fileFormat, True)
 
-    body = {'uploadId': uploadId, 'extent':extent, 'format' :'geojson'}
+
+    body = { 'extent':extent, 'format' :fileFormat}
     
     r = apiManager.post('/path/' + pathId + '/vector/timestamp/' + timestampId + '/order', body, token)    
 

{ellipsis-3.1.38 → ellipsis-3.1.40}/ellipsis/path/vector/timestamp/root.py

@@ -25,6 +25,15 @@ def add(pathId,  token, properties = None, description = None, date ={'from': da
     r = apiManager.post('/path/' + pathId + '/vector/timestamp', body, token)
     return r
 
+def getLocationInfo(pathId, timestampId, locations, epsg = 4326, token= None)
+    pathId = sanitize.validUuid('pathId', pathId, True)
+    timestampId = sanitize.validUuid('timestampId', timestampId, True)
+    token = sanitize.validString('token', token, False)
+    epsg = sanitize.validInt('epsg', epsg, True)
+    body = {'locations':locations,'epsg':epsg}
+    r = apiManager.post('/path/' + pathId + '/vector/timestamp/' + timestampId + '/location', body, token)
+    return r
+
 def edit(pathId, timestampId, token, description=None, date=None):
 
     pathId = sanitize.validUuid('pathId', pathId, True) 
@@ -207,7 +216,6 @@ def getFeaturesByExtent(pathId, timestampId, extent, propertyFilter = None, toke
         bounds = sh.bounds
         centerX = (bounds['maxx'].values + bounds['minx'].values )/2
         centerY = (bounds['maxy'].values + bounds['miny'].values )/2
-        print('hoi')
         sh = sh[ np.logical_and(np.logical_and( centerX >= extent['xMin'], centerX <= extent['xMax'] ), np.logical_and( centerY >= extent['yMin'], centerY <= extent['yMax'] )  )  ]
 
     else:

{ellipsis-3.1.38 → ellipsis-3.1.40}/ellipsis/view/root.py

@@ -1,4 +1,4 @@
-pifrom ellipsis import apiManager
+from ellipsis import apiManager
 from ellipsis import sanitize
 from ellipsis.util.root import recurse
 

{ellipsis-3.1.38 → ellipsis-3.1.40}/ellipsis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.38
+Version: 3.1.40
 Summary: Package to interact with the Ellipsis API
 Home-page: https://github.com/ellipsis-drive-internal/python-package
 Author: Daniel van der Maas

{ellipsis-3.1.38 → ellipsis-3.1.40}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="ellipsis",
-    version="3.1.38",
+    version="3.1.40",
     author="Daniel van der Maas",
     author_email="daniel@ellipsis-drive.com",
     description="Package to interact with the Ellipsis API",