ssb-sgis 1.2.11__tar.gz → 1.2.13__tar.gz

{ssb_sgis-1.2.11 → ssb_sgis-1.2.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ssb-sgis
-Version: 1.2.11
+Version: 1.2.13
 Summary: GIS functions used at Statistics Norway.
 Home-page: https://github.com/statisticsnorway/ssb-sgis
 License: MIT

{ssb_sgis-1.2.11 → ssb_sgis-1.2.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-sgis"
-version = "1.2.11"
+version = "1.2.13"
 description = "GIS functions used at Statistics Norway."
 authors = ["Morten Letnes <morten.letnes@ssb.no>"]
 license = "MIT"

{ssb_sgis-1.2.11 → ssb_sgis-1.2.13}/src/sgis/maps/examine.py

@@ -99,11 +99,7 @@ class Examine:
 
         m = Explore(*gdfs, column=column, **kwargs)
 
-        # m = Map(*gdfs, column=column, **kwargs)
-        self._gdfs: dict[str, gpd.GeoDataFrame] = dict(
-            zip(m.labels, m.gdfs, strict=False)
-        )
-
+        self._gdfs = m._gdfs
         self.rasters: dict[str, ImageCollection | Image | Band] = m.rasters
 
         self.indices = list(range(len(self.mask_gdf)))

{ssb_sgis-1.2.11 → ssb_sgis-1.2.13}/src/sgis/maps/httpserver.py

@@ -24,21 +24,33 @@ def run_html_server(contents: str | None = None, port: int = 3000) -> None:
     if "JUPYTERHUB_SERVICE_PREFIX" in os.environ:
         # Create a link using the https://github.com/jupyterhub/jupyter-server-proxy
         display_address = os.environ["JUPYTERHUB_SERVICE_PREFIX"] + f"proxy/{port}/"
-        stop_address = os.environ["JUPYTERHUB_SERVICE_PREFIX"] + f"proxy/{port}/stop"
-        display_content = HTML(
-            f"""
-        <p>Click <a href='{display_address}'>here</a> to open in browser.</p>
-        <p>Click <a href='{stop_address}'>here</a> to stop.</p>
-        """
-        )
+        # stop_address = os.environ["JUPYTERHUB_SERVICE_PREFIX"] + f"proxy/{port}/stop"
+        # display_content = HTML(
+        #     f"""
+        # <p>Click <a href='{display_address}'>here</a> to open in browser.</p>
+        # <p>Click <a href='{stop_address}'>here</a> to stop.</p>
+        # """
+        # )
+    elif (
+        "VSCODE_PROXY_URI" in os.environ
+        and "{{port}}" in os.environ["VSCODE_PROXY_URI"]
+    ):
+        display_address = os.environ["VSCODE_PROXY_URI"].replace("{{port}}", str(port))
     else:
         display_address = f"http://localhost:{port}"
-        display_content = HTML(
-            f"""
-        <p>Click <a href='http://localhost:{port}'>here</a> to open in browser.</p>
-        <p>Click <a href='http://localhost:{port}/stop'>here</a> to stop.<p>"
-        """
-        )
+        # display_content = HTML(
+        #     f"""
+        # <p>Click <a href='http://localhost:{port}'>here</a> to open in browser.</p>
+        # <p>Click <a href='http://localhost:{port}/stop'>here</a> to stop.<p>"
+        # """
+        # )
+    stop_address = f"{display_address}/stop"
+    display_content = HTML(
+        f"""
+    <p>Click <a href='{display_address}'>here</a> to open in browser.</p>
+    <p>Click <a href='{stop_address}'>here</a> to stop.</p>
+    """
+    )
 
     class HTTPServerRequestHandler(BaseHTTPRequestHandler):
         """A handler of request for the server, hosting static content."""