nds-mapviewer 2026.3.2.dev115__tar.gz → 2026.3.2.dev117__tar.gz

{nds_mapviewer-2026.3.2.dev115/src/nds_mapviewer.egg-info → nds_mapviewer-2026.3.2.dev117}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nds-mapviewer
-Version: 2026.3.2.dev115
+Version: 2026.3.2.dev117
 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.2.dev115 → nds_mapviewer-2026.3.2.dev117/src/nds_mapviewer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nds-mapviewer
-Version: 2026.3.2.dev115
+Version: 2026.3.2.dev117
 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.2.dev115 → nds_mapviewer-2026.3.2.dev117}/src/ndslive/mapviewer/config.py

@@ -26,7 +26,9 @@ FILESTORE_PATTERN = re.compile(r"^filestore:(.+)$")
 FOLDER_URI_PATTERN = re.compile(r"^folder:(.+)$")
 LOCALHOST_PATTERN = re.compile(r"^(localhost|127\.0\.0\.1)(:\d+)?$")
 CUSTOM_STYLES_ROOT = "/custom-styles"
+STYLE_OPTION_PRESETS_ROOT = "/style-option-presets"
 CUSTOM_BACKGROUNDS_ROOT = "/custom-backgrounds"
+COORDINATE_LEGAL_TERMS_ROOT = "/coordinates-legal-terms"
 
 # Default config for demo mode
 DEFAULT_DEMO_CONFIG = {
@@ -478,6 +480,34 @@ def transform_config(
             return container_dir
         return f"{container_dir}/{suffix}"
 
+    def transform_coordinate_legal_terms(value: str) -> str:
+        """Mount one local legal-terms document below its public static root."""
+        value = value.strip()
+        if not value or _is_explicit_browser_path(value, COORDINATE_LEGAL_TERMS_ROOT):
+            return value
+        host_file = _resolve_host_asset_path(value, base_dir)
+        return add_asset_volume(
+            host_file,
+            COORDINATE_LEGAL_TERMS_ROOT,
+            f"{COORDINATE_LEGAL_TERMS_ROOT}/{host_file.name}",
+        )
+
+    def transform_style_option_presets(value: str) -> str:
+        """Mount one local preset document below its dedicated public root."""
+        value = value.strip()
+        if (
+            not value
+            or _is_external_or_bundle_url(value)
+            or _is_explicit_browser_path(value, STYLE_OPTION_PRESETS_ROOT)
+        ):
+            return value
+        host_file = _resolve_host_asset_path(value, base_dir)
+        return add_asset_volume(
+            host_file,
+            STYLE_OPTION_PRESETS_ROOT,
+            f"{STYLE_OPTION_PRESETS_ROOT}/{host_file.name}",
+        )
+
     erdblick = transformed.get("erdblick")
     if isinstance(erdblick, dict):
         additional_styles = erdblick.get("additionalStyles")
@@ -503,6 +533,18 @@ def transform_config(
                         for item in url_template
                     ]
 
+        coordinate_legal_terms = erdblick.get("coordinates-legal-terms")
+        if isinstance(coordinate_legal_terms, str):
+            erdblick["coordinates-legal-terms"] = transform_coordinate_legal_terms(
+                coordinate_legal_terms
+            )
+
+        style_option_presets = erdblick.get("styleOptionPresets")
+        if isinstance(style_option_presets, str):
+            erdblick["styleOptionPresets"] = transform_style_option_presets(
+                style_option_presets
+            )
+
     return TransformedConfig(config=transformed, volumes=volumes + asset_volumes)
 
 
@@ -625,6 +667,49 @@ def validate_paths(
                             f"Directory does not exist: {host_root}"
                         )
 
+        coordinate_legal_terms = erdblick.get("coordinates-legal-terms")
+        if isinstance(coordinate_legal_terms, str):
+            coordinate_legal_terms = coordinate_legal_terms.strip()
+            if (
+                coordinate_legal_terms
+                and not _is_explicit_browser_path(
+                    coordinate_legal_terms, COORDINATE_LEGAL_TERMS_ROOT
+                )
+            ):
+                host_file = _resolve_host_asset_path(coordinate_legal_terms, base_dir)
+                if host_file.suffix.lower() not in (".json", ".yaml", ".yml"):
+                    errors.append(
+                        "erdblick.coordinates-legal-terms: "
+                        "File must use .json, .yaml, or .yml"
+                    )
+                elif not host_file.is_file():
+                    errors.append(
+                        "erdblick.coordinates-legal-terms: "
+                        f"File does not exist: {host_file}"
+                    )
+
+        style_option_presets = erdblick.get("styleOptionPresets")
+        if isinstance(style_option_presets, str):
+            style_option_presets = style_option_presets.strip()
+            if (
+                style_option_presets
+                and not _is_external_or_bundle_url(style_option_presets)
+                and not _is_explicit_browser_path(
+                    style_option_presets, STYLE_OPTION_PRESETS_ROOT
+                )
+            ):
+                host_file = _resolve_host_asset_path(style_option_presets, base_dir)
+                if host_file.suffix.lower() not in (".yaml", ".yml"):
+                    errors.append(
+                        "erdblick.styleOptionPresets: "
+                        "File must use .yaml or .yml"
+                    )
+                elif not host_file.is_file():
+                    errors.append(
+                        "erdblick.styleOptionPresets: "
+                        f"File does not exist: {host_file}"
+                    )
+
     return errors
 
 

{nds_mapviewer-2026.3.2.dev115 → nds_mapviewer-2026.3.2.dev117}/tests/test_config.py

@@ -453,6 +453,90 @@ class TestTransformConfig:
         assert layers[2]["url"] == "service"
         assert any(_same_path(vol.host_path, imagery_dir) for vol in result.volumes)
 
+    def test_erdblick_coordinate_legal_terms_are_mapped_from_config_dir(
+        self, temp_dir
+    ):
+        """Relative coordinate terms are mounted at the dedicated browser root."""
+        legal_dir = temp_dir / "legal"
+        legal_dir.mkdir()
+        legal_file = legal_dir / "coordinates.yaml"
+        legal_file.write_text("legal-terms: Test terms\n")
+        config = {
+            "sources": [],
+            "erdblick": {
+                "coordinates-enabled": True,
+                "coordinates-legal-terms": "legal/coordinates.yaml",
+            },
+        }
+
+        result = transform_config(config, base_dir=temp_dir)
+
+        assert result.config["erdblick"]["coordinates-enabled"] is True
+        assert result.config["erdblick"]["coordinates-legal-terms"] == (
+            "/coordinates-legal-terms/coordinates.yaml"
+        )
+        assert any(
+            _same_path(vol.host_path, legal_file)
+            and vol.container_path == "/coordinates-legal-terms/coordinates.yaml"
+            for vol in result.volumes
+        )
+
+    def test_explicit_coordinate_legal_terms_browser_path_is_preserved(self):
+        """Raw-Docker browser paths do not create Python-managed mounts."""
+        config = {
+            "sources": [],
+            "erdblick": {
+                "coordinates-legal-terms": (
+                    "/coordinates-legal-terms/manual.json"
+                )
+            },
+        }
+
+        result = transform_config(config)
+
+        assert result.config["erdblick"]["coordinates-legal-terms"] == (
+            "/coordinates-legal-terms/manual.json"
+        )
+        assert result.volumes == []
+
+    def test_style_option_presets_are_mapped_from_config_dir(self, temp_dir):
+        """A relative preset YAML is mounted as one file at its dedicated root."""
+        presets_dir = temp_dir / "presets"
+        presets_dir.mkdir()
+        presets_file = presets_dir / "viewer.yaml"
+        presets_file.write_text("version: 1\npresets: []\n")
+        config = {
+            "sources": [],
+            "erdblick": {
+                "styleOptionPresets": "presets/viewer.yaml",
+            },
+        }
+
+        result = transform_config(config, base_dir=temp_dir)
+
+        assert result.config["erdblick"]["styleOptionPresets"] == (
+            "/style-option-presets/viewer.yaml"
+        )
+        assert any(
+            _same_path(volume.host_path, presets_file)
+            and volume.container_path == "/style-option-presets/viewer.yaml"
+            for volume in result.volumes
+        )
+
+    def test_style_option_preset_urls_are_preserved(self):
+        """External, bundled, and explicit browser URLs do not create mounts."""
+        for value in (
+            "https://example.com/presets.yaml",
+            "bundle/styles/style-option-presets.yaml",
+            "/style-option-presets/manual.yaml",
+        ):
+            result = transform_config({
+                "sources": [],
+                "erdblick": {"styleOptionPresets": value},
+            })
+            assert result.config["erdblick"]["styleOptionPresets"] == value
+            assert result.volumes == []
+
     def test_existing_volume_mapping_is_reused(self, temp_dir):
         """Hot reloads keep container paths stable when entries are removed."""
         first = temp_dir / "first"
@@ -614,6 +698,62 @@ class TestValidatePaths:
         assert "erdblick.additionalStyles[0]" in errors[0]
         assert "erdblick.backgroundLayers[0].urlTemplate[0]" in errors[1]
 
+    def test_coordinate_legal_terms_path_and_extension_are_validated(self, temp_dir):
+        """Coordinate terms must be an existing JSON/YAML file."""
+        legal_file = temp_dir / "terms.json"
+        legal_file.write_text('{"legal-terms":"Text"}\n')
+
+        assert validate_paths(
+            {"erdblick": {"coordinates-legal-terms": "terms.json"}},
+            base_dir=temp_dir,
+        ) == []
+
+        missing_errors = validate_paths(
+            {"erdblick": {"coordinates-legal-terms": "missing.yaml"}},
+            base_dir=temp_dir,
+        )
+        extension_errors = validate_paths(
+            {"erdblick": {"coordinates-legal-terms": "terms.txt"}},
+            base_dir=temp_dir,
+        )
+
+        assert len(missing_errors) == 1
+        assert "File does not exist" in missing_errors[0]
+        assert len(extension_errors) == 1
+        assert "File must use .json, .yaml, or .yml" in extension_errors[0]
+
+    def test_style_option_preset_path_and_extension_are_validated(self, temp_dir):
+        """Preset configuration must point at an existing YAML file."""
+        presets_file = temp_dir / "presets.yaml"
+        presets_file.write_text("version: 1\npresets: []\n")
+
+        assert validate_paths(
+            {"erdblick": {"styleOptionPresets": "presets.yaml"}},
+            base_dir=temp_dir,
+        ) == []
+        assert validate_paths(
+            {"erdblick": {"styleOptionPresets": "https://example.com/presets.yaml"}},
+            base_dir=temp_dir,
+        ) == []
+        assert validate_paths(
+            {"erdblick": {"styleOptionPresets": "/style-option-presets/manual.yaml"}},
+            base_dir=temp_dir,
+        ) == []
+
+        missing_errors = validate_paths(
+            {"erdblick": {"styleOptionPresets": "missing.yaml"}},
+            base_dir=temp_dir,
+        )
+        extension_errors = validate_paths(
+            {"erdblick": {"styleOptionPresets": "presets.json"}},
+            base_dir=temp_dir,
+        )
+
+        assert len(missing_errors) == 1
+        assert "File does not exist" in missing_errors[0]
+        assert len(extension_errors) == 1
+        assert "File must use .yaml or .yml" in extension_errors[0]
+
 
 class TestWriteConfigToTemp:
     """Tests for write_config_to_temp()."""