visnetmap 0.1.3.6__tar.gz → 0.2.1__tar.gz

{visnetmap-0.1.3.6/visnetmap.egg-info → visnetmap-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: visnetmap
-Version: 0.1.3.6
+Version: 0.2.1
 Summary: A short description of my package
 Author-email: "Peng (Atsaniik) Yang" <peng.yang@uef.fi>
 Project-URL: Homepage, https://github.com/Atsaniik/visnetmap

{visnetmap-0.1.3.6 → visnetmap-0.2.1}/pyproject.toml

@@ -1,11 +1,11 @@
 # pyproject.toml
 [build-system]
-requires = ["setuptools>=61.0.0"]
+requires = ["setuptools>=66.0.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "visnetmap" # The name that will appear on PyPI
-version = "0.1.3.6"
+version = "0.2.1"
 authors = [
     {name = "Peng (Atsaniik) Yang", email = "peng.yang@uef.fi"},
 ]

{visnetmap-0.1.3.6 → visnetmap-0.2.1}/visnetmap/__init__.py

@@ -8,14 +8,14 @@ Usage
 from visnetmap import visnet, netMap, latLong, nx2vis
 """
 
-from visnet_base import (
+from .visnet_base import (
     base64_from_url,
     base64_from_loc,
     nx2vis,
     visnet,
 )
 
-from netmap_base import (
+from .netmap_base import (
     latLong,
     netMap,
 )
@@ -27,4 +27,4 @@ __all__ = [
     "visnet",
     "latLong",
     "netMap",
-]
+]

{visnetmap-0.1.3.6 → visnetmap-0.2.1}/visnetmap/netmap_base.py

@@ -7,13 +7,15 @@ import time
 def latLong(place):
     user_agent = random.randint(10000, 99999)
     geolocator = Nominatim(user_agent=str(user_agent))
-    location = geolocator.geocode(place)
+    location = geolocator.geocode(place,timeout=11)
+    if location is None:
+      raise ValueError(f"Could not geocode place: {place}")
     latitude = location.latitude
     longitude = location.longitude
     full_address = location.address
     return latitude, longitude, full_address
 
-def netMap(cities_data, connections_data, title="Network Map", maximum_nodes=100, writeHTML="network_map.html", default_size=5,browserView =False ):
+def netMap(cities_data, connections_data, title="Network Map", maximum_nodes=100, folder_path=None,writeHTML="network_map.html", default_size=12,browserView =False,tile_layer="esri_gray" ):
     """
     cities_data (list):  {
         "node": "New York", "lat": 40.7128, "lon": -74.0060, "size": 15,
@@ -26,6 +28,39 @@ def netMap(cities_data, connections_data, title="Network Map", maximum_nodes=100
         "default_size": node size 5
     },
     maximum_nodes: maximum nodes to display initially
+    
+    tile_layer : str, optional
+        Name of the map tile layer to use as the background map.
+
+        Supported values depend on the `tile_layers` dictionary defined inside
+        the function.
+
+        Recommended available options:
+
+            "esri_gray"
+                Esri World Light Gray Canvas.
+                Good for network visualizations because the background is
+                visually simple and does not compete with nodes and edges.
+
+            "esri_street"
+                Esri World Street Map.
+                More detailed street-map style.
+
+            "esri_satellite"
+                Esri World Imagery.
+                Satellite imagery background.
+
+            "osm"
+                OpenStreetMap public tile server.
+
+                Warning:
+                    This may return HTTP 403 if the application is blocked by
+                    OpenStreetMap's public tile servers or does not comply with
+                    their tile usage policy. For reliable use, prefer another
+                    tile provider or use your own tile service.
+
+        Default is "esri_gray".
+
     """
     df_nodes = pd.DataFrame(cities_data)
     if not df_nodes['lat'].apply(lambda x: isinstance(x, (int, float)) and not isinstance(x, bool)).all():
@@ -87,6 +122,49 @@ def netMap(cities_data, connections_data, title="Network Map", maximum_nodes=100
     unique_colors = sorted(set(city['color'] for city in cities_data))
     unique_hovers = sorted(set(city['node_hover'] for city in cities_data))
 
+
+
+    tile_layers = {
+        "esri_gray": """
+      L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/{z}/{y}/{x}', {
+        maxZoom: 16,
+        attribution: 'Tiles © Esri'
+      }).addTo(map);
+        """,
+
+        "esri_street": """
+      L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer/tile/{z}/{y}/{x}', {
+        maxZoom: 19,
+        attribution: 'Tiles © Esri'
+      }).addTo(map);
+        """,
+
+        "esri_satellite": """
+      L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {
+        maxZoom: 19,
+        attribution: 'Tiles © Esri'
+      }).addTo(map);
+        """,
+
+        "osm": """
+      L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        maxZoom: 19,
+        attribution: '© OpenStreetMap contributors'
+      }).addTo(map);
+        """
+    }
+
+    if tile_layer not in tile_layers:
+        raise ValueError(
+            f"Unknown tile_layer '{tile_layer}'. "
+            f"Available options are: {list(tile_layers.keys())}"
+        )
+
+    selected_tile_layer = tile_layers[tile_layer]
+
+
+
+
     html_content = f"""
     <!DOCTYPE html>
     <html>
@@ -226,10 +304,8 @@ def netMap(cities_data, connections_data, title="Network Map", maximum_nodes=100
       let lonMax = 180;
 
       const map = L.map('map').setView([20, 0], 2);
-      L.tileLayer('https://{{s}}.tile.openstreetmap.org/{{z}}/{{x}}/{{y}}.png', {{
-        maxZoom: 19,
-        attribution: '© OpenStreetMap contributors'
-      }}).addTo(map);
+
+      {selected_tile_layer}
       
 
 
@@ -575,7 +651,11 @@ def netMap(cities_data, connections_data, title="Network Map", maximum_nodes=100
     from pathlib import Path
     if writeHTML is None:
         writeHTML ='map.html'
-    folder_path = Path(f"{Path(__file__).parent.resolve()}/mapOutPut/")
+    if folder_path is None:
+          
+      folder_path = Path(f"{Path(__file__).parent.resolve()}/mapOutPut/")
+    else:
+        folder_path = Path(folder_path)
     folder_path.mkdir(parents=True, exist_ok=True)
     writeOut = f"{folder_path}/{writeHTML}"
 
@@ -670,4 +750,4 @@ if __name__ == "__main__":
         },
     ]
 
-    netMap(cities, connections, title="net map", writeHTML='simple.html', maximum_nodes=9,browserView=True)
+    netMap(cities, connections, title="net map", writeHTML='simple.html', maximum_nodes=9,browserView=True)

{visnetmap-0.1.3.6 → visnetmap-0.2.1}/visnetmap/visnet_base.py

@@ -269,6 +269,7 @@ def visnet(
     network_subtitle: str | None = None,
     description_df: pd.DataFrame | None = None,
     description_title: str = "Introduce your network",
+    folder_path = None,
     writeHTML: str | None = "network_visualization.html",
     browserView: bool = False,
     min_default_node_size: int | float = 0,
@@ -2141,8 +2142,11 @@ def visnet(
     from pathlib import Path
     if writeHTML is None:
         writeHTML = 'network.html'
-
-    folder_path = Path(f"{Path(__file__).parent.resolve()}/netOutPut/")
+    if folder_path is None:
+        folder_path = Path(f"{Path(__file__).parent.resolve()}/netOutPut/")
+        
+    else:
+        folder_path = Path(folder_path)
     folder_path.mkdir(parents=True, exist_ok=True)
     writeOut = f"{folder_path}/{writeHTML}"
 
@@ -2221,4 +2225,4 @@ if __name__ == "__main__":
         edge = {"from": random.randint(1, 20), "to": i , "width": width, "color": {"color": "#131112"}, "arrows": "to", "title": f"to {i} width {width}"}
         edges2.append(edge)
 
-    visnet(nodes=nodes2, edges=edges2, network_title='Large Network', browserView=True, writeHTML='test_large.html', min_default_node_size=1, min_default_edge_width=1, maximum_display=100)
+    visnet(nodes=nodes2, edges=edges2, network_title='Large Network', browserView=True, writeHTML='test_large.html', min_default_node_size=1, min_default_edge_width=1, maximum_display=100)

{visnetmap-0.1.3.6 → visnetmap-0.2.1/visnetmap.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: visnetmap
-Version: 0.1.3.6
+Version: 0.2.1
 Summary: A short description of my package
 Author-email: "Peng (Atsaniik) Yang" <peng.yang@uef.fi>
 Project-URL: Homepage, https://github.com/Atsaniik/visnetmap