Merge pull request #371 from LordJavi/fix-arearestrictions-search

Fix arearestrictions search

Author: TurtIeSocks

src/data/map.js

@@ -1178,12 +1178,13 @@ const getPortals = async (minLat, maxLat, minLon, maxLon, portalFilterExclude =
 };
 
 /* eslint-disable no-case-declarations */
-const getSearchData = async (lat, lon, id, value, iconStyle) => {
+const getSearchData = async (lat, lon, id, value, iconStyle, areaRestrictions) => {
     let sql = '';
     let args = [lat, lon, lat];
     let useDb;
     let conditions = [];
     let sanitizedValue = sanitizer.sanitize(value);
+    let areaRestrictionsSQL = getAreaRestrictionSql(areaRestrictions);
     sanitizedValue = sanitizedValue.toLowerCase();
     switch (id) {
         case 'search-reward':
@@ -1308,7 +1309,7 @@ const getSearchData = async (lat, lon, id, value, iconStyle) => {
             useDb = 'pokestop';
             break;
     }
-    sql += ` ORDER BY distance LIMIT ${config.searchMaxResults || 20}`;
+    sql += `${areaRestrictionsSQL} ORDER BY distance LIMIT ${config.searchMaxResults || 20}`;
     let results = await dbSelection(useDb).query(sql, args);
     if (results && results.length > 0) {
         switch (id) {

src/routes/api.js

@@ -19,7 +19,7 @@ router.post('/get_data', async (req, res) => {
 });
 
 router.post('/search', async (req, res) => {
-    const data = await getSearch(req.body);
+    const data = await getSearch(req.session.perms, req.body);
     res.json({ data: data });
 });
 
@@ -1051,8 +1051,9 @@ const getData = async (perms, filter) => {
     return data;
 };
 
-const getSearch = async (filter) => {
-    const searchData = await map.getSearchData(filter.lat, filter.lon, filter.id, filter.value, filter.icon_style);
+const getSearch = async (perms, filter) => {
+    const permAreaRestrictions = perms ? perms.areaRestrictions : [];
+    const searchData = await map.getSearchData(filter.lat, filter.lon, filter.id, filter.value, filter.icon_style, permAreaRestrictions);
     return searchData;
 };