Merge branch 'develop' into rsvp-details

Author: Mygod

CHANGELOG.md

@@ -1,3 +1,47 @@
+# [1.36.0-develop.19](https://github.com/WatWowMap/ReactMap/compare/v1.36.0-develop.18...v1.36.0-develop.19) (2025-07-07)
+
+
+### Bug Fixes
+
+* defender info updated time ([04706ab](https://github.com/WatWowMap/ReactMap/commit/04706abcb57ccafa2595bd9f3d56f6a1293cd36c))
+* fix the formula oops ([0de9804](https://github.com/WatWowMap/ReactMap/commit/0de98046516fc84a747687e19579a04b923b6834))
+* support light mode for motivation display ([cf9e412](https://github.com/WatWowMap/ReactMap/commit/cf9e4129daa8de175e7321fcdf41dca23c96de36))
+
+
+### Features
+
+* **client:** better footer on gym popup ([fd0ee09](https://github.com/WatWowMap/ReactMap/commit/fd0ee09687baf1bd9eb6c3e7a44202db090f0136))
+* **client:** better spacing on gym popup ([b187b46](https://github.com/WatWowMap/ReactMap/commit/b187b46eb26331414e803ee2c7eaff53f5927d36))
+* **client:** conditional gym defender heart lines & translate CP ([39726eb](https://github.com/WatWowMap/ReactMap/commit/39726eb5a634797c34924dba31f05544d806fd40))
+* **client:** drop defenders from extra info, fix defenders hearth calculation ([6604029](https://github.com/WatWowMap/ReactMap/commit/6604029d6058b48d0b951b3d55f4ca9749cccc95))
+* **client:** fixes on gym defenders popup ([14f8f97](https://github.com/WatWowMap/ReactMap/commit/14f8f97701a37eeb657e965bd90b18b12425def9))
+* **client:** make deffenders popup more compact ([5e3aa75](https://github.com/WatWowMap/ReactMap/commit/5e3aa754feea7ecda76228cb194ad3e85a822ff9))
+* **client:** restore comments on defenders code ([7f24004](https://github.com/WatWowMap/ReactMap/commit/7f240042fd3190099bbfce6284a4e92ec7ee757b))
+* display MOAR info ([791140b](https://github.com/WatWowMap/ReactMap/commit/791140b5af6fed72899f6327710a0ce0d67fc24d))
+* front-end display gym defenders ([f3c9511](https://github.com/WatWowMap/ReactMap/commit/f3c9511aac1b6c5d7bc7a2851248d4ec56cd2868))
+* predict motivation now ([644c01e](https://github.com/WatWowMap/ReactMap/commit/644c01ecb2e24bae89791a69cd7d756d920e50a8))
+* prepare gym defenders backend ([ca7f7c7](https://github.com/WatWowMap/ReactMap/commit/ca7f7c7b64df61262fa0445bfb4dc744d5aecb9a))
+
+
+### Reverts
+
+* Revert "chore: drop MAD support" ([4216560](https://github.com/WatWowMap/ReactMap/commit/4216560d16282d819b502200b8f00c6ee0a729a3))
+* Revert "fix: search" ([877c7eb](https://github.com/WatWowMap/ReactMap/commit/877c7eb4a8acb5d847431f87f86f9e8808fa14ab))
+
+# [1.36.0-develop.18](https://github.com/WatWowMap/ReactMap/compare/v1.36.0-develop.17...v1.36.0-develop.18) (2025-07-07)
+
+
+### Bug Fixes
+
+* raid timer in search ([23275f6](https://github.com/WatWowMap/ReactMap/commit/23275f6276cb014eab1858d693c9792731f64e3b))
+
+# [1.36.0-develop.17](https://github.com/WatWowMap/ReactMap/compare/v1.36.0-develop.16...v1.36.0-develop.17) (2025-07-07)
+
+
+### Bug Fixes
+
+* search ([26eaaab](https://github.com/WatWowMap/ReactMap/commit/26eaaabdb08fb0a93bc5ba73118678425a63f11b))
+
 # [1.36.0-develop.16](https://github.com/WatWowMap/ReactMap/compare/v1.36.0-develop.15...v1.36.0-develop.16) (2025-04-11)
 
 

README.md

@@ -48,6 +48,7 @@ Pokemon GO Map frontend built with React.
 ## Backends Supported
 
 - [Chuck](https://github.com/WatWowMap/Chuck)
+- [Map-A-Droid (MAD)](https://github.com/Map-A-Droid/MAD)
 - [RealDeviceMap (RDM)](https://github.com/realdevicemap/realdevicemap)
 - [Golbat](https://github.com/UnownHash/Golbat)
 

config/custom-environment-variables.json

@@ -791,6 +791,10 @@
         "__name": "CLIENT_SIDE_OPTIONS_POKESTOPS_CUSTOM_RANGE",
         "__format": "number"
       },
+      "madQuestText": {
+        "__name": "CLIENT_SIDE_OPTIONS_POKESTOPS_MAD_QUEST_TEXT",
+        "__format": "boolean"
+      },
       "hasQuestIndicator": {
         "__name": "CLIENT_SIDE_OPTIONS_POKESTOPS_HAS_QUEST_INDICATOR",
         "__format": "boolean"

config/default.json

@@ -368,6 +368,7 @@
       "interactionRanges": false,
       "lureRange": false,
       "customRange": 0,
+      "madQuestText": false,
       "hasQuestIndicator": true,
       "showArBadge": false,
       "enablePokestopPopupCoords": false,
@@ -605,7 +606,7 @@
   },
   "scanner": {
     "backendConfig": {
-      "platform": "rdm/dragonite/custom",
+      "platform": "rdm/mad/dragonite/custom",
       "apiEndpoint": "http://ip:port/api/",
       "headers": [],
       "apiUsername": "username",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.36.0-develop.16",
+  "version": "1.36.0-develop.19",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",
@@ -218,6 +218,5 @@
   "engines": {
     "node": ">=18",
     "yarn": "^1.22.x"
-  },
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  }
 }

packages/config/.configref

@@ -1 +1 @@
-25382
+25415

packages/locales/lib/generated/de.json

@@ -185,6 +185,7 @@
   "min_iv_circle": "Minimales Kreis IV",
   "interaction_ranges": "Interaktionsbereiche",
   "cannot_connect": "\nVerbindung zum Server derzeit nicht möglich.\nEin sofortiger weiterer Versuch verursacht nur mehr Probleme.\nBitte versuchen Sie es in ein paar Minuten erneut.\n\n- Map Admin Team",
+  "mad_quest_text": "Native Quests",
   "xs": "XS",
   "primary": "Primär",
   "secondary": "Sekundär",

packages/locales/lib/generated/es.json

@@ -185,6 +185,7 @@
   "min_iv_circle": "Círculo IV Mínimo",
   "interaction_ranges": "Rangos de Interacción",
   "cannot_connect": "\nNo se puede conectar al servidor en este momento.\nIntentarlo de nuevo inmediatamente solo causará más problemas.\nPor favor, inténtalo de nuevo en unos minutos.\n\n- Equipo de Administración del Mapa",
+  "mad_quest_text": "Misiones Nativas",
   "xs": "XS",
   "primary": "Primario",
   "secondary": "Secundario",

packages/locales/lib/generated/fr.json

@@ -185,6 +185,7 @@
   "min_iv_circle": "Cercle IV Minimum",
   "interaction_ranges": "Plages d'Interaction",
   "cannot_connect": "\nImpossible de se connecter au serveur pour le moment.\nRéessayer immédiatement ne fera qu'aggraver les problèmes.\nVeuillez réessayer dans quelques minutes.\n\n- Équipe Admin de la Carte",
+  "mad_quest_text": "Quêtes Natives",
   "xs": "XS",
   "primary": "Primaire",
   "secondary": "Secondaire",

packages/locales/lib/generated/hi.json

@@ -185,6 +185,7 @@
   "min_iv_circle": "न्यूनतम सर्कल IV",
   "interaction_ranges": "इंटरेक्शन रेंज",
   "cannot_connect": "\nइस समय सर्वर से कनेक्ट नहीं हो सकता।\nतुरंत फिर से प्रयास करने से अधिक समस्याएँ होंगी।\nकृपया कुछ मिनटों में पुनः प्रयास करें।\n\n- मैप एडमिन टीम",
+  "mad_quest_text": "मूल क्वेस्ट्स",
   "xs": "XS",
   "primary": "प्राथमिक",
   "secondary": "द्वितीयक",