nds-mapviewer 2026.3.1.dev102__tar.gz → 2026.3.1.dev104__tar.gz

{nds_mapviewer-2026.3.1.dev102/src/nds_mapviewer.egg-info → nds_mapviewer-2026.3.1.dev104}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nds-mapviewer
-Version: 2026.3.1.dev102
+Version: 2026.3.1.dev104
 Summary: CLI to run the NDS MapViewer Docker container for visualizing map data (NDS.Live, GeoJSON, and more)
 Author-email: NDS Association <support@nds-association.org>
 License: Proprietary

{nds_mapviewer-2026.3.1.dev102 → nds_mapviewer-2026.3.1.dev104/src/nds_mapviewer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nds-mapviewer
-Version: 2026.3.1.dev102
+Version: 2026.3.1.dev104
 Summary: CLI to run the NDS MapViewer Docker container for visualizing map data (NDS.Live, GeoJSON, and more)
 Author-email: NDS Association <support@nds-association.org>
 License: Proprietary

{nds_mapviewer-2026.3.1.dev102 → nds_mapviewer-2026.3.1.dev104}/src/ndslive/mapviewer/config.py

@@ -6,7 +6,7 @@ import os
 import re
 import tempfile
 from dataclasses import dataclass, field
-from pathlib import Path
+from pathlib import Path, PurePath
 from typing import Any
 from urllib.parse import urlparse
 
@@ -184,6 +184,13 @@ def _to_url_path(path: str) -> str:
     return path.replace(os.sep, "/")
 
 
+def _join_container_path(container_base: str, relative: PurePath) -> str:
+    """Join a container mount path and relative host path with POSIX separators."""
+    if str(relative) == ".":
+        return container_base
+    return f"{container_base.rstrip('/')}/{relative.as_posix().lstrip('/')}"
+
+
 def _split_background_template(
     template: str,
     base_dir: str | Path | None,
@@ -386,7 +393,7 @@ def transform_config(
         # Calculate relative path from mount parent to the actual path
         try:
             relative = local_path.relative_to(mount_parent)
-            container_full_path = f"{container_base}/{relative}" if str(relative) != "." else container_base
+            container_full_path = _join_container_path(container_base, relative)
         except ValueError:
             # Path is not relative to mount parent (shouldn't happen)
             container_full_path = f"{container_base}/{local_path.name}"

{nds_mapviewer-2026.3.1.dev102 → nds_mapviewer-2026.3.1.dev104}/tests/test_config.py

@@ -1,6 +1,6 @@
 """Tests for config loading and transformation (no Docker required)."""
 
-from pathlib import Path
+from pathlib import Path, PureWindowsPath
 
 import pytest
 import yaml
@@ -9,6 +9,7 @@ from ndslive.mapviewer.config import (
     CONFIGS_DIR,
     _extract_local_path,
     _is_localhost,
+    _join_container_path,
     _transform_localhost,
     _transform_localhost_url,
     create_classic_config,
@@ -294,6 +295,45 @@ class TestTransformConfig:
         assert len(result.volumes) == 1
         assert "filestore:/data/" in result.config["sources"][0]["uri"]
 
+    def test_nested_filestore_paths_use_container_separators(self, temp_dir):
+        """Nested filestores share a mount and keep POSIX container URIs."""
+        root_map = temp_dir / "map" / "map.ndslive"
+        nested_map = temp_dir / "map" / "and" / "othermap.ndslive"
+        nested_map.parent.mkdir(parents=True)
+        root_map.touch()
+        nested_map.touch()
+
+        config = {
+            "sources": [
+                {
+                    "type": "SmartLayerTileService",
+                    "uri": f"filestore:{root_map}",
+                    "mapId": "Root",
+                },
+                {
+                    "type": "SmartLayerTileService",
+                    "uri": f"filestore:{nested_map}",
+                    "mapId": "Nested",
+                },
+            ]
+        }
+
+        result = transform_config(config)
+
+        assert len(result.volumes) == 1
+        assert _same_path(result.volumes[0].host_path, root_map.parent)
+        assert result.config["sources"][0]["uri"] == "filestore:/data/0/map.ndslive"
+        assert result.config["sources"][1]["uri"] == (
+            "filestore:/data/0/and/othermap.ndslive"
+        )
+
+    def test_windows_relative_paths_are_rendered_as_container_paths(self):
+        """Windows path separators must not leak into Linux container URIs."""
+        assert _join_container_path(
+            "/data/0",
+            PureWindowsPath(r"and\othermap.ndslive"),
+        ) == "/data/0/and/othermap.ndslive"
+
     def test_localhost_host_transformed(self):
         """localhost host is transformed to host.docker.internal."""
         config = {