Skip to content

Fix issue where admin panel sets zone rad is metres but core read it … #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SpookWorkshop merged 1 commit into from
Jul 8, 2026
Merged

Fix issue where admin panel sets zone rad is metres but core read it … #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions core/src/vf_core/vessel_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def _calculate_distance(
"""
Calculate the great-circle distance between two coordinates.

Uses the haversine formula to compute the distance in kilometres.
Uses the haversine formula to compute the distance in metres.

Args:
lat1 (float): Latitude of the first point in decimal degrees.
Expand All @@ -239,7 +239,7 @@ def _calculate_distance(
lon2 (float): Longitude of the second point in decimal degrees.

Returns:
float: Distance between the two coordinates in kilometres.
float: Distance between the two coordinates in metres.
"""
lat1, lon1, lat2, lon2 = map(math.radians, [lat1, lon1, lat2, lon2])

Expand All @@ -252,8 +252,8 @@ def _calculate_distance(
)
c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a))

EARTH_RADIUS = 6371.0
return EARTH_RADIUS * c
EARTH_RADIUS_M = 6_371_000.0
return EARTH_RADIUS_M * c

def _check_zones(self, ship_lat: float, ship_lon: float) -> str | None:
"""
Expand All @@ -277,13 +277,14 @@ def _check_zones(self, ship_lat: float, ship_lon: float) -> str | None:

if distance <= zone["radius"]:
self._logger.debug(
f"Vessel in zone '{zone['name']}' (distance: {distance:.2f}km)"
f"Vessel in zone '{zone['name']}' (distance: {distance:.0f}m)"
)
return zone["name"]

return None

def register_zone(self, zone_name, zone_lat, zone_lon, zone_rad):
"""Register a circular monitoring zone. zone_rad is in metres."""
self._zones.append(
{"name": zone_name, "lat": zone_lat, "lon": zone_lon, "radius": zone_rad}
)
Expand Down