Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: stations / dynamax #1050

Merged
merged 66 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
f6a479b
feat: stations
TurtIeSocks Sep 4, 2024
d661c9b
refactor: show more s2 cells in dev
TurtIeSocks Sep 4, 2024
7879a7f
fix: just a lot of things :dango:
TurtIeSocks Sep 4, 2024
a200e50
fix: local.example.json additions
TurtIeSocks Sep 4, 2024
115cbf9
style: more popup formatting fixes
TurtIeSocks Sep 4, 2024
7037c46
fix: station clustering in config
TurtIeSocks Sep 4, 2024
7bd4c50
feat: station searching
TurtIeSocks Sep 4, 2024
9f7532f
fix: undefined/null issue in marker
TurtIeSocks Sep 4, 2024
fd2e7c4
fix: a slightly better temporary image hack
TurtIeSocks Sep 4, 2024
f1fdf16
style: station popup
TurtIeSocks Sep 5, 2024
4dd8b2c
fix: select query
TurtIeSocks Sep 5, 2024
6e61dca
feat: stations
TurtIeSocks Sep 4, 2024
cd5f79e
refactor: show more s2 cells in dev
TurtIeSocks Sep 4, 2024
421b06e
fix: just a lot of things :dango:
TurtIeSocks Sep 4, 2024
89706eb
fix: local.example.json additions
TurtIeSocks Sep 4, 2024
08a9ef2
style: more popup formatting fixes
TurtIeSocks Sep 4, 2024
d87dd0e
fix: station clustering in config
TurtIeSocks Sep 4, 2024
fbf3b6d
feat: station searching
TurtIeSocks Sep 4, 2024
48ee917
fix: undefined/null issue in marker
TurtIeSocks Sep 4, 2024
29b9eb6
fix: a slightly better temporary image hack
TurtIeSocks Sep 4, 2024
6cf3b37
style: station popup
TurtIeSocks Sep 5, 2024
cac8eab
fix: select query
TurtIeSocks Sep 5, 2024
7aeacaa
Merge branch 'stations' of https://github.com/WatWowMap/ReactMap into…
TurtIeSocks Sep 9, 2024
ed01ebb
style: remove visible toggle icon
TurtIeSocks Sep 9, 2024
fb31236
chore: prettier
TurtIeSocks Sep 9, 2024
5b7b58f
fix: encode title in apollo client
TurtIeSocks Sep 9, 2024
a1cfb57
fix: optimize dynamax code
TurtIeSocks Sep 10, 2024
0352204
fix: missing >
TurtIeSocks Sep 10, 2024
dcd994a
fix: station and dynamax perms on profile page
TurtIeSocks Sep 10, 2024
5ba34c9
feat: station override dropdown
TurtIeSocks Sep 10, 2024
6e35170
fix: remove log
TurtIeSocks Sep 10, 2024
19ae836
fix: some type imports
TurtIeSocks Sep 10, 2024
cd32477
fix: forgot to rename from `battleTimers` => `stationTimers`
TurtIeSocks Sep 10, 2024
f720aa3
fix: `battleOpacity` => `stationsOpacity`
TurtIeSocks Sep 10, 2024
dd66d03
fix: memo comparison
TurtIeSocks Sep 10, 2024
abb047a
fix: missing translations
TurtIeSocks Sep 10, 2024
0a565ed
fix: more consistent `is_battle_available` usage
TurtIeSocks Sep 10, 2024
553ab86
feat: stationed pokemon
TurtIeSocks Sep 11, 2024
a1776f1
fix: uicons 1.4.1
TurtIeSocks Sep 11, 2024
32b22ff
fix: add missing copy coords menu item
TurtIeSocks Sep 12, 2024
79c937e
style: dense copy btn
TurtIeSocks Sep 12, 2024
73fd35a
fix: some client side perm stuff
TurtIeSocks Sep 12, 2024
d676875
fix: missing translation
TurtIeSocks Sep 12, 2024
7eaf43d
fix: add types & onClose callback to `CopyCoords`
TurtIeSocks Sep 12, 2024
a1f527a
feat: german translations for dynamax
ReuschelCGN Sep 10, 2024
2e1da04
Update general.d.ts
ReuschelCGN Sep 10, 2024
b1faede
Update de.json
ReuschelCGN Sep 10, 2024
fdd13ef
Update de.json
ReuschelCGN Sep 10, 2024
f5e95bb
Update de.json
ReuschelCGN Sep 10, 2024
1ec274a
Update de.json
ReuschelCGN Sep 11, 2024
b2d9e83
Update en.json
ReuschelCGN Sep 11, 2024
c7ffd3c
Update de.json
ReuschelCGN Sep 11, 2024
3ae8c1c
Update de.json
ReuschelCGN Sep 11, 2024
a21c85f
Update en.json
ReuschelCGN Sep 11, 2024
6200630
Update de.json
ReuschelCGN Sep 11, 2024
b0b96b4
Update de.json
ReuschelCGN Sep 12, 2024
9c9dc54
Update de.json
ReuschelCGN Sep 12, 2024
6e171c8
Update de.json
ReuschelCGN Sep 12, 2024
826ef80
Update de.json
ReuschelCGN Sep 12, 2024
78536f0
Merge pull request #1054 from ReuschelCGN/dynamax
TurtIeSocks Sep 12, 2024
3bffd7e
feat: categories in options menus
TurtIeSocks Sep 10, 2024
3c53db3
Merge pull request #1053 from WatWowMap/option-categories
TurtIeSocks Sep 13, 2024
4c5dfcc
feat: bread mode uicons support
TurtIeSocks Sep 13, 2024
70316d6
feat: station timers + bread mon moves
TurtIeSocks Sep 20, 2024
f845400
style: station popup
TurtIeSocks Sep 23, 2024
da4c6a6
Merge branch 'develop' into stations
TurtIeSocks Sep 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 55 additions & 5 deletions config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"scanAreas": 10000,
"scanCells": 10,
"submissionCells": 500,
"stations": 15,
"weather": 30
},
"searchable": {
Expand All @@ -47,20 +48,23 @@
"portals": true,
"nests": true,
"pokemon": true,
"invasions": true
"invasions": true,
"stations": true
},
"queryUpdateHours": {
"pokemon": 0.17,
"quests": 0.25,
"raids": 0.05,
"nests": 0.5,
"historicalRarity": 6
"historicalRarity": 6,
"stations": 0.05
},
"queryOnSessionInit": {
"pokemon": false,
"quests": false,
"raids": true,
"nests": false
"nests": false,
"stations": false
},
"dataRequestLimits": {
"categories": {
Expand All @@ -71,7 +75,8 @@
"pokestops": 0,
"portals": 0,
"routes": 0,
"weather": 0
"weather": 0,
"stations": 0
},
"time": 60
},
Expand All @@ -83,7 +88,8 @@
"portals": 5000,
"spawnpoints": 10000,
"nests": 2500,
"scanCells": 5000
"scanCells": 5000,
"stations": 5000
},
"pvp": {
"leagues": [
Expand All @@ -110,6 +116,7 @@
},
"portalUpdateLimit": 30,
"weatherCellLimit": 3,
"stationUpdateLimit": 30,
"searchResultsLimit": 15,
"searchSoftKmLimit": 10,
"searchHardKmLimit": 100,
Expand Down Expand Up @@ -150,6 +157,7 @@
"gyms",
"nests",
"pokestops",
"stations",
"pokemon",
"routes",
"wayfarer",
Expand Down Expand Up @@ -255,6 +263,7 @@
"enableGymPopupCoordsSelector": false,
"enablePokestopPopupCoordsSelector": false,
"enablePortalPopupCoordsSelector": false,
"enableStationPopupCoordsSelector": false,
"customFloatingIcons": [],
"expandAllScanAreas": false,
"enableRouteDownload": false
Expand Down Expand Up @@ -284,6 +293,10 @@
"spawnpoints": {
"zoomLevel": 12,
"forcedLimit": 5000
},
"stations": {
"zoomLevel": 14,
"forcedLimit": 2500
}
},
"messageOfTheDay": {
Expand Down Expand Up @@ -364,6 +377,15 @@
"opacityFiveMinutes": 0.5,
"opacityOneMinute": 0.25
},
"stations": {
"clustering": true,
"stationTimers": false,
"stationsOpacity": true,
"enableStationPopupCoords": false,
"opacityTenMinutes": 0.75,
"opacityFiveMinutes": 0.5,
"opacityOneMinute": 0.25
},
"pokemon": {
"clustering": true,
"pokemonTimers": false,
Expand Down Expand Up @@ -553,6 +575,12 @@
"s14Cells": true,
"includeSponsored": true
},
"stations": {
"enabled": false,
"pokemon": false,
"battleTier": "all",
"battles": false
},
"s2cells": {
"enabled": false,
"cells": []
Expand Down Expand Up @@ -839,6 +867,16 @@
"enabled": true,
"trialPeriodEligible": false,
"roles": []
},
"stations": {
"enabled": true,
"trialPeriodEligible": false,
"roles": []
},
"dynamax": {
"enabled": true,
"trialPeriodEligible": false,
"roles": []
}
}
},
Expand Down Expand Up @@ -960,6 +998,18 @@
"md": 25,
"lg": 35,
"xl": 45
},
"station": {
"sm": 15,
"md": 25,
"lg": 35,
"xl": 45
},
"dynamax": {
"sm": 15,
"md": 25,
"lg": 35,
"xl": 45
}
}
},
Expand Down
13 changes: 12 additions & 1 deletion config/local.example.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
"spawnpoint",
"weather",
"route",
"nest"
"nest",
"station"
]
},
{
Expand Down Expand Up @@ -236,6 +237,16 @@
"enabled": true,
"trialPeriodEligible": false,
"roles": []
},
"stations": {
"enabled": true,
"trialPeriodEligible": false,
"roles": []
},
"dynamax": {
"enabled": true,
"trialPeriodEligible": false,
"roles": []
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
"source-map": "^0.7.4",
"suncalc": "^1.9.0",
"supercluster": "^8.0.1",
"uicons.js": "1.2.0",
"uicons.js": "2.0.1",
"zustand": "4.4.6"
},
"devDependencies": {
Expand Down
1 change: 1 addition & 0 deletions packages/config/lib/mutations.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const applyMutations = (config) => {
'nests',
'pokestops',
'pokemon',
'stations',
'routes',
'wayfarer',
's2cells',
Expand Down
49 changes: 37 additions & 12 deletions packages/locales/lib/human/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
"legacy": "Legendär",
"id": "ID",
"location": "Standort",
"search_pokemon": "Suche Pokemon",
"search_nests": "Suche Nester",
"search_gyms": "Suche Arena",
"search_pokestops": "Suche Pokestops",
"search_pokemon": "Pokemon durchsuchen",
"search_nests": "Nester durchsuchen",
"search_gyms": "Arenen durchsuchen",
"search_pokestops": "Pokestops durchsuchen",
"sm": "S",
"md": "M",
"lg": "L",
Expand Down Expand Up @@ -66,7 +66,7 @@
"settings": "Einstellungen",
"advanced": "erweitert",
"icons": "Symbole",
"navigation": "navigation",
"navigation": "Navigation",
"drawer": "Drawer",
"iconsDefault": "Standard",
"drawer_temporary": "Vorübergehend",
Expand Down Expand Up @@ -422,7 +422,7 @@
"poke_global": "Alle",
"amount": "Anzahl",
"specific_gym": "Spezifische Arena",
"search_location": "Suche Standorte",
"search_location": "Standorte durchsuchen",
"search_specific": "Suche nach spezifischer {{category}}",
"webhook_success_gym": "Raids, Eier, und Team Wechsel Alarme wurden hinzugefügt!",
"slot_changes": "Platzänderungen",
Expand Down Expand Up @@ -533,11 +533,11 @@
"early_old_client_title": "veraltet",
"early_old_client_body": "Eine alte Version dieser Map könnte im Browser zwischengespeichert sein, lösche den Cache, bevor diese Map verwendet werden kann.",
"refresh": "Aktualisieren",
"search_raids": "Suche nach Raids",
"search_eggs": "Suche nach Eier",
"search_quests": "Suche nach Quests",
"search_lures": "Suche nach Lockmodulen",
"search_invasions": "Suche nach Invasionen",
"search_raids": "Raids durchsuchen",
"search_eggs": "Eier durchsuchen",
"search_quests": "Quests durchsuchen",
"search_lures": "Lockmodule durchsuchen",
"search_invasions": "Invasionen durchsuchen",
"no_alerts": "Keine Benachrichtigungen gefunden",
"points": "Punkte",
"day": "Tag",
Expand Down Expand Up @@ -763,5 +763,30 @@
"enter_translation": "Übersetzung eingeben",
"individual_filters": "individuell gefiltert",
"best_buddy": "Bester Kumpel",
"data_limit_reached": "Du hast kürzlich zu viele Daten angefordert und befindest dich im Cooldown bis {{until}}"
"data_limit_reached": "Du hast kürzlich zu viele Daten angefordert und befindest dich im Cooldown bis {{until}}",
"unknown_station": "unbekannte Kraftquelle",
"exclude_battle": "Dyna-Raids ausschließen",
"station": "Kraftquelle",
"stations": "Kraftquellen",
"stations_filters": "Dynamax Filter Einstellungen",
"stations_options": "Kraftquellen Optionen",
"all_stations": "alle Kraftquellen",
"search_battles": "Dyna-Raids durchsuchen",
"started": "gestartet",
"ended": "beendet",
"search_stations": "Kraftquellen durchsuchen",
"global_search_stations": "Füge den Namen der Kraftquelle ein...",
"station_timers": "Kraftquellen Timer",
"stations_opacity": "Kraftquellen Durchsichtigkeit",
"max_battles": "Dyna-Raids",
"dynamax": "Dynamax",
"stations_subtitle": "Kraftquellen auf der Map anzeigen",
"dynamax_subtitle": "Dyna-Raids auf der Map anzeigen",
"override": "Dyna-Raid Override",
"station_icons": "Kraftquellen Icons",
"stationed_pokemon": "platzierte Pokémon",
"attack_bonus": "Angriffsbonus",
"no_stationed_pokemon": "Keine Pokémon platziert",
"battle_bonus": "Kampfbonus",
"copy_coordinates": "Koordinaten kopieren"
}
33 changes: 31 additions & 2 deletions packages/locales/lib/human/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -786,5 +786,34 @@
"locale_instructions_8": "Wait for the pull request to be reviewed and merged",
"enter_translation": "Enter Translation",
"individual_filters": "Partially Filtered",
"data_limit_reached": "You have requested too much data recently and are on cooldown until {{until}}"
}
"data_limit_reached": "You have requested too much data recently and are on cooldown until {{until}}",
"unknown_station": "Unknown Power Spot",
"exclude_battle": "Exclude Max Battle",
"station": "Power Spot",
"stations": "Power Spots",
"stations_filters": "Power Spots Filter Settings",
"stations_options": "Power Spot Options",
"all_stations": "All Power Spots",
"search_battles": "Search Max Battles",
"started": "Started",
"ended": "Ended",
"search_stations": "Search Power Spots",
"global_search_stations": "Enter Power Spot Name or Dynamax Pokémon...",
"station_timers": "Power Spot Timers",
"stations_opacity": "Dynamic Power Spot Opacity",
"max_battles": "Max Battles",
"dynamax": "Dynamax",
"stations_subtitle": "Displays Power Spots on the map",
"dynamax_subtitle": "Displays Dynamax Battles on the map",
"override": "Override",
"placed_pokemon": "Placed Pokémon",
"attack_bonus": "Attack Bonus",
"battle_bonus": "Battle Bonus",
"copy_coordinates": "Copy Coordinates",
"enable_station_popup_coords": "Show Power Spot Coords",
"station_icons": "Power Spot Icons",
"dynamic_opacity": "Dynamic Opacity",
"tooltips": "Tooltips",
"markers": "Markers",
"filters": "Filters"
}
4 changes: 2 additions & 2 deletions packages/types/lib/client.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type {
FormControlProps,
SxProps,
Theme,
SelectProps,
BaseSelectProps,
} from '@mui/material'
import type { SelectInputProps } from '@mui/material/Select/SelectInput'
import { SystemStyleObject } from '@mui/system'
Expand Down Expand Up @@ -124,7 +124,7 @@ export type useDeepStore = <
(arg1: V, ...rest: V extends keyof U ? [arg2: U[V]] : [arg2?: never]) => void,
]

export interface FCSelectProps<Value = unknown> extends SelectProps<Value> {
export interface FCSelectProps<Value = unknown> extends BaseSelectProps<Value> {
fcSx?: SxProps
setWidth?: (width: number) => void
}
Expand Down
1 change: 1 addition & 0 deletions packages/types/lib/general.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export type UiconImage = `${string}.${ImageExt}`
export interface UICONS {
device: UiconImage[]
gym: UiconImage[]
station: UiconImage[]
invasion: UiconImage[]
misc: UiconImage[]
nest: UiconImage[]
Expand Down
Loading
Loading