fix feed page point icons and deduplicate pointToLayer logic

Author: nuest

works/static/js/map-search.js

@@ -400,10 +400,8 @@ class MapSearchManager {
     const styleFn = (typeof publicationStyle === 'function') ? publicationStyle : () => ({});
 
     // Create a new layer with the filtered publications, preserving the original symbology.
-    // pointToLayer is required so that GeoJSON Point features become CircleMarkers
-    // (matching the original layer) rather than falling back to default blue pin markers.
     this.filteredLayer = L.geoJSON(filteredGeoJSON, {
-      pointToLayer: (feature, latlng) => L.circleMarker(latlng, Object.assign({ radius: 6 }, styleFn(feature))),
+      pointToLayer: (feature, latlng) => publicationPointToLayer(feature, latlng, styleFn),
       style: styleFn,
       onEachFeature: popupFunc
     });

works/static/js/map-status-layers.js

@@ -51,13 +51,10 @@
       // (interaction, keyboard, search). Not added to the map directly — its
       // children are routed to the two FeatureGroups, which ARE on the map.
       this.allLayer = L.geoJSON(features, {
-        // Render GeoJSON Points as circleMarkers (same as the work landing page)
-        // instead of the default pin-marker. The style function is not called for
-        // layers created by pointToLayer, so we compute the style here directly.
         pointToLayer: (feature, latlng) => {
           const base = styleFn ? styleFn(feature) : {};
           const style = isUnpublished(feature) ? unpublishedStyle(base) : base;
-          return L.circleMarker(latlng, Object.assign({ radius: 6 }, style));
+          return publicationPointToLayer(feature, latlng, () => style);
         },
         style: (feature) => {
           const base = styleFn ? styleFn(feature) : {};

works/static/js/map-styles.js

@@ -27,3 +27,17 @@ const OPTIMAP_MAP_STYLES = {
 function publicationStyle(/* feature */) {
   return OPTIMAP_MAP_STYLES.default;
 }
+
+/**
+ * Shared pointToLayer for L.geoJSON — renders GeoJSON Point features as
+ * circleMarkers so they match the styled polygon/line symbology instead of
+ * falling back to Leaflet's default blue-pin marker.
+ * @param {Object} feature - GeoJSON feature
+ * @param {L.LatLng} latlng
+ * @param {Function} [styleFn] - Optional override; defaults to publicationStyle.
+ * @returns {L.CircleMarker}
+ */
+function publicationPointToLayer(feature, latlng, styleFn) {
+  const style = (styleFn || publicationStyle)(feature);
+  return L.circleMarker(latlng, Object.assign({ radius: 6 }, style));
+}

works/templates/feed_page.html

@@ -174,6 +174,7 @@ <h3>About this feed</h3>
     // Add publications to map using shared popup function (displayed above region layer)
     const publicationsLayer = L.geoJSON(publicationsData, {
       style: publicationStyle,
+      pointToLayer: publicationPointToLayer,
       onEachFeature: publicationPopup
     }).addTo(map);
 

works/templates/work_landing_page.html

@@ -598,7 +598,7 @@ <h5 class="mb-0">
     if (publicationFeature) {
       layer = L.geoJSON(publicationFeature, {
         style: publicationStyle,
-        pointToLayer: (feat, latlng) => L.circleMarker(latlng, Object.assign({ radius: 6 }, publicationStyle(feat)))
+        pointToLayer: publicationPointToLayer
       });
       featureGroup.addLayer(layer);