ssb-sgis 1.1.0__py3-none-any.whl → 1.1.2__py3-none-any.whl

sgis/maps/explore.py

@@ -4,7 +4,6 @@ This module holds the Explore class, which is the basis for the explore, samplem
 clipmap functions from the 'maps' module.
 """
 
-import os
 import random
 import re
 import warnings
@@ -44,6 +43,7 @@ from ..geopandas_tools.general import clean_geoms
 from ..geopandas_tools.general import make_all_singlepart
 from ..geopandas_tools.geometry_types import get_geom_type
 from ..geopandas_tools.geometry_types import to_single_geom_type
+from ..helpers import _get_file_system
 from .wms import WmsLoader
 
 try:
@@ -114,6 +114,20 @@ _MAP_KWARGS = [
 ]
 
 
+class HtmlViewer:
+    """To be passed to IPython.display.display to show as map in Jupyter."""
+
+    def __init__(self, path: str, file_system=None) -> None:
+        """Takes a file path."""
+        self.file_system = _get_file_system(file_system, {})
+        self.path = path
+
+    def _repr_html_(self) -> str:
+        """Method to be used by IPython.display.display."""
+        with self.file_system.open(self.path, "r") as file:
+            return file.read()
+
+
 class MeasureControlFix(plugins.MeasureControl):
     """Monkey-patch to fix a bug in the lenght measurement control.
 
@@ -281,6 +295,7 @@ class Explore(Map):
         max_nodata_percentage: int = 100,
         display: bool = True,
         wms: WmsLoader | None = None,
+        file_system=None,
         **kwargs,
     ) -> None:
         """Initialiser.
@@ -311,6 +326,8 @@ class Explore(Map):
                 image arrays.
             display: Whether to display the map interactively.
             wms: A WmsLoader instance for loading image tiles as layers. E.g. NorgeIBilderWms.
+            file_system: Any file system instance with an 'open' method. Used to write html file
+                to 'out_path'.
             **kwargs: Additional keyword arguments. Can also be geometry-like objects
                 where the key is the label.
         """
@@ -329,6 +346,7 @@ class Explore(Map):
         self.display = display
         self.wms = [wms] if isinstance(wms, WmsLoader) else wms
         self.legend = None
+        self.file_system = _get_file_system(file_system, kwargs)
 
         self.browser = browser
         if not self.browser and "show_in_browser" in kwargs:
@@ -614,8 +632,9 @@ class Explore(Map):
 
     def save(self, path: str) -> None:
         """Save the map to local disk as an html document."""
-        with open(path, "w") as f:
+        with self.file_system.open(path, "w") as f:
             f.write(self.map._repr_html_())
+        print(f"display(sg.HtmlViewer('{self.out_path}'))")
 
     def _explore(self, **kwargs) -> None:
         self.kwargs = self.kwargs | kwargs
@@ -629,10 +648,9 @@ class Explore(Map):
             self._create_continous_map()
 
         if self.out_path:
-            with open(
-                os.getcwd() + "/" + self.out_path.strip(".html") + ".html", "w"
-            ) as f:
+            with self.file_system.open(self.out_path, "w") as f:
                 f.write(self.map._repr_html_())
+            print(f"display(sg.HtmlViewer('{self.out_path}'))")
         elif self.browser:
             run_html_server(self.map._repr_html_())
         elif not self.display:

{ssb_sgis-1.1.0.dist-info → ssb_sgis-1.1.2.dist-info}/METADATA

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

{ssb_sgis-1.1.0.dist-info → ssb_sgis-1.1.2.dist-info}/RECORD

@@ -1,13 +1,14 @@
-sgis/__init__.py,sha256=Bh-W4cB6-1uc-xRzUxqxECwwoennpdlikZI3gwXtZ7E,7389
+sgis/__init__.py,sha256=kzqGuEIjkxATr3nVKWDE1SVkXp6NoLXoZNZzXd_w1dc,7419
+sgis/conf.py,sha256=5GYeg00-qXtV_roskBaihZ2s5Ut3oF-cxjICo9UFJU0,2134
 sgis/debug_config.py,sha256=Tfr19kU46hSkkspsIJcrUWvlhaL4U3-f8xEPkujSCAQ,593
 sgis/exceptions.py,sha256=WNaEBPNNx0rmz-YDzlFX4vIE7ocJQruUTqS2RNAu2zU,660
 sgis/geopandas_tools/__init__.py,sha256=bo8lFMcltOz7TtWAi52_ekR2gd3mjfBfKeMDV5zuqFY,28
 sgis/geopandas_tools/bounds.py,sha256=MUtm3w6P_t7RfZ8WJz5iKqG2PyVzFMiAALf6AMLAewk,23798
 sgis/geopandas_tools/buffer_dissolve_explode.py,sha256=t9GJqRMDsHEU74RIlqeMr4QBgbTK0hYlXL4af1RKIks,19955
 sgis/geopandas_tools/centerlines.py,sha256=Q65Sx01SeAlulBEd9oaZkB2maBBNdLcJwAbTILg4SPU,11848
-sgis/geopandas_tools/cleaning.py,sha256=tkHH5wm0BF_1EXMsh3rM9DqWOwtr7JKkqCCi6uymSP4,60214
+sgis/geopandas_tools/cleaning.py,sha256=_V3KrJBaL8hZk1Iv6HBfTMTe7GCgcRbWfelkWOxqaIg,24116
 sgis/geopandas_tools/conversion.py,sha256=o3QJZLfaqqpJNdWWNKfQn_dS77uJxxRxWZxhf18vPXs,25505
