abmp-npm 2.0.79 → 2.0.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "2.0.79",
+  "version": "2.0.81",
   "main": "index.js",
   "files": [
     "index.js",

package/pages/Home.js

@@ -3,15 +3,14 @@ const { location: wixLocation } = require('@wix/site-location');
 const { window: wixWindow, rendering } = require('@wix/site-window');
 const { withWarmUpData } = require('psdev-utils/frontend');
 
-const { ADDRESS_STATUS_TYPES, DEFAULT_FILTER, DROPDOWN_OPTIONS } = require('../public/consts.js');
+const { DEFAULT_FILTER, DROPDOWN_OPTIONS } = require('../public/consts.js');
 const { createHomepageUtils } = require('../public/Utils/homePage.js');
 const {
   getMainAddress,
   formatPracticeAreasForDisplay,
-  checkAddressIsVisible,
   isWixHostedImage,
   normalizeExternalUrl,
-  buildMapLink,
+  buildDirectionsLink,
 } = require('../public/Utils/sharedUtils.js');
 
 let filter = JSON.parse(JSON.stringify(DEFAULT_FILTER));
@@ -226,25 +225,13 @@ const homePageOnReady = async ({
         $item('#milesAwayText').text = '';
       }
 
-      // 7) "Show maps" button shown only when we can actually build a link for it
-      const visible = checkAddressIsVisible(addresses);
-      const fullAddressWithValidCoords = visible.find(
-        addr =>
-          addr.addressStatus === ADDRESS_STATUS_TYPES.FULL_ADDRESS &&
-          addr.latitude &&
-          addr.longitude
-      );
-
-      // Links to the street address rather than the stored coordinates, which are
-      // unreliable for some members. The full-address filter above is what keeps
-      // this safe: members set to state_city_zip or dont_show never reach here, so
-      // a hidden street address is never put in a maps URL.
+      // 7) "Show maps" button - only for members who selected "Show Full Address".
       //
-      // Gate on the link rather than on the address. buildMapLink returns '' when
-      // it can build neither an address nor a coordinate link, and it also handles
-      // being passed undefined - so this cannot leave a visible button linking
-      // nowhere, even if the filter above is later relaxed.
-      const mapLink = buildMapLink(fullAddressWithValidCoords);
+      // buildDirectionsLink owns the rule and returns '' when the button should be
+      // hidden: city/state/ZIP and hidden members get nothing, and a full-address
+      // member gets a link built from their address text rather than their NetForum
+      // coordinates, which are unreliable (Monday 12596102059).
+      const mapLink = buildDirectionsLink(itemData.addressDisplayOption, addresses);
 
       if (mapLink) {
         $item('#showMaps').enable();

package/public/Utils/sharedUtils.js

@@ -137,6 +137,12 @@ function formatAddress(item) {
 function buildMapLink(address) {
   if (!address) return '';
 
+  // A member set to dont_show has opted out of publishing their location at all.
+  // formatAddress returns '' for them, so without this guard they would fall
+  // through to the coordinate fallback below and have their exact position put
+  // into an outbound maps URL - worse than the street line they chose to hide.
+  if (address.addressStatus === ADDRESS_STATUS_TYPES.DONT_SHOW) return '';
+
   const query = formatAddress(address);
   if (query) {
     return `https://maps.google.com/?q=${encodeURIComponent(query)}`;
@@ -149,6 +155,40 @@ function buildMapLink(address) {
   return '';
 }
 
+/**
+ * Builds the directions-button link for a member, or '' when no button should show.
+ *
+ * PAC's rule (Monday 12596102059, confirmed by Richard Visser): directions appear
+ * only for members who selected "Show Full Address". Members displaying
+ * city/state/ZIP, and members who hid their address, get no button at all. An
+ * earlier pass relaxed this to city-level members and had to be reverted, so the
+ * rule lives here with tests around it rather than inline in the page code.
+ *
+ * The address is resolved with findMainAddress, so the button is always tied to
+ * the same address as the location text rendered beside it. A member whose
+ * displayed address is city-level gets no button even when a fuller address exists
+ * elsewhere on their record - the button must not point somewhere other than what
+ * is on screen.
+ *
+ * Coordinates are deliberately not required: buildMapLink navigates from the
+ * address text, so a member with missing or wrong NetForum coordinates still gets
+ * a working button where previously they got none. Distance ranking and the
+ * "XX miles away" figure keep using the coordinates and are unaffected.
+ *
+ * @param {Array} addressDisplayOption
+ * @param {Array} addresses
+ * @returns {string} map URL, or '' when the button should be hidden
+ */
+function buildDirectionsLink(addressDisplayOption = [], addresses = []) {
+  const address = findMainAddress(addressDisplayOption, addresses);
+
+  if (address?.addressStatus !== ADDRESS_STATUS_TYPES.FULL_ADDRESS) {
+    return '';
+  }
+
+  return buildMapLink(address);
+}
+
 /**
  * @param {Array} addressDisplayOption
  * @param {Array} addresses
@@ -260,6 +300,7 @@ module.exports = {
   generateId,
   formatAddress,
   buildMapLink,
+  buildDirectionsLink,
   isWixHostedImage,
   normalizeExternalUrl,
   normalizeEmail,