ellipsis 3.2.1__tar.gz → 3.2.3__tar.gz

{ellipsis-3.2.1 → ellipsis-3.2.3}/PKG-INFO

@@ -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,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pandas
-Requires-Dist: Pillow
-Requires-Dist: matplotlib
-Requires-Dist: geopandas
-Requires-Dist: pyproj
-Requires-Dist: imageio
-Requires-Dist: numpy
-Requires-Dist: imagecodecs
-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 → ellipsis-3.2.3}/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-3.2.1 → ellipsis-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-3.2.1 → ellipsis-3.2.3}/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-3.2.1 → ellipsis-3.2.3}/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-3.2.1 → ellipsis-3.2.3}/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 → ellipsis-3.2.3}/ellipsis.egg-info/PKG-INFO

@@ -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,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pandas
-Requires-Dist: Pillow
-Requires-Dist: matplotlib
-Requires-Dist: geopandas
-Requires-Dist: pyproj
-Requires-Dist: imageio
-Requires-Dist: numpy
-Requires-Dist: imagecodecs
-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 → ellipsis-3.2.3}/setup.py

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

{ellipsis-3.2.1 → ellipsis-3.2.3}/ellipsis.egg-info/requires.txt

@@ -1,18 +1,18 @@
-pandas
+Fiona
 Pillow
-matplotlib
+Shapely
+dill
 geopandas
-pyproj
+geopy
+imagecodecs
 imageio
+matplotlib
 numpy
-imagecodecs
+pandas
+pygltflib
+pyproj
+rasterio
 requests
 requests-toolbelt
-rasterio
-Shapely
-geopy
 scikit-image
-Fiona
-pygltflib
 tifffile
-dill