From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 22 Oct 2019 18:03:44 +0000 (-0400)
Subject: Fixed problems with getting members by lat/lon for NearMe add-on.
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=2715260c45b5c6e6e4837dee7c8900093b9ea179;p=WP-Plugins%2Fglm-member-db.git

Fixed problems with getting members by lat/lon for NearMe add-on.
---

diff --git a/classes/memberDataByLatLon.php b/classes/memberDataByLatLon.php
index 12eb1d9f..c6913c12 100644
--- a/classes/memberDataByLatLon.php
+++ b/classes/memberDataByLatLon.php
@@ -155,8 +155,8 @@ class GlmMembersFront_members_memberDataByLatLon extends GlmDataMemberInfo
             foreach ($search as $area) {
                 $where .= "
                     $or (
-                        lat BETWEEN ".$area['latMin']." AND ".$area['latMax']."
-                        AND lon BETWEEN ".$area['lonMin']." AND ".$area['lonMax']."
+                        T.lat BETWEEN ".$area['latMin']." AND ".$area['latMax']."
+                        AND T.lon BETWEEN ".$area['lonMin']." AND ".$area['lonMax']."
                     )
                 ";
                 $or = ' OR ';
@@ -178,14 +178,14 @@ class GlmMembersFront_members_memberDataByLatLon extends GlmDataMemberInfo
         }
 
         // Get the filtered list of members and return data fields for map items.
-        $this->postProcessCategory = true;
+//        $this->postProcessCategory = true;
         $members = $this->getSimpleMemberInfoList($where.$suppliedWhere, true);
-        $this->postProcessCategory = false;
+//        $this->postProcessCategory = false;
 
         // Rebuild data with correct array format for map items
         if (is_array($members) && count($members) > 0) {
             foreach ($members as $k=>$v) {
-
+/*
                 // Pull categories from the results and build the required simplfied array
                 $cats = array();
                 if (is_array($v['categories']) && count($v['categories']) > 0) {
@@ -196,11 +196,12 @@ class GlmMembersFront_members_memberDataByLatLon extends GlmDataMemberInfo
                         );
                     }
                 }
+*/
 
-                $members[$this->config['terms']['term_member_cap']+$v['id']] = array(
+                $members[$k] = array(
                     'type'        => $this->config['terms']['term_member_cap'],
                     'id'          => $v['id'],
-                    'member'      => $v['member_pointer'],
+                    'member'      => $v['member'],
                     'member_slug' => $v['member_slug'],
                     'lat'         => ($this->config['settings']['memb_info_location'] && isset($v['lat']) ? $v['lat'] : ''),
                     'lon'         => ($this->config['settings']['memb_info_location'] && isset($v['lon']) ? $v['lon'] : ''),
@@ -209,18 +210,18 @@ class GlmMembersFront_members_memberDataByLatLon extends GlmDataMemberInfo
                     'addr1'       => $v['addr1'],
                     'addr2'       => $v['addr2'],
                     'city'        => ($this->config['settings']['memb_info_location'] && isset($v['city']) ? $v['city'] : ''),
-                    'state'       => $v['state']['value'],
+                    'state'       => $v['state'],
                     'zip'         => $v['zip'],
-                    'country'     => $v['country']['name'],
+//                    'country'     => $v['country']['name'],
                     'phone'       => ($this->config['settings']['memb_info_contact'] && isset($v['phone']) ? $v['phone'] : ''),
                     'toll_free'   => ($this->config['settings']['memb_info_contact'] && isset($v['toll_free']) ? $v['toll_free'] : ''),
                     'email'       => $v['email'],
                     'url'         => $v['url'],
                     'region'      => ($this->config['settings']['memb_info_location'] && isset($v['region']) ? $v['region'] : ''),
-                    'categories'  => $cats,
-                    'cc_type'     => $v['cc_type'],
+//                    'categories'  => $cats,
+//                    'cc_type'     => $v['cc_type'],
                     'logo'        => $v['logo'],
-                    'descr'       => $v['descr'],
+//                    'descr'       => $v['short_descr'],
                     'short_descr' => $v['short_descr'],
                     'detail_page' => GLM_MEMBERS_SITE_BASE_URL.$this->config['settings']['canonical_member_page'].'/'.$v['member_slug'].'/',
                     'dates'       => '',