ellipsis 3.1.4__tar.gz → 3.1.6__tar.gz

{ellipsis-3.1.4 → ellipsis-3.1.6}/PKG-INFO

@@ -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 → ellipsis-3.1.6}/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-3.1.4 → ellipsis-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-3.1.4 → ellipsis-3.1.6}/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-3.1.4 → ellipsis-3.1.6}/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-3.1.4 → ellipsis-3.1.6}/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-3.1.4 → ellipsis-3.1.6}/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-3.1.4 → ellipsis-3.1.6}/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-3.1.4 → ellipsis-3.1.6}/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 → ellipsis-3.1.6}/ellipsis.egg-info/PKG-INFO

@@ -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 → ellipsis-3.1.6}/setup.py

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

{ellipsis-3.1.4 → ellipsis-3.1.6}/test/test.py

@@ -274,6 +274,8 @@ yMax = bounds.bounds[3]
 
 bounds = {'xMin':xMin, 'xMax':xMax, 'yMin':yMin, 'yMax':yMax}
 sh = el.path.vector.timestamp.getFeaturesByExtent(pathId = mapId, timestampId = layerId, extent =  bounds, token = token, listAll = False, epsg = 4326)
+sh = el.path.vector.timestamp.getFeaturesByExtent(pathId = mapId, timestampId = layerId, extent =  bounds, token = token, listAll = False, pageStart = sh['nextPageStart'], epsg = 4326)
+
 sh['result'].plot()
 
 sh = el.path.vector.timestamp.listFeatures(mapId, layerId, token)