ellipsis 3.1.21__tar.gz → 3.1.23__tar.gz

{ellipsis-3.1.21 → ellipsis-3.1.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.21
+Version: 3.1.23
 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.21 → ellipsis-3.1.23}/ellipsis/__init__.py

@@ -7,4 +7,4 @@ from ellipsis import path
 from ellipsis import view
 from ellipsis import util
 
-__version__ = '3.1.21'
+__version__ = '3.1.23'

{ellipsis-3.1.21 → ellipsis-3.1.23}/ellipsis/apiManager.py

@@ -24,7 +24,7 @@ def filterNone(body, toString= False):
                 params[k] = body[k]
     return params
 
-def get(url, body = None, token = None, crash = True):
+def get(url, body = None, token = None, crash = True, parseJson = True):
     if body == None:
         body = {'token': token}
     else:
@@ -40,7 +40,7 @@ def get(url, body = None, token = None, crash = True):
 
     url = url + '?' + body
 
-    r = call( method = requests.get, url = url, body = None, token = token, crash = crash )
+    r = call( method = requests.get, url = url, body = None, token = token, crash = crash, parseJson = parseJson )
 
 
     return r
@@ -66,7 +66,7 @@ def delete(url, body, token = None):
     return r
 
 
-def call(method, url, body = None, token = None, crash = True):
+def call(method, url, body = None, token = None, crash = True, parseJson = True):
     body = filterNone(body)
     if type(body) != type(None) and type(body) != type({}):
         raise ValueError(
@@ -85,10 +85,12 @@ def call(method, url, body = None, token = None, crash = True):
     if crash:
         if r.status_code != 200:
             raise ValueError(r.text)
-        try:
-            r = r.json()
-        except:
-            r = r.text
+            
+        if parseJson:
+            try:
+                r = r.json()
+            except:
+                r = r.text
     
         return r
     else:

{ellipsis-3.1.21 → ellipsis-3.1.23}/ellipsis/path/raster/timestamp/__init__.py

@@ -11,6 +11,7 @@ from ellipsis.path.raster.timestamp.root import trash
 from ellipsis.path.raster.timestamp.root import recover
 from ellipsis.path.raster.timestamp.root import getSampledRaster
 from ellipsis.path.raster.timestamp.root import getValuesAlongLine
+from ellipsis.path.raster.timestamp.root import contour
 
 from ellipsis.path.raster.timestamp import file
 from ellipsis.path.raster.timestamp import order

{ellipsis-3.1.21 → ellipsis-3.1.23}/ellipsis/path/raster/timestamp/root.py

@@ -17,13 +17,16 @@ import tifffile
 from PIL import Image
 import geopandas as gpd
 import datetime
+import pandas as pd
 import time
 import requests
+from skimage.measure import find_contours
+from shapely.geometry import Point, LineString
 
 def getDownsampledRaster(pathId, timestampId, extent, width, height, epsg=3857, style = None, token = None):
     return getSampledRaster(pathId, timestampId, extent, width, height, epsg, style, token)
 
-def getSampledRaster(pathId, timestampId, extent, width, height, epsg=3857, style = None, token = None):
+def getSampledRaster(pathId, timestampId, extent, width, height, epsg=4326, style = None, token = None):
     bounds = extent
     token = sanitize.validString('token', token, False)
     pathId = sanitize.validUuid('pathId', pathId, True)
@@ -32,9 +35,7 @@ def getSampledRaster(pathId, timestampId, extent, width, height, epsg=3857, styl
     style = sanitize.validObject('style', style, False)
     epsg = sanitize.validInt('epsg', epsg, True)
     body = {'pathId':pathId, 'timestampId':timestampId, 'extent':bounds, 'width':width, 'height':height, 'style':style, 'epsg':epsg}
-    r = apiManager.get('/path/' + pathId + '/raster/timestamp/' + timestampId + '/rasterByExtent', body, token, crash = False)
-    if r.status_code != 200:
-        raise ValueError(r.message)
+    r = apiManager.get('/path/' + pathId + '/raster/timestamp/' + timestampId + '/rasterByExtent', body, token, crash = True, parseJson = False)
 
 
     if type(style) == type(None):
@@ -56,18 +57,88 @@ def getSampledRaster(pathId, timestampId, extent, width, height, epsg=3857, styl
     return {'raster': r, 'transform':trans, 'extent': {'xMin' : xMin, 'yMin': yMin, 'xMax': xMax, 'yMax': yMax}, 'crs':"EPSG:" + str(epsg) }
 
 
+def contour(pathId, timestampId, extent, interval = None, intervals = None, epsg = 4326, bandNumber = 1, 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)
+    extent = sanitize.validBounds('extent', extent, True)
+
+
+    res = getActualExtent(extent['xMin'], extent['xMax'], extent['yMin'], extent['yMax'], 'EPSG:' + str(epsg))    
+    if res['status'] == '400':
+        raise ValueError('Invalid epsg and extent combination')
+        
+    bounds = res['message']
+
+    xMinWeb = bounds['xMin']
+    yMinWeb = bounds['yMin']
+    xMaxWeb = bounds['xMax']
+    yMaxWeb = bounds['yMax']
+
+    extentWeb = {'xMin': xMinWeb, 'xMax':xMaxWeb, 'yMin':yMinWeb, 'yMax':yMaxWeb}
+    size = 1000
+    r = getSampledRaster(pathId = pathId, timestampId = timestampId, extent = extentWeb, width = size, height = size, epsg=3857, token = token)
+    raster = r['raster']
+    
+    if bandNumber >= raster.shape[0]:
+        raise ValueError('BandNumber too high. Raster only has ' + str(raster.shape[0]) + 'bands.')
+
+
+    
+    if type(intervals) == type(None):
+        minVal = np.min(raster[bandNumber-1, raster[-1,:,:] == 1])
+        maxVal = np.max(raster[bandNumber-1, raster[-1,:,:] == 1])
+        
+        
+        cont = minVal + interval
+
+        conts = []
+        while cont < maxVal:
+            conts = conts + [cont]
+            cont = cont + interval
+    else:
+        conts = intervals
+
+    
+    Lx = (xMaxWeb - xMinWeb)/size
+    Ly = (yMaxWeb - yMinWeb)/size
+
+    sh_total = []
+    for cont in conts:
+        
+        lines = find_contours(raster[bandNumber-1,:,:],  mask=raster[-1,:,:] == 1, level = cont)
+         
+        newLines = []
+        line = lines[0]
+        for line in lines:
+            newLine = LineString([ Point( xMinWeb + x[0] * Lx  , yMinWeb +  x[1] * Ly )  for x in line])
+            newLines = newLines + [newLine]
+        
+        sh = gpd.GeoDataFrame({'geometry': newLines, 'label': (np.repeat(cont, len(newLines)))} )        
+        
+        sh_total = sh_total + [sh]
+    
+    sh = pd.concat(sh_total)
+    sh.crs = 'EPSG:3857'
+    sh = sh.to_crs('EPSG:' + str(epsg))
+
+    return sh
+
+
 def getValuesAlongLine(pathId, timestampId, line, token = None, epsg = 4326):
     pathId = sanitize.validUuid('pathId', pathId, True)
     timestampId = sanitize.validUuid('timestampId', timestampId, True)
     token = sanitize.validString('token', token, False)
     line = sanitize.validShapely('line', line, True)
+    epsg = sanitize.validInt('epsg', epsg, True)
 
     if line.type != 'LineString':
         raise ValueError('line must be a shapely lineString')
 
     temp = gpd.GeoDataFrame({'geometry':[line]})
     temp.crs = 'EPSG:' + str(epsg)
-    temp = temp.to_crs('EPSG:4326')
+    temp = temp.to_crs('EPSG:3857')
     line = temp['geometry'].values[0]
     line = list(line.coords)
         
@@ -79,20 +150,32 @@ def getValuesAlongLine(pathId, timestampId, line, token = None, epsg = 4326):
     xMax = max(x_of_line)
     yMin = min(y_of_line)
     yMax = max(y_of_line)
-
+    
+    d = (xMax - xMin) * 0.1
+    xMax = xMax + d
+    xMin = xMin -d
+    d = (yMax - yMin) * 0.1
+    yMax = yMax + d
+    yMin = yMin -d
+    
+    
+    
     #now we retrieve the needed raster we use epsg = 4326 but we can use other coordinates as well
     extent = {'xMin': xMin, 'xMax':xMax, 'yMin':yMin, 'yMax':yMax}
 
     size = 1000
-    r = getSampledRaster(pathId = pathId, timestampId = timestampId, extent = extent, width = size, height = size, epsg=4326)
+    r = getSampledRaster(pathId = pathId, timestampId = timestampId, extent = extent, width = size, height = size, epsg=3857, token = token)
     raster = r['raster']
 
     memfile =  MemoryFile()
     dataset = memfile.open( driver='GTiff', dtype='float32', height=size, width=size, count = raster.shape[0], crs= r['crs'], transform=r['transform'])
     dataset.write(raster)
 
+
+
     values = list(dataset.sample(line))
 
+    memfile.close()
     return values
 
 

{ellipsis-3.1.21 → ellipsis-3.1.23}/ellipsis/path/usage/__init__.py

@@ -1 +1 @@
-from ellipsis.path.usage.root import getActiveUsers, getUsage, getAggregatedUsage
+from ellipsis.path.usage.root import getActiveUsers, getUsage, getAggregatedUsage, getUserUsage

{ellipsis-3.1.21 → ellipsis-3.1.23}/ellipsis/path/usage/root.py

@@ -1,5 +1,7 @@
 from ellipsis import apiManager, sanitize
 from ellipsis.util.root import recurse
+from ellipsis.util.root import dateToString
+
 
 
 def getActiveUsers(pathId, token, listAll = True, pageStart = None):
@@ -36,3 +38,11 @@ def getAggregatedUsage(pathId, loggedIn, token):
 
 
     return apiManager.get('/path/' + pathId + '/usage/processingUnits', {'loggedIn': loggedIn}, token)
+
+
+def getUserUsage(userId, date, token):
+    token = sanitize.validString('token', token, True)
+    userId = sanitize.validUuid('userId', userId, True)
+    date = sanitize.validDate('date', date, True)
+    
+    return apiManager.get('/path/usage/user/' + userId + '/processingUnits', {'date':date}, token)

{ellipsis-3.1.21 → ellipsis-3.1.23}/ellipsis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ellipsis
-Version: 3.1.21
+Version: 3.1.23
 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.21 → ellipsis-3.1.23}/setup.py

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