Merge branch 'master' into popup-templates

Author: versx

README.md

@@ -25,6 +25,8 @@ NodeJS Map clone replacement for [RealDeviceMap](https://github.com/realdevicema
 - Follow my location  
 - Cache previous location  
 - Global search for quest rewards, nest pokemon, gyms, and pokestops
+- Minimum candy and stardust amount quest filter
+- Quick Start Pokemon filter button for new users
 - Fast  
 
 ## Installation
@@ -124,7 +126,8 @@ NodeJS Map clone replacement for [RealDeviceMap](https://github.com/realdevicema
     },
     // Available tileservers
     "tileservers": {
-        "Default": "https://tile.openstreetmap.org/{z}/{x}/{y}.png;Map data © <a href='https://www.openstreetmap.org'>OpenStreetMap</a> contributors",
+        "Default": "https://{s}.basemaps.cartocdn.com/rastertiles/voyager_labels_under/{z}/{x}/{y}{r}.png;Map tiles by Carto, under CC BY 3.0. Data by  <a href='https://www.openstreetmap.org/'>OpenStreetMap</a>, under ODbL.",
+        "OSM": "https://tile.openstreetmap.org/{z}/{x}/{y}.png;Map data © <a href='https://www.openstreetmap.org'>OpenStreetMap</a> contributors",
         "Dark Matter": "https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png;© <a href='https://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors © <a href='https://carto.com/attributions'>CARTO</a>",
         "Alidade Smooth Dark": "https://tiles.stadiamaps.com/tiles/alidade_smooth_dark/{z}/{x}/{y}.png;&copy; <a href='https://stadiamaps.com/'>Stadia Maps</a>, &copy; <a href='https://openmaptiles.org/'>OpenMapTiles</a> &copy; <a href='http://openstreetmap.org'>OpenStreetMap</a> contributors",
         "Thunder Forest": "https://{s}.tile.thunderforest.com/transport-dark/{z}/{x}/{y}.png;&copy; <a href='http://www.thunderforest.com/'>Thunderforest</a>, &copy; <a href='https://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors",
@@ -155,6 +158,10 @@ NodeJS Map clone replacement for [RealDeviceMap](https://github.com/realdevicema
     "discord": {
         // Enable discord authentication
         "enabled": true,
+        // Channel ID for logging
+        "logChannelId": "",
+        // Status display message for the bot
+        "status": "Map Status: Online",
         // Discord bot token
         "botToken": "",
         // Discord bot client id
@@ -261,7 +268,17 @@ NodeJS Map clone replacement for [RealDeviceMap](https://github.com/realdevicema
         "maxScouts": 15
     },
     // Maximum search results for global search to return
-    "searchMaxResults": 20
+    "searchMaxResults": 20,
+    // Set a custom list of Pokemon to be activated if a user selects the "Quick Start" filter button on the Pokemon Filter menu
+    "recommendedPokemon": [
+        3,6,9,65,68,76,94,99,106,107,108,112,113,114,115,122,125,130,131,134,135,136,137,142,143,144,145,146,147,148,149,150,151,154,157,160,169,176,196,197,201,
+        214,221,222,233,237,241,242,243,244,245,246,247,248,249,250,251,254,257,260,280,281,282,286,287,288,289,290,291,292,297,303,306,327,328,329,330,349,350,357,
+        358,359,361,362,365,366,369,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,389,392,395,403,404,405,408,409,410,411,417,443,444,445,447,448,
+        480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,496,497,499,500,502,503,522,523,524,525,526,530,531,532,533,534,538,539,550,551,552,553,554,555,
+        556,559,560,561,564,565,566,567,570,574,575,576,587,596,597,599,600,601,607,608,609,610,611,612,618,622,623,626,631,632,633,634,635,636,637,638,639,640,
+        641,642,643,644,645,646,647,648,649
+    ]
+    
 }
 ```
 

src/config.example.json

@@ -2,6 +2,7 @@
     "interface": "0.0.0.0",
     "port": 8080,
     "title": "MapJS",
+    "headerTitle": "MapJS - NodeJS Map Replacement",
     "locale": "en",
     "style": "dark",
     "sessionSecret": "98ki^e72~!@#(85o3kXLI*#c9wu5l!Z",
@@ -47,7 +48,8 @@
         ]
     },
     "tileservers": {
-        "Default": "https://tile.openstreetmap.org/{z}/{x}/{y}.png;Map data © <a href='https://www.openstreetmap.org'>OpenStreetMap</a> contributors",
+        "Default": "https://{s}.basemaps.cartocdn.com/rastertiles/voyager_labels_under/{z}/{x}/{y}{r}.png;Map tiles by Carto, under CC BY 3.0. Data by  <a href='https://www.openstreetmap.org/'>OpenStreetMap</a>, under ODbL.",
+        "OSM": "https://tile.openstreetmap.org/{z}/{x}/{y}.png;Map data © <a href='https://www.openstreetmap.org'>OpenStreetMap</a> contributors",
         "Dark Matter": "https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}{r}.png;© <a href='https://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors © <a href='https://carto.com/attributions'>CARTO</a>",
         "Alidade Smooth Dark": "https://tiles.stadiamaps.com/tiles/alidade_smooth_dark/{z}/{x}/{y}.png;&copy; <a href='https://stadiamaps.com/'>Stadia Maps</a>, &copy; <a href='https://openmaptiles.org/'>OpenMapTiles</a> &copy; <a href='http://openstreetmap.org'>OpenStreetMap</a> contributors",
         "Thunder Forest": "https://{s}.tile.thunderforest.com/transport-dark/{z}/{x}/{y}.png;&copy; <a href='http://www.thunderforest.com/'>Thunderforest</a>, &copy; <a href='https://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors",
@@ -159,5 +161,13 @@
         "url": "",
         "maxScouts": 15
     },
-    "searchMaxResults": 20
+    "searchMaxResults": 20,
+    "recommendedPokemon": [
+        3,6,9,65,68,76,94,99,106,107,108,112,113,114,115,122,125,130,131,134,135,136,137,142,143,144,145,146,147,148,149,150,151,154,157,160,169,176,196,197,201,
+        214,221,222,233,237,241,242,243,244,245,246,247,248,249,250,251,254,257,260,280,281,282,286,287,288,289,290,291,292,297,303,306,327,328,329,330,349,350,357,
+        358,359,361,362,365,366,369,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,389,392,395,403,404,405,408,409,410,411,417,443,444,445,447,448,
+        480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,496,497,499,500,502,503,522,523,524,525,526,530,531,532,533,534,538,539,550,551,552,553,554,555,
+        556,559,560,561,564,565,566,567,570,574,575,576,587,596,597,599,600,601,607,608,609,610,611,612,618,622,623,626,631,632,633,634,635,636,637,638,639,640,
+        641,642,643,644,645,646,647,648,649
+    ]
 }

src/data/default.js

@@ -3,6 +3,7 @@
 const config = require('../config.json');
 const data = require('../../static/locales/' + config.locale + '.json');
 data.title = config.title;
+data.header_title = config.headerTitle;
 data.locale = config.locale;
 data.style = config.style == 'dark' ? 'dark' : '';
 data.max_pokemon_id = config.map.maxPokemonId; // TODO: Fix, no idea why index.js isn't picking up max_pokemon_id anymore
@@ -30,5 +31,6 @@ data.default_show_submissioncells = config.map.filters.submissionCells;
 data.default_show_nests = config.map.filters.nests;
 data.default_show_scanareas = config.map.filters.scanAreas;
 data.default_show_devices = config.map.filters.devices;
+data.recommended_pokemon_json = JSON.stringify(config.recommendedPokemon);
 
-module.exports = data;
+module.exports = data;

src/data/map.js

@@ -1017,13 +1017,16 @@ const getNests = async (minLat, maxLat, minLon, maxLon, nestFilterExclude = null
     const minLonReal = minLon - 0.01;
     const maxLonReal = maxLon + 0.01;
     const excludedPokemon = [];
+    let averageCountFilter = 0;
 
     if (nestFilterExclude) {
         for (let i = 0; i < nestFilterExclude.length; i++) {
             const filter = nestFilterExclude[i];
             if (filter.includes('p')) {
                 const id = parseInt(filter.replace('p', ''));
                 excludedPokemon.push(id);
+            } else if (filter.includes('avg')) {
+                averageCountFilter = filter.replace('avg', '');
             }
         }
     }
@@ -1043,12 +1046,20 @@ const getNests = async (minLat, maxLat, minLon, maxLon, nestFilterExclude = null
         excludePokemonSQL = sqlExcludeCreate;
     }
 
+    let args = [minLatReal, maxLatReal, minLonReal, maxLonReal];
+
+    let excludeAverageSQL;
+    if (averageCountFilter >= 0) {
+        // Minimum average count
+        excludeAverageSQL = ' AND pokemon_avg >= ?';
+        args.push(averageCountFilter);
+    }
+
     const sql = `
     SELECT nest_id, lat, lon, name, pokemon_id, pokemon_count, pokemon_avg, updated
     FROM nests
-    WHERE lat >= ? AND lat <= ? AND lon >= ? AND lon <= ? ${excludePokemonSQL}
+    WHERE lat >= ? AND lat <= ? AND lon >= ? AND lon <= ? ${excludePokemonSQL} ${excludeAverageSQL}
     `;
-    let args = [minLatReal, maxLatReal, minLonReal, maxLonReal];
     for (let i = 0; i < excludedPokemon.length; i++) {
         args.push(excludedPokemon[i]);
     }
@@ -1132,7 +1143,7 @@ const getSearchData = async (lat, lon, id, value) => {
             }
             sql = `
             SELECT id, name, lat, lon, url, quest_type, quest_pokemon_id, quest_item_id, quest_reward_type,
-                json_extract(json_extract('quest_rewards','$[*].info.form_id'),'$[0]') AS quest_pokemon_form_id,
+                JSON_VALUE(quest_rewards, '$[0].info.form_id') AS quest_pokemon_form_id
                 ROUND(( 3959 * acos( cos( radians(?) ) * cos( radians( lat ) ) * cos( radians( lon ) - radians(?) ) + sin( radians(?) ) * sin( radians( lat ) ) ) ),2) AS distance
             FROM pokestop
             WHERE ${conditions.join(' OR ') || 'FALSE'}

src/routes/api.js

@@ -489,19 +489,21 @@ const getData = async (perms, filter) => {
             'type': pokestopOptionsString
         });
 
-        for (let i = 1; i <= 4; i++) {
-            const pokestopLure = i18n.__('filter_pokestop_lure_' + i);
-            pokestopData.push({
-                'id': {
-                    'formatted': utils.zeroPad(i, 3),
-                    'sort': i
-                },
-                'name': pokestopLure,
-                'image': `<img class="lazy_load" data-src="${iconStylePath}/pokestop/${i}.png" style="height:50px; width:50px;">`,
-                'filter': generateShowHideButtons(i, 'pokestop-lure'),
-                'size': generateSizeButtons(i, 'pokestop-lure'),
-                'type': pokestopOptionsString
-            });
+        if (permShowLures) {
+            for (let i = 1; i <= 4; i++) {
+                const pokestopLure = i18n.__('filter_pokestop_lure_' + i);
+                pokestopData.push({
+                    'id': {
+                        'formatted': utils.zeroPad(i, 3),
+                        'sort': i
+                    },
+                    'name': pokestopLure,
+                    'image': `<img class="lazy_load" data-src="${iconStylePath}/pokestop/${i}.png" style="height:50px; width:50px;">`,
+                    'filter': generateShowHideButtons(i, 'pokestop-lure'),
+                    'size': generateSizeButtons(i, 'pokestop-lure'),
+                    'type': pokestopOptionsString
+                });
+            }
         }
         data['pokestop_filters'] = pokestopData;
     }
@@ -575,7 +577,36 @@ const getData = async (perms, filter) => {
 
     if (permViewMap && showNestFilter) {
         const pokemonString = i18n.__('filter_pokemon');
+        const onString = i18n.__('filter_on');
+        const offString = i18n.__('filter_off');
+        const globalAverageString = i18n.__('filter_global_avg');
+        const globalFiltersString = i18n.__('filter_global_filters');
+        const configureString = i18n.__('filter_configure');
+
         let nestData = [];
+        const filter = `
+        <div class="btn-group btn-group-toggle" data-toggle="buttons">
+            <label class="btn btn-sm btn-off select-button-new" data-id="avg" data-type="nest-avg" data-info="off">
+                <input type="radio" name="options" id="hide" autocomplete="off">${offString}
+            </label>
+            <label class="btn btn-sm btn-on select-button-new" data-id="avg" data-type="nest-avg" data-info="on">
+                <input type="radio" name="options" id="show" autocomplete="off">${onString}
+            </label>
+        </div>
+        `;
+        const size = `<button class="btn btn-sm btn-primary configure-button-new" data-id="avg" data-type="nest-avg" data-info="global-avg">${configureString}</button>`;
+        nestData.push({
+            'id': {
+                'formatted': utils.zeroPad(0, 3),
+                'sort': 0
+            },
+            'name': globalAverageString,
+            'image': `AVG`,
+            'filter': filter,
+            'size': size,
+            'type': globalFiltersString
+        });
+
         //Pokemon
         let pokemon = await map.getAvailableNestPokemon();
         for (let i = 0; i < pokemon.length; i++) {

src/routes/ui.js

@@ -65,11 +65,10 @@ router.get('/@/:city/:zoom', async (req, res) => {
 
 router.get('/purge', async (req, res) => {
     let target = req.query.target;
-    let type = req.query.type;
     if (!target || !target.startsWith('/')) {
         target = '/';
     }
-    res.set('Clear-Site-Data', `"${type}"`);
+    res.set('Clear-Site-Data', '"cache"');
     res.redirect(target);
 });
 

src/views/header.mustache

@@ -42,5 +42,5 @@
     <script type="text/javascript" src="/js/i18n.min.js"></script>
     <script type="text/javascript" src="/js/leaflet.forceZIndex.js"></script>
 
-    <title>{{title}}{{#page}} - {{page}}{{/page}}</title>
+    <title>{{header_title}}{{#page}} - {{page}}{{/page}}</title>
 </head>