ellipsis 3.1.4__py3-none-any.whl → 3.1.6__py3-none-any.whl

ellipsis/__init__.py

@@ -7,4 +7,4 @@ from ellipsis import path
 from ellipsis import view
 from ellipsis import util
 
-__version__ = '3.1.4'
+__version__ = '3.1.6'

ellipsis/path/raster/root.py

@@ -24,14 +24,15 @@ def editBand(pathId, bandNumber, name, token):
     return(r)
 
 # /path/{pathId}/raster
-def edit(pathId, token, interpolation = None, includesTransparent = None):
+def edit(pathId, token, interpolation = None, includesTransparent = None, compressionQuality = None):
 
     token = sanitize.validString('token', token, True)
     pathId = sanitize.validUuid('pathId', pathId, True)
     interpolation = sanitize.validString('interpolation', interpolation, False)
     includesTransparent = sanitize.validBool('includesTransparent', includesTransparent, False)
+    compressionQuality = sanitize.validInt('compressionQuality', compressionQuality, False)
 
-    body = {'interpolation':interpolation, 'includesTransparent':includesTransparent}
+    body = {'interpolation':interpolation, 'includesTransparent':includesTransparent, 'compressionQuality':compressionQuality}
     r = apiManager.patch('/path/' + pathId + '/raster' , body, token)
     return(r)
     

ellipsis/path/raster/timestamp/file/root.py

@@ -29,7 +29,7 @@ def get(pathId, timestampId, token, pageStart= None, listAll = True):
     pageStart = sanitize.validUuid('pageStart', pageStart, False) 
 
     def f(body):
-        r = apiManager.get('/path/' + pathId + '/raster/timestamp/' + timestampId + '/file', None, token)    
+        r = apiManager.get('/path/' + pathId + '/raster/timestamp/' + timestampId + '/file', body, token)    
         for i in np.arange( len(r['result'])):
             if 'info' in r['result'][i].keys() and 'bounds' in r['result'][i]['info'].keys() and type(r['result'][i]['info']['bounds']) != type(None):
                 r['result'][i]['info']['bounds'] = gpd.GeoDataFrame.from_features([{'id': 0, 'properties':{}, 'geometry':r['result'][i]['info']['bounds']}]).unary_union

ellipsis/path/root.py