-sgis/geopandas_tools/duplicates.py,sha256=LG8-BG8LdA2zjWauuloslIZHvMGND6Fja0MtXIPZ1wo,14301
+sgis/geopandas_tools/duplicates.py,sha256=qtcwMg310QytXBTV7XIJpPghZKz5Zyt7P59BHqc93gw,14919
 sgis/geopandas_tools/general.py,sha256=_XpQf792JqkvnMvEqtUMkPGVhjsct2SHSAyDYFdCyuQ,39885
 sgis/geopandas_tools/geocoding.py,sha256=n47aFQMm4yX1MsPnTM4dFjwegCA1ZmGUDj1uyu7OJV4,691
 sgis/geopandas_tools/geometry_types.py,sha256=ijQDbQaZPqPGjBl707H4yooNXpk21RXyatI7itnvqLk,7603
@@ -17,14 +18,15 @@ sgis/geopandas_tools/point_operations.py,sha256=JM4hvfIVxZaZdGNlGzcCurrKzkgC_b9h
 sgis/geopandas_tools/polygon_operations.py,sha256=FJ-dXCxLHRsmp0oXsmBOFRprFFwmhrxqOPZkW2WWWQM,50088
 sgis/geopandas_tools/polygons_as_rings.py,sha256=BX_GZS6F9I4NbEpiOlNBd7zywJjdfdJVi_MkeONBuiM,14941
 sgis/geopandas_tools/sfilter.py,sha256=SLcMYprQwnY5DNo0R7TGXk4m6u26H8o4PRn-RPhmeZY,9345
-sgis/helpers.py,sha256=3NqPfVBKlZcZTiMJrsTAlDv5tNKDHrJr_8NimutVzQg,8797
+sgis/helpers.py,sha256=Ah4vFPQwnAFkZRALLBiR5iXwRMrx89kNTx5-5NTHsY8,9475
+sgis/io/__init__.py,sha256=uyBr20YDqB2bQttrd5q1JuGOvX32A-MSvS7Wmw5f5qg,177
 sgis/io/_is_dapla.py,sha256=wmfkSe98IrLhUg3dtXZusV6OVC8VlY1kbc5EQDf3P-Q,358
-sgis/io/dapla_functions.py,sha256=o1TlMyKhuOpXx6I_Pi2XPAPUcN5XRYEzTcZMfmfe09c,18205
+sgis/io/dapla_functions.py,sha256=jHE67ADF1Fu3WG1-4x696r6f4pSUG3f9JaJu_c2Aqjs,29360
 sgis/io/opener.py,sha256=HWO3G1NB6bpXKM94JadCD513vjat1o1TFjWGWzyVasg,898
 sgis/io/read_parquet.py,sha256=FvZYv1rLkUlrSaUY6QW6E1yntmntTeQuZ9ZRgCDO4IM,3776
 sgis/maps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sgis/maps/examine.py,sha256=Pb0dH8JazU5E2svfQrzHO1Bi-sjy5SeyY6zoeMO34jE,9369
-sgis/maps/explore.py,sha256=JX9ZTeHVsV1KsXP2YNVBa21Edvc6EksKdbb3V6W0tKs,47051
+sgis/maps/explore.py,sha256=AxgaUNAKnGY_b7T5e3mLfysvF8fpJshHxsmEQih8oBw,47846
 sgis/maps/httpserver.py,sha256=7Od9JMCtntcIQKk_TchetojMHzFHT9sPw7GANahI97c,1982
 sgis/maps/legend.py,sha256=lVRVCkhPmJRjGK23obFJZAO3qp6du1LYnobkkN7DPkc,26279
 sgis/maps/map.py,sha256=smaf9i53EoRZWmZjn9UuqlhzUvVs1XKo2ItIpHxyuik,29592
@@ -56,7 +58,7 @@ sgis/raster/indices.py,sha256=-J1HYmnT240iozvgagvyis6K0_GHZHRuUrPOgyoeIrY,223
 sgis/raster/regex.py,sha256=kYhVpRYzoXutx1dSYmqMoselWXww7MMEsTPmLZwHjbM,3759
 sgis/raster/sentinel_config.py,sha256=nySDqn2R8M6W8jguoBeSAK_zzbAsqmaI59i32446FwY,1268
 sgis/raster/zonal.py,sha256=D4Gyptw-yOLTCO41peIuYbY-DANsJCG19xXDlf1QAz4,2299
-ssb_sgis-1.1.0.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
-ssb_sgis-1.1.0.dist-info/METADATA,sha256=eu1eJIwc822GIYWGPYj9tgJlM7NPfJ2pRX9YuRp9J8s,11740
-ssb_sgis-1.1.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ssb_sgis-1.1.0.dist-info/RECORD,,
+ssb_sgis-1.1.2.dist-info/LICENSE,sha256=np3IfD5m0ZUofn_kVzDZqliozuiO6wrktw3LRPjyEiI,1073
+ssb_sgis-1.1.2.dist-info/METADATA,sha256=SkKkxMGWK9n2CGvI0D4FQ4Hb4UKV9TAba38iTlDiQVI,11740
+ssb_sgis-1.1.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ssb_sgis-1.1.2.dist-info/RECORD,,