ellipsis 3.1.38__py3-none-any.whl → 3.1.40__py3-none-any.whl

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/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/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/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/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/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/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/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.dist-info → ellipsis-3.1.40.dist-info}/METADATA

@@ -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.dist-info → ellipsis-3.1.40.dist-info}/RECORD

@@ -1,12 +1,12 @@
-ellipsis/__init__.py,sha256=nuG3XAv8EtiJ9mdJcNDN_tZtZWhpbiagOWuuMo7blVQ,236
-ellipsis/apiManager.py,sha256=gG_9abycrc_xp0dR21EFecdfWAjbucGSNwcaSYxTEs0,5011
+ellipsis/__init__.py,sha256=wz8_WqPmdNXuQ20QqK0MKw_TkwabTZsKEGA-UZY1yLU,236
+ellipsis/apiManager.py,sha256=W1xTId1ZIDOaFN4NVcyGoxGC4HeI5CIabY4FyGz__7M,5027
 ellipsis/sanitize.py,sha256=T5FawJRZ2eqGv0itiMkZ1fuJpahsSyhBMFty9cG-wwA,10194
 ellipsis/account/__init__.py,sha256=K40DMBaUDSxt3rO2WZv63Wmpfy49ocqBxvWqyIYHR24,92
 ellipsis/account/root.py,sha256=tgGAT2BzP3zgAqsevvkeognn5S67T-MrIP52BLN9rbE,1791
 ellipsis/account/accessToken/__init__.py,sha256=ivwhK1eC4g74PAKaeTReb1QhIpKXyvmfdqZV6wDY-EY,66
 ellipsis/account/accessToken/root.py,sha256=TYo8wTyWyzytaqOTsuQC-Vn3y7BhYMC88EItZafpISA,1281
 ellipsis/path/__init__.py,sha256=jqmyE8UyYLua23_zRP79BoiFvekMlZO6oTdAs_sFCyw,435
-ellipsis/path/root.py,sha256=lOij7Axngm35ODbSZ29rBBo7L-yjkx2Lxufs-b9ifJc,8645
+ellipsis/path/root.py,sha256=3HaKJhjAeHMqK1rBjcvT92aG6kBWllpu3prUqO3Ov6s,8618
 ellipsis/path/file/__init__.py,sha256=i_KB1S1J9pZjcPTKdyGMnjJf2tCoHFzptLGaxmTi55A,107
 ellipsis/path/file/root.py,sha256=3aqUFHQ7JLZf2arFoxOruOEKU-yOqUooj_LexGdPZ_s,4418
 ellipsis/path/folder/__init__.py,sha256=HCeAZAWZSqUnWiSQYJjsVFe6AI9uKSS8tb5uTkSeAtI,91
@@ -31,7 +31,7 @@ ellipsis/path/raster/root.py,sha256=-y0SEukHEYUDvyJyDI1x7gtcDm-Wum_Ze7ekSYJr6O4,
 ellipsis/path/raster/style/__init__.py,sha256=mxlqVtSd2dsKai3DAVQjtNsh2KnTrZVyF8loRwUNT7E,61
 ellipsis/path/raster/style/root.py,sha256=YFQlGTdgjpwXn4h0ug7LrQZFLmRp2bdJN71A0iqZRFo,1627
 ellipsis/path/raster/timestamp/__init__.py,sha256=_2rt8Kcpu-Zj7FwyzmvAbbxoENv-R5dNbjRbJdnjpz4,915
-ellipsis/path/raster/timestamp/root.py,sha256=cYszB9H4cF1Gxj8BN26EPHY3scbii2yqJsHOp0Ao6cc,18674
+ellipsis/path/raster/timestamp/root.py,sha256=H6CNriytljBYJBZLQHa6fCVJekQZUeMZpeoOZJN_p30,19151
 ellipsis/path/raster/timestamp/util.py,sha256=eupFFSBp5CaTDIRg6DYnZnfWY61h81JZ7c15NdJ-j5E,2580
 ellipsis/path/raster/timestamp/file/__init__.py,sha256=Ln9_dQ4-PMwb5VP--Qh09IV5zmr-47RShpe0-f_NVh4,97
 ellipsis/path/raster/timestamp/file/root.py,sha256=T-vcD5o257-8t2M1l-c7WUxpq4ZmSApWFLqFhIL5Kb0,3920
@@ -46,25 +46,25 @@ ellipsis/path/vector/featureProperty/root.py,sha256=eb2bw4UGO3eYGaYgjwu43pZyA4iA
 ellipsis/path/vector/style/__init__.py,sha256=riiDnL4FDq4EFhSYAYHBSe_o5oltRTSrj4sc72F6IVQ,63
 ellipsis/path/vector/style/root.py,sha256=09PsRbCJ35YV8bl8xoWFoeGRpdmf5IBmmqwhRj30OTM,1641
 ellipsis/path/vector/timestamp/__init__.py,sha256=n0ncRxXoQIDX1WeV0lbpJH1BND793CdZ5swGgeu1Kfk,330
