feat: offset for duplicate coordinates

Author: andreishket

server/workers/common/common/aquanavi/constants/constants.py

@@ -0,0 +1,15 @@
+COLUMNS = {
+    "url": "url",
+    "name": "Name",
+    "country": "Country",
+    "continent": "Continent",
+    "equipment": "Equipment",
+    "research_topics": "Research Topics",
+    "specialist_areas": "Specialist areas",
+    "grand_challenges": "Primary interests",
+    "controlled_parameters": "Controlled Parameters",
+    "description": "Description of Facility",
+    "location": "Facility location(s) split",
+    "years_of_experiments": "Years of Mesocosm Experiments",
+    "photos_of_experiments": "Photos of experiments/installations images",
+}

server/workers/common/common/aquanavi/helpers/__init__.py

@@ -0,0 +1,95 @@
+import ast
+import math
+
+from ..constants.constants import COLUMNS
+
+# Cap jitter so markers stay near the original location.
+MAX_OFFSET_METERS = 30.0
+# Controls how quickly the offset grows for the 2nd, 3rd, ... duplicates.
+GROWTH_FACTOR = 6.0
+# Golden angle for an even spiral distribution.
+GOLDEN_ANGLE_DEGREES = 137.50776405003785
+# Approx conversion: meters per 1 degree of latitude.
+METERS_PER_DEGREE_LAT = 111_111.0
+# Avoid division by ~0 for longitude conversion near the poles.
+COS_EPSILON = 1e-6
+
+def get_row_coordinates_with_collision_offset(row, seen_coordinates):
+    """
+    Returns row coordinates with a small deterministic offset applied for duplicates.
+
+    Args:
+        row (pandas.Series): DataFrame row.
+        seen_coordinates (dict[tuple[float, float], int]): Occurrence counter by exact (lat, lon).
+
+    Returns:
+        tuple[float|None, float|None]: (latitude, longitude), possibly offset for duplicates.
+    """
+    latitude, longitude = get_latitude_longitude(row)
+
+    duplicate_index = 0
+    if latitude is not None and longitude is not None:
+        key = (latitude, longitude)
+        duplicate_index = seen_coordinates.get(key, 0)
+        seen_coordinates[key] = duplicate_index + 1
+
+    return offset_duplicate_coordinates(latitude, longitude, duplicate_index)
+
+def get_latitude_longitude(row):
+    """
+    The function returns a list with latitude and longitude.
+
+    Args:
+        row (str): String DataFrame.
+
+    Returns:
+        list: A list with latitude and longitude (or None).
+    """
+    coordinates_string = str(row[COLUMNS['location']]).strip()
+
+    latitude, longitude = None, None
+
+    if "," in coordinates_string:
+        try:
+            coords = ast.literal_eval(coordinates_string)
+            if isinstance(coords, (list, tuple)) and len(coords) == 2:
+                latitude = float(str(coords[0]).strip())
+                longitude = float(str(coords[1]).strip())
+        except Exception:
+            latitude, longitude = None, None
+
+    return [latitude, longitude]
+
+def offset_duplicate_coordinates(latitude, longitude, duplicate_index):
+    """
+    Applies a tiny deterministic offset (meters) to avoid marker collision for identical coordinates.
+
+    The offset is intentionally limited to keep the point nearby while making collisions visible.
+
+    Args:
+        latitude (float|None): Latitude.
+        longitude (float|None): Longitude.
+        duplicate_index (int): 0 for the first occurrence (no offset), 1..N for duplicates.
+
+    Returns:
+        tuple[float|None, float|None]: (latitude, longitude) with offset applied.
+    """
+    if latitude is None or longitude is None:
+        return latitude, longitude
+    if duplicate_index <= 0:
+        return latitude, longitude
+
+    golden_angle_rad = math.radians(GOLDEN_ANGLE_DEGREES)
+    angle = duplicate_index * golden_angle_rad
+
+    radius_m = min(GROWTH_FACTOR * math.sqrt(duplicate_index), MAX_OFFSET_METERS)
+    east_m = radius_m * math.cos(angle)
+    north_m = radius_m * math.sin(angle)
+
+    lat_rad = math.radians(latitude)
+    meters_per_degree_lon = METERS_PER_DEGREE_LAT * max(math.cos(lat_rad), COS_EPSILON)
+
+    dlat = north_m / METERS_PER_DEGREE_LAT
+    dlon = east_m / meters_per_degree_lon
+
+    return latitude + dlat, longitude + dlon

server/workers/common/common/aquanavi/helpers/coordinates.py

@@ -1,31 +1,17 @@
 import re
