-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
Add Detailed Gym Data #666
Conversation
Can you provide the right frontend code to show all users in the gym? |
Can you post some screenshots? |
gym_id = ForeignKeyField(Gym, primary_key=True) | ||
name = CharField() | ||
member_count = IntegerField() | ||
updated_at = DateTimeField(default=datetime.utcnow) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
last_scanned
is better English than updated_at
. Preference.
… for sprites instead
If you are increasing the model, you should consider metric and security updates as well. EVERYTHING should have a I would LIKE to see everything have a |
@Johanju I'm not sure how @jnovack I agree, but I think that maybe should be a separate PR? Added front-end code as well, here's a screenshot: https://i.imgur.com/CRgQQI2.png |
3c8bfe4
to
8a31d48
Compare
@maddhatter Don't forget to add a basic webhook of sending the current data. I suggest a gym hashed array, and trainers/mons array in JSON. Suggestion; {
"id": string,
"long": string,
"lat": string,
"team": id
"name": string, /* soon */
"url": string, /* soon */
"level": [
{
"trainer": string,
"pokemon": string,
"pokemon_id": int,
"cp": int
}
]
} |
@jnovack I don't have anything set up for webhooks to test, but I threw in a quick implementation. If I get some time later, I'll stand up something to receive the hooks and just dump to console. |
Free, simple, easy. |
Well, that's handy. Other than me copy/paste failing on a property name (fixed now), looks like it's working. |
|
||
class GymDetails(BaseModel): | ||
gym = ForeignKeyField(Gym, primary_key=True) | ||
name = CharField() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is the Gym Name in gym_details
, and not gym
?
The long, lat, id and name should be in the same table, those are static and unchanging.
In fact, team_id
should not even be in gym
. It should be in gym_details
since it is mutable. That's a breaking change, so I'd like some feedback.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My thinking was since gym detail scanning is optional (--gym-info
/ -gi
), stuff that can only be discovered by doing a get_gym_details
call would go into GymDetails
. The gym info that's returned by the "normal" scanner's get_map_objects
call was already going into Gym
, so I left it there.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gym_name
andgym_picture
- I understand, but I would rather it be ingym
, the column(s) can be empty if you aren't running-gi
.team_id
- That's a breaking change that should be discussed by the collaborators. I have no say.
Paging @invisiblek @chuyskywalker
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might as well squash GymDetails
into Gym
completely really - the only thing left on it would be the last_scanned
column, and if Gym
's getting NULL
s for the other values anyway, could add gym.last_detailed_scan
or something to it.
That would probably make it easier for non-SQL people to play with anyway, since there'd be no joins to access the data. I'll play around with updating it later on tonight (getting offline for now)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are probably right, good point. Perhaps last_inspected
?
Or, for semtentics sake, the 900km glance should be last_skimmed
, and the inspection should be last_scanned
. But that's just me being punch-drunk and silly at this point.
618d8fc
to
d6a7b71
Compare
@FlarumHostingCo Did you run it with The |
No missed that being required @maddhatter How can I add it to javascript or config.ini to default yes? I like to just use python runserver.py and go :) |
@maddhatter turning on gyms in menu, map goes blank. Console traceback is 016-08-15 21:12:30,824 [ search_worker_6][ auth_ptc][ INFO] Request PTC Access Token... |
@FlarumHostingCo What version of MariaDB are you using? |
@maddhatter 10.1.16 On CentOS7.2 |
@maddhatter I installed MySQL5.7 on another server. Gyms don't load and console gets flooded with this.. gym_id |
Hi, I have been trying to set a gym only scanning map with the developer branch after seeing this awesome feature, I already set everything and the map is running however it shows the previous version of the gyms, as in it only shows prestige, location and color (it does update it in real time), runserver seems to find the info tho. This is the configuration I am testing
I already ran the command
But it stays the same, I am using MySQL. Am I doing something wrong? Thanks in advance. |
@gatomiaurex Sorry, I could have sworn I replied yesterday... try running @Guile3home That's something that really should be handled by the DB abstraction layer, but unfortunately isn't. What's happening is too many rows are trying to be inserted at once. I submitted #1091 to update the max # of rows being upserted. EDIT: Updated with the PR I just opened. |
is there a way to only display 1 team's gyms on map? like gym filter? |
@maddhatter don't worry, I fixed it by deleting everything and starting from downloading the map again and it worked thanks! |
@maddhatter unfortunately i couldn't get https://github.com/PokemonGoMap/PokemonGo-Map/pull/782 to work with your detailed gym info. did you get it to work (without any problems)? |
I actually hadn't merged it (I keep looking at it and wanting to, but hadn't) until now. Looks like it's working without issues... |
got https://github.com/PokemonGoMap/PokemonGo-Map/pull/782 to work, i just forgot to grunt build it lol i ended up just putting an if statement for a filter of what to display. no UI change so no PR but it's simply just this in the map.js |
Is there a way to make it show the nickname of the people in the gyms? |
Can you please apply that change already to your code? So it brings the file changed already? Or put it in the instructions! |
* Implement gym details backend * grunt-sass doesn't appear to support concating files - adding include for sprites instead * Improvements + front-end code * Appease the flake8 overload + add webhook (needs tested) * Minor cleanup * Remove member_count * Fix all the things! * Cleanup + Indexes * Use relative (to dist output directory) path for sprite (needed for this to work with reverse proxy paths that shift the map off the root URL) * Fix /raw_data crash if no gyms in area * Fix bugs with neutral gyms * Tweaks to sleep logic * More info, 3NF * Get rid of unsued gym-delay arg * Stop being an idiot * Add some room to grow * Fix flake8 issues * Don't show GymMembers if the gym has been modified since we last checked the members * Frontend tweak * Extra debug logging * Unnecessary SELECT * * No need to open the db * Default pokemon stats to 0 * Fix sprite relative path - works with cachebusting now * Incorporate RocketMap#901 * Fixing merge conflicts * Formatting tweak * Add example config * Don't parse gyms if map parsing failed * Chill out flake8... * Add docs * Re-add schema migration
* Implement gym details backend * grunt-sass doesn't appear to support concating files - adding include for sprites instead * Improvements + front-end code * Appease the flake8 overload + add webhook (needs tested) * Minor cleanup * Remove member_count * Fix all the things! * Cleanup + Indexes * Use relative (to dist output directory) path for sprite (needed for this to work with reverse proxy paths that shift the map off the root URL) * Fix /raw_data crash if no gyms in area * Fix bugs with neutral gyms * Tweaks to sleep logic * More info, 3NF * Get rid of unsued gym-delay arg * Stop being an idiot * Add some room to grow * Fix flake8 issues * Don't show GymMembers if the gym has been modified since we last checked the members * Frontend tweak * Extra debug logging * Unnecessary SELECT * * No need to open the db * Default pokemon stats to 0 * Fix sprite relative path - works with cachebusting now * Incorporate RocketMap#901 * Fixing merge conflicts * Formatting tweak * Add example config * Don't parse gyms if map parsing failed * Chill out flake8... * Add docs * Re-add schema migration
…pgrades (#782) * Added gym levels to marker icons Relocated code for determining gym levels to a new function getGymLevel() * Gym Level Markers * Compressed changed files (4.9kb ->1.4kb) * Fixed ternary operator order You guys are right. I didn't even think of it * Made the gymPrestige array a global variable Made gymPrestige a global variable as opposed to a local variable in the event that other features use this data in the future (such as #666) * Add gym style option * Choose between gym marker styles * lint fix * Reorganized forts for multiple gym styles * Reload icons on demand Used to wait until a mapUpdate(), but that could take up to 5 seconds * Fixed lint error * Lossless and optimized large versions Original large version had heavy artifacts and were not compressed. Harmony: 35.7KB -> 20.2KB Instinct: 17.6KB -> 10.1KB Mystic: 27.4KB -> 11.6KB Valor: 29.0KB -> 13.9KB Uncontested: 43.2KB -> 14.6KB * High-res gym markers for mobile When viewing on mobile, the images get enlarged in order to have the same "size" as when viewing on the desktop, resulting in blurry images * High-res gym markers for mobile Same thing as the ingame markers * Load and scale back a higher res version Mobile users will be able to load the markers without them being blurry * Whoops, didn't realize stats used these too * Changed default gym marker to in-game * Resize icons based on higher res icons * Revert default gym markers back to shield * Forgot these Somehow I forgot to upload these when I added the css for #arenaList :/
* Update pokemon.json (RocketMap#1305) * Matches Polyfill (RocketMap#1100) * Update index.rst (RocketMap#1322) updated windows link for nodejs, was 4.4.7 move to 4.5.0 * Move commandline page from wiki to docs (RocketMap#1326) Reorganizing to keep docs in docs * fixes (RocketMap#1327) There! More example.py * Added Title to command line page and misc fix (RocketMap#1335) * webworker (RocketMap#1287) * Output better error when csv file has > 3 fields (RocketMap#1336) * Correct multi-acc doc * Prevent header from cutting off bottom (RocketMap#1343) Same issue/fix as RocketMap#873, this time affecting the stats side bar instead of the menu bar * Close info window upon second click (RocketMap#1238) Currently the info window for Pokémon, Gyms, etc. can only be closed with the little x. This adds a stateful click handler that closes the info window with a second click. Implements RocketMap#1237 * Decrease Number of Upserted Rows (RocketMap#1091) * Decrease step size * Check the type of DB * setup.bat now won't set paths if already set, now also installs npm (RocketMap#770) * Various fixes Updated to install npm and now includes more user output. Now also won't set paths if already set, which was a problem if you ran the setup more than once. * Update setup.bat * Updated to not use temp files As requested by Balthamel, it now no longer uses a temp file but rathers stores it in a variable. * Update the "Easy setup" script (RocketMap#1217) * Fully Implement On Demand Mode(Conflicts resolved) (RocketMap#1271) * On demand mode * On demand mode * On demand mode * On demand mode * Pause before checking time in service * Fix alphabetical order (RocketMap#1110) * Suppress virtual keyboard - update - mobile OS detection (RocketMap#1289) * [Fix] issue RocketMap#622, statistics 2x Uncaught TypeError * Fix lint errors * Prevent OSK on Touch * Select Boxes prevent Virtual Keyboard Appearing on Touch Devices * remove unnecessary loop * basic mobile os detection * fixed order in which some things must be installed * Fix for some cases of 0,0,0 returns (RocketMap#1097) Some users reporting 0,0,0 returns on subsequent auth token refreshes after the first. * Update pull request template (RocketMap#399) * Update pull request template * Changed checklist into a comment * Stupid markdown comments * Auth Update for nginx.md (RocketMap#221) * Auth Update for nginx.md Adding large block for httpd nginx authentication with reverse proxy * Update nginx.md * Removed references to third party docker container (RocketMap#1359) * Removed references to third party container * Changed references to container we control * SpawnPoint Scanning Confusion - changed --spawnpoints-only to --skip-empty (RocketMap#1372) * Change --spawnpoints-only to --skip-empty Change --spawnpoints-only to --skip-empty with better description in order to stop the confusion between TBTerra's Spawnpoint Scanning and this. * Update commandline.md to include --skip-empty * Few doc updates (RocketMap#1373) * Added little Linux thing * Some doc updates * little thing * changed 2nd gen link * added loc gen * Enhance Statistics Panel (RocketMap#1241) * Test Commit * Revert "Test Commit" aa This reverts commit e87c9d5. * Add sortable Pokemon stats table * Put back accidentally deleted PokeGyms stats code * add link to Pokedex * Styling fixes for statistics panel * Fix listing errors * fix some PokéSpelling errors * Only count visible pokemon/gyms/pokestops Correct issue (that has apparently existed for a while?) where items not currently on screen were included in the stats. * fix linting errors * add option to specify config file on command line or via env variable RocketMap#1341 - Rebased (RocketMap#1376) * add option to specify config file on command line or via env variable original PR 1341 * Add new config file documentation Original PR 1341 * Update commandline.md with new config file flags Original PR 1341 * fix for those not using a config file at all (RocketMap#1377) * Fixed purge_data query not executing (RocketMap#1247) * Escaping ampersand in html (RocketMap#1380) It's groundbreaking. My valid html OCD is kicking in again :D * Add gym levels to markers (alternative to RocketMap#351) and misc gym marker upgrades (RocketMap#782) * Added gym levels to marker icons Relocated code for determining gym levels to a new function getGymLevel() * Gym Level Markers * Compressed changed files (4.9kb ->1.4kb) * Fixed ternary operator order You guys are right. I didn't even think of it * Made the gymPrestige array a global variable Made gymPrestige a global variable as opposed to a local variable in the event that other features use this data in the future (such as RocketMap#666) * Add gym style option * Choose between gym marker styles * lint fix * Reorganized forts for multiple gym styles * Reload icons on demand Used to wait until a mapUpdate(), but that could take up to 5 seconds * Fixed lint error * Lossless and optimized large versions Original large version had heavy artifacts and were not compressed. Harmony: 35.7KB -> 20.2KB Instinct: 17.6KB -> 10.1KB Mystic: 27.4KB -> 11.6KB Valor: 29.0KB -> 13.9KB Uncontested: 43.2KB -> 14.6KB * High-res gym markers for mobile When viewing on mobile, the images get enlarged in order to have the same "size" as when viewing on the desktop, resulting in blurry images * High-res gym markers for mobile Same thing as the ingame markers * Load and scale back a higher res version Mobile users will be able to load the markers without them being blurry * Whoops, didn't realize stats used these too * Changed default gym marker to in-game * Resize icons based on higher res icons * Revert default gym markers back to shield * Forgot these Somehow I forgot to upload these when I added the css for #arenaList :/ * we use sass, we can do crazy programatic stuff like this (RocketMap#1390) * [FAQ.md] Updated formula Thanks OurFlagIsMined :3 * Enable pulling each pokemons IVs and Moves by starting their encounter. (RocketMap#1272) * Scan for IVs and moves Clean implementation, bug free? * Don't ignore moves.json * whoopsie tabsies * im on a roll here * whitespace is really hard guys * whitespace is really hard guys * I'm sorry travis senpai * Don't pass the whole dictonary to pokemonLabel on top of everything else * Notifications based off % perfection From owraight's branch * praise travis * Fix 0/0/0 results from atypical spawnpoints? Some spawnpoints spawn the same encounter multiple times an hour. This should prevent those points from being skipped over in the parsing process. * minor text fixes * Fix get_encountered_pokemon oops. Thanks sLoPPydrive. * Default to a whitelist, support a black one * Stop erroneous empty results when rescanning pokemon Keep track of of pokemon that get skipped over druing the parsing phase so we don't think we're getting 0 results from the server. * Minor text fixes * Minorer text fixes * No more white/black flip --encounter-blacklist (-eblk) is back, and --encounter-whitelist (-ewht) is here now. * Fix up the white/blacklists Now they're in a mutually exclusive group, and it properly encounter everything if neither list is set. * sorry travis * derp * leave me alone travis * Improve moves.json handling Use RocketMap#1316 more useful moves.json and support move names being translated * Reduce db requests to one per cell Instead of one per pokemon. Thanks jchristi and DiscoTim * text minor fixes * Handle failed encounters * Minor fixes to the config.ini.example
* Update pokemon.json (RocketMap#1305) * Matches Polyfill (RocketMap#1100) * Update index.rst (RocketMap#1322) updated windows link for nodejs, was 4.4.7 move to 4.5.0 * Move commandline page from wiki to docs (RocketMap#1326) Reorganizing to keep docs in docs * fixes (RocketMap#1327) There! More example.py * Added Title to command line page and misc fix (RocketMap#1335) * webworker (RocketMap#1287) * Output better error when csv file has > 3 fields (RocketMap#1336) * Correct multi-acc doc * Prevent header from cutting off bottom (RocketMap#1343) Same issue/fix as RocketMap#873, this time affecting the stats side bar instead of the menu bar * Close info window upon second click (RocketMap#1238) Currently the info window for Pokémon, Gyms, etc. can only be closed with the little x. This adds a stateful click handler that closes the info window with a second click. Implements RocketMap#1237 * Decrease Number of Upserted Rows (RocketMap#1091) * Decrease step size * Check the type of DB * setup.bat now won't set paths if already set, now also installs npm (RocketMap#770) * Various fixes Updated to install npm and now includes more user output. Now also won't set paths if already set, which was a problem if you ran the setup more than once. * Update setup.bat * Updated to not use temp files As requested by Balthamel, it now no longer uses a temp file but rathers stores it in a variable. * Update the "Easy setup" script (RocketMap#1217) * Fully Implement On Demand Mode(Conflicts resolved) (RocketMap#1271) * On demand mode * On demand mode * On demand mode * On demand mode * Pause before checking time in service * Fix alphabetical order (RocketMap#1110) * Suppress virtual keyboard - update - mobile OS detection (RocketMap#1289) * [Fix] issue RocketMap#622, statistics 2x Uncaught TypeError * Fix lint errors * Prevent OSK on Touch * Select Boxes prevent Virtual Keyboard Appearing on Touch Devices * remove unnecessary loop * basic mobile os detection * fixed order in which some things must be installed * Fix for some cases of 0,0,0 returns (RocketMap#1097) Some users reporting 0,0,0 returns on subsequent auth token refreshes after the first. * Update pull request template (RocketMap#399) * Update pull request template * Changed checklist into a comment * Stupid markdown comments * Auth Update for nginx.md (RocketMap#221) * Auth Update for nginx.md Adding large block for httpd nginx authentication with reverse proxy * Update nginx.md * Removed references to third party docker container (RocketMap#1359) * Removed references to third party container * Changed references to container we control * SpawnPoint Scanning Confusion - changed --spawnpoints-only to --skip-empty (RocketMap#1372) * Change --spawnpoints-only to --skip-empty Change --spawnpoints-only to --skip-empty with better description in order to stop the confusion between TBTerra's Spawnpoint Scanning and this. * Update commandline.md to include --skip-empty * Few doc updates (RocketMap#1373) * Added little Linux thing * Some doc updates * little thing * changed 2nd gen link * added loc gen * Enhance Statistics Panel (RocketMap#1241) * Test Commit * Revert "Test Commit" aa This reverts commit e87c9d5. * Add sortable Pokemon stats table * Put back accidentally deleted PokeGyms stats code * add link to Pokedex * Styling fixes for statistics panel * Fix listing errors * fix some PokéSpelling errors * Only count visible pokemon/gyms/pokestops Correct issue (that has apparently existed for a while?) where items not currently on screen were included in the stats. * fix linting errors * add option to specify config file on command line or via env variable RocketMap#1341 - Rebased (RocketMap#1376) * add option to specify config file on command line or via env variable original PR 1341 * Add new config file documentation Original PR 1341 * Update commandline.md with new config file flags Original PR 1341 * fix for those not using a config file at all (RocketMap#1377) * Fixed purge_data query not executing (RocketMap#1247) * Escaping ampersand in html (RocketMap#1380) It's groundbreaking. My valid html OCD is kicking in again :D * Add gym levels to markers (alternative to RocketMap#351) and misc gym marker upgrades (RocketMap#782) * Added gym levels to marker icons Relocated code for determining gym levels to a new function getGymLevel() * Gym Level Markers * Compressed changed files (4.9kb ->1.4kb) * Fixed ternary operator order You guys are right. I didn't even think of it * Made the gymPrestige array a global variable Made gymPrestige a global variable as opposed to a local variable in the event that other features use this data in the future (such as RocketMap#666) * Add gym style option * Choose between gym marker styles * lint fix * Reorganized forts for multiple gym styles * Reload icons on demand Used to wait until a mapUpdate(), but that could take up to 5 seconds * Fixed lint error * Lossless and optimized large versions Original large version had heavy artifacts and were not compressed. Harmony: 35.7KB -> 20.2KB Instinct: 17.6KB -> 10.1KB Mystic: 27.4KB -> 11.6KB Valor: 29.0KB -> 13.9KB Uncontested: 43.2KB -> 14.6KB * High-res gym markers for mobile When viewing on mobile, the images get enlarged in order to have the same "size" as when viewing on the desktop, resulting in blurry images * High-res gym markers for mobile Same thing as the ingame markers * Load and scale back a higher res version Mobile users will be able to load the markers without them being blurry * Whoops, didn't realize stats used these too * Changed default gym marker to in-game * Resize icons based on higher res icons * Revert default gym markers back to shield * Forgot these Somehow I forgot to upload these when I added the css for #arenaList :/ * we use sass, we can do crazy programatic stuff like this (RocketMap#1390) * [FAQ.md] Updated formula Thanks OurFlagIsMined :3 * Enable pulling each pokemons IVs and Moves by starting their encounter. (RocketMap#1272) * Scan for IVs and moves Clean implementation, bug free? * Don't ignore moves.json * whoopsie tabsies * im on a roll here * whitespace is really hard guys * whitespace is really hard guys * I'm sorry travis senpai * Don't pass the whole dictonary to pokemonLabel on top of everything else * Notifications based off % perfection From owraight's branch * praise travis * Fix 0/0/0 results from atypical spawnpoints? Some spawnpoints spawn the same encounter multiple times an hour. This should prevent those points from being skipped over in the parsing process. * minor text fixes * Fix get_encountered_pokemon oops. Thanks sLoPPydrive. * Default to a whitelist, support a black one * Stop erroneous empty results when rescanning pokemon Keep track of of pokemon that get skipped over druing the parsing phase so we don't think we're getting 0 results from the server. * Minor text fixes * Minorer text fixes * No more white/black flip --encounter-blacklist (-eblk) is back, and --encounter-whitelist (-ewht) is here now. * Fix up the white/blacklists Now they're in a mutually exclusive group, and it properly encounter everything if neither list is set. * sorry travis * derp * leave me alone travis * Improve moves.json handling Use RocketMap#1316 more useful moves.json and support move names being translated * Reduce db requests to one per cell Instead of one per pokemon. Thanks jchristi and DiscoTim * text minor fixes * Handle failed encounters * Minor fixes to the config.ini.example
* Update pokemon.json (RocketMap#1305) * Matches Polyfill (RocketMap#1100) * Update index.rst (RocketMap#1322) updated windows link for nodejs, was 4.4.7 move to 4.5.0 * Move commandline page from wiki to docs (RocketMap#1326) Reorganizing to keep docs in docs * fixes (RocketMap#1327) There! More example.py * Added Title to command line page and misc fix (RocketMap#1335) * webworker (RocketMap#1287) * Output better error when csv file has > 3 fields (RocketMap#1336) * Correct multi-acc doc * Prevent header from cutting off bottom (RocketMap#1343) Same issue/fix as RocketMap#873, this time affecting the stats side bar instead of the menu bar * Close info window upon second click (RocketMap#1238) Currently the info window for Pokémon, Gyms, etc. can only be closed with the little x. This adds a stateful click handler that closes the info window with a second click. Implements RocketMap#1237 * Decrease Number of Upserted Rows (RocketMap#1091) * Decrease step size * Check the type of DB * setup.bat now won't set paths if already set, now also installs npm (RocketMap#770) * Various fixes Updated to install npm and now includes more user output. Now also won't set paths if already set, which was a problem if you ran the setup more than once. * Update setup.bat * Updated to not use temp files As requested by Balthamel, it now no longer uses a temp file but rathers stores it in a variable. * Update the "Easy setup" script (RocketMap#1217) * Fully Implement On Demand Mode(Conflicts resolved) (RocketMap#1271) * On demand mode * On demand mode * On demand mode * On demand mode * Pause before checking time in service * Fix alphabetical order (RocketMap#1110) * Suppress virtual keyboard - update - mobile OS detection (RocketMap#1289) * [Fix] issue RocketMap#622, statistics 2x Uncaught TypeError * Fix lint errors * Prevent OSK on Touch * Select Boxes prevent Virtual Keyboard Appearing on Touch Devices * remove unnecessary loop * basic mobile os detection * fixed order in which some things must be installed * Fix for some cases of 0,0,0 returns (RocketMap#1097) Some users reporting 0,0,0 returns on subsequent auth token refreshes after the first. * Update pull request template (RocketMap#399) * Update pull request template * Changed checklist into a comment * Stupid markdown comments * Auth Update for nginx.md (RocketMap#221) * Auth Update for nginx.md Adding large block for httpd nginx authentication with reverse proxy * Update nginx.md * Removed references to third party docker container (RocketMap#1359) * Removed references to third party container * Changed references to container we control * SpawnPoint Scanning Confusion - changed --spawnpoints-only to --skip-empty (RocketMap#1372) * Change --spawnpoints-only to --skip-empty Change --spawnpoints-only to --skip-empty with better description in order to stop the confusion between TBTerra's Spawnpoint Scanning and this. * Update commandline.md to include --skip-empty * Few doc updates (RocketMap#1373) * Added little Linux thing * Some doc updates * little thing * changed 2nd gen link * added loc gen * Enhance Statistics Panel (RocketMap#1241) * Test Commit * Revert "Test Commit" aa This reverts commit e87c9d5. * Add sortable Pokemon stats table * Put back accidentally deleted PokeGyms stats code * add link to Pokedex * Styling fixes for statistics panel * Fix listing errors * fix some PokéSpelling errors * Only count visible pokemon/gyms/pokestops Correct issue (that has apparently existed for a while?) where items not currently on screen were included in the stats. * fix linting errors * add option to specify config file on command line or via env variable RocketMap#1341 - Rebased (RocketMap#1376) * add option to specify config file on command line or via env variable original PR 1341 * Add new config file documentation Original PR 1341 * Update commandline.md with new config file flags Original PR 1341 * fix for those not using a config file at all (RocketMap#1377) * Fixed purge_data query not executing (RocketMap#1247) * Escaping ampersand in html (RocketMap#1380) It's groundbreaking. My valid html OCD is kicking in again :D * Add gym levels to markers (alternative to RocketMap#351) and misc gym marker upgrades (RocketMap#782) * Added gym levels to marker icons Relocated code for determining gym levels to a new function getGymLevel() * Gym Level Markers * Compressed changed files (4.9kb ->1.4kb) * Fixed ternary operator order You guys are right. I didn't even think of it * Made the gymPrestige array a global variable Made gymPrestige a global variable as opposed to a local variable in the event that other features use this data in the future (such as RocketMap#666) * Add gym style option * Choose between gym marker styles * lint fix * Reorganized forts for multiple gym styles * Reload icons on demand Used to wait until a mapUpdate(), but that could take up to 5 seconds * Fixed lint error * Lossless and optimized large versions Original large version had heavy artifacts and were not compressed. Harmony: 35.7KB -> 20.2KB Instinct: 17.6KB -> 10.1KB Mystic: 27.4KB -> 11.6KB Valor: 29.0KB -> 13.9KB Uncontested: 43.2KB -> 14.6KB * High-res gym markers for mobile When viewing on mobile, the images get enlarged in order to have the same "size" as when viewing on the desktop, resulting in blurry images * High-res gym markers for mobile Same thing as the ingame markers * Load and scale back a higher res version Mobile users will be able to load the markers without them being blurry * Whoops, didn't realize stats used these too * Changed default gym marker to in-game * Resize icons based on higher res icons * Revert default gym markers back to shield * Forgot these Somehow I forgot to upload these when I added the css for #arenaList :/ * we use sass, we can do crazy programatic stuff like this (RocketMap#1390) * [FAQ.md] Updated formula Thanks OurFlagIsMined :3 * Enable pulling each pokemons IVs and Moves by starting their encounter. (RocketMap#1272) * Scan for IVs and moves Clean implementation, bug free? * Don't ignore moves.json * whoopsie tabsies * im on a roll here * whitespace is really hard guys * whitespace is really hard guys * I'm sorry travis senpai * Don't pass the whole dictonary to pokemonLabel on top of everything else * Notifications based off % perfection From owraight's branch * praise travis * Fix 0/0/0 results from atypical spawnpoints? Some spawnpoints spawn the same encounter multiple times an hour. This should prevent those points from being skipped over in the parsing process. * minor text fixes * Fix get_encountered_pokemon oops. Thanks sLoPPydrive. * Default to a whitelist, support a black one * Stop erroneous empty results when rescanning pokemon Keep track of of pokemon that get skipped over druing the parsing phase so we don't think we're getting 0 results from the server. * Minor text fixes * Minorer text fixes * No more white/black flip --encounter-blacklist (-eblk) is back, and --encounter-whitelist (-ewht) is here now. * Fix up the white/blacklists Now they're in a mutually exclusive group, and it properly encounter everything if neither list is set. * sorry travis * derp * leave me alone travis * Improve moves.json handling Use RocketMap#1316 more useful moves.json and support move names being translated * Reduce db requests to one per cell Instead of one per pokemon. Thanks jchristi and DiscoTim * text minor fixes * Handle failed encounters * Minor fixes to the config.ini.example
* Update pokemon.json (RocketMap#1305) * Matches Polyfill (RocketMap#1100) * Update index.rst (RocketMap#1322) updated windows link for nodejs, was 4.4.7 move to 4.5.0 * Move commandline page from wiki to docs (RocketMap#1326) Reorganizing to keep docs in docs * fixes (RocketMap#1327) There! More example.py * Added Title to command line page and misc fix (RocketMap#1335) * webworker (RocketMap#1287) * Output better error when csv file has > 3 fields (RocketMap#1336) * Correct multi-acc doc * Prevent header from cutting off bottom (RocketMap#1343) Same issue/fix as RocketMap#873, this time affecting the stats side bar instead of the menu bar * Close info window upon second click (RocketMap#1238) Currently the info window for Pokémon, Gyms, etc. can only be closed with the little x. This adds a stateful click handler that closes the info window with a second click. Implements RocketMap#1237 * Decrease Number of Upserted Rows (RocketMap#1091) * Decrease step size * Check the type of DB * setup.bat now won't set paths if already set, now also installs npm (RocketMap#770) * Various fixes Updated to install npm and now includes more user output. Now also won't set paths if already set, which was a problem if you ran the setup more than once. * Update setup.bat * Updated to not use temp files As requested by Balthamel, it now no longer uses a temp file but rathers stores it in a variable. * Update the "Easy setup" script (RocketMap#1217) * Fully Implement On Demand Mode(Conflicts resolved) (RocketMap#1271) * On demand mode * On demand mode * On demand mode * On demand mode * Pause before checking time in service * Fix alphabetical order (RocketMap#1110) * Suppress virtual keyboard - update - mobile OS detection (RocketMap#1289) * [Fix] issue RocketMap#622, statistics 2x Uncaught TypeError * Fix lint errors * Prevent OSK on Touch * Select Boxes prevent Virtual Keyboard Appearing on Touch Devices * remove unnecessary loop * basic mobile os detection * fixed order in which some things must be installed * Fix for some cases of 0,0,0 returns (RocketMap#1097) Some users reporting 0,0,0 returns on subsequent auth token refreshes after the first. * Update pull request template (RocketMap#399) * Update pull request template * Changed checklist into a comment * Stupid markdown comments * Auth Update for nginx.md (RocketMap#221) * Auth Update for nginx.md Adding large block for httpd nginx authentication with reverse proxy * Update nginx.md * Removed references to third party docker container (RocketMap#1359) * Removed references to third party container * Changed references to container we control * SpawnPoint Scanning Confusion - changed --spawnpoints-only to --skip-empty (RocketMap#1372) * Change --spawnpoints-only to --skip-empty Change --spawnpoints-only to --skip-empty with better description in order to stop the confusion between TBTerra's Spawnpoint Scanning and this. * Update commandline.md to include --skip-empty * Few doc updates (RocketMap#1373) * Added little Linux thing * Some doc updates * little thing * changed 2nd gen link * added loc gen * Enhance Statistics Panel (RocketMap#1241) * Test Commit * Revert "Test Commit" aa This reverts commit e87c9d5. * Add sortable Pokemon stats table * Put back accidentally deleted PokeGyms stats code * add link to Pokedex * Styling fixes for statistics panel * Fix listing errors * fix some PokéSpelling errors * Only count visible pokemon/gyms/pokestops Correct issue (that has apparently existed for a while?) where items not currently on screen were included in the stats. * fix linting errors * add option to specify config file on command line or via env variable RocketMap#1341 - Rebased (RocketMap#1376) * add option to specify config file on command line or via env variable original PR 1341 * Add new config file documentation Original PR 1341 * Update commandline.md with new config file flags Original PR 1341 * fix for those not using a config file at all (RocketMap#1377) * Fixed purge_data query not executing (RocketMap#1247) * Escaping ampersand in html (RocketMap#1380) It's groundbreaking. My valid html OCD is kicking in again :D * Add gym levels to markers (alternative to RocketMap#351) and misc gym marker upgrades (RocketMap#782) * Added gym levels to marker icons Relocated code for determining gym levels to a new function getGymLevel() * Gym Level Markers * Compressed changed files (4.9kb ->1.4kb) * Fixed ternary operator order You guys are right. I didn't even think of it * Made the gymPrestige array a global variable Made gymPrestige a global variable as opposed to a local variable in the event that other features use this data in the future (such as RocketMap#666) * Add gym style option * Choose between gym marker styles * lint fix * Reorganized forts for multiple gym styles * Reload icons on demand Used to wait until a mapUpdate(), but that could take up to 5 seconds * Fixed lint error * Lossless and optimized large versions Original large version had heavy artifacts and were not compressed. Harmony: 35.7KB -> 20.2KB Instinct: 17.6KB -> 10.1KB Mystic: 27.4KB -> 11.6KB Valor: 29.0KB -> 13.9KB Uncontested: 43.2KB -> 14.6KB * High-res gym markers for mobile When viewing on mobile, the images get enlarged in order to have the same "size" as when viewing on the desktop, resulting in blurry images * High-res gym markers for mobile Same thing as the ingame markers * Load and scale back a higher res version Mobile users will be able to load the markers without them being blurry * Whoops, didn't realize stats used these too * Changed default gym marker to in-game * Resize icons based on higher res icons * Revert default gym markers back to shield * Forgot these Somehow I forgot to upload these when I added the css for #arenaList :/ * we use sass, we can do crazy programatic stuff like this (RocketMap#1390) * [FAQ.md] Updated formula Thanks OurFlagIsMined :3 * Enable pulling each pokemons IVs and Moves by starting their encounter. (RocketMap#1272) * Scan for IVs and moves Clean implementation, bug free? * Don't ignore moves.json * whoopsie tabsies * im on a roll here * whitespace is really hard guys * whitespace is really hard guys * I'm sorry travis senpai * Don't pass the whole dictonary to pokemonLabel on top of everything else * Notifications based off % perfection From owraight's branch * praise travis * Fix 0/0/0 results from atypical spawnpoints? Some spawnpoints spawn the same encounter multiple times an hour. This should prevent those points from being skipped over in the parsing process. * minor text fixes * Fix get_encountered_pokemon oops. Thanks sLoPPydrive. * Default to a whitelist, support a black one * Stop erroneous empty results when rescanning pokemon Keep track of of pokemon that get skipped over druing the parsing phase so we don't think we're getting 0 results from the server. * Minor text fixes * Minorer text fixes * No more white/black flip --encounter-blacklist (-eblk) is back, and --encounter-whitelist (-ewht) is here now. * Fix up the white/blacklists Now they're in a mutually exclusive group, and it properly encounter everything if neither list is set. * sorry travis * derp * leave me alone travis * Improve moves.json handling Use RocketMap#1316 more useful moves.json and support move names being translated * Reduce db requests to one per cell Instead of one per pokemon. Thanks jchristi and DiscoTim * text minor fixes * Handle failed encounters * Minor fixes to the config.ini.example
* Implement gym details backend * grunt-sass doesn't appear to support concating files - adding include for sprites instead * Improvements + front-end code * Appease the flake8 overload + add webhook (needs tested) * Minor cleanup * Remove member_count * Fix all the things! * Cleanup + Indexes * Use relative (to dist output directory) path for sprite (needed for this to work with reverse proxy paths that shift the map off the root URL) * Fix /raw_data crash if no gyms in area * Fix bugs with neutral gyms * Tweaks to sleep logic * More info, 3NF * Get rid of unsued gym-delay arg * Stop being an idiot * Add some room to grow * Fix flake8 issues * Don't show GymMembers if the gym has been modified since we last checked the members * Frontend tweak * Extra debug logging * Unnecessary SELECT * * No need to open the db * Default pokemon stats to 0 * Fix sprite relative path - works with cachebusting now * Incorporate RocketMap#901 * Fixing merge conflicts * Formatting tweak * Add example config * Don't parse gyms if map parsing failed * Chill out flake8... * Add docs * Re-add schema migration
… marker upgrades (RocketMap#782) * Added gym levels to marker icons Relocated code for determining gym levels to a new function getGymLevel() * Gym Level Markers * Compressed changed files (4.9kb ->1.4kb) * Fixed ternary operator order You guys are right. I didn't even think of it * Made the gymPrestige array a global variable Made gymPrestige a global variable as opposed to a local variable in the event that other features use this data in the future (such as RocketMap#666) * Add gym style option * Choose between gym marker styles * lint fix * Reorganized forts for multiple gym styles * Reload icons on demand Used to wait until a mapUpdate(), but that could take up to 5 seconds * Fixed lint error * Lossless and optimized large versions Original large version had heavy artifacts and were not compressed. Harmony: 35.7KB -> 20.2KB Instinct: 17.6KB -> 10.1KB Mystic: 27.4KB -> 11.6KB Valor: 29.0KB -> 13.9KB Uncontested: 43.2KB -> 14.6KB * High-res gym markers for mobile When viewing on mobile, the images get enlarged in order to have the same "size" as when viewing on the desktop, resulting in blurry images * High-res gym markers for mobile Same thing as the ingame markers * Load and scale back a higher res version Mobile users will be able to load the markers without them being blurry * Whoops, didn't realize stats used these too * Changed default gym marker to in-game * Resize icons based on higher res icons * Revert default gym markers back to shield * Forgot these Somehow I forgot to upload these when I added the css for #arenaList :/
* Update pokemon.json (RocketMap#1305) * Matches Polyfill (RocketMap#1100) * Update index.rst (RocketMap#1322) updated windows link for nodejs, was 4.4.7 move to 4.5.0 * Move commandline page from wiki to docs (RocketMap#1326) Reorganizing to keep docs in docs * fixes (RocketMap#1327) There! More example.py * Added Title to command line page and misc fix (RocketMap#1335) * webworker (RocketMap#1287) * Output better error when csv file has > 3 fields (RocketMap#1336) * Correct multi-acc doc * Prevent header from cutting off bottom (RocketMap#1343) Same issue/fix as RocketMap#873, this time affecting the stats side bar instead of the menu bar * Close info window upon second click (RocketMap#1238) Currently the info window for Pokémon, Gyms, etc. can only be closed with the little x. This adds a stateful click handler that closes the info window with a second click. Implements RocketMap#1237 * Decrease Number of Upserted Rows (RocketMap#1091) * Decrease step size * Check the type of DB * setup.bat now won't set paths if already set, now also installs npm (RocketMap#770) * Various fixes Updated to install npm and now includes more user output. Now also won't set paths if already set, which was a problem if you ran the setup more than once. * Update setup.bat * Updated to not use temp files As requested by Balthamel, it now no longer uses a temp file but rathers stores it in a variable. * Update the "Easy setup" script (RocketMap#1217) * Fully Implement On Demand Mode(Conflicts resolved) (RocketMap#1271) * On demand mode * On demand mode * On demand mode * On demand mode * Pause before checking time in service * Fix alphabetical order (RocketMap#1110) * Suppress virtual keyboard - update - mobile OS detection (RocketMap#1289) * [Fix] issue RocketMap#622, statistics 2x Uncaught TypeError * Fix lint errors * Prevent OSK on Touch * Select Boxes prevent Virtual Keyboard Appearing on Touch Devices * remove unnecessary loop * basic mobile os detection * fixed order in which some things must be installed * Fix for some cases of 0,0,0 returns (RocketMap#1097) Some users reporting 0,0,0 returns on subsequent auth token refreshes after the first. * Update pull request template (RocketMap#399) * Update pull request template * Changed checklist into a comment * Stupid markdown comments * Auth Update for nginx.md (RocketMap#221) * Auth Update for nginx.md Adding large block for httpd nginx authentication with reverse proxy * Update nginx.md * Removed references to third party docker container (RocketMap#1359) * Removed references to third party container * Changed references to container we control * SpawnPoint Scanning Confusion - changed --spawnpoints-only to --skip-empty (RocketMap#1372) * Change --spawnpoints-only to --skip-empty Change --spawnpoints-only to --skip-empty with better description in order to stop the confusion between TBTerra's Spawnpoint Scanning and this. * Update commandline.md to include --skip-empty * Few doc updates (RocketMap#1373) * Added little Linux thing * Some doc updates * little thing * changed 2nd gen link * added loc gen * Enhance Statistics Panel (RocketMap#1241) * Test Commit * Revert "Test Commit" aa This reverts commit e87c9d5. * Add sortable Pokemon stats table * Put back accidentally deleted PokeGyms stats code * add link to Pokedex * Styling fixes for statistics panel * Fix listing errors * fix some PokéSpelling errors * Only count visible pokemon/gyms/pokestops Correct issue (that has apparently existed for a while?) where items not currently on screen were included in the stats. * fix linting errors * add option to specify config file on command line or via env variable RocketMap#1341 - Rebased (RocketMap#1376) * add option to specify config file on command line or via env variable original PR 1341 * Add new config file documentation Original PR 1341 * Update commandline.md with new config file flags Original PR 1341 * fix for those not using a config file at all (RocketMap#1377) * Fixed purge_data query not executing (RocketMap#1247) * Escaping ampersand in html (RocketMap#1380) It's groundbreaking. My valid html OCD is kicking in again :D * Add gym levels to markers (alternative to RocketMap#351) and misc gym marker upgrades (RocketMap#782) * Added gym levels to marker icons Relocated code for determining gym levels to a new function getGymLevel() * Gym Level Markers * Compressed changed files (4.9kb ->1.4kb) * Fixed ternary operator order You guys are right. I didn't even think of it * Made the gymPrestige array a global variable Made gymPrestige a global variable as opposed to a local variable in the event that other features use this data in the future (such as RocketMap#666) * Add gym style option * Choose between gym marker styles * lint fix * Reorganized forts for multiple gym styles * Reload icons on demand Used to wait until a mapUpdate(), but that could take up to 5 seconds * Fixed lint error * Lossless and optimized large versions Original large version had heavy artifacts and were not compressed. Harmony: 35.7KB -> 20.2KB Instinct: 17.6KB -> 10.1KB Mystic: 27.4KB -> 11.6KB Valor: 29.0KB -> 13.9KB Uncontested: 43.2KB -> 14.6KB * High-res gym markers for mobile When viewing on mobile, the images get enlarged in order to have the same "size" as when viewing on the desktop, resulting in blurry images * High-res gym markers for mobile Same thing as the ingame markers * Load and scale back a higher res version Mobile users will be able to load the markers without them being blurry * Whoops, didn't realize stats used these too * Changed default gym marker to in-game * Resize icons based on higher res icons * Revert default gym markers back to shield * Forgot these Somehow I forgot to upload these when I added the css for #arenaList :/ * we use sass, we can do crazy programatic stuff like this (RocketMap#1390) * [FAQ.md] Updated formula Thanks OurFlagIsMined :3 * Enable pulling each pokemons IVs and Moves by starting their encounter. (RocketMap#1272) * Scan for IVs and moves Clean implementation, bug free? * Don't ignore moves.json * whoopsie tabsies * im on a roll here * whitespace is really hard guys * whitespace is really hard guys * I'm sorry travis senpai * Don't pass the whole dictonary to pokemonLabel on top of everything else * Notifications based off % perfection From owraight's branch * praise travis * Fix 0/0/0 results from atypical spawnpoints? Some spawnpoints spawn the same encounter multiple times an hour. This should prevent those points from being skipped over in the parsing process. * minor text fixes * Fix get_encountered_pokemon oops. Thanks sLoPPydrive. * Default to a whitelist, support a black one * Stop erroneous empty results when rescanning pokemon Keep track of of pokemon that get skipped over druing the parsing phase so we don't think we're getting 0 results from the server. * Minor text fixes * Minorer text fixes * No more white/black flip --encounter-blacklist (-eblk) is back, and --encounter-whitelist (-ewht) is here now. * Fix up the white/blacklists Now they're in a mutually exclusive group, and it properly encounter everything if neither list is set. * sorry travis * derp * leave me alone travis * Improve moves.json handling Use RocketMap#1316 more useful moves.json and support move names being translated * Reduce db requests to one per cell Instead of one per pokemon. Thanks jchristi and DiscoTim * text minor fixes * Handle failed encounters * Minor fixes to the config.ini.example * Doc fixes (RocketMap#1410) * Update commandline.md with IV commands * Added information for updating * Add scan here function (RocketMap#1398) * Add scan here function * fix tab for spaces * fix trailing space * adding a switch to show the scan button with a warning message the first time the switch is enabled * travis correction (replacing doublequotes by singlequotes) * deleted unwanted files * deleted unwanted files * Removed deprecated debug flag (RocketMap#1427) * Removed Debug flag * Removed debug to verbose condition * Removed a missed reference to debug flag. * Clarify `encounter-delay` unit (RocketMap#1423) It’s measured in seconds. * fix default config usage (RocketMap#1428) * Only send updated and newly visible Stops/Gyms/Pokémon and not-'hidden' Pokémon in the JSON from server to client. (RocketMap#1303) * Only send 'not-hidden' pokemon * Forgot to take out console.log * More space fixes * Bye redundant pokestop requests. Hi, travis? * <3 Travis * one more commit, should really test before push * When moving screen only send new pokestops + modified * Yes, spaces indentations and empty lines.. * And again.. * And another.. * Dont query each ID but remove ID's we dont send afterwards. * Check if Stops/Gyms go from off to on, use same old/previous coords for both Gyms/Stops and use optional parameters in get_stops/get_gyms instead of new function * Spaces indents and you know whats. * Only send updated and newly visible Stops/Gyms and not-'hidden' Pokemon. * Query datetime instead of time * Clean exclude query. * over-indented * Only send modified pokemon and uncovered. * Fix list + list, instead of .update * Default value for last_modified * Optimize SQL queries * Code cleanup * Code from PR RocketMap#1272, Pokémon already in database don't need to be parsed again. * Code fixes and optimising ScannedLocations * Fix if clause so pokemen get properly skipped. * A bridge too far, ScannedLocations dont update properly when only sending new locations (Reverting Scannedlocations changes) * Code fixes * Check for Gym last scanned instead of modified to update front-end Last Scanned value. * Code cleanup/optimization for app.py * refactor map.js to not require full data set for scanned locations and spawn points * Fix switch flip in between json updates * Optimize scannedlocations and spawnpoints * Random capitals and code fixes * Optimize map.js thanks @DiscoTim * Fix class so it works like it used to * Code clean up, prevstamp was not used * When zooming in we are not uncovering new terrain, so no need to look further then last_modified * # Comments to clarify * It needs some overlap * Determine last_modified on insert * Move timestanp generation up * Reduced the need for backtrack on timestamp Reduced the default response, no need for the previous status on switch if its false. Dont send the new fields in the response Collect all pokemon/forts from cells before running queries. Dont upsert pokestops that haven't changed since last scan. Show in log how many pokemon/pokestop we didnt upsert (skipped). Set scannedlocation last_modified on upsert instead of in code. Add extra column on pokestops to keep track of when its been updated so we can send it to the map. * update map.js to not require full set of pokestops * Minor text fixes * Frontend/Backend fixes Only send lured stops if lured-only is selected Resend unhidden Pokes * Minor map fix * Minor text fixes. * Send all pokemon details to frontend * Small woopsie oh baby, oh baby, prepare for disappointment ;P -Thunderfox * Update last modified on already existing scanlocations and fixes 1448 (RocketMap#1444) * Update last modified on already existing scanlocations * references before filled * Handle default config file in configargparse correctly (RocketMap#1463) * fix default config usage * fix issue w/ configargparse not reading default value * update debian instillation (RocketMap#1432) * update debian instillation updated for easier instillation for noobs like me :) * update debian instillation added cd~/ * Update linux.rst * Update linux.rst (RocketMap#1483) Fedora fix for: error: command 'gcc' failed with exit status 1 and on Fedora needs only: dnf install python * Update example.py * Update example.py * Updated readme * Fixed travis errors, map still not working * Fix map V.2 (RocketMap#1511) * Fixed the null pointer error again * Use official API * Updated for new libs, added submodule and updated docs (RocketMap#1522) * remove IRC from readme * Enable automated recaptcha solving with 2captcha (RocketMap#1526) * Enable automatic captcha solving via 2captcha * Revert "Enable automatic captcha solving via 2captcha" This reverts commit 39dd8e4. * Enable automated captcha solving with 2captcha -cs flag to enable -ck flag to specify 2captcha API key -cds flag to specify the data-sitekey for PoGo captchas * Revert "Enable automated captcha solving with 2captcha" This reverts commit 13c10cf. * Enable automated captcha solving with 2captcha -cs flag to enable -ck flag to specify 2captcha API key -cds flag to specify the data-sitekey for PoGo captchas * Revert "Enable automated captcha solving with 2captcha" This reverts commit c1286a6. * Enable automated captcha solving with 2captcha -cs flag to enable -ck flag to specify 2captcha API key -cds flag to specify the data-sitekey for PoGo captchas * Uncommented 'api.activate_signature(encryption_lib_path)' * Travis fixes * Update for .45 API (RocketMap#1536) * Remove unneeded encrypt lib references and remove unneeded submodule * removed recursive instructions * cmon travis, I wanna go to sleep. * Travis, let me sleep. It's 3:44am. * Whoops, forgot to remove this * Remove direct node download links Not needed, another thing to needlessly update. Points to main nodejs download now. * Somebody managed to get none-CI passing code into develop? (RocketMap#1563) * Change searchbox into Autocomplete object. (RocketMap#1270) * Change searchbox into Autocomplete object. Autocomplete fields are more flexible than Searchbox: http://goo.gl/pxqxK7 This will enable Autocomplete results to be limited to countries, coordinate bounds, etc. Requested in RocketMap#1129 * Check if `place` contains `geometry`. When user doesn't choose a place from the dropdown, there's a console error due to missing `geomerty` property. * *grumble, grumble* (I actually love Travis).
Description
Collection detailed information about which Pokemon are in a gym, along with the gym name and description. It's an opt-in feature (using the
-gi
switch), so no additional API hits unless you explicitly want them.This pairs really well with #748 (already merged) to create a gym-only scanner, and would allow future development on a local gym leaderboard using the information collected (and sent out via webhook).
Motivation and Context
#605
It's nice to have the option to see detailed gym information about who's in which gyms, the gym's prestige level, the gym's name, etc.
How Has This Been Tested?
Backend tested on Windows 10 with SQLite and a MariaDB (running on a CentOS VM), in various scanning locations (Mine and @FlarumHostingCo's location, namely)
Frontend tested on Windows 7/10 on Firefox/Chrome, and on Android Chrome
Screenshots (if appropriate):
Types of changes
Checklist: