Store user logos locally to avoid missing markers in map

XinShen-CHN · Aug 2, 2024 · c387d67 · c387d67
1 parent 98a33de
commit c387d67
Show file tree

Hide file tree

Showing 29 changed files with 3 additions and 28 deletions.
diff --git a/docs/source/images/ENEA.png b/docs/source/images/ENEA.png
diff --git a/docs/source/images/MIT_Cambridge_MA_USA.png b/docs/source/images/MIT_Cambridge_MA_USA.png
diff --git a/docs/source/images/University_Wisconsin_Madison_USA.png b/docs/source/images/University_Wisconsin_Madison_USA.png
diff --git a/docs/source/images/digiLab_UK.png b/docs/source/images/digiLab_UK.png
diff --git a/docs/source/images/Beihang_University.png → .../images/user_logos/Beihang_University.png b/docs/source/images/Beihang_University.png → .../images/user_logos/Beihang_University.png
diff --git a/...onwealth_Fusion_Systems Devens_MA_USA.png → ...onwealth_Fusion_Systems Devens_MA_USA.png b/...onwealth_Fusion_Systems Devens_MA_USA.png → ...onwealth_Fusion_Systems Devens_MA_USA.png
diff --git a/...source/images/Cranfield_University_UK.png → ...es/user_logos/Cranfield_University_UK.png b/...source/images/Cranfield_University_UK.png → ...es/user_logos/Cranfield_University_UK.png
diff --git a/docs/source/images/user_logos/ENEA.png b/docs/source/images/user_logos/ENEA.png
diff --git a/docs/source/images/ENI.png → docs/source/images/user_logos/ENI.png b/docs/source/images/ENI.png → docs/source/images/user_logos/ENI.png
diff --git a/docs/source/images/Frazer_Nash.png → .../source/images/user_logos/Frazer_Nash.png b/docs/source/images/Frazer_Nash.png → .../source/images/user_logos/Frazer_Nash.png
diff --git a/docs/source/images/IRFM_cadarache_France.png → ...ages/user_logos/IRFM_cadarache_France.png b/docs/source/images/IRFM_cadarache_France.png → ...ages/user_logos/IRFM_cadarache_France.png
diff --git a/...ource/images/ITER_organization_France.png → ...s/user_logos/ITER_organization_France.png b/...ource/images/ITER_organization_France.png → ...s/user_logos/ITER_organization_France.png
diff --git a/docs/source/images/Institut_Jožef_Stefan.png → ...ages/user_logos/Institut_Jožef_Stefan.png b/docs/source/images/Institut_Jožef_Stefan.png → ...ages/user_logos/Institut_Jožef_Stefan.png
diff --git a/...a_physics_Chinese_academy_of_sciences.png → ...a_physics_Chinese_academy_of_sciences.png b/...a_physics_Chinese_academy_of_sciences.png → ...a_physics_Chinese_academy_of_sciences.png
diff --git a/docs/source/images/Kyoto_Fusioneering.png → .../images/user_logos/Kyoto_Fusioneering.png b/docs/source/images/Kyoto_Fusioneering.png → .../images/user_logos/Kyoto_Fusioneering.png
diff --git a/...ource/images/LSPM_Villetaneuse_France.png → ...s/user_logos/LSPM_Villetaneuse_France.png b/...ource/images/LSPM_Villetaneuse_France.png → ...s/user_logos/LSPM_Villetaneuse_France.png
diff --git a/docs/source/images/MEPhI_moscow_Russia.png → ...images/user_logos/MEPhI_moscow_Russia.png b/docs/source/images/MEPhI_moscow_Russia.png → ...images/user_logos/MEPhI_moscow_Russia.png
diff --git a/docs/source/images/user_logos/MIT_Cambridge_MA_USA.png b/docs/source/images/user_logos/MIT_Cambridge_MA_USA.png
diff --git a/docs/source/images/Marathon_Fusion_USA.png → ...images/user_logos/Marathon_Fusion_USA.png b/docs/source/images/Marathon_Fusion_USA.png → ...images/user_logos/Marathon_Fusion_USA.png
diff --git a/.../images/Oak_Ridge_National_Laboratory.png → ...r_logos/Oak_Ridge_National_Laboratory.png b/.../images/Oak_Ridge_National_Laboratory.png → ...r_logos/Oak_Ridge_National_Laboratory.png
diff --git a/docs/source/images/Politecnico_di_Torino.png → ...ages/user_logos/Politecnico_di_Torino.png b/docs/source/images/Politecnico_di_Torino.png → ...ages/user_logos/Politecnico_di_Torino.png
diff --git a/docs/source/images/Thea_Energy_USA.png → ...rce/images/user_logos/Thea_Energy_USA.png b/docs/source/images/Thea_Energy_USA.png → ...rce/images/user_logos/Thea_Energy_USA.png
diff --git a/docs/source/images/UKAEA_UK.png → docs/source/images/user_logos/UKAEA_UK.png b/docs/source/images/UKAEA_UK.png → docs/source/images/user_logos/UKAEA_UK.png
diff --git a/docs/source/images/University_San_Diego.png → ...mages/user_logos/University_San_Diego.png b/docs/source/images/University_San_Diego.png → ...mages/user_logos/University_San_Diego.png
diff --git a/docs/source/images/user_logos/University_Wisconsin_Madison_USA.png b/docs/source/images/user_logos/University_Wisconsin_Madison_USA.png
diff --git a/docs/source/images/University_of_Surrey.png → ...mages/user_logos/University_of_Surrey.png b/docs/source/images/University_of_Surrey.png → ...mages/user_logos/University_of_Surrey.png
diff --git a/docs/source/images/University_of_Tsukuba.png → ...ages/user_logos/University_of_Tsukuba.png b/docs/source/images/University_of_Tsukuba.png → ...ages/user_logos/University_of_Tsukuba.png
diff --git a/docs/source/images/Zap_Energy.png → docs/source/images/user_logos/Zap_Energy.png b/docs/source/images/Zap_Energy.png → docs/source/images/user_logos/Zap_Energy.png
diff --git a/docs/source/map.py b/docs/source/map.py
@@ -8,31 +8,6 @@
 
 LOGO_HEIGHT = 60
 
