Merge pull request #1178 from WatWowMap/develop

Sync Dev to Main

Author: Mygod

CHANGELOG.md

@@ -1,3 +1,38 @@
+## [1.40.1-develop.5](https://github.com/WatWowMap/ReactMap/compare/v1.40.1-develop.4...v1.40.1-develop.5) (2025-12-09)
+
+
+### Bug Fixes
+
+* flyTo stops location following ([08e4eac](https://github.com/WatWowMap/ReactMap/commit/08e4eac27a2d6e1e804339ac3c887f5051e248e0))
+
+## [1.40.1-develop.4](https://github.com/WatWowMap/ReactMap/compare/v1.40.1-develop.3...v1.40.1-develop.4) (2025-12-04)
+
+
+### Bug Fixes
+
+* locatecontrol ([754e544](https://github.com/WatWowMap/ReactMap/commit/754e54446059c0a4f0c5200b193b3a73972b43a4))
+
+## [1.40.1-develop.3](https://github.com/WatWowMap/ReactMap/compare/v1.40.1-develop.2...v1.40.1-develop.3) (2025-11-25)
+
+
+### Bug Fixes
+
+* missing translations ([238f602](https://github.com/WatWowMap/ReactMap/commit/238f6021eec53b12ec4a1ad1a1080d0718293b02))
+
+## [1.40.1-develop.2](https://github.com/WatWowMap/ReactMap/compare/v1.40.1-develop.1...v1.40.1-develop.2) (2025-11-25)
+
+
+### Bug Fixes
+
+* incorrect escape shiny rate tooltip ([ebf31da](https://github.com/WatWowMap/ReactMap/commit/ebf31da2af9528e686130da6aa8e7f52f77e0d18)), closes [#1160](https://github.com/WatWowMap/ReactMap/issues/1160)
+
+## [1.40.1-develop.1](https://github.com/WatWowMap/ReactMap/compare/v1.40.0...v1.40.1-develop.1) (2025-11-24)
+
+
+### Bug Fixes
+
+* stationed pokemon not updating in popup ([cb3ff09](https://github.com/WatWowMap/ReactMap/commit/cb3ff095fb312133579a87884d391d2a4ee0afe7))
+
 # [1.40.0](https://github.com/WatWowMap/ReactMap/compare/v1.39.0...v1.40.0) (2025-11-24)
 
 

config/local.example.json

@@ -36,6 +36,7 @@
           "scanCell",
           "spawnpoint",
           "weather",
+          "tappable",
           "route",
           "nest",
           "station"
@@ -138,6 +139,11 @@
         "trialPeriodEligible": false,
         "roles": []
       },
+      "tappables": {
+        "enabled": true,
+        "trialPeriodEligible": false,
+        "roles": []
+      },
       "pokestops": {
         "enabled": true,
         "trialPeriodEligible": false,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.40.0",
+  "version": "1.40.1-develop.5",
   "private": true,
   "description": "React based frontend map.",
   "license": "MIT",
@@ -100,7 +100,7 @@
   "dependencies": {
     "@apollo/client": "3.11.4",
     "@apollo/server": "4.11.0",
-    "@emotion/react": "11.13.0",
+    "@emotion/react": "11.14.0",
     "@emotion/styled": "11.13.0",
     "@graphql-tools/graphql-file-loader": "8.0.1",
     "@graphql-tools/load": "8.0.2",
@@ -117,7 +117,7 @@
     "@sentry/react": "^7.65.0",
     "@turf/boolean-contains": "7.1.0",
     "@turf/boolean-overlap": "7.1.0",
-    "@turf/boolean-point-in-polygon": "7.1.0",
+    "@turf/boolean-point-in-polygon": "7.3.1",
     "@turf/center": "7.1.0",
     "@turf/destination": "7.1.0",
     "@turf/distance": "7.1.0",
@@ -135,7 +135,7 @@
     "discord.js": "^14.18.0",
     "dlv": "^1.1.3",
     "dotenv": "^16.3.1",
-    "express": "5.0.1",
+    "express": "5.2.1",
     "express-mysql-session": "3.0.3",
     "express-rate-limit": "7.4.0",
     "express-session": "^1.18.1",
@@ -150,16 +150,16 @@
     "knex": "3.1.0",
     "leaflet": "1.9.4",
     "leaflet-arrowheads": "^1.4.0",
-    "leaflet.locatecontrol": "0.81.0",
+    "leaflet.locatecontrol": "0.85.1",
     "lodash": "^4.17.21",
     "long": "^4.0.0",
-    "moment-timezone": "^0.5.43",
+    "moment-timezone": "^0.6.0",
     "mysql2": "3.11.0",
     "node-cache": "^5.1.2",
     "node-fetch": "2.7.0",
     "node-geocoder": "^4.2.0",
     "nodes2ts": "3.0.0",
-    "objection": "3.1.4",
+    "objection": "3.1.5",
     "ohbem": "1.5.3",
     "passport": "^0.6.0",
     "passport-discord": "https://github.com/tonestrike/passport-discord.git",
@@ -170,7 +170,7 @@
     "react-i18next": "15.0.1",
     "react-leaflet": "4.2.1",
     "react-router-dom": "^6.15.0",
-    "react-virtuoso": "4.10.1",
+    "react-virtuoso": "4.16.1",
     "rtree": "^1.4.2",
     "source-map": "^0.7.4",
     "suncalc": "^1.9.0",

packages/locales/lib/generated/de.json

@@ -790,5 +790,37 @@
   "expert_group_2": "Gruppe 2",
   "expert_group_2_description": "Hohes Level mit perfektem Angriff.",
   "expert_combine_description": "Kombiniere sie mit einer , oder |:",
-  "expert_result_description": "Dieser Filter zeigt ein Pokémon an, wenn es die Kriterien für Gruppe 1 ERFÜLLT ODER wenn es alle Kriterien für Gruppe 2 erfüllt."
+  "expert_result_description": "Dieser Filter zeigt ein Pokémon an, wenn es die Kriterien für Gruppe 1 ERFÜLLT ODER wenn es alle Kriterien für Gruppe 2 erfüllt.",
+  "jump_to_areas_attribution": "Suche über OpenStreetMap",
+  "unknown_background_with_id": "Unbekannter Hintergrund #{{id}}",
+  "unknown_costume": "Unbekanntes Kostüm",
+  "last_active": "Zuletzt aktiv: {{time}}",
+  "shiny_sample": "{{percentage}}%: {{shiny}} Shiny/{{checks}} Checks seit {{date}}",
+  "location_error_default": "Dein Standort konnte nicht abgerufen werden",
+  "location_error_permission_denied": "Standortzugriff verweigert. Bitte erlaube Standortberechtigungen im Browser.",
+  "location_error_position_unavailable": "Dein Standort ist derzeit nicht verfügbar. Bitte versuche es später erneut.",
+  "location_error_timeout": "Standortabfrage hat zu lange gedauert. Bitte versuche es erneut.",
+  "showcase_range": "Showcase-Reichweite",
+  "seen_tappable_encounter": "Antippbare Begegnung",
+  "seen_tappable_lure_encounter": "Antippbare Lockmodul-Begegnung",
+  "tappable_origin_from": "von",
+  "backup_error_generic": "Backup konnte nicht erstellt werden. Bitte versuche es erneut.",
+  "backup_error_too_large": "Backup ist zu groß zum Hochladen. Verringere die Größe und versuche es erneut.",
+  "compact_route_view": "Kompakte Routenansicht",
+  "route_short_code": "Route-Teilen-Code: ",
+  "route_anchor_count_one": "{{count}} Route",
+  "route_anchor_count_other": "{{count}} Routen",
+  "shortcode_copied_to_clipboard": "Code in die Zwischenablage kopiert!",
+  "copy_failed": "Kopieren fehlgeschlagen",
+  "tappables": "Antippbare Objekte",
+  "tappable_type_breakfast": "Zygarde-Zelle",
+  "tappable_type_hat": "Partyhut",
+  "tappable_type_maple": "Apfel",
+  "tappable_type_pokeball": "Pokéball",
+  "search_tappables": "Antippbare Objekte suchen",
+  "inactive_stations": "Inaktive Kraftquellen",
+  "station_battle_cp_multiplier": "WP-Multiplikator: {{value}}",
+  "station_battle_cp_tooltip_extra": ". Zusätzliche versteckte Multiplikatoren können bei Kämpfen mit 5+ Sternen vorhanden sein",
+  "hp": "KP",
+  "inactive_since": "Inaktiv seit {{time}}"
 }

packages/locales/lib/generated/es.json

@@ -819,5 +819,37 @@
   "expert_group_2": "Grupo 2",
   "expert_group_2_description": "Alto nivel con ataque perfecto.",
   "expert_combine_description": "Combínalos con un , o |:",
-  "expert_result_description": "Este filtro mostrará un Pokémon si coincide con los criterios del Grupo 1 O si coincide con todos los criterios del Grupo 2."
+  "expert_result_description": "Este filtro mostrará un Pokémon si coincide con los criterios del Grupo 1 O si coincide con todos los criterios del Grupo 2.",
+  "jump_to_areas_attribution": "Búsqueda con tecnología de OpenStreetMap",
+  "unknown_background_with_id": "Fondo desconocido #{{id}}",
+  "unknown_costume": "Disfraz desconocido",
+  "last_active": "Última actividad: {{time}}",
+  "shiny_sample": "{{percentage}}%: {{shiny}} shiny/{{checks}} comprobaciones desde {{date}}",
+  "location_error_default": "No se pudo obtener tu ubicación",
+  "location_error_permission_denied": "Acceso a la ubicación denegado. Activa los permisos de ubicación en tu navegador.",
+  "location_error_position_unavailable": "Tu ubicación no está disponible en este momento. Inténtalo de nuevo más tarde.",
+  "location_error_timeout": "La solicitud de ubicación agotó el tiempo. Inténtalo de nuevo.",
+  "showcase_range": "Rango de exhibición",
+  "seen_tappable_encounter": "Encuentro tocable",
+  "seen_tappable_lure_encounter": "Encuentro de cebo tocable",
+  "tappable_origin_from": "desde",
+  "backup_error_generic": "No se pudo crear la copia de seguridad. Inténtalo de nuevo.",
+  "backup_error_too_large": "La copia de seguridad es demasiado grande para subirla. Reduce su tamaño e inténtalo de nuevo.",
+  "compact_route_view": "Vista de ruta compacta",
+  "route_short_code": "Código para compartir ruta: ",
+  "route_anchor_count_one": "{{count}} ruta",
+  "route_anchor_count_other": "{{count}} rutas",
+  "shortcode_copied_to_clipboard": "¡Código copiado al portapapeles!",
+  "copy_failed": "Error al copiar",
+  "tappables": "Tocables",
+  "tappable_type_breakfast": "Célula de Zygarde",
+  "tappable_type_hat": "Gorro festivo",
+  "tappable_type_maple": "Manzana",
+  "tappable_type_pokeball": "Poké Ball",
+  "search_tappables": "Buscar tocables",
+  "inactive_stations": "Puntos de poder inactivos",
+  "station_battle_cp_multiplier": "Multiplicador de PC: {{value}}",
+  "station_battle_cp_tooltip_extra": ". Puede haber multiplicadores ocultos adicionales en combates de 5+ estrellas",
+  "hp": "PS",
+  "inactive_since": "Inactivo desde {{time}}"
 }

packages/locales/lib/generated/fr.json

@@ -817,5 +817,37 @@
   "expert_group_2": "Groupe 2",
   "expert_group_2_description": "Niveau élevé avec une attaque parfaite.",
   "expert_combine_description": "Combinez-les avec une , ou | :",
-  "expert_result_description": "Ce filtre affichera un Pokémon s'il correspond aux critères du Groupe 1 OU s'il correspond à tous les critères du Groupe 2."
+  "expert_result_description": "Ce filtre affichera un Pokémon s'il correspond aux critères du Groupe 1 OU s'il correspond à tous les critères du Groupe 2.",
+  "jump_to_areas_attribution": "Recherche propulsée par OpenStreetMap",
+  "unknown_background_with_id": "Arrière-plan inconnu #{{id}}",
+  "unknown_costume": "Costume inconnu",
+  "last_active": "Dernière activité : {{time}}",
+  "shiny_sample": "{{percentage}}% : {{shiny}} shiny/{{checks}} vérifications depuis {{date}}",
+  "location_error_default": "Impossible de récupérer votre position",
+  "location_error_permission_denied": "Accès à la localisation refusé. Veuillez activer la localisation dans votre navigateur.",
+  "location_error_position_unavailable": "Votre position est actuellement indisponible. Réessayez plus tard.",
+  "location_error_timeout": "La demande de localisation a expiré. Veuillez réessayer.",
+  "showcase_range": "Portée du concours",
+  "seen_tappable_encounter": "Rencontre cliquable",
+  "seen_tappable_lure_encounter": "Rencontre d'appât cliquable",
+  "tappable_origin_from": "de",
+  "backup_error_generic": "Impossible de créer la sauvegarde. Veuillez réessayer.",
+  "backup_error_too_large": "La sauvegarde est trop volumineuse pour être envoyée. Réduisez sa taille et réessayez.",
+  "compact_route_view": "Vue de route compacte",
+  "route_short_code": "Code de partage de route : ",
+  "route_anchor_count_one": "{{count}} route",
+  "route_anchor_count_other": "{{count}} routes",
+  "shortcode_copied_to_clipboard": "Code copié dans le presse-papiers !",
+  "copy_failed": "Échec de la copie",
+  "tappables": "Cliquables",
+  "tappable_type_breakfast": "Cellule de Zygarde",
+  "tappable_type_hat": "Chapeau de fête",
+  "tappable_type_maple": "Pomme",
+  "tappable_type_pokeball": "Poké Ball",
+  "search_tappables": "Rechercher des cliquables",
+  "inactive_stations": "Points d'énergie inactifs",
+  "station_battle_cp_multiplier": "Multiplicateur PC : {{value}}",
+  "station_battle_cp_tooltip_extra": ". Des multiplicateurs cachés supplémentaires peuvent être présents pour les combats 5+ étoiles",
+  "hp": "PV",
+  "inactive_since": "Inactif depuis {{time}}"
 }

packages/locales/lib/generated/hi.json

@@ -822,5 +822,41 @@
   "expert_group_2": "समूह 2",
   "expert_group_2_description": "उच्च स्तर के साथ परफेक्ट हमला।",
   "expert_combine_description": "इन्हें , या | के साथ मिलाएं:",
-  "expert_result_description": "यह फ़िल्टर एक पौकémon को दिखाएगा यदि यह समूह 1 के मानदंडों से मेल खाता है या यदि यह समूह 2 के सभी मानदंडों से मेल खाता है।"
+  "expert_result_description": "यह फ़िल्टर एक पौकémon को दिखाएगा यदि यह समूह 1 के मानदंडों से मेल खाता है या यदि यह समूह 2 के सभी मानदंडों से मेल खाता है।",
+  "jump_to_areas_attribution": "खोज OpenStreetMap द्वारा संचालित",
+  "unknown_background_with_id": "अज्ञात पृष्ठभूमि #{{id}}",
+  "unknown_costume": "अज्ञात पोशाक",
+  "last_active": "आखिरी बार सक्रिय: {{time}}",
+  "shiny_sample": "{{percentage}}%: {{date}} से {{checks}} चेक्स में {{shiny}} शाइनी",
+  "location_error_default": "आपका स्थान प्राप्त नहीं किया जा सका",
+  "location_error_permission_denied": "स्थान एक्सेस अस्वीकृत। कृपया अपने ब्राउज़र में स्थान अनुमति सक्षम करें।",
+  "location_error_position_unavailable": "आपका स्थान अभी उपलब्ध नहीं है। कृपया बाद में पुनः प्रयास करें।",
+  "location_error_timeout": "स्थान अनुरोध का समय समाप्त हो गया। कृपया पुनः प्रयास करें।",
+  "showcase_range": "शोकेस रेंज",
+  "seen_tappable_encounter": "टैप करने योग्य मुठभेड़",
+  "seen_tappable_lure_encounter": "टैप करने योग्य लुअर मुठभेड़",
+  "tappable_origin_from": "से",
+  "backup_error_generic": "बैकअप नहीं बना सके। कृपया पुनः प्रयास करें।",
+  "backup_error_too_large": "बैकअप अपलोड करने के लिए बहुत बड़ा है। आकार कम करें और पुनः प्रयास करें।",
+  "compact_route_view": "कॉम्पैक्ट रूट दृश्य",
+  "route_short_code": "रूट शेयर कोड: ",
+  "route_anchor_count_one": "{{count}} मार्ग",
+  "route_anchor_count_other": "{{count}} मार्ग",
+  "shortcode_copied_to_clipboard": "कोड क्लिपबोर्ड में कॉपी हुआ!",
+  "copy_failed": "कॉपी विफल",
+  "tappables": "टैप करने योग्य",
+  "tappable_type_breakfast": "ज़ाइगार्ड सेल",
+  "tappable_type_hat": "पार्टी हैट",
+  "tappable_type_maple": "सेब",
+  "tappable_type_pokeball": "पोके बॉल",
+  "search_tappables": "टैप करने योग्य खोजें",
+  "inactive_stations": "निष्क्रिय शक्ति स्थान",
+  "station_battle_cp_multiplier": "सीपी गुणक: {{value}}",
+  "station_battle_cp_tooltip_extra": ". 5+ सितारा लड़ाइयों के लिए अतिरिक्त छुपे गुणक हो सकते हैं",
+  "hp": "HP",
+  "inactive_since": "{{time}} से निष्क्रिय",
+  "rsvp_0": "no rsvp",
+  "rsvp_1": "rsvp",
+  "rsvp_2": "rsvp_only",
+  "rsvp_changes": "RSVP परिवर्तन"
 }

packages/locales/lib/generated/id.json

@@ -822,5 +822,41 @@
   "expert_group_2": "Grup 2",
   "expert_group_2_description": "Level tinggi dengan serangan sempurna.",
   "expert_combine_description": "Gabungkan mereka dengan , atau |:",
-  "expert_result_description": "Filter ini akan menunjukkan Pokémon jika cocok dengan kriteria untuk Grup 1 ATAU jika cocok dengan semua kriteria untuk Grup 2."
+  "expert_result_description": "Filter ini akan menunjukkan Pokémon jika cocok dengan kriteria untuk Grup 1 ATAU jika cocok dengan semua kriteria untuk Grup 2.",
+  "jump_to_areas_attribution": "Pencarian didukung oleh OpenStreetMap",
+  "unknown_background_with_id": "Latar belakang tidak dikenal #{{id}}",
+  "unknown_costume": "Kostum tidak dikenal",
+  "last_active": "Terakhir aktif: {{time}}",
+  "shiny_sample": "{{percentage}}%: {{shiny}} shiny/{{checks}} cek sejak {{date}}",
+  "location_error_default": "Tidak dapat mengambil lokasi Anda",
+  "location_error_permission_denied": "Akses lokasi ditolak. Harap aktifkan izin lokasi di browser Anda.",
+  "location_error_position_unavailable": "Lokasi Anda saat ini tidak tersedia. Silakan coba lagi nanti.",
+  "location_error_timeout": "Permintaan lokasi habis waktu. Silakan coba lagi.",
+  "showcase_range": "Jangkauan Showcase",
+  "seen_tappable_encounter": "Pertemuan yang dapat diketuk",
+  "seen_tappable_lure_encounter": "Pertemuan Lure yang dapat diketuk",
+  "tappable_origin_from": "dari",
+  "backup_error_generic": "Tidak dapat membuat cadangan. Silakan coba lagi.",
+  "backup_error_too_large": "Cadangan terlalu besar untuk diunggah. Kurangi ukurannya dan coba lagi.",
+  "compact_route_view": "Tampilan Rute Ringkas",
+  "route_short_code": "Kode Berbagi Rute: ",
+  "route_anchor_count_one": "{{count}} Rute",
+  "route_anchor_count_other": "{{count}} Rute",
+  "shortcode_copied_to_clipboard": "Kode disalin ke papan klip!",
+  "copy_failed": "Gagal menyalin",
+  "tappables": "Tappable",
+  "tappable_type_breakfast": "Sel Zygarde",
+  "tappable_type_hat": "Topi Pesta",
+  "tappable_type_maple": "Apel",
+  "tappable_type_pokeball": "Poké Ball",
+  "search_tappables": "Cari Tappable",
+  "inactive_stations": "Tempat Energi tidak aktif",
+  "station_battle_cp_multiplier": "Pengali CP: {{value}}",
+  "station_battle_cp_tooltip_extra": ". Pengali tersembunyi tambahan mungkin ada untuk pertempuran bintang 5+",
+  "hp": "HP",
+  "inactive_since": "Tidak aktif sejak {{time}}",
+  "rsvp_0": "no rsvp",
+  "rsvp_1": "rsvp",
+  "rsvp_2": "rsvp_only",
+  "rsvp_changes": "Perubahan RSVP"
 }