huff 1.1.1__tar.gz → 1.1.2__tar.gz

{huff-1.1.1 → huff-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: huff
-Version: 1.1.1
+Version: 1.1.2
 Summary: huff: Huff Model Market Area Analysis
 Author: Thomas Wieland
 Author-email: geowieland@googlemail.com
@@ -29,6 +29,7 @@ See the /tests directory for usage examples of most of the included functions.
 
 Attribution of OpenRouteService:
 © openrouteservice.org by HeiGIT | Map data © OpenStreetMap contributors
+
 Visit https://openrouteservice.org/
 
 ## Literature

{huff-1.1.1 → huff-1.1.2}/README.md

@@ -21,6 +21,7 @@ See the /tests directory for usage examples of most of the included functions.
 
 Attribution of OpenRouteService:
 © openrouteservice.org by HeiGIT | Map data © OpenStreetMap contributors
+
 Visit https://openrouteservice.org/
 
 ## Literature

{huff-1.1.1 → huff-1.1.2}/huff/gistools.py

@@ -4,13 +4,60 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     1.1.1
-# Last update: 2025-04-29 18:12
+# Version:     1.1.2
+# Last update: 2025-05-03 13:30
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 
 
-import geopandas as gp 
+import geopandas as gp
+from math import pi, sin, cos, acos
+
+
+def distance_matrix(
+    sources: list,
+    destinations: list,
+    unit: str = "m",
+    ):
+
+    def euclidean_distance (
+        source: list,
+        destination: list,
+        unit: str = "m"
+        ):
+
+        lon1 = source[0]
+        lat1 = source[1]
+        lon2 = destination[0]
+        lat2 = destination[1]
+
+        lat1_r = lat1*pi/180
+        lon1_r = lon1*pi/180
+        lat2_r = lat2*pi/180
+        lon2_r = lon2*pi/180
+
+        distance = 6378 * (acos(sin(lat1_r) * sin(lat2_r) + cos(lat1_r) * cos(lat2_r) * cos(lon2_r - lon1_r)))
+        if unit == "m": 
+            distance = distance*1000
+        if unit == "mile": 
+            distance = distance/1.60934
+
+        return distance
+
+    matrix = []
+
+    for source in sources:
+        row = []
+        for destination in destinations:
+            dist = euclidean_distance(
+                source, 
+                destination, 
+                unit
+                )
+            row.append(dist)
+        matrix.append(row)
+
+    return matrix
 
 
 def overlay_difference(

{huff-1.1.1 → huff-1.1.2}/huff/models.py

@@ -4,8 +4,8 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     1.1.1
-# Last update: 2025-04-29 18:12
+# Version:     1.1.2
+# Last update: 2025-05-03 13:29
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 
@@ -15,7 +15,7 @@ import geopandas as gp
 import numpy as np
 import time
 from huff.ors import Client, TimeDistanceMatrix, Isochrone
-from huff.gistools import overlay_difference
+from huff.gistools import overlay_difference, distance_matrix
 
 
 class CustomerOrigins:
@@ -373,13 +373,19 @@ class InteractionMatrix:
 
     def transport_costs(
         self,
+        network: bool = True,
         range_type: str = "time",
         time_unit: str = "minutes",
+        distance_unit: str = "kilometers",
         ors_server: str = "https://api.openrouteservice.org/v2/",
         ors_auth: str = None,
         save_output: bool = False,
         output_filepath: str = "transport_costs_matrix.csv"
         ):
+
+        if not network and range_type == "time":
+            print ("Calculating euclidean distances (network = False). Setting range_type = 'distance'")
+            range_type = "distance"
         
         interaction_matrix_df = self.get_interaction_matrix_df()
 
@@ -401,53 +407,70 @@ class InteractionMatrix:
         
         customer_origins_index = list(range(len(customer_origins_coords)))
         locations_coords_index = list(range(len(customer_origins_index), len(locations_coords)))
-    
-        ors_client = Client(
-            server = ors_server,
-            auth = ors_auth
-            )
-        time_distance_matrix = ors_client.matrix(
-            locations = locations_coords,
-            save_output = save_output,
-            output_filepath = output_filepath, 
-            sources = customer_origins_index,
-            destinations = locations_coords_index,
-            range_type = range_type
-            )
-        
-        if time_distance_matrix.get_metadata() is None:
-            raise ValueError ("No transport costs matrix was built.")
 
-        transport_costs_matrix = time_distance_matrix.get_matrix()
-        transport_costs_matrix_config = time_distance_matrix.get_config()
-        range_type = transport_costs_matrix_config["range_type"]
+        if network:
 
-        transport_costs_matrix["source"] = transport_costs_matrix["source"].astype(int)
-        transport_costs_matrix["source"] = transport_costs_matrix["source"].map(
-            dict(enumerate(customer_origins_ids))
-            )
-        
-        transport_costs_matrix["destination"] = transport_costs_matrix["destination"].astype(int)
-        transport_costs_matrix["destination"] = transport_costs_matrix["destination"].map(
-            dict(enumerate(supply_locations_ids))
-            )
-        
-        transport_costs_matrix["source_destination"] = transport_costs_matrix["source"].astype(str)+"_"+transport_costs_matrix["destination"].astype(str)
-        transport_costs_matrix = transport_costs_matrix[["source_destination", range_type]]
+            ors_client = Client(
+                server = ors_server,
+                auth = ors_auth
+                )
+            time_distance_matrix = ors_client.matrix(
+                locations = locations_coords,
+                save_output = save_output,
+                output_filepath = output_filepath, 
+                sources = customer_origins_index,
+                destinations = locations_coords_index,
+                range_type = range_type
+                )
+            
+            if time_distance_matrix.get_metadata() is None:
+                raise ValueError ("No transport costs matrix was built.")
 
-        interaction_matrix_df = interaction_matrix_df.merge(
-            transport_costs_matrix,
-            left_on="ij",
-            right_on="source_destination"
-            )
-        
-        interaction_matrix_df["t_ij"] = interaction_matrix_df[range_type]
-        if time_unit == "minutes":
-            interaction_matrix_df["t_ij"] = interaction_matrix_df["t_ij"]/60
-        if time_unit == "hours":
-            interaction_matrix_df["t_ij"] = interaction_matrix_df["t_ij"]/60/60
+            transport_costs_matrix = time_distance_matrix.get_matrix()
+            transport_costs_matrix_config = time_distance_matrix.get_config()
+            range_type = transport_costs_matrix_config["range_type"]
+
+            transport_costs_matrix["source"] = transport_costs_matrix["source"].astype(int)
+            transport_costs_matrix["source"] = transport_costs_matrix["source"].map(
+                dict(enumerate(customer_origins_ids))
+                )
+            
+            transport_costs_matrix["destination"] = transport_costs_matrix["destination"].astype(int)
+            transport_costs_matrix["destination"] = transport_costs_matrix["destination"].map(
+                dict(enumerate(supply_locations_ids))
+                )
+            
+            transport_costs_matrix["source_destination"] = transport_costs_matrix["source"].astype(str)+"_"+transport_costs_matrix["destination"].astype(str)
+            transport_costs_matrix = transport_costs_matrix[["source_destination", range_type]]
+
+            interaction_matrix_df = interaction_matrix_df.merge(
+                transport_costs_matrix,
+                left_on="ij",
+                right_on="source_destination"
+                )
+            
+            interaction_matrix_df["t_ij"] = interaction_matrix_df[range_type]
+            if time_unit == "minutes":
+                interaction_matrix_df["t_ij"] = interaction_matrix_df["t_ij"]/60
+            if time_unit == "hours":
+                interaction_matrix_df["t_ij"] = interaction_matrix_df["t_ij"]/60/60
+
+            interaction_matrix_df = interaction_matrix_df.drop(columns=["source_destination", range_type])
+
+        else:
+
+            distance_matrix_result = distance_matrix(
+                sources = customer_origins_coords,
+                destinations = supply_locations_coords,
+                unit = "m"
+                )
+            
+            distance_matrix_result_flat = [distance for sublist in distance_matrix_result for distance in sublist]
+
+            interaction_matrix_df["t_ij"] = distance_matrix_result_flat
 
-        interaction_matrix_df = interaction_matrix_df.drop(columns=["source_destination", range_type])
+            if distance_unit == "kilometers":
+                interaction_matrix_df["t_ij"] = interaction_matrix_df["t_ij"]/1000
 
         self.interaction_matrix_df = interaction_matrix_df
 

{huff-1.1.1 → huff-1.1.2}/huff/ors.py

@@ -4,8 +4,8 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     1.1.1
-# Last update: 2025-04-29 18:12
+# Version:     1.1.2
+# Last update: 2025-05-03 13:33
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 

{huff-1.1.1 → huff-1.1.2}/huff/tests/tests_huff.py

@@ -4,8 +4,8 @@
 # Author:      Thomas Wieland 
 #              ORCID: 0000-0001-5168-9846
 #              mail: geowieland@googlemail.com              
-# Version:     1.1.1
-# Last update: 2025-04-29 18:12
+# Version:     1.1.2
+# Last update: 2025-05-03 13:32
 # Copyright (c) 2025 Thomas Wieland
 #-----------------------------------------------------------------------
 

{huff-1.1.1 → huff-1.1.2}/huff.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: huff
-Version: 1.1.1
+Version: 1.1.2
 Summary: huff: Huff Model Market Area Analysis
 Author: Thomas Wieland
 Author-email: geowieland@googlemail.com
@@ -29,6 +29,7 @@ See the /tests directory for usage examples of most of the included functions.
 
 Attribution of OpenRouteService:
 © openrouteservice.org by HeiGIT | Map data © OpenStreetMap contributors
+
 Visit https://openrouteservice.org/
 
 ## Literature

{huff-1.1.1 → huff-1.1.2}/setup.py

@@ -7,7 +7,7 @@ def read_README():
     
 setup(
     name='huff',
-    version='1.1.1',
+    version='1.1.2',
     description='huff: Huff Model Market Area Analysis',
     packages=find_packages(include=["huff", "huff.tests"]),
     include_package_data=True,