-import ast
 import sys
 import hashlib
 import pandas as pd
 
 from pathlib import Path
+from .helpers.coordinates import get_row_coordinates_with_collision_offset
+from .constants.constants import COLUMNS
 
 PATH_TO_FOLDER_IN_CONTAINER = "common/common/aquanavi/"
 CSV_PATH_WITH_REAL_DATA = f"{PATH_TO_FOLDER_IN_CONTAINER}mesocosm_data_cleaned.csv"
 CSV_PATH_WITH_TEST_DATA = f"{PATH_TO_FOLDER_IN_CONTAINER}mesocosm_test_data.csv"
 DEFAULT_DOCUMENT_TYPE = "physical object"
 DEFAULT_RESULT_TYPE = ['Other/Unknown material']
-COLUMNS = {
-    "url": "url",
-    "name": "Name",
-    "country": "Country",
-    "continent": "Continent",
-    "equipment": "Equipment",
-    "research_topics": "Research Topics",
-    "specialist_areas": "Specialist areas",
-    "grand_challenges": "Primary interests",
-    "controlled_parameters": "Controlled Parameters",
-    "description": "Description of Facility",
-    "location": "Facility location(s) split",
-    "years_of_experiments": "Years of Mesocosm Experiments",
-    "photos_of_experiments": "Photos of experiments/installations images",
-}
 
 def process_column(row, column_name, join_value_parts_with):
     """
@@ -86,31 +72,6 @@ def get_and_process_value(row, column_name, is_remove_trailing_dot, join_value_p
 
     return value
 
-def get_latitude_longitude(row):
-    """
-    The function returns a list with latitude and longitude.
-
-    Args:
-        row (str): String DataFrame.
-
-    Returns:
-        list: A list with latitude and longitude (or None).
-    """
-    coordinates_string = str(row[COLUMNS['location']]).strip()
-
-    latitude, longitude = None, None
-
-    if "," in coordinates_string:
-        try:
-            coords = ast.literal_eval(coordinates_string)
-            if isinstance(coords, (list, tuple)) and len(coords) == 2:
-                latitude = float(str(coords[0]).strip())
-                longitude = float(str(coords[1]).strip())
-        except Exception:
-            latitude, longitude = None, None
-
-    return [latitude, longitude]
-
 def get_years_of_experiments(row):
     """
     The function returns a time range in the list format.
@@ -163,19 +124,20 @@ def get_years_of_experiments(row):
 
     return None, None
 
-def get_coverage(row):
+def get_coverage_with_coordinates(row, latitude, longitude):
     """
     Creates a coverage field information for each data entry. The coverage field contains
     string value in format as presented in the line below:
     "country=France; continent=Europe; east=-0.618181; north=44.776596 ; start=2010-07; end=2012-06"
 
     Args:
         row (pandas.Series): String DataFrame.
+        latitude (float|None): Latitude.
+        longitude (float|None): Longitude.
 
     Returns:
         str: String in the coverage field format.
     """
-    latitude, longitude = get_latitude_longitude(row)
     start, end = get_years_of_experiments(row)
 
     coverage_parts = []
@@ -342,11 +304,13 @@ def map_sample_data():
     df = load_and_prepare_dataframe()
 
     result = []
+    seen_coordinates = {}
     for _, row in df.iterrows():
         id = get_id(row)
         title = str(row[COLUMNS['name']]).strip() if row[COLUMNS['name']] else ""
         url = str(row[COLUMNS['url']]).strip() if row[COLUMNS['url']] else ""
         image = row[COLUMNS['photos_of_experiments']] if row[COLUMNS['photos_of_experiments']] else ""
+        latitude, longitude = get_row_coordinates_with_collision_offset(row, seen_coordinates)
 
         result.append({
             "id": id,
@@ -363,7 +327,7 @@ def map_sample_data():
             "relation": image,
             "paper_abstract": get_abstract(row),
             "subject_orig": get_keywords(row),
-            "coverage": get_coverage(row)
+            "coverage": get_coverage_with_coordinates(row, latitude=latitude, longitude=longitude)
         })
 
     return { "documents": result }

server/workers/common/common/aquanavi/mapping.py

@@ -4,7 +4,7 @@ import { useDispatch } from "react-redux";
 import { useActiveDataItem } from "@/hooks/useActiveDataItem";
 import { useData } from "@/hooks/useData";
 import { selectPaper } from "@/js/actions";
-import { AllPossiblePapersType } from "@/js/types";
+import { AllPossiblePapersType, AquanaviPaper } from "@/js/types";
 
 import { Pin } from "./Pin";