Consolidates work identifier logic

Uses a consistent method to determine the work identifier (DOI or ID) for generating URLs and API responses.

This change ensures that permalinks, sitemap entries,
and API data consistently use the DOI if available,
falling back to the internal ID otherwise.

It also centralizes this logic in a `get_identifier`
method on the `Work` model.

Author: nuest

optimap/sitemaps.py

@@ -17,11 +17,7 @@ def items(self):
 
     def location(self, item):
         """Return the URL path for a work (without domain)."""
-        # Return only the path, not the full URL (Django's sitemap adds domain)
-        if item.doi:
-            return reverse("optimap:work-landing", args=[item.doi])
-        else:
-            return f"/work/{item.id}/"
+        return reverse("optimap:work-landing", args=[item.get_identifier()])
 
     def lastmod(self, item):
         """Return the last modification date of the work."""

works/models.py

@@ -138,14 +138,26 @@ class Meta:
     def __str__(self):
         return self.title
 
+    def get_identifier(self) -> str:
+        """
+        Return the most suitable identifier for this work.
+        Prefers DOI if available, otherwise returns internal ID as string.
+
+        This identifier can be used in URLs, API responses, and anywhere
+        a unique work identifier is needed.
+
+        Returns:
+            str: DOI (if available) or internal ID (as string)
+        """
+        return self.doi if self.doi else str(self.id)
+
     def permalink(self) -> str | None:
         """
-        Return the absolute OPTIMAP permalink (/work/<doi>) if a DOI exists; otherwise None.
+        Return the absolute OPTIMAP permalink (/work/<identifier>).
+        Uses DOI if available, otherwise falls back to internal ID.
         """
-        if not getattr(self, "doi", None):
-            return None
         base = settings.BASE_URL.rstrip("/")
-        rel = reverse("optimap:work-landing", args=[self.doi])
+        rel = reverse("optimap:work-landing", args=[self.get_identifier()])
         return f"{base}{rel}"
     permalink.short_description = "Permalink"
 

works/sitemaps.py

@@ -17,11 +17,7 @@ def items(self):
 
     def location(self, item):
         """Return the URL path for a work (without domain)."""
-        # Return only the path, not the full URL (Django's sitemap adds domain)
-        if item.doi:
-            return reverse("optimap:work-landing", args=[item.doi])
-        else:
-            return f"/work/{item.id}/"
+        return reverse("optimap:work-landing", args=[item.get_identifier()])
 
     def lastmod(self, item):
         """Return the last modification date of the work."""

works/static/js/map-interaction.js

@@ -368,7 +368,8 @@ class MapInteractionManager {
   showPaginatedPopup(overlapping, latlng) {
     console.log('showPaginatedPopup called with latlng:', latlng);
 
-    // Close existing popup FIRST (before setting new location)
+    // Close all existing popups FIRST (both paginated and individual)
+    this.map.closePopup();
     this.closePaginatedPopup();
 
     // Now set new state
@@ -555,6 +556,10 @@ class MapInteractionManager {
    * Show publication popup for single feature
    */
   showPublicationPopup(featureData, latlng) {
+    // Close all existing popups first (both individual and paginated)
+    this.map.closePopup();
+    this.closePaginatedPopup();
+
     // Use layer's built-in popup if it exists
     if (featureData.layer && featureData.layer.getPopup()) {
       featureData.layer.openPopup();

works/views.py

@@ -832,13 +832,9 @@ def works_list(request):
             "doi": work.doi,
             "authors": work.authors or [],
             "source": work.source.name if work.source else None,
+            "href": reverse("optimap:work-landing", args=[work.get_identifier()]),
         }
 
-        if work.doi:
-            work_data["href"] = reverse("optimap:work-landing", args=[work.doi])
-        elif work.url:
-            work_data["href"] = work.url
-
         # Add status info for admin users
         if is_admin:
             work_data["status"] = work.get_status_display()

works/views/work_views.py

@@ -170,13 +170,9 @@ def works_list(request):
             "doi": work.doi,
             "authors": work.authors or [],
             "source": work.source.name if work.source else None,
+            "href": reverse("optimap:work-landing", args=[work.get_identifier()]),
         }
 
-        if work.doi:
-            work_data["href"] = reverse("optimap:work-landing", args=[work.doi])
-        elif work.url:
-            work_data["href"] = work.url
-
         # Add status info for admin users
         if is_admin:
             work_data["status"] = work.get_status_display()