ellipsis 3.2.1__py3-none-any.whl → 3.2.3__py3-none-any.whl

ellipsis/__init__.py

@@ -6,7 +6,7 @@ from ellipsis import user
 from ellipsis import path
 from ellipsis import util
 from ellipsis import compute
-__version__ = '3.2.1'
+__version__ = '3.2.3'
 
 
 

ellipsis/compute/__init__.py

@@ -1 +1 @@
-from ellipsis.compute.root import createCompute, listComputes, execute, terminatecompute, terminateAll, addToLayer
+from ellipsis.compute.root import createCompute, listComputes, execute, terminateCompute, terminateAll, addToLayer

ellipsis/compute/root.py

@@ -79,7 +79,7 @@ def parseResults(r):
 
     return results
 
-def terminatecompute(computeId, token, awaitTillTerminated = True):
+def terminateCompute(computeId, token, awaitTillTerminated = True):
     computeId = sanitize.validUuid('computeId', computeId, True)
     token = sanitize.validString('token', token, True)
     sanitize.validBool('awaitTillTerminated',awaitTillTerminated, True)
@@ -145,13 +145,13 @@ def addToLayer(response, pathId, timestampId, token):
     token = sanitize.validString('token', token, True)
 
     for url in response:
-        memfile = downloadFile(url, filePath, token)
+        memfile = downloadFile(url,  token)
         addFile(pathId = pathId, timestampId=timestampId, token = token, fileFormat='tif', memFile=memfile, name='out.tif')
     activate(pathId=pathId, timestampId=timestampId, token=token)
 
 
 
-def downloadFile(url, filePath, token):
+def downloadFile(url,  token):
     memfile = BytesIO()
     apiManager.download(url = url, filePath='', memfile=memfile, token = token)
     memfile.seek(0)

ellipsis/path/raster/timestamp/root.py