-ellipsis/path/vector/timestamp/root.py,sha256=i2bLqUZfUZ7glCBt8Aagz7EPMPPdU_-trJwFpgRoXH0,11105
+ellipsis/path/vector/timestamp/root.py,sha256=EnSLILbO7VYScCUdnXOSA3J1p5ITqsxyNiuI2bgkO40,11562
 ellipsis/path/vector/timestamp/feature/__init__.py,sha256=miaLCHkogL9KJ_eUr4K_N15BShAe2ivcppDFJuE_SgI,210
 ellipsis/path/vector/timestamp/feature/root.py,sha256=BQdXZCgF5fi1sIovmUdNAV5aUrPizjJuLqfwzPguVQw,13011
 ellipsis/path/vector/timestamp/feature/message/__init__.py,sha256=XfX3MIa4RjpToFnxNyfxCKTvRlNtJFRQ44j31wDyhGc,100
 ellipsis/path/vector/timestamp/feature/message/root.py,sha256=isLzkITTiluKoIsH0PYT0K5Cr-LBzTA0TSE4-2tZU5M,3949
 ellipsis/path/vector/timestamp/feature/series/__init__.py,sha256=vPi57QdUPTEnQE31abgxzwWU3Gzu-Xxi3ZVD4z5MMwg,107
-ellipsis/path/vector/timestamp/feature/series/root.py,sha256=vbGb1u035L6aoVd1zuM-RIEt1LctFJoz67DwY9h5vJk,7523
+ellipsis/path/vector/timestamp/feature/series/root.py,sha256=KCm28pQ8E6WREftuSi4wge_2QpojDW11b55j7_tG7Js,7519
 ellipsis/path/vector/timestamp/file/__init__.py,sha256=qJtOXI9MEv4KifDjMW3zUDKnef8PD69SQmgRc3wDShQ,73
 ellipsis/path/vector/timestamp/file/root.py,sha256=UPmcyJ4oWsOpDrsiM-sM5wtXGwkijKSIXLqpnQd4icA,4132
 ellipsis/path/vector/timestamp/order/__init__.py,sha256=w11nMYDQJzZJU_q8o7ApadV2EOdCX93gNkHZ7PO1gUo,74
-ellipsis/path/vector/timestamp/order/root.py,sha256=FB3AAbsp46Wv2vtvuFLx_djwh_Qn07I6trg752qL2f8,1179
+ellipsis/path/vector/timestamp/order/root.py,sha256=Mke16gxwK4qJDtSMqt5DRkOtLFqZyZGU8bjN_8uBjoA,1169
 ellipsis/user/__init__.py,sha256=um_b42pc2otFiQRGqMajcEtONQpC2ei4r-EY3j7bsfQ,43
 ellipsis/user/root.py,sha256=dsMK6wGBdeCmOd3YsbIv9cEcQ6tAiSGr0jmtBhQl5-0,484
 ellipsis/util/__init__.py,sha256=G0LaqqipkJXqZZnW78pqOw-gDQWZYLMa2ioLoCac-NI,714
 ellipsis/util/root.py,sha256=keGn515Dnxyja8kNG9p-xdsX6gRa8pHCh6AJaQXLoig,23445
 ellipsis/view/__init__.py,sha256=91KyJzbSvwSP9hvJQyo1LLM48b5NixLz6G40I9h6sdY,67
-ellipsis/view/root.py,sha256=bgsyRBfi2822QJpKj0VjNtBbRnkeEvGULG8qF4B-xmk,1728
-ellipsis-3.1.38.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-ellipsis-3.1.38.dist-info/METADATA,sha256=X-6x9Lz7SM8J1oeYEeEZafT0LAHkECPL9qWRK-d6wms,1823
-ellipsis-3.1.38.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ellipsis-3.1.38.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
-ellipsis-3.1.38.dist-info/RECORD,,
+ellipsis/view/root.py,sha256=6actiBwIsM0f7sJhQl_U4j-C6Dhe0z5XGGtxIOIKdY8,1726
+ellipsis-3.1.40.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
+ellipsis-3.1.40.dist-info/METADATA,sha256=v_qTXg9zcOJO4DJRqjBgPufOWb6lLSrDEBPX9HPpdcc,1823
+ellipsis-3.1.40.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+ellipsis-3.1.40.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
+ellipsis-3.1.40.dist-info/RECORD,,