Merge pull request #264 from Mygod/update-masterfile

Update masterfile

Author: clburlison

docs/configuration/config.md

@@ -55,8 +55,6 @@ Anything you do not include will use the `default.json` as a fallback. When view
 ```js
     // Map settings
     "map": {
-        // Maximum available Pokemon
-        "maxPokemonId": 649,
         // Map start location latitude
         "startLat": 0,
         // Map start location longitude

package-lock.json

@@ -28,8 +28,7 @@
         "startZoom": 12,
         "minZoom": 10,
         "maxZoom": 18,
-        "maxPokemonId": 649,
-        "minPvpCp": { 
+        "minPvpCp": {
             "great": 1400,
             "ultra": 2400
         },

src/configs/default.json

@@ -5,8 +5,6 @@ const data = require('../../static/locales/' + config.locale + '.json');
 data.title = config.title;
 data.header_title = config.headerTitle;
 data.locale = config.locale;
-data.max_pokemon_id = config.map.maxPokemonId; // TODO: Fix, no idea why index.js isn't picking up max_pokemon_id anymore
-data.pokemon_count = config.map.maxPokemonId;
 data.google_analytics_id = config.google.analytics;
 data.google_adsense_id = config.google.adsense;
 data.cluster_pokemon = config.map.clusters.pokemon;

src/data/default.js

@@ -27,7 +27,7 @@ const getPokemon = async (minLat, maxLat, minLon, maxLon, showPVP, showIV, updat
         if (split.length === 2) {
             const pokemonId = parseInt(split[0]);
             const formId = parseInt(split[1]);
-            if ((masterfile.pokemon[pokemonId] || {}).default_form_id === split[1]) {
+            if ((masterfile.pokemon[pokemonId] || {}).default_form_id === formId) {
                 pokemonLookup[pokemonId] = false;
             }
             formLookup[formId] = false;
@@ -56,7 +56,7 @@ const getPokemon = async (minLat, maxLat, minLon, maxLon, showPVP, showIV, updat
             if (split.length === 2) {
                 const pokemonId = parseInt(split[0]);
                 const formId = parseInt(split[1]);
-                if ((masterfile.pokemon[pokemonId] || {}).default_form_id === split[1]) {
+                if ((masterfile.pokemon[pokemonId] || {}).default_form_id === formId) {
                     pokemonLookup[pokemonId] = jsFilter;
                 }
                 formLookup[formId] = jsFilter;
@@ -179,7 +179,7 @@ const getGyms = async (minLat, maxLat, minLon, maxLon, updated = 0, showRaids =
                         excludePokemonIds.push(pokemonId);
                     } else {
                         excludeFormIds.push(formId);
-                        if ((masterfile.pokemon[pokemonId] || {}).default_form_id === split[1]) {
+                        if ((masterfile.pokemon[pokemonId] || {}).default_form_id === formId) {
                             excludePokemonIds.push(pokemonId);
                         }
                     }

src/data/map.js

@@ -4,7 +4,6 @@ const i18n = require('i18n');
 const express = require('express');
 const router = express.Router();
 
-const config = require('../services/config.js');
 const map = require('../data/map.js');
 const utils = require('../services/utils.js');
 
@@ -343,8 +342,7 @@ const getData = async (perms, filter) => {
             'types': null
         });
 
-        for (let i = 1; i < config.map.maxPokemonId; i++) {
-            const pkmn = masterfile.pokemon[i];
+        for (const [i, pkmn] of Object.entries(masterfile.pokemon)) {
             const forms = Object.keys(pkmn.forms);
             for (let j = 0; j < forms.length; j++) {
                 const formId = forms[j];

src/routes/api.js

@@ -73,8 +73,6 @@ const handlePage = async (req, res) => {
     data.bodyClass = config.style === 'dark' ? 'theme-dark' : '';
     data.tableClass = config.style === 'dark' ? 'table-dark' : '';
 
-    data.max_pokemon_id = config.map.maxPokemonId;
-
     // Build available tile servers list
     const tileservers = getAvailableTileservers();
     data.available_tileservers_json = JSON.stringify(tileservers);

src/routes/ui.js

@@ -16,8 +16,6 @@
         const scoutingUrl = '{{{scouting_url}}}';
         const scoutMaxCount = parseInt('{{scouting_count}}' || 15);
 
-        const maxPokemonId = '{{pokemon_count}}'; // Bandaid
-
         const defaultShowPokemon = '{{default_show_pokemon}}' === 'true';
         const defaultShowPokemonTimers = '{{default_show_pokemon_timers}}' === 'true';
         const defaultShowRaids = '{{default_show_raids}}' === 'true';