PyPI - geovizpy - Versions diffs - 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl - Mend

geovizpy 0.1.5py3-none-any.whl → 0.1.6py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

geovizpy/renderer.py CHANGED Viewed

@@ -4,6 +4,9 @@ import json
 import tempfile
 import os
 import time
+import html
+import sys
+import subprocess
 class RendererMixin:
     """Mixin class for rendering the map."""
@@ -33,14 +36,14 @@ class RendererMixin:
         """Return the configuration as a JSON string."""
         return json.dumps(self.get_config())
-    def render_html(self, filename="map.html"):
-        """Render the map to an HTML file."""
+    def _get_html_content(self):
+        """Generate the full HTML content string."""
         json_commands = self.to_json()
         layer_control_js = self._get_layer_control_js()
         export_control_js = self._get_export_control_js()
-        html_content = f"""
+        return f"""
 <!DOCTYPE html>
 <html>
 <head>
@@ -49,7 +52,7 @@ class RendererMixin:
   <script src="https://cdn.jsdelivr.net/npm/d3@7"></script>
   <script src="https://cdn.jsdelivr.net/npm/geoviz@0.9.8"></script>
   <style>
-    body {{ margin: 0; padding: 0; }}
+    body {{ margin: 0; padding: 0; overflow: hidden; }}
     button {{ background: #f8f9fa; border: 1px solid #ddd; border-radius: 3px; }}
     button:hover {{ background: #e2e6ea; }}
   </style>
@@ -111,10 +114,35 @@ class RendererMixin:
 </body>
 </html>
 """
+    def render_html(self, filename="map.html"):
+        """Render the map to an HTML file."""
+        html_content = self._get_html_content()
         with open(filename, "w") as f:
             f.write(html_content)
         print(f"Map saved to {filename}")
+    def show(self, width=800, height=600):
+        """
+        Display the map in a Jupyter notebook using an IFrame.
+        Args:
+            width (int/str): Width of the display area (default 800).
+            height (int/str): Height of the display area (default 600).
+        """
+        try:
+            from IPython.display import IFrame
+            import base64
+        except ImportError:
+            print("IPython is required to display the map. Please install it with 'pip install ipython'.")
+            return
+        html_content = self._get_html_content()
+        b64_content = base64.b64encode(html_content.encode('utf-8')).decode('utf-8')
+        data_uri = f"data:text/html;base64,{b64_content}"
+        return IFrame(src=data_uri, width=width, height=height)
     def save(self, filename="map.html"):
         """
         Save the map to a file.
@@ -134,39 +162,69 @@ class RendererMixin:
             print("Error: filename must end with .html, .png, or .svg")
     def _save_image(self, filename):
-        """Internal method to save as PNG or SVG using Playwright."""
+        """Internal method to save as PNG or SVG using Playwright via a subprocess."""
+        # Check if playwright is installed
         try:
-            from playwright.sync_api import sync_playwright
+            import playwright
         except ImportError:
             print("Error: Playwright is required for image export.")
             print("Please install it with: pip install geovizpy[export] && playwright install")
             return
+        # Create a temporary HTML file
         with tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".html") as tmp_file:
             self.render_html(tmp_file.name)
             tmp_path = tmp_file.name
+        # Create a temporary Python script to run Playwright
+        # This isolates Playwright from the current asyncio loop (Jupyter)
+        script_content = f"""
+import os
+from playwright.sync_api import sync_playwright
+def run():
+    try:
+        with sync_playwright() as p:
+            browser = p.chromium.launch()
+            page = browser.new_page(viewport={{"width": 1000, "height": 800}})
+            page.goto(f"file://{{os.path.abspath('{tmp_path}')}}")
+            page.wait_for_timeout(2000)
+            if "{filename}".endswith(".svg"):
+                svg_outer = page.locator("svg").first.evaluate("el => el.outerHTML")
+                with open("{filename}", "w") as f:
+                    f.write(svg_outer)
+            else:
+                page.locator("svg").first.screenshot(path="{filename}")
+            browser.close()
+            print(f"Image saved to {filename}")
+    except Exception as e:
+        print(f"Error in subprocess: {{e}}")
+        exit(1)
+if __name__ == "__main__":
+    run()
+"""
+        with tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".py") as tmp_script:
+            tmp_script.write(script_content)
+            tmp_script_path = tmp_script.name
         try:
-            with sync_playwright() as p:
-                browser = p.chromium.launch()
-                page = browser.new_page(viewport={"width": 1000, "height": 800})
-                page.goto(f"file://{os.path.abspath(tmp_path)}")
-                page.wait_for_timeout(2000)
-                if filename.endswith(".svg"):
-                    svg_outer = page.locator("svg").first.evaluate("el => el.outerHTML")
-                    with open(filename, "w") as f:
-                        f.write(svg_outer)
-                else: # .png
-                    page.locator("svg").first.screenshot(path=filename)
-                browser.close()
-                print(f"Image saved to {filename}")
-        except Exception as e:
-            print(f"Error saving image: {e}")
+            # Run the script in a subprocess
+            result = subprocess.run([sys.executable, tmp_script_path], capture_output=True, text=True)
+            if result.returncode != 0:
+                print(f"Error saving image: {result.stderr}")
+            else:
+                print(result.stdout.strip())
         finally:
+            # Cleanup
             if os.path.exists(tmp_path):
                 os.remove(tmp_path)
+            if os.path.exists(tmp_script_path):
+                os.remove(tmp_script_path)
     def _get_layer_control_js(self):
         if not self.layer_control_config:

{geovizpy-0.1.5.dist-info → geovizpy-0.1.6.dist-info}/METADATA RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geovizpy
-Version: 0.1.5
+Version: 0.1.6
 Summary: A Python wrapper for the geoviz JavaScript library
 Author: fbxyz
 Project-URL: Source, https://codeberg.org/fbxyz/geovizpy
@@ -24,7 +24,9 @@ Dynamic: summary
 **geovizpy** is a Python wrapper for the `geoviz` JavaScript library, designed to bring the power of D3.js-based thematic mapping to Python. It allows you to create high-quality, interactive maps directly from Python scripts or Jupyter notebooks.
-This library is a wrapper around the excellent `geoviz` library. For detailed information on the underlying mapping logic, please refer to the [original geoviz documentation](https://github.com/neocarto/geoviz).
+This library is a wrapper around the  `geoviz` library. For detailed information on the underlying mapping logic, please refer to the [original geoviz documentation](https://github.com/neocarto/geoviz).
+![Choropleth Map Example](https://codeberg.org/fbxyz/geovizpy/raw/branch/main/docs/source/_static/choropleth.png)
 ## Features
@@ -53,7 +55,7 @@ pip install git+https://codeberg.org/fbxyz/geovizpy.git
 ### For Image Export
-To save maps as PNG or SVG files directly from Python, you need to install the optional `export` dependencies, which include `playwright`.
+To save maps as PNG or SVG files directly from Python, you need to install the optional `export` dependencies:
 1.  **Install the extra dependencies:**
@@ -113,5 +115,4 @@ viz.save("my_map.html")  # Renders an interactive HTML file
 ## Documentation
-For more detailed information on all available methods and parameters, please see the [full documentation](https://your-username.github.io/geovizpy/).
+For more detailed information on all available methods and parameters, please see the [full documentation](https://geovizpy.readthedocs.io/en/latest/).

{geovizpy-0.1.5.dist-info → geovizpy-0.1.6.dist-info}/RECORD RENAMED Viewed

@@ -5,8 +5,8 @@ geovizpy/geoviz.py,sha256=bG1A5AQIhsfIJ9RQ4RJteG9HRuu70k2xI9l_eydQTH0,1415
 geovizpy/legends.py,sha256=IPn_1drQ9MkmJlQ54XwBqAlTRSyq98sm8gzgE-ATRog,2218
 geovizpy/marks.py,sha256=xqwf8ELY05lnrrXGQljMe-mm315vUt_-qOmdFAsYhwA,5520
 geovizpy/plots.py,sha256=EVjPPBFyUFQpXH7sAuxCz_sctonJVUxoi8edbehKrpI,3089
-geovizpy/renderer.py,sha256=lrPZnAbvOdvtjA5DrcHkcID_CMwFcpreQwzDspf0ES4,14603
-geovizpy-0.1.5.dist-info/METADATA,sha256=SNuEBOpCeC8TT1o-bV5WkT3jB-E5wos0fGx9rd3EOcg,3386
-geovizpy-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-geovizpy-0.1.5.dist-info/top_level.txt,sha256=3D5AFdMd9bWEvGQUWDy6jccJamUwdKmchgCmxLHaAYs,9
-geovizpy-0.1.5.dist-info/RECORD,,
+geovizpy/renderer.py,sha256=ql9eaRGo-274MEA6ZXcLY4QpidJdmHlt65IuHiwAbko,16543
+geovizpy-0.1.6.dist-info/METADATA,sha256=l9WRhOd_vESt9qOK071kioRARK4OTvpCymOEtXRbHhE,3463
+geovizpy-0.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+geovizpy-0.1.6.dist-info/top_level.txt,sha256=3D5AFdMd9bWEvGQUWDy6jccJamUwdKmchgCmxLHaAYs,9
+geovizpy-0.1.6.dist-info/RECORD,,

{geovizpy-0.1.5.dist-info → geovizpy-0.1.6.dist-info}/WHEEL RENAMED Viewed

File without changes

{geovizpy-0.1.5.dist-info → geovizpy-0.1.6.dist-info}/top_level.txt RENAMED Viewed

File without changes

geovizpy 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl

geovizpy 0.1.5py3-none-any.whl → 0.1.6py3-none-any.whl