Skip to content

Commit daac169

Browse files
versxversx
authored
Merge branch 'master' into popup-templates
2 parents d431eca + 19f2201 commit daac169

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+275
-68
lines changed

‎README.md

+19-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ NodeJS Map clone replacement for [RealDeviceMap](https://github.com/realdevicema
2525
- Follow my location
2626
- Cache previous location
2727
- Global search for quest rewards, nest pokemon, gyms, and pokestops
28+
- Minimum candy and stardust amount quest filter
29+
- Quick Start Pokemon filter button for new users
2830
- Fast
2931

3032
## Installation
@@ -124,7 +126,8 @@ NodeJS Map clone replacement for [RealDeviceMap](https://github.com/realdevicema
124126
},
125127
// Available tileservers
126128
"tileservers": {
127-
"Default": "https://tile.openstreetmap.org/{z}/{x}/{y}.png;Map data © <a href='https://www.openstreetmap.org'>OpenStreetMap</a> contributors",
129+
"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.",
130+
"OSM": "https://tile.openstreetmap.org/{z}/{x}/{y}.png;Map data © <a href='https://www.openstreetmap.org'>OpenStreetMap</a> contributors",
128131
"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>",
129132
"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",
130133
"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
155158
"discord": {
156159
// Enable discord authentication
157160
"enabled": true,
161+
// Channel ID for logging
162+
"logChannelId": "",
163+
// Status display message for the bot
164+
"status": "Map Status: Online",
158165
// Discord bot token
159166
"botToken": "",
160167
// Discord bot client id
@@ -261,7 +268,17 @@ NodeJS Map clone replacement for [RealDeviceMap](https://github.com/realdevicema
261268
"maxScouts": 15
262269
},
263270
// Maximum search results for global search to return
264-
"searchMaxResults": 20
271+
"searchMaxResults": 20,
272+
// Set a custom list of Pokemon to be activated if a user selects the "Quick Start" filter button on the Pokemon Filter menu
273+
"recommendedPokemon": [
274+
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,
275+
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,
276+
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,
277+
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,
278+
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,
279+
641,642,643,644,645,646,647,648,649
280+
]
281+
265282
}
266283
```
267284

‎src/config.example.json

+12-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"interface": "0.0.0.0",
33
"port": 8080,
44
"title": "MapJS",
5+
"headerTitle": "MapJS - NodeJS Map Replacement",
56
"locale": "en",
67
"style": "dark",
78
"sessionSecret": "98ki^e72~!@#(85o3kXLI*#c9wu5l!Z",
@@ -47,7 +48,8 @@
4748
]
4849
},
4950
"tileservers": {
50-
"Default": "https://tile.openstreetmap.org/{z}/{x}/{y}.png;Map data © <a href='https://www.openstreetmap.org'>OpenStreetMap</a> contributors",
51+
"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.",
52+
"OSM": "https://tile.openstreetmap.org/{z}/{x}/{y}.png;Map data © <a href='https://www.openstreetmap.org'>OpenStreetMap</a> contributors",
5153
"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>",
5254
"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",
5355
"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 @@
159161
"url": "",
160162
"maxScouts": 15
161163
},
162-
"searchMaxResults": 20
164+
"searchMaxResults": 20,
165+
"recommendedPokemon": [
166+
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,
167+
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,
168+
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,
169+
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,
170+
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,
171+
641,642,643,644,645,646,647,648,649
172+
]
163173
}

‎src/data/default.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
const config = require('../config.json');
44
const data = require('../../static/locales/' + config.locale + '.json');
55
data.title = config.title;
6+
data.header_title = config.headerTitle;
67
data.locale = config.locale;
78
data.style = config.style == 'dark' ? 'dark' : '';
89
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;
3031
data.default_show_nests = config.map.filters.nests;
3132
data.default_show_scanareas = config.map.filters.scanAreas;
3233
data.default_show_devices = config.map.filters.devices;
34+
data.recommended_pokemon_json = JSON.stringify(config.recommendedPokemon);
3335

34-
module.exports = data;
36+
module.exports = data;

‎src/data/map.js

+14-3
Original file line numberDiff line numberDiff line change
@@ -1017,13 +1017,16 @@ const getNests = async (minLat, maxLat, minLon, maxLon, nestFilterExclude = null
10171017
const minLonReal = minLon - 0.01;
10181018
const maxLonReal = maxLon + 0.01;
10191019
const excludedPokemon = [];
1020+
let averageCountFilter = 0;
10201021

10211022
if (nestFilterExclude) {
10221023
for (let i = 0; i < nestFilterExclude.length; i++) {
10231024
const filter = nestFilterExclude[i];
10241025
if (filter.includes('p')) {
10251026
const id = parseInt(filter.replace('p', ''));
10261027
excludedPokemon.push(id);
1028+
} else if (filter.includes('avg')) {
1029+
averageCountFilter = filter.replace('avg', '');
10271030
}
10281031
}
10291032
}
@@ -1043,12 +1046,20 @@ const getNests = async (minLat, maxLat, minLon, maxLon, nestFilterExclude = null
10431046
excludePokemonSQL = sqlExcludeCreate;
10441047
}
10451048

1049+
let args = [minLatReal, maxLatReal, minLonReal, maxLonReal];
1050+
1051+
let excludeAverageSQL;
1052+
if (averageCountFilter >= 0) {
1053+
// Minimum average count
1054+
excludeAverageSQL = ' AND pokemon_avg >= ?';
1055+
args.push(averageCountFilter);
1056+
}
1057+
10461058
const sql = `
10471059
SELECT nest_id, lat, lon, name, pokemon_id, pokemon_count, pokemon_avg, updated
10481060
FROM nests
1049-
WHERE lat >= ? AND lat <= ? AND lon >= ? AND lon <= ? ${excludePokemonSQL}
1061+
WHERE lat >= ? AND lat <= ? AND lon >= ? AND lon <= ? ${excludePokemonSQL} ${excludeAverageSQL}
10501062
`;
1051-
let args = [minLatReal, maxLatReal, minLonReal, maxLonReal];
10521063
for (let i = 0; i < excludedPokemon.length; i++) {
10531064
args.push(excludedPokemon[i]);
10541065
}
@@ -1132,7 +1143,7 @@ const getSearchData = async (lat, lon, id, value) => {
11321143
}
11331144
sql = `
11341145
SELECT id, name, lat, lon, url, quest_type, quest_pokemon_id, quest_item_id, quest_reward_type,
1135-
json_extract(json_extract('quest_rewards','$[*].info.form_id'),'$[0]') AS quest_pokemon_form_id,
1146+
JSON_VALUE(quest_rewards, '$[0].info.form_id') AS quest_pokemon_form_id
11361147
ROUND(( 3959 * acos( cos( radians(?) ) * cos( radians( lat ) ) * cos( radians( lon ) - radians(?) ) + sin( radians(?) ) * sin( radians( lat ) ) ) ),2) AS distance
11371148
FROM pokestop
11381149
WHERE ${conditions.join(' OR ') || 'FALSE'}

‎src/routes/api.js

+44-13
Original file line numberDiff line numberDiff line change
@@ -489,19 +489,21 @@ const getData = async (perms, filter) => {
489489
'type': pokestopOptionsString
490490
});
491491

492-
for (let i = 1; i <= 4; i++) {
493-
const pokestopLure = i18n.__('filter_pokestop_lure_' + i);
494-
pokestopData.push({
495-
'id': {
496-
'formatted': utils.zeroPad(i, 3),
497-
'sort': i
498-
},
499-
'name': pokestopLure,
500-
'image': `<img class="lazy_load" data-src="${iconStylePath}/pokestop/${i}.png" style="height:50px; width:50px;">`,
501-
'filter': generateShowHideButtons(i, 'pokestop-lure'),
502-
'size': generateSizeButtons(i, 'pokestop-lure'),
503-
'type': pokestopOptionsString
504-
});
492+
if (permShowLures) {
493+
for (let i = 1; i <= 4; i++) {
494+
const pokestopLure = i18n.__('filter_pokestop_lure_' + i);
495+
pokestopData.push({
496+
'id': {
497+
'formatted': utils.zeroPad(i, 3),
498+
'sort': i
499+
},
500+
'name': pokestopLure,
501+
'image': `<img class="lazy_load" data-src="${iconStylePath}/pokestop/${i}.png" style="height:50px; width:50px;">`,
502+
'filter': generateShowHideButtons(i, 'pokestop-lure'),
503+
'size': generateSizeButtons(i, 'pokestop-lure'),
504+
'type': pokestopOptionsString
505+
});
506+
}
505507
}
506508
data['pokestop_filters'] = pokestopData;
507509
}
@@ -575,7 +577,36 @@ const getData = async (perms, filter) => {
575577

576578
if (permViewMap && showNestFilter) {
577579
const pokemonString = i18n.__('filter_pokemon');
580+
const onString = i18n.__('filter_on');
581+
const offString = i18n.__('filter_off');
582+
const globalAverageString = i18n.__('filter_global_avg');
583+
const globalFiltersString = i18n.__('filter_global_filters');
584+
const configureString = i18n.__('filter_configure');
585+
578586
let nestData = [];
587+
const filter = `
588+
<div class="btn-group btn-group-toggle" data-toggle="buttons">
589+
<label class="btn btn-sm btn-off select-button-new" data-id="avg" data-type="nest-avg" data-info="off">
590+
<input type="radio" name="options" id="hide" autocomplete="off">${offString}
591+
</label>
592+
<label class="btn btn-sm btn-on select-button-new" data-id="avg" data-type="nest-avg" data-info="on">
593+
<input type="radio" name="options" id="show" autocomplete="off">${onString}
594+
</label>
595+
</div>
596+
`;
597+
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>`;
598+
nestData.push({
599+
'id': {
600+
'formatted': utils.zeroPad(0, 3),
601+
'sort': 0
602+
},
603+
'name': globalAverageString,
604+
'image': `AVG`,
605+
'filter': filter,
606+
'size': size,
607+
'type': globalFiltersString
608+
});
609+
579610
//Pokemon
580611
let pokemon = await map.getAvailableNestPokemon();
581612
for (let i = 0; i < pokemon.length; i++) {

‎src/routes/ui.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,10 @@ router.get('/@/:city/:zoom', async (req, res) => {
6565

6666
router.get('/purge', async (req, res) => {
6767
let target = req.query.target;
68-
let type = req.query.type;
6968
if (!target || !target.startsWith('/')) {
7069
target = '/';
7170
}
72-
res.set('Clear-Site-Data', `"${type}"`);
71+
res.set('Clear-Site-Data', '"cache"');
7372
res.redirect(target);
7473
});
7574

‎src/views/header.mustache

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@
4242
<script type="text/javascript" src="/js/i18n.min.js"></script>
4343
<script type="text/javascript" src="/js/leaflet.forceZIndex.js"></script>
4444

45-
<title>{{title}}{{#page}} - {{page}}{{/page}}</title>
45+
<title>{{header_title}}{{#page}} - {{page}}{{/page}}</title>
4646
</head>

0 commit comments

Comments
 (0)