fix: no more search hard limits

- fixes WatWowMap#956
Mygod · Feb 29, 2024 · 440bb94 · 440bb94
1 parent 1c21c0c
commit 440bb94
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 9 deletions.
diff --git a/server/src/configs/custom-environment-variables.json b/server/src/configs/custom-environment-variables.json
@@ -261,10 +261,6 @@
       "__name": "API_SEARCH_SOFT_KM_LIMIT",
       "__format": "number"
     },
-    "searchHardKmLimit": {
-      "__name": "API_SEARCH_HARD_KM_LIMIT",
-      "__format": "number"
-    },
     "nestHemisphere": "API_NEST_HEMISPHERE",
     "gymValidDataLimit": {
       "__name": "API_GYM_VALID_DATA_LIMIT",

diff --git a/server/src/configs/default.json b/server/src/configs/default.json
@@ -100,7 +100,6 @@
     "weatherCellLimit": 3,
     "searchResultsLimit": 15,
     "searchSoftKmLimit": 10,
-    "searchHardKmLimit": 100,
     "nestHemisphere": "north",
     "gymValidDataLimit": 30,
     "hideOldGyms": false,

diff --git a/server/src/services/DbCheck.js b/server/src/services/DbCheck.js
@@ -9,7 +9,6 @@ const { getBboxFromCenter } = require('./functions/getBbox')
 const { getCache } = require('./cache')
 
 const softLimit = config.getSafe('api.searchSoftKmLimit')
-const hardLimit = config.getSafe('api.searchHardKmLimit')
 
 /**
  * @type {import("@rm/types").DbCheckClass}
@@ -441,7 +440,6 @@ module.exports = class DbCheck {
     let deDuped = []
     let count = 0
     let distance = softLimit
-    const max = model === 'Pokemon' ? hardLimit / 2 : hardLimit
     const startTime = Date.now()
     while (deDuped.length < this.searchLimit) {
       const loopTime = Date.now()
@@ -475,7 +473,6 @@ module.exports = class DbCheck {
       )
       if (
         deDuped.length >= this.searchLimit * 0.5 ||
-        distance >= max ||
         Date.now() - startTime > 2_000
       ) {
         break
@@ -487,7 +484,6 @@ module.exports = class DbCheck {
       } else {
         distance += softLimit
       }
-      distance = Math.min(distance, max)
     }
     if (count > 1) {
       log.info(