refactor: some limit adjustments

WatWowMap · Jan 17, 2024 · 15a080c · 15a080c
1 parent d062e52
commit 15a080c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/server/src/models/Pokemon.js b/server/src/models/Pokemon.js
@@ -638,7 +638,7 @@ class Pokemon extends Model {
               longitude: bbox.maxLon,
             },
             maxDistance,
-            limit: searchResultsLimit * 4,
+            limit: searchResultsLimit,
             searchIds: pokemonIds.map((id) => +id),
             global: {},
             filters: {},
@@ -649,9 +649,7 @@ class Pokemon extends Model {
     )
     return results
       .filter(
-        (item, i) =>
-          i < searchResultsLimit &&
-          (!mem || filterRTree(item, perms.areaRestrictions, onlyAreas)),
+        (item) => !mem || filterRTree(item, perms.areaRestrictions, onlyAreas),
       )
       .map((poke) => ({
         ...poke,

diff --git a/server/src/services/DbCheck.js b/server/src/services/DbCheck.js
@@ -472,8 +472,8 @@ module.exports = class DbCheck {
         break
       }
       distance += softLimit
-      if (deDuped.length === 0) {
-        distance = Math.min(distance + softLimit, hardLimit)
+      if (deDuped.length === 0 && distance < hardLimit) {
+        distance += softLimit
       }
     }
     if (count > 1) {

diff --git a/src/components/layout/dialogs/Search.jsx b/src/components/layout/dialogs/Search.jsx
@@ -290,7 +290,7 @@ export default function Search() {
       <Box width={{ xs: 'inherit', sm: 500 }}>
         <Header titles="search" action={handleClose} />
         <Autocomplete
-          freeSolo={search?.length ? false : true}
+          freeSolo
           inputValue={search}
           onInputChange={handleChange}
           options={options.map((option, i) => ({ ...option, i }))}