trying to get nearby detail card working

server.js

@@ -110,6 +110,23 @@ app.get('/rightbyme', cache('15 minutes'), (req, res) => {
   }
 });
 
+app.get('/nearbydetail', cache('15 minutes'), (req, res) => {
+  if (req.query.hasOwnProperty('id'))
+    rightbyme.doGetMoreDetail(req.query.id)
+      .then((d) => {
+        res.send(d);
+      }).catch((e) => {
+        logger.error(e);
+        res.status(500).send('There was an error!');
+      });
+
+  else {
+    // throw new Error('Weather: LL missing');
+    logger.warn('FS: LL missing');
+    res.status(500).send('LL Missing');
+  }
+});
+
 app.get('/news', cache('15 minutes'), (req, res) => {
   euronews.getEuroNews().then((d) => {
     res.send(d);

server/RightByMe.js

@@ -5,7 +5,7 @@ const yelp = require('yelp-fusion');
 
 const client = yelp.client('YlF_b6D149xr_xnrrYudlSnpn1A53b67vALlIK2HnD0ymBXQocRvPW3KjGN8jZNw0KnyAqxGaOzU7CLVPr84_KbnTxutNRXFVR9axmRqGN6ccda1xahoZo58KC2GWnYx');
 
-const { get, isEmpty } = require('lodash');
+const { get, isEmpty, has } = require('lodash');
 
 const { reduceExplore, reduceYelp, reduceFullFS, reduceTwitter } = require('./reducers/rightbyme');
 
@@ -32,9 +32,9 @@ function doFSVenueSearch(ll, data = {}) {
 
     if (isEmpty(payLoad))
       foursquare.venues.search(fsObj, function(err, fsData) {
-        if (err)
-        {
+        if (err) {
           logger.debug(err);
+
           return reject(err);
         }
         else {
@@ -68,9 +68,9 @@ function doFSVenueExplore(ll) {
     };
 
     foursquare.venues.explore(fsObj, function(err, fsData) {
-      if (err)
-      {
+      if (err) {
         console.log(err);
+
         return reject(err);
       }
       else {
@@ -99,11 +99,13 @@ function doYelpSearch(data = {}) {
   return new Promise((resolve, reject) => {
     if (!isEmpty(payLoad)) {
       yelpSearch.term = payLoad.name;
+      yelpSearch.location = payLoad.address;
       yelpSearch.latitude = payLoad.latitude;
       yelpSearch.longitude = payLoad.longitude;
-      yelpSearch.location = payLoad.address;
-      yelpSearch.radius = 250;
-      yelpSearch.sort_by = 'best_match';
+
+      // yelpSearch.radius = 250;
+      yelpSearch.sort_by = 'distance';
+      logger.debug(yelpSearch);
       client.search(yelpSearch).then(response => {
         const respArray = get(response, 'jsonBody.businesses');
         yelpReply = (respArray.length > 0) ? respArray[0] : {};
@@ -139,8 +141,10 @@ function doFSGetFullVenue(data = {}) {
         if (err)
           return reject(err);
         else {
+          console.log(JSON.stringify(fsData));
+          const initPayload = (has(payLoad, 'name')) ? {} : reduceExplore(get(fsData, 'response.venue'));
           const partPayload = reduceFullFS(get(fsData, 'response.venue'));
-          const newPayload = Object.assign(payLoad, partPayload);
+          const newPayload = Object.assign(payLoad, initPayload, partPayload);
 
           return resolve(newPayload);
         }
@@ -230,6 +234,42 @@ function doGetRightByMe(ll) {
   });
 }
 
+function doGetMoreDetail(id) {
+  return new Promise((resolve, reject) => {
+    doFSGetFullVenue({ 'id':id })
+      .catch((e) => {
+        logger.error(e);
+
+        return reject(e);
+        // res.status(500).send('There was an error!');
+      })
+      .then((d) => {
+        return doYelpSearch(d);
+      })
+      .catch((e) => {
+        logger.error(e);
+
+        return reject(e);
+        // res.status(500).send('There was an error!');
+      })
+      .then((d) => {
+        // return doYelpSearch(d)
+        return doTweetSearch(d);
+      })
+      .catch((e) => {
+        logger.error(e);
+
+        return reject(e);
+        // res.status(500).send('There was an error!');
+      })
+      .then((d) => {
+        logger.info('Final', d.name, d.id);
+
+        return resolve(d);
+      });
+  });
+}
+
 async function test(ll, near) {
   return new Promise((resolve, reject) => {
     doFSVenueExplore(ll)
@@ -272,7 +312,7 @@ async function test(ll, near) {
       });
   });
 }
-module.exports = { doGetRightByMe };
+module.exports = { doGetRightByMe, doGetMoreDetail };
 
 const tests = {
   'cruachan' : '56.3946,-5.1166',

server/reducers/rightbyme.js

@@ -7,6 +7,7 @@ const { get, isEmpty } = require('lodash');
 logger.level = 'debug';
 
 function reduceExplore(data) {
+  const cleaner = /\((.*?)\)/g;
   const obj = {};
   if (typeof data === 'undefined' || isEmpty(data)) return obj;
   const { categories, location, contact } = data;
@@ -24,7 +25,7 @@ function reduceExplore(data) {
   obj.icon = (iconPrefix !== '') ? `${iconPrefix}64${iconSuffix}` : '';
   obj.id = get(localObj, 'id', '');
   obj.provider = 'foursquare';
-  obj.address = get(location, 'formattedAddress', []).join(', ');
+  obj.address = get(location, 'formattedAddress', []).join(', ').replace(cleaner, '');
   obj.city = get(location, 'city', '');
   obj.state = get(location, 'state', '');
   obj.postcode = get(location, 'postalCode', '');

src/service-worker.js

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-const CACHE_VERSION = { 'version': '0.0.480' };
+const CACHE_VERSION = { 'version': '0.0.483' };
 const dataCacheName = 'jubileeData-v1';
 const cacheName = 'jubilee-final-1';
 const filesToCache = [

src/v1/js/NewsList.js

@@ -18,7 +18,7 @@ const newsCollection = new NewsCollection();
 
 const NewsItemView = Backbone.View.extend({
   'tagName': 'div',
-  'className' : 'newsItem',
+  'className' : 'newsItem mui-container',
   'template': _.template(`
     
     <div class="mui--text-subhead mui--text-accent"><%=title%></div>

src/v1/js/app.js

@@ -18,7 +18,7 @@ const { AgendaModel, AgendaView } = require('./Agenda');
 const { TrafficModel, TrafficView } = require('./Traffic');
 var app = app || {};
 
-const live = true;
+const live = false;
 
 if (live) {
   window.loc = 'https://jubilee.silvrtree.co.uk';