@@ -26,7 +26,7 @@ def search(pathTypes = ['raster', 'vector', 'file', 'folder'] ,root=None, text=N
     date = sanitize.validDateRange('date', date, False)
 
 
-    resolution = sanitize.validFloatArray('resolution', resolution, False)
+    resolution = sanitize.validResolution('resolution', resolution, False)
 
     body = {
         'type': pathTypes,

ellipsis/path/vector/timestamp/feature/root.py

@@ -76,12 +76,11 @@ def zipLevels(levelOfDetail1, levelOfDetail2, levelOfDetail3, levelOfDetail4, le
         levels = None
     return levels
     
-def add(pathId, timestampId, features, token, showProgress = True, zoomLevels = None, levelOfDetail1 = None, levelOfDetail2 = None, levelOfDetail3 = None, levelOfDetail4 = None, levelOfDetail5 = None, cores = 1):
+def add(pathId, timestampId, features, token, showProgress = True, levelOfDetail1 = None, levelOfDetail2 = None, levelOfDetail3 = None, levelOfDetail4 = None, levelOfDetail5 = None, cores = 1):
     pathId = sanitize.validUuid('pathId', pathId, True)
     timestampId = sanitize.validUuid('timestampId', timestampId, True)
     token = sanitize.validString('token', token, True)
     features = sanitize.validGeopandas('features', features, True, cores = cores)
-    zoomLevels = sanitize.validIntArray('zoomLevels', zoomLevels, False)
     showProgress = sanitize.validBool('showProgress', showProgress, True)
     cores = sanitize.validInt('cores', cores, True)
     
@@ -127,9 +126,9 @@ def add(pathId, timestampId, features, token, showProgress = True, zoomLevels =
         levels = zipLevels(levelOfDetail1, levelOfDetail2, levelOfDetail3, levelOfDetail4, levelOfDetail5, indices_sub)
                       
         if type(levels) != type(None):
-            featuresBody = [{'feature': features_sub[i], 'zoomLevels':zoomLevels, 'levelsOfDetail': levels[i] } for i in np.arange(len(indices_sub))]
+            featuresBody = [{'feature': features_sub[i], 'levelsOfDetail': levels[i] } for i in np.arange(len(indices_sub))]
         else:
-            featuresBody = [{'feature': features_sub[i], 'zoomLevels':zoomLevels } for i in np.arange(len(indices_sub))]
+            featuresBody = [{'feature': features_sub[i] } for i in np.arange(len(indices_sub))]
         body = {"features":featuresBody}
         r = apiManager.post('/path/' + pathId + '/vector/timestamp/' + timestampId + '/feature', body, token)
         addedIds = addedIds + r
@@ -141,12 +140,11 @@ def add(pathId, timestampId, features, token, showProgress = True, zoomLevels =
 
 
     
-def edit(pathId, timestampId, featureIds, token, features = None, showProgress = True, newZoomLevels = None, levelOfDetail1 = None, levelOfDetail2 = None, levelOfDetail3 = None, levelOfDetail4 = None, levelOfDetail5 = None, cores = 1):
+def edit(pathId, timestampId, featureIds, token, features = None, showProgress = True, levelOfDetail1 = None, levelOfDetail2 = None, levelOfDetail3 = None, levelOfDetail4 = None, levelOfDetail5 = None, cores = 1):
     pathId = sanitize.validUuid('pathId', pathId, True) 
     timestampId = sanitize.validUuid('timestampId', timestampId, True) 
     token = sanitize.validString('token', token, True)
     features = sanitize.validGeopandas('features', features, False, cores=cores)
-    newZoomLevels = sanitize.validIntArray('newZoomLevels', newZoomLevels, False)
     featureIds = sanitize.validUuidArray('featureIds', featureIds, True)
     showProgress = sanitize.validBool('showProgress', showProgress, True)
     cores = sanitize.validInt('cores', cores, True)
@@ -172,18 +170,8 @@ def edit(pathId, timestampId, featureIds, token, features = None, showProgress =
         levels = zipLevels(levelOfDetail1, levelOfDetail2, levelOfDetail3, levelOfDetail4, levelOfDetail5, indices_sub)
 
         if type(levels) == type(None):
-            if str(type(newZoomLevels)) != str(type(None)) and str(type(features)) != str(type(None)):
-                changes = [{'featureId':x[0] , 'newProperties':x[1]['properties'], 'newGeometry':x[1]['geometry'], 'newZoomLevels':newZoomLevels} for x in zip(featureIds_sub, features_sub['features'])]
-            elif str(type(newZoomLevels)) != str(type(None)) and str(type(features)) == str(type(None)):
-                changes = [{'featureId':geometryId, 'newZoomLevels':newZoomLevels} for geometryId in featureIds]
-            else:
                 changes = [{'featureId':x[0] , 'newProperties':x[1]['properties'], 'newGeometry':x[1]['geometry']} for x in zip(featureIds_sub, features_sub['features'])]
         else:
-            if str(type(newZoomLevels)) != str(type(None)) and str(type(features)) != str(type(None)):
-                changes = [{'featureId':x[0] , 'levelsOfDetail': levels , 'newProperties':x[1]['properties'], 'newGeometry':x[1]['geometry'], 'newZoomLevels':newZoomLevels} for x in zip(featureIds_sub, features_sub['features'])]
-            elif str(type(newZoomLevels)) != str(type(None)) and str(type(features)) == str(type(None)):
-                changes = [{'featureId':geometryId, 'levelsOfDetail': levels, 'newZoomLevels':newZoomLevels} for geometryId in featureIds]
-            else:
                 changes = [{'featureId':x[0], 'levelsOfDetail': levels , 'newProperties':x[1]['properties'], 'newGeometry':x[1]['geometry']} for x in zip(featureIds_sub, features_sub['features'])]
             
         body = {'changes':changes}

ellipsis/path/vector/timestamp/root.py

@@ -146,7 +146,7 @@ def getFeaturesByExtent(pathId, timestampId, extent, propertyFilter = None, toke
     extent = sanitize.validBounds('extent', extent, True)
     propertyFilter = sanitize.validObject('propertyFilter', propertyFilter, False)
     listAll = sanitize.validBool('listAll', listAll, True)
-    pageStart = sanitize.validUuid('pageStart', pageStart, False) 
+    pageStart = sanitize.validObject('pageStart', pageStart, False) 
 
     p = geometry.Polygon( [(extent['xMin'], extent['yMin']), (extent['xMin'], extent['yMax']),(extent['xMax'], extent['yMax']),(extent['xMax'], extent['yMin'])] )
     p = gpd.GeoDataFrame({'geometry':[p]})
@@ -195,7 +195,7 @@ def listFeatures(pathId, timestampId, token = None, listAll = True, pageStart =
     timestampId = sanitize.validUuid('timestampId', timestampId, True) 
     token = sanitize.validString('token', token, False)
     listAll = sanitize.validBool('listAll', listAll, True)
-    pageStart = sanitize.validUuid('pageStart', pageStart, False) 
+    pageStart = sanitize.validObject('pageStart', pageStart, False) 
 
     body = {'pageStart': pageStart}
 

ellipsis/sanitize.py

@@ -18,6 +18,25 @@ def validUuid(name, value, required):
         raise ValueError(name + ' must be of type string and be a uuid')
     return(value)
 
+def validResolution(name, value, required):
+    if not required and type(value) == type(None):
+        return
+
+    if type(value) != type({}):
+        raise ValueError(name + ' must be of type dictionary with properties min and max as float')
+
+    if 'min' not in value.keys() or 'max' not in value.keys():
+        raise ValueError(name + ' must be of type dictionary with properties min and max as float')
+
+    try:
+        value = {'min': float(value['min']), 'max':float(value['max']) }        
+    except:
+        raise ValueError(name + ' must be of type dictionary with properties min and max as float')
+
+    return(value)
+
+
+
 def validDateRange(name, value, required):
 
     if not required and type(value) == type(None):

ellipsis/util/root.py

@@ -29,7 +29,7 @@ warnings.simplefilter("ignore")
 
 
 def recurse(f, body, listAll, extraKey = None):
-    
+
     r = f(body)
     if listAll:
         nextPageStart = r['nextPageStart']

{ellipsis-3.1.4.dist-info → ellipsis-3.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.4
+Version: 3.1.6
 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.4.dist-info → ellipsis-3.1.6.dist-info}/RECORD

@@ -1,12 +1,12 @@
-ellipsis/__init__.py,sha256=lDrl5WPzTJ6vffJp-Yqdpp6efpNRHqV1jn-tm-cReLY,232
+ellipsis/__init__.py,sha256=93GninuGlrB3AOG4w3NKKwibcLa_Tbx-8psQkH0QGGY,232
 ellipsis/apiManager.py,sha256=QU0LzYMivctlzUN9yLOTIF1ypAwvI9xsD9Nw_kJT1Yk,3302
-ellipsis/sanitize.py,sha256=HqGR5HnvlE0JOSU0xgksJ4L0HhOwOLzWYsvIcYAnCFU,9113
+ellipsis/sanitize.py,sha256=YCxtl9DFA7oipf_oiAkGUrbvB3J3ZWUFNuk06s8Byq4,9745
 ellipsis/account/__init__.py,sha256=K40DMBaUDSxt3rO2WZv63Wmpfy49ocqBxvWqyIYHR24,92
 ellipsis/account/root.py,sha256=29IGUJavfXC9wLC_Fxzy1cdCbnP4QPmbYlE-H6VP088,1285
 ellipsis/account/accessToken/__init__.py,sha256=ivwhK1eC4g74PAKaeTReb1QhIpKXyvmfdqZV6wDY-EY,66
 ellipsis/account/accessToken/root.py,sha256=TYo8wTyWyzytaqOTsuQC-Vn3y7BhYMC88EItZafpISA,1281
 ellipsis/path/__init__.py,sha256=2AL0qA5fzPYtizw-baHA8l5J4MTG55giSdxJ3HrHzl8,398
-ellipsis/path/root.py,sha256=vE-AbB0Awk2dUiwZWkZsvbgVwI_f4LGWWF_RyAipCro,7609
+ellipsis/path/root.py,sha256=vw8p36-_rLAHuy7WUv793HRftxa3VIPmpmWtSdJiXOE,7609
 ellipsis/path/file/__init__.py,sha256=jpXoU1agFnEH1XzLSigJ8uNRC-5534I4kskuNpt-6us,85
 ellipsis/path/file/root.py,sha256=kXUfHXd_OmhjuCdDPS5vpCBoqlFPSfkAOAKex_1e6M8,829
 ellipsis/path/folder/__init__.py,sha256=HCeAZAWZSqUnWiSQYJjsVFe6AI9uKSS8tb5uTkSeAtI,91
@@ -18,13 +18,13 @@ ellipsis/path/invite/root.py,sha256=lX13eUE3FYrAElOuVMg89XEIrdYbwsJAl5_8OV1f92g,
 ellipsis/path/member/__init__.py,sha256=1mu6v4LzTY5mZHNniCCLRtJo7MkSZleUT-xJQ7vMZOM,56
 ellipsis/path/member/root.py,sha256=YBYyQsBp2YQNfI_ffvyA-Y_Fhs9UoYvMKYAXsrUaslg,1071
 ellipsis/path/raster/__init__.py,sha256=xWEsdpQxsqnwSdRqmZujS3pEUAmemHmUCtMKCaWLK0M,217
-ellipsis/path/raster/root.py,sha256=3vORO_IcBZayQRpQGwTXinhlcAYpIYQ5KlJprEyD3hc,1589
+ellipsis/path/raster/root.py,sha256=-y0SEukHEYUDvyJyDI1x7gtcDm-Wum_Ze7ekSYJr6O4,1749
 ellipsis/path/raster/style/__init__.py,sha256=mxlqVtSd2dsKai3DAVQjtNsh2KnTrZVyF8loRwUNT7E,61
 ellipsis/path/raster/style/root.py,sha256=D01E-z2F1OrbLJgUF48cttH6chM0K94Vk2dhwENg8OY,1547
 ellipsis/path/raster/timestamp/__init__.py,sha256=x7uCEnVHmNFS686Iaw8bD0zv6lfQpEdYx6RZpcnQ5-4,859
 ellipsis/path/raster/timestamp/root.py,sha256=BROg-wummgaGMVr2SjV7jN1VS3NvgQVBipuq_QzgLmk,12671
 ellipsis/path/raster/timestamp/file/__init__.py,sha256=Ln9_dQ4-PMwb5VP--Qh09IV5zmr-47RShpe0-f_NVh4,97
-ellipsis/path/raster/timestamp/file/root.py,sha256=X1ocSCpfXmVLXr20P9E7WLxUcQKvMTaxetCtd5H9Lvk,3891
+ellipsis/path/raster/timestamp/file/root.py,sha256=GvcSSEONJveX0KfazqXLmE-SPP-gSZIjwPKZKO-diFM,3891
 ellipsis/path/raster/timestamp/order/__init__.py,sha256=4YEK4XW9TM-HsjoFlFeyGMtI3OKX2VCXfb4NsTsugBo,74
 ellipsis/path/raster/timestamp/order/root.py,sha256=zWcfI_q9KlfevzyvwWY8ni27KCvOyAiaJvohVfasjXg,1176
 ellipsis/path/usage/__init__.py,sha256=TfHolUnnQFh7VuE9eG3-DGEc5ctyj4PzPxDNVgoU5tg,82
@@ -36,9 +36,9 @@ ellipsis/path/vector/featureProperty/root.py,sha256=-RdDE-F_MiLsPjKSOrRexijJ94lq
 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=bdvGvUGsuNR4Zw3mPskUFq2EUhwvOJjAsViRdCPnI9Q,8616
+ellipsis/path/vector/timestamp/root.py,sha256=bxR2WVPNjwCemiMlGG2kswxscCBlVcux6OlSgCJcsZk,8620
 ellipsis/path/vector/timestamp/feature/__init__.py,sha256=miaLCHkogL9KJ_eUr4K_N15BShAe2ivcppDFJuE_SgI,210
-ellipsis/path/vector/timestamp/feature/root.py,sha256=pwov8wKeR_Uadl-brKIHtejKsNxaz4mu_97YlsTohyc,14400
+ellipsis/path/vector/timestamp/feature/root.py,sha256=5tmX_UHj8VZeYRhsLwf4P82vprL7Lsee-ViGncKWyXA,13019
 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
@@ -50,11 +50,11 @@ ellipsis/path/vector/timestamp/order/root.py,sha256=FB3AAbsp46Wv2vtvuFLx_djwh_Qn
 ellipsis/user/__init__.py,sha256=um_b42pc2otFiQRGqMajcEtONQpC2ei4r-EY3j7bsfQ,43
 ellipsis/user/root.py,sha256=dsMK6wGBdeCmOd3YsbIv9cEcQ6tAiSGr0jmtBhQl5-0,484
 ellipsis/util/__init__.py,sha256=A3BEF6O5qTRU90yoaZDI-xF8R1WAFuh1fdxwWKd1Uvw,628
-ellipsis/util/root.py,sha256=3ZUjFshnvOMhi7t6jscwpZHO7kVw7gjpYLafEnPKBr8,19438
+ellipsis/util/root.py,sha256=d7CYEhiGb6RY5Ep7lDmIderiRfXnnPtW8f9ZJu0VTgg,19434
 ellipsis/view/__init__.py,sha256=91KyJzbSvwSP9hvJQyo1LLM48b5NixLz6G40I9h6sdY,67
 ellipsis/view/root.py,sha256=6actiBwIsM0f7sJhQl_U4j-C6Dhe0z5XGGtxIOIKdY8,1726
-ellipsis-3.1.4.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-ellipsis-3.1.4.dist-info/METADATA,sha256=gzsUVAHQynM2bbX24tq-VQ_INs3y9ZhfXsKYs-bMFAQ,1805
-ellipsis-3.1.4.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ellipsis-3.1.4.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
-ellipsis-3.1.4.dist-info/RECORD,,
+ellipsis-3.1.6.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
+ellipsis-3.1.6.dist-info/METADATA,sha256=P5wVbXyxs2EB-Zu38neKQcTtkJGuko0-e6Et4oc4wDY,1805
+ellipsis-3.1.6.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+ellipsis-3.1.6.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
+ellipsis-3.1.6.dist-info/RECORD,,