ellipsis 3.1.43__tar.gz → 3.1.45__tar.gz

{ellipsis-3.1.43 → ellipsis-3.1.45}/PKG-INFO

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

@@ -7,7 +7,7 @@ from ellipsis import path
 from ellipsis import view
 from ellipsis import util
 
-__version__ = '3.1.43'
+__version__ = '3.1.45'
 
 
 

{ellipsis-3.1.43 → ellipsis-3.1.45}/ellipsis/apiManager.py

@@ -31,10 +31,10 @@ def get(url, body = None, token = None, crash = True, parseJson = True):
     else:
         body['token'] = token
     body = filterNone(body)
-    
+
     for k in body.keys():
         if type(body[k]) != type('x') :
-            body[k] = json.dumps(body[k]).replace(' ','')
+            body[k] = json.dumps(body[k])
 
 
     body = urllib.parse.urlencode(body)
@@ -94,7 +94,7 @@ def call(method, url, body = None, token = None, crash = True, parseJson = True)
     else:
         return r
 
-TIMEOUTTIME = 10
+TIMEOUTTIME = 20
 def actualCall(method, url, body, token):
     body = filterNone(body)
     if type(body) != type(None) and type(body) != type({}):
@@ -124,9 +124,7 @@ def upload(url, filePath, body, token, key = 'data', memfile= None):
     else:
         conn_file = memfile
 
-
     payload = MultipartEncoder(fields = {**body, key: (fileName, conn_file, 'application/octet-stream')})
-
     token = 'Bearer ' + token
 
     r = requests.post(baseUrl + url, headers = {"Authorization":token, "Content-Type": payload.content_type}, data=payload, verify=False)

{ellipsis-3.1.43 → ellipsis-3.1.45}/ellipsis/path/folder/__init__.py

@@ -1,2 +1,4 @@
 from ellipsis.path.folder.root import listFolder
 from ellipsis.path.folder.root import add
+from ellipsis.path.folder.root import traverse
+

{ellipsis-3.1.43 → ellipsis-3.1.45}/ellipsis/path/folder/root.py

@@ -36,3 +36,17 @@ def add( name, token, parentId = None, publicAccess =None, metadata=None):
 
     return apiManager.post('/path/folder', body, token)
 
+def traverse(pathId, location, pathType, token):
+    pathId = sanitize.validUuid('pathId', pathId, True)
+    location = sanitize.validStringArray('location', location, True)
+    pathType = sanitize.validString('pathType', pathType, True)
+    token = sanitize.validString('token', token, False)
+
+    body = {'location': location, 'type':pathType }
+
+    return apiManager.get('/path/' + pathId + '/folder/traverse', body, token)
+
+
+
+
+

{ellipsis-3.1.43 → ellipsis-3.1.45}/ellipsis/path/vector/timestamp/root.py

@@ -175,11 +175,6 @@ def getFeaturesByExtent(pathId, timestampId, extent, propertyFilter = None, toke
             zoom = t['zoom']
             coordinateBuffer = 0.5*360 / 2**zoom
 
-
-
-
-
-
     res = getActualExtent(extent['xMin'], extent['xMax'], extent['yMin'], extent['yMax'], 'EPSG:' + str(epsg), 4326)
     if res['status'] == '400':
         raise ValueError('Invalid epsg and extent combination')

{ellipsis-3.1.43 → ellipsis-3.1.45}/ellipsis.egg-info/PKG-INFO

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

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

{ellipsis-3.1.43 → ellipsis-3.1.45}/test/test.py

@@ -13,8 +13,7 @@ token = el.account.logIn('admin', 'aEUZXm4jzXW6GnQHUyrl')
 
 
 
-
-
+####################################
 
 #python3 setup.py sdist bdist_wheel
 #twine upload --repository pypi dist/*