@@ -329,8 +329,8 @@ def getRaster(pathId, timestampId, extent, token = None, showProgress = True, ep
         y_index = tileY - y1_osm
         
         r = iterate(fetch, 0, tileX, tileY)
+        r_total[0:r.shape[0],y_index*w:(y_index+1)*w,x_index*w:(x_index+1)*w] = r
 
-        r_total[:,y_index*w:(y_index+1)*w,x_index*w:(x_index+1)*w] = r
         I = I + 1
         if showProgress:
             loadingBar(I, len(tiles))
@@ -381,6 +381,7 @@ def analyse(pathId, timestampIds, geometry, returnType= 'all', approximate=True,
     return r
 
 
+
 def add(pathId, token, description= None, date ={'from': datetime.datetime.now(), 'to': datetime.datetime.now()}):
     
 

ellipsis/util/root.py

@@ -21,8 +21,8 @@ import multiprocessing
 import warnings
 import uuid
 import shapely
-from shapely.ops import cascaded_union
 
+from io import BytesIO
 
 from ellipsis import sanitize
 from rasterio.warp import reproject as warp, Resampling, calculate_default_transform
@@ -487,7 +487,7 @@ def cut(sh, bounds, tile, chosen):
             collections = np.array(['collection' in str(type(x)) for x in sh_intersects['geometry']])
             geometryCollections = sh_intersects['geometry'][collections].values
     
-            newGeometries = [ cascaded_union([geometry for geometry in collection if chosen in str(type(geometry))]) for collection in geometryCollections   ]
+            newGeometries = [ shapely.ops.cascaded_union([geometry for geometry in collection if chosen in str(type(geometry))]) for collection in geometryCollections   ]
     
             sh_intersects['geometry'][collections] = newGeometries
             

{ellipsis-3.2.1.dist-info → ellipsis-3.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.2.1
+Version: 3.2.3
 Summary: Package to interact with the Ellipsis API
 Home-page: https://github.com/ellipsis-drive-internal/python-package
 Author: Daniel van der Maas
@@ -11,24 +11,24 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pandas
+Requires-Dist: Fiona
 Requires-Dist: Pillow
-Requires-Dist: matplotlib
+Requires-Dist: Shapely
+Requires-Dist: dill
 Requires-Dist: geopandas
-Requires-Dist: pyproj
+Requires-Dist: geopy
+Requires-Dist: imagecodecs
 Requires-Dist: imageio
+Requires-Dist: matplotlib
 Requires-Dist: numpy
-Requires-Dist: imagecodecs
+Requires-Dist: pandas
+Requires-Dist: pygltflib
+Requires-Dist: pyproj
+Requires-Dist: rasterio
 Requires-Dist: requests
 Requires-Dist: requests-toolbelt
-Requires-Dist: rasterio
-Requires-Dist: Shapely
-Requires-Dist: geopy
 Requires-Dist: scikit-image
-Requires-Dist: Fiona
-Requires-Dist: pygltflib
 Requires-Dist: tifffile
-Requires-Dist: dill
 
 # Ellipsis Drive Python Package
 

{ellipsis-3.2.1.dist-info → ellipsis-3.2.3.dist-info}/RECORD

@@ -1,12 +1,12 @@
-ellipsis/__init__.py,sha256=-Xy1_i1cnwMfp6HBcWbfwqRb43Ho-SWJ8WSgQ04-UAs,237
+ellipsis/__init__.py,sha256=HIFPMdYQQE4ad73-VzjQhkZ-Xif4ByuPRfOxTCdrAws,237
 ellipsis/apiManager.py,sha256=iX6XFwilMfuCQYioAmgRgReL8W63FUBr3UC506ucIF4,5603
 ellipsis/sanitize.py,sha256=VuTPjHAUNCGUaOzKU2ojloiEN8kPhm53fIjbk6E9IEg,10597
 ellipsis/account/__init__.py,sha256=jTmwL9HVS27vAHPC_2a98RQJWbpSKBN4ptiXpY0qJgk,101
 ellipsis/account/root.py,sha256=p8AehZQizaPlpGdFB5RsMduyUF4ynN0cGDz41nIxjYM,1942
 ellipsis/account/accessToken/__init__.py,sha256=ivwhK1eC4g74PAKaeTReb1QhIpKXyvmfdqZV6wDY-EY,66
 ellipsis/account/accessToken/root.py,sha256=TYo8wTyWyzytaqOTsuQC-Vn3y7BhYMC88EItZafpISA,1281
-ellipsis/compute/__init__.py,sha256=D_PEEIfNar00N85LUF4m1p9R4icrnAktJP_26PoAPqA,115
-ellipsis/compute/root.py,sha256=Ec5BgrfGDV_cKN-3RpMVLJqRv9mk1kKRRggbxKmsV1Y,5342
+ellipsis/compute/__init__.py,sha256=zcjm8GX1kSi5PEK5CXsR3wc2wxBdy3EIMo_y1sFEguQ,115
+ellipsis/compute/root.py,sha256=4FTcMDQARJuRZgFvo3Sfk_3Z3rpy737JvH0fsxUG-E8,5324
 ellipsis/path/__init__.py,sha256=NzdcTpXpicdrBWLgsFP6WY7ARIBKUFnkwa5VuB1Qdpc,506
 ellipsis/path/root.py,sha256=GqiYjAkdSchkQf1NzcSFZvBrmoQir7K2fqmZosqghFM,7953
 ellipsis/path/bookmark/__init__.py,sha256=vNrqGcWl5MN_xVAiClP6W6NilmsV-fqYOnJukbYcNwc,56
@@ -35,7 +35,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=brmFXg69CKRcWaAfPbxWfsvHvnn5q8GBQhVzUTVb4_w,842
-ellipsis/path/raster/timestamp/root.py,sha256=JxMjB834jVHYsjA9KeIjUttvf9K5S8zHI44iC03cdhQ,17507
+ellipsis/path/raster/timestamp/root.py,sha256=6fGels-BtxWpF6EarxWni-AHK-5r2kb7fqVUFEnLNY4,17519
 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=KD8E64eZtS62C-WCl3BTeVjsc08BaLXpuLwxfbmnTLI,4545
@@ -66,9 +66,9 @@ ellipsis/path/vector/timestamp/order/root.py,sha256=kknhHJSuj91WaRF-qzfovummHwpl
 ellipsis/user/__init__.py,sha256=um_b42pc2otFiQRGqMajcEtONQpC2ei4r-EY3j7bsfQ,43
 ellipsis/user/root.py,sha256=dsMK6wGBdeCmOd3YsbIv9cEcQ6tAiSGr0jmtBhQl5-0,484
 ellipsis/util/__init__.py,sha256=_sNBUXDKJVGffRyt93xdUrJ4gON651Sp-unr7LKVCEc,756
-ellipsis/util/root.py,sha256=Ts7DeaD_X7x-csmq5V2sa_hYrt1mCd59T7-NUQcWj3Y,23980
-ellipsis-3.2.1.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-ellipsis-3.2.1.dist-info/METADATA,sha256=wehcxhDesgn_cQzN89hMbh36KVDaLSrDDTbmiI0GNA4,1842
-ellipsis-3.2.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-ellipsis-3.2.1.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
-ellipsis-3.2.1.dist-info/RECORD,,
+ellipsis/util/root.py,sha256=3pw-tXGTQC5PMUtpReJEA9rgyJZNlTM3uUISPz2Sq6Q,23976
+ellipsis-3.2.3.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
+ellipsis-3.2.3.dist-info/METADATA,sha256=hI6pIwOoWjIROT2Zbz3TEAsc8V-XhLvHKkZk4fEV-Ag,1842
+ellipsis-3.2.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+ellipsis-3.2.3.dist-info/top_level.txt,sha256=eG8gfaVDyprKdb-dsGSh_lFMSa3DiZCsJFqze239RjA,9
+ellipsis-3.2.3.dist-info/RECORD,,

{ellipsis-3.2.1.dist-info → ellipsis-3.2.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any