-
-def get_image_dimensions_from_url(image_url):
-    """Function to get the dimensions of an image from URL
-
-
-    Args:
-        image_url (str): the url
-
-    Returns:
-        tuple: the dimensions of the image
-    """
-    headers = {
-        "User-Agent": "FESTIM (https://github.com/festim-dev/festim; [email protected])"
-    }
-
-    try:
-        response = requests.get(image_url, headers=headers)
-        response.raise_for_status()  # Raise an exception for HTTP errors
-        img = Image.open(BytesIO(response.content))
-        return img.size
-    except Exception as e:
-        print(f"Error fetching or processing image: {e}")
-        return None
-
-
 def generate_map(clustered=True, draggable=False):
     # Load GeoJSON data
     with open("map.json") as f:
@@ -55,8 +30,8 @@ def generate_map(clustered=True, draggable=False):
         # Get the dimensions of the image from local images
 
         if "path" in feature["properties"]:
-            url = feature["properties"]["path"]
-            image_dimensions = Image.open(url).size
+            path = feature["properties"]["path"]
+            image_dimensions = Image.open(path).size
 
         if image_dimensions:
             height_to_width_ratio = image_dimensions[1] / image_dimensions[0]
@@ -65,7 +40,7 @@ def generate_map(clustered=True, draggable=False):
             image_dimensions = (LOGO_HEIGHT, LOGO_HEIGHT)
         # Create a marker with a custom icon and popup
         if coordinates != [0, 0]:
-            icon = folium.CustomIcon(url, icon_size=image_dimensions)
+            icon = folium.CustomIcon(path, icon_size=image_dimensions)
             marker = folium.Marker(
                 location=[coordinates[1], coordinates[0]],
                 icon=icon,