huff 1.1.1__tar.gz → 1.2.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: huff
-Version: 1.1.1
+Version: 1.2.0
 Summary: huff: Huff Model Market Area Analysis
 Author: Thomas Wieland
 Author-email: geowieland@googlemail.com
@@ -23,13 +23,16 @@ See the /tests directory for usage examples of most of the included functions.
   - Calculating basic Huff Model
 - **Multiplicative Competitive Interaction Model**: 
   - Log-centering transformation
-- **OpenRouteService Client** (Tools via API): 
+  - Fitting MCI model with >= independent variables
+- **OpenRouteService Client** (1) (Tools via API): 
   - Creating transport costs matrix from origins and destinations
   - Creating isochrones from destinations
+- **Tools**: 
+  - Loading own interaction matrix for analysis
+  - GIS tools for preparing geodata
 
-Attribution of OpenRouteService:
-© openrouteservice.org by HeiGIT | Map data © OpenStreetMap contributors
-Visit https://openrouteservice.org/
+(1) Attribution of OpenRouteService:
+© openrouteservice.org by HeiGIT | Map data © OpenStreetMap contributors | https://openrouteservice.org/
 
 ## Literature
   - Huff DL (1962) *Determination of Intra-Urban Retail Trade Areas*.

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

@@ -15,13 +15,16 @@ See the /tests directory for usage examples of most of the included functions.
   - Calculating basic Huff Model
 - **Multiplicative Competitive Interaction Model**: 
   - Log-centering transformation
-- **OpenRouteService Client** (Tools via API): 
+  - Fitting MCI model with >= independent variables
+- **OpenRouteService Client** (1) (Tools via API): 
   - Creating transport costs matrix from origins and destinations
   - Creating isochrones from destinations
+- **Tools**: 
+  - Loading own interaction matrix for analysis
+  - GIS tools for preparing geodata
 
-Attribution of OpenRouteService:
-© openrouteservice.org by HeiGIT | Map data © OpenStreetMap contributors
-Visit https://openrouteservice.org/
+(1) Attribution of OpenRouteService:
+© openrouteservice.org by HeiGIT | Map data © OpenStreetMap contributors | https://openrouteservice.org/
 
 ## Literature
   - Huff DL (1962) *Determination of Intra-Urban Retail Trade Areas*.

{huff-1.1.1 → huff-1.2.0}/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.2.0
+# Last update: 2025-05-14 18:28
 # 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(