Merge branch 'develop' into better-multi-domain

Author: TurtIeSocks

CHANGELOG.md

@@ -1,3 +1,47 @@
+# [1.30.0-develop.11](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.10...v1.30.0-develop.11) (2024-02-27)
+
+
+### Bug Fixes
+
+* various text fixes ([6eb9c6a](https://github.com/WatWowMap/ReactMap/commit/6eb9c6aed1d0ba557220799560ec498fc6f7e6dc)), closes [#967](https://github.com/WatWowMap/ReactMap/issues/967)
+
+# [1.30.0-develop.10](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.9...v1.30.0-develop.10) (2024-02-27)
+
+
+### Bug Fixes
+
+* pokemon ui inconsistency ([0cb334c](https://github.com/WatWowMap/ReactMap/commit/0cb334c44748dbbe2a591cc5b61c466b7487f3bf))
+
+# [1.30.0-develop.9](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.8...v1.30.0-develop.9) (2024-02-27)
+
+
+### Bug Fixes
+
+* various small things ([ada7947](https://github.com/WatWowMap/ReactMap/commit/ada7947313300864da5a524c0233bb8c31d5c1bc))
+
+# [1.30.0-develop.8](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.7...v1.30.0-develop.8) (2024-02-27)
+
+
+### Bug Fixes
+
+* 0s in gym popup ([2d9bdc1](https://github.com/WatWowMap/ReactMap/commit/2d9bdc1665715d7d3dfa6bd3b6f05b9471b12abe))
+* map dependency checks ([85c992d](https://github.com/WatWowMap/ReactMap/commit/85c992dc499f0c25dff2ba00ec75e4bb20911bab))
+
+# [1.30.0-develop.7](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.6...v1.30.0-develop.7) (2024-02-27)
+
+
+### Bug Fixes
+
+* importing ([89b7fce](https://github.com/WatWowMap/ReactMap/commit/89b7fcebca0a58959ecc29418db4a75390072ffd))
+* less strict searching for `'` ([ca08a69](https://github.com/WatWowMap/ReactMap/commit/ca08a690fca54f90132b4688b5700532958b60f5))
+* Merge pull request [#963](https://github.com/WatWowMap/ReactMap/issues/963) from ReuschelCGN/translation ([cbc0160](https://github.com/WatWowMap/ReactMap/commit/cbc0160f6820a68fed04c9b7b57a287cfaf66f58))
+* safe 0 fallback ([45795a8](https://github.com/WatWowMap/ReactMap/commit/45795a80d114f7b638ff6a7a0d0438811dd86511))
+
+
+### Features
+
+* data management page ([561c031](https://github.com/WatWowMap/ReactMap/commit/561c031e0f290d7c63e17b6a645e8b145cf2e4d1))
+
 # [1.30.0-develop.6](https://github.com/WatWowMap/ReactMap/compare/v1.30.0-develop.5...v1.30.0-develop.6) (2024-02-23)
 
 ### Bug Fixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.30.0-develop.6",
+  "version": "1.30.0-develop.11",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",

packages/config/.configref

@@ -1 +1 @@
-24083
+24091

packages/locales/lib/human/en.json

@@ -734,5 +734,32 @@
   "gender_filters_all": "Gender Applies to All",
   "and_caption": "Linked Together",
   "or_caption": "Filters Independently",
-  "filter_help": "Filter Help"
+  "filter_help": "Filter Help",
+  "kilometers": "Kilometers",
+  "miles": "Miles",
+  "distance_unit": "Distance Unit",
+  "data_management": "Data Management",
+  "reset_or_manage_text": "You can either hard reset your filters or you can view the data management page which will allow you to reset individual categories.",
+  "reset_audio": "Reset Audio",
+  "reset_all": "Reset All",
+  "reset_icons": "Reset Icons",
+  "reset_position": "Reset Position",
+  "reset_ui": "Reset UI",
+  "reset_options": "Reset Options",
+  "reset_menus": "Reset Menus",
+  "reset_settings": "Reset Settings",
+  "reset_pokemon": "Reset Pokémon",
+  "reset_pokestops": "Reset PokéStops",
+  "reset_gyms": "Reset Gyms",
+  "reset_nests": "Reset Nests",
+  "reset_portals": "Reset Portals",
+  "reset_routes": "Reset Routes",
+  "reset_scan_areas": "Reset Scan Areas",
+  "reset_scan_cells": "Reset Scan Cells",
+  "reset_devices": "Reset Devices",
+  "reset_weather": "Reset Weather",
+  "reset_s2cells": "Reset S2 Cells",
+  "reset_spawnpoints": "Reset Spawnpoints",
+  "reset_submission_cells": "Reset Submission Cells",
+  "hisuian": "Hisuian"
 }

packages/masterfile/lib/index.d.ts

@@ -5,6 +5,7 @@ export interface MasterfileForm {
   rarity?: string
   isCostume?: boolean
   category?: AdvCategories
+  types?: number[]
 }
 
 export interface MasterfilePokemon {

packages/types/lib/server.d.ts

@@ -24,6 +24,7 @@ import Pokestop = require('server/src/models/Pokestop')
 import { ModelReturn, OnlyType } from './utility'
 import { Profile } from 'passport-discord'
 import { User } from './models'
+import { Config } from '@rm/types'
 
 export interface DbContext {
   isMad: boolean
@@ -102,7 +103,6 @@ export interface DbCheckClass {
   historical: Rarity
   questConditions: { [key: string]: string[] }
   rarityPercents: RarityPercents
-  distanceUnit: 'km' | 'mi'
   reactMapDb: null | number
   filterContext: {
     Route: { maxDistance: number; maxDuration: number }
@@ -254,3 +254,16 @@ export type AdvCategories = 'pokemon' | 'gyms' | 'pokestops' | 'nests'
 export type UIObject = ReturnType<
   typeof import('server/src/services/ui/primary')
 >
+
+export interface PokemonGlow
+  extends Partial<Omit<Config['clientSideOptions']['pokemon'], 'glow'>> {
+  glow: boolean
+  Hundo?: string
+  Nundo?: string
+  'Top PVP Rank'?: string
+  Multiple?: string
+}
+export interface ClientOptions
+  extends Partial<Omit<Config['clientSideOptions'], 'pokemon'>> {
+  pokemon: PokemonGlow
+}

server/src/configs/default.json

@@ -237,7 +237,7 @@
       "permImageDir": "images/perms",
       "permArrayImages": false,
       "clientTimeoutMinutes": 30,
-      "distanceUnit": "km",
+      "distanceUnit": "kilometers",
       "enablePokemonPopupCoordsSelector": false,
       "enableGymPopupCoordsSelector": false,
       "enablePokestopPopupCoordsSelector": false,

server/src/models/Pokemon.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-unused-vars */
 /* eslint-disable no-restricted-syntax */
 const { Model, raw, ref } = require('objection')
 const i18next = require('i18next')
@@ -24,7 +23,6 @@ const {
 } = require('../services/filters/pokemon/constants')
 const PkmnFilter = require('../services/filters/pokemon/Backend')
 
-const distanceUnit = config.getSafe('map.misc.distanceUnit')
 const searchResultsLimit = config.getSafe('api.searchResultsLimit')
 const queryLimits = config.getSafe('api.queryLimits')
 const queryDebug = config.getSafe('devOptions.queryDebug')
@@ -652,11 +650,7 @@ class Pokemon extends Model {
             point([poke.lon, poke.lat]),
             point([args.lon, args.lat]),
             {
-              units:
-                distanceUnit.toLowerCase() === 'km' ||
-                distanceUnit.toLowerCase() === 'kilometers'
-                  ? 'kilometers'
-                  : 'miles',
+              units: 'meters',
             },
           ).toFixed(2),
       }))

server/src/services/DbCheck.js

@@ -107,21 +107,18 @@ module.exports = class DbCheck {
       )
       process.exit(0)
     }
-    this.distanceUnit = config.getSafe('map.misc.distanceUnit')
   }
 
   /**
    * @param {{ lat: number, lon: number }} args
    * @param {boolean} isMad
    * @returns {ReturnType<typeof raw>}
    */
-  getDistance(args, isMad) {
+  static getDistance(args, isMad) {
     const radLat = args.lat * (Math.PI / 180)
     const radLon = args.lon * (Math.PI / 180)
     return raw(
-      `ROUND(( ${
-        this.distanceUnit === 'mi' ? '3959' : '6371'
-      } * acos( cos( ${radLat} ) * cos( radians( ${
+      `ROUND(( 6371000 * acos( cos( ${radLat} ) * cos( radians( ${
         isMad ? 'latitude' : 'lat'
       } ) ) * cos( radians( ${
         isMad ? 'longitude' : 'lon'
@@ -456,7 +453,7 @@ module.exports = class DbCheck {
             perms,
             args,
             source,
-            this.getDistance(args, source.isMad),
+            DbCheck.getDistance(args, source.isMad),
             bbox,
           ),
         ),

server/src/services/config.js

@@ -173,7 +173,22 @@ const mergeMapConfig = (input = {}) => {
 
   /** @type {import('@rm/types').Config['map']} */
   const merged = config.util.extendDeep({}, base, input)
-
+  if (
+    merged.misc.distanceUnit !== 'kilometers' &&
+    merged.misc.distanceUnit !== 'miles'
+  ) {
+    log.warn(
+      HELPERS.config,
+      `Invalid distanceUnit: ${merged.misc.distanceUnit}, only 'kilometers' OR 'miles' are allowed.`,
+    )
+    if (merged.misc.distance === 'km') {
+      merged.misc.distanceUnit = 'kilometers'
+    } else if (merged.misc.distance === 'mi') {
+      merged.misc.distanceUnit = 'miles'
+    } else {
+      merged.misc.distanceUnit = 'kilometers'
+    }
+  }
   merged.general.menuOrder = merged?.general?.menuOrder
     ? merged.general.menuOrder.filter((x) => allowedMenuItems.includes(x))
     : []

server/src/services/ui/advMenus.js

@@ -21,64 +21,115 @@ const CATEGORIES = /** @type {const} */ ({
   nests: ['pokemon'],
 })
 
-const BASE_RARITY = /** @type {const} */ ([
-  'common',
-  'uncommon',
-  'rare',
-  'ultraRare',
-  'regional',
-  'ultraBeast',
-  'legendary',
-  'mythical',
-  'never',
-])
-
 function buildMenus() {
-  const menuFilters = {}
-  const returnedItems = {}
-
   const rarityTiers = new Set(
     Object.values(Event.masterfile.pokemon).map((val) => val.rarity),
   )
   const historicalTiers = new Set(
     Object.values(Event.masterfile.pokemon).map((val) => val.historic),
   )
+  const generations = [
+    ...new Set(
+      Object.values(Event.masterfile.pokemon).map(
+        (val) => `generation_${val.genId}`,
+      ),
+    ),
+  ].filter((val) => val !== undefined)
+  const types = Object.keys(Event.masterfile.types)
+    .map((key) => `poke_type_${key}`)
+    .filter((val) => val !== 'poke_type_0')
+
+  const forms = Object.entries(
+    Object.values(Event.masterfile.pokemon).reduce((acc, val) => {
+      Object.values(val.forms || {}).forEach((form) => {
+        if (acc[form.name]) {
+          acc[form.name] += 1
+        } else {
+          acc[form.name] = 1
+        }
+      })
+      return acc
+    }, /** @type {Record<string, number>} */ ({})),
+  ).filter(([key, count]) => count > 10 && key !== 'Normal' && key !== 'Unset')
 
   const pokemonFilters = {
-    generations: [
-      ...new Set(
-        Object.values(Event.masterfile.pokemon).map(
-          (val) => `generation_${val.genId}`,
-        ),
-      ),
-    ].filter((val) => val !== undefined),
-    types: Object.keys(Event.masterfile.types)
-      .map((key) => `poke_type_${key}`)
-      .filter((val) => val !== 'poke_type_0'),
-    rarity: BASE_RARITY.filter((tier) => rarityTiers.has(tier)),
-    historicRarity: BASE_RARITY.filter((tier) => historicalTiers.has(tier)),
-    forms: ['normalForms', 'altForms', 'Alola', 'Galarian'],
-    others: ['reverse', 'selected', 'unselected', 'onlyAvailable'],
+    generations: Object.fromEntries(generations.map((gen) => [gen, false])),
+    types: Object.fromEntries(types.map((type) => [type, false])),
+    rarity: Object.fromEntries(
+      Array.from(rarityTiers).map((tier) => [tier, false]),
+    ),
+    historicRarity: Object.fromEntries(
+      Array.from(historicalTiers).map((tier) => [tier, false]),
+    ),
+    forms: {
+      normalForms: false,
+      altForms: false,
+      ...Object.fromEntries(forms.map((form) => [form[0], false])),
+    },
+    others: {
+      reverse: false,
+      selected: false,
+      unselected: false,
+      onlyAvailable: false,
+    },
   }
 
-  Object.entries(pokemonFilters).forEach(([key, items]) => {
-    menuFilters[key] = Object.fromEntries(items.map((item) => [item, false]))
-  })
-
-  Object.entries(CATEGORIES).forEach(([key, items]) => {
-    returnedItems[key] = {
-      categories: items,
+  const returnObj = {
+    gyms: {
+      categories: CATEGORIES.gyms,
+      filters: {
+        ...pokemonFilters,
+        others: {
+          ...pokemonFilters.others,
+          onlyAvailable: true,
+        },
+        categories: Object.fromEntries(
+          CATEGORIES.gyms.map((item) => [item, false]),
+        ),
+      },
+    },
+    pokestops: {
+      categories: CATEGORIES.pokestops,
+      filters: {
+        ...pokemonFilters,
+        others: {
+          ...pokemonFilters.others,
+          onlyAvailable: true,
+        },
+        categories: Object.fromEntries(
+          CATEGORIES.pokestops.map((item) => [item, false]),
+        ),
+      },
+    },
+    pokemon: {
+      categories: CATEGORIES.pokemon,
+      filters: {
+        ...pokemonFilters,
+        others: {
+          ...pokemonFilters.others,
+          onlyAvailable: true,
+        },
+        categories: Object.fromEntries(
+          CATEGORIES.pokemon.map((item) => [item, false]),
+        ),
+      },
+    },
+    nests: {
+      categories: CATEGORIES.nests,
       filters: {
-        ...menuFilters,
+        ...pokemonFilters,
         others: {
-          ...menuFilters.others,
+          ...pokemonFilters.others,
           onlyAvailable: true,
         },
-        categories: Object.fromEntries(items.map((item) => [item, false])),
+        categories: Object.fromEntries(
+          CATEGORIES.nests.map((item) => [item, false]),
+        ),
       },
-    }
-  })
-  return returnedItems
+    },
+  }
+
+  return returnObj
 }
 
 module.exports = buildMenus