simwrapper 4.3.0__tar.gz → 4.3.2__tar.gz

{simwrapper-4.3.0 → simwrapper-4.3.2}/CONFIG-EXAMPLE.yaml

@@ -7,19 +7,26 @@
 # **Local/network mounts only: no http URLs here**
 # Each key defines a starting point in the local filesystem.
 # (if no config is found, the current working folder is shared)
+
 storage:
   data:
-    path: '/Users/billy/data'
+    path: '/data'
     description: 'Local data from this server'
 
-#zones:
-#  SEMCOG:
-#    file: './SEMCOG_TAZ.geojson'
-#    lookup: 'ID'
-#    sizes: 1454,2454,2475,3717
+# --- ZONAL GEOJSON BOUNDARIES ---
+# You can supply your own GeoJSON-format boundary files here.
+# Specify the filename, the field containg the zone 'id',
+# and the matrix sizes that map to these boundaries.
+# Supply as many as you like with different key names.
 
+#zones:
+#  MY_ZONES:
+#    file: './myboundaries.geojson.gz'
+#    lookup: 'TAZ'
+#    sizes: 1500,2000
 
 # --- FRONT-PAGE TEXT -------------
+
 tagline: 'Transport simulation data visualizer'
 
 # Optional readme can be either a .md markdown filename,
@@ -27,4 +34,4 @@ tagline: 'Transport simulation data visualizer'
 # readme: |
 #   Welcome to SimWrapper on Docker
 #   ========================
-##   - This is running inside a container. Edit CONFIG-DOCKER.yaml to remove this message!
+#   - This is running inside a container. Edit CONFIG-DOCKER.yaml to remove this message!

{simwrapper-4.3.0 → simwrapper-4.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simwrapper
-Version: 4.3.0
+Version: 4.3.2
 Summary: SimWrapper command line tools
 Project-URL: Homepage, https://docs.simwrapper.app
 Project-URL: Repository, https://github.com/simwrapper/simwrapper-python-tools

{simwrapper-4.3.0 → simwrapper-4.3.2}/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-version = "4.3.0"
+version = "4.3.2"
 name = "simwrapper"
 description = "SimWrapper command line tools"
 readme = "README.md"

{simwrapper-4.3.0 → simwrapper-4.3.2}/simwrapper/FlaskApp.py

@@ -34,7 +34,7 @@ mimetypes.add_type('application/wasm', '.wasm')
 # STORAGE LOCATIONS -------------------------------------------------
 # Default is to just share the content of the starting folder.
 STORAGE = {
-    "Server": "/Users/billyc/data/",
+    "Server": "./",
 }
 STORAGE_ROOTS = {
     "Server": { "path": "./", "description": os.getcwd()},
@@ -67,7 +67,10 @@ class FilesList(Resource):
         # prefix must end with a slash
         if not prefix.endswith('/'): prefix += '/'
 
-        path = f"{STORAGE[server_id]}/{prefix}"
+        base = STORAGE[server_id]
+        if not base.endswith('/'): base += '/'
+
+        path = f"{base}{prefix}"
         if sys.platform.startswith("win"): path = path.replace("/", "\\")
 
         content = {"files": [], "dirs": [], "handles": {}}
@@ -95,8 +98,12 @@ class File(Resource):
 
         logger.debug(f'GET {server_id} {request.args["prefix"]}')
 
+        base = STORAGE[server_id]
+        if not base.endswith('/'): base += '/'
+
         prefix = request.args['prefix']
-        path = f"{STORAGE[server_id]}{prefix}"
+        path = f"{base}{prefix}"
+
         if sys.platform.startswith("win"): path = path.replace("/", "\\")
         try:
             if not os.path.isfile(path):
@@ -155,7 +162,9 @@ class Omx(Resource):
         # We need the prefix # and the personal-access-token
         prefix =  request.args["prefix"]
         server = STORAGE[server_id]
-        path = f"{server}/{prefix}"
+        if not server.endswith('/'): server += '/'
+
+        path = f"{server}{prefix}"
         if sys.platform.startswith("win"): path = path.replace("/", "\\")
 
         # 1. Open the OMX file

{simwrapper-4.3.0 → simwrapper-4.3.2}/uv.lock

@@ -1331,7 +1331,7 @@ wheels = [
 
 [[package]]
 name = "simwrapper"
-version = "4.3.0"
+version = "4.3.2"
 source = { editable = "." }
 dependencies = [
     { name = "blosc" },