Update app.py

app.py

@@ -429,31 +429,60 @@ async def generate_i3s(request: GenerateI3SRequest):
         raise HTTPException(status_code=500, detail=str(e))
 
 @app.middleware("http")
-async def i3s_json_middleware(request: Request, call_next):
-    # Check for ArcGIS-style query param f=pjson or f=json
-    if request.query_params.get("f") in ["json", "pjson"]:
-        # Allow normal processing first? No, static files don't handle query params usually
-        # We check if the path corresponds to a directory with 3dSceneLayer.json
+async def i3s_smart_middleware(request: Request, call_next):
+    # Intercept requests to /layers/
+    if request.url.path.startswith("/layers"):
+        path = request.url.path
         
-        # Construct local path from URL path
-        # URL path: /layers/<uuid>/SceneLayer
-        # Local path: .../static/layers/<uuid>/SceneLayer
+        # Determine local path
+        # URL: /layers/<uuid>/...
+        # Local: .../static/layers/<uuid>/...
+        rel_path = path[len("/layers"):]
+        if rel_path.startswith("/"): rel_path = rel_path[1:]
+        local_path = os.path.join(LAYERS_DIR, rel_path.replace("/", os.sep))
         
-        path = request.url.path
-        if path.startswith("/layers"):
-            rel_path = path[len("/layers"):] # e.g. /<uuid>/SceneLayer
-            if rel_path.startswith("/"): rel_path = rel_path[1:]
+        # Logic to map REST-style I3S requests to File System
+        target_file = None
+        
+        # 1. Check if exact file exists
+        if os.path.isfile(local_path):
+             # Let default static handler (or call_next) handle it?
+             # But call_next might be the static mount. 
+             # We can just let it proceed.
+             pass
+        else:
+            # 2. Handle I3S Conventions
+            
+            # Case A: Layer Root (e.g. .../layers/0r or .../layers/0r/)
+            # If directory exists, check for 3dSceneLayer.json
+            if os.path.isdir(local_path):
+                 possible_json = os.path.join(local_path, "3dSceneLayer.json")
+                 if os.path.isfile(possible_json):
+                      target_file = possible_json
+
+            # Case B: Nodes (e.g. .../nodes/root or .../nodes/15)
+            # Expects: .../nodes/root/3dNodeIndexDocument.json
+            elif "/nodes/" in path:
+                # If local_path is a directory, look for 3dNodeIndexDocument.json
+                # But os.path.isdir might fail if the url doesn't have trailing slash? 
+                # Actually, 'nodes/root' might be a folder on disk.
+                if os.path.isdir(local_path):
+                     possible_doc = os.path.join(local_path, "3dNodeIndexDocument.json")
+                     if os.path.isfile(possible_doc):
+                          target_file = possible_doc
             
-            local_path = os.path.join(LAYERS_DIR, rel_path.replace("/", os.sep))
+            # Case C: NodePages (e.g. .../nodepages/0)
+            # Expects: .../nodepages/0.json
+            elif "/nodepages/" in path:
+                 # Check if adding .json helps
+                 possible_json_page = local_path + ".json"
+                 if os.path.isfile(possible_json_page):
+                      target_file = possible_json_page
+
+        if target_file:
+            logger.info(f"Serving I3S Resource: {path} -> {target_file}")
+            return FileResponse(target_file, media_type="application/json")
             
-            # If request is for a directory (or valid path that is a dir)
-            if os.path.exists(local_path) and os.path.isdir(local_path):
-                json_path = os.path.join(local_path, "3dSceneLayer.json")
-                if os.path.exists(json_path):
-                    logger.info(f"Intercepting f=pjson for {path}, serving 3dSceneLayer.json")
-                    from fastapi.responses import FileResponse
-                    return FileResponse(json_path, media_type="application/json")
-    
     response = await call_next(request)
     return response