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

Improve Nests page #363

Closed
wants to merge 120 commits into from

Conversation

Projects
None yet
4 participants
@123FLO321
Copy link
Collaborator

commented Feb 21, 2018

This PR requires/includes #353 (Will rebase once merged)
I recommend settting nest_exclude_pokemon to an empty array ( '[ ]' )
Update your .htaccess (cp htaccess .htaccess)!

Changes in this PR: 123FLO321/Worldopole@db-types...123FLO321:nests

Description

  • group spawnpoints by Nests (Nests are loaded from openstreetmap)
  • use auto_ver for nests json file
  • clear nests on migration
  • extra update 12h after migration

Motivation and Context

Because veryone want's it.

How Has This Been Tested?

Testet and working fine locally.

I need do wait for migration tonight to test the clearing and early update.

Screenshots (if appropriate):

sc1

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

123FLO321 and others added some commits Jan 20, 2018

Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
.
.
Florian Kostenzer
Merge branch 'db-types' of https://github.com/123FLO321/Worldopole in…
…to db-types

Conflicts:
	core/process/data.loader.php
@fosJoddie

This comment has been minimized.

Copy link

commented Feb 26, 2018

I'd have to retest with very latest changes, but there's no explosions running this PR.

There are a few issues with how nests are done for the parks though:

  • one of my databases have a few big "parks" (farmers fields really) that has exactly one spawnpoint inside them that is truly the nesting spawnpoint. The rest of the spawnpoints inside the park just follow normal biome rules.

This means that the "nest" for these parks will be whatever the weather decides the most common pokemon to be. Some days this is Oddish, other Swablu or Spheal, etc. Even if the nesting pokemon is a Ponyta it won't show up unless you go to frequent spawn mode.

Of course, I can just start using the next exclude again, which will then of course exclude any nests that happen to be those ones. So it's not really a big problem in any case.

But if the nest logic somehow could take rarity into account as well... that would be awesome.
Since in some of my nests (like the Ponyta one) there's 6 of them every day. They just get silenced by the 24 oddishes. Maybe the algorithm need to take into account number of spawns pr species divided by spawnpoints (Oddish would then come out as 4 pr hour pr spawnpoint etc).

Anyhow.. just some ramblings on a solid piece of PR. I haven't been able to find any bugs so far at least, in my limited testing

edit: my setup:
Rocketmap with weather PR, 4 instances.
4 worldopole setups with nginx in front.

@123FLO321

This comment has been minimized.

Copy link
Collaborator Author

commented Feb 26, 2018

@fosJoddie One spawn point "Nests" are hard to catch.
Maybe it would be possible to count weather-boosted Pokemon less that non weather-boosted ones.

123FLO321 added some commits Feb 28, 2018

fix conflicts
Conflicts:
	core/cron/pokedex_counts.cron.php
	pages/gymhistory.page.php
# This is a combination of 20 commits.
# The first commit's message is:
improve nests

# The 2nd commit message will be skipped:

#	remove debug comment

# The 3rd commit message will be skipped:

#	update variables example

# The 4th commit message will be skipped:

#	Update index.php

# The 5th commit message will be skipped:

#	scale by size

# The 6th commit message will be skipped:

#	remove

# The 7th commit message will be skipped:

#	add simple support for relations

# The 8th commit message will be skipped:

#	fix woops

# The 9th commit message will be skipped:

#	fix typo and improve error check

# The 10th commit message will be skipped:

#	Update nests.cron.php

# The 11th commit message will be skipped:

#	nature_reserve is not a nest

# The 12th commit message will be skipped:

#	Fix fast update

# The 13th commit message will be skipped:

#	fix order + fix 12h update

# The 14th commit message will be skipped:

#	Update crontabs.include.php

# The 15th commit message will be skipped:

#	Save last update date in case of abort

# The 16th commit message will be skipped:

#	use $prevNestTime

# The 17th commit message will be skipped:

#	improve memory usage (maybe?)

# The 18th commit message will be skipped:

#	fix if core/json/nests.parks.json doesn't exist

# The 19th commit message will be skipped:

#	improved multipolygon

# The 20th commit message will be skipped:

#	run 12h update from 12-24 after migration

@123FLO321 123FLO321 force-pushed the 123FLO321:nests branch from 8bca71e to ba99141 Mar 17, 2018

123FLO321 added some commits Mar 18, 2018

@michikrug michikrug referenced this pull request Feb 3, 2019

Merged

Combine PR #353 with #363 & Code formatting #371

1 of 3 tasks complete
@Obihoernchen

This comment has been minimized.

Copy link
Collaborator

commented Apr 1, 2019

Now in #371

Obihoernchen added a commit that referenced this pull request Apr 1, 2019

Combine PR #353 with #363 & Code formatting (#371)
* added no_lures to default config

* Implementet no_lures

* Separated no gyms and show raids on homepage

* added missing setting in example

* styling fixes

* === not ==

* Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com

* Revert "Scrutinizer Auto-Fixes"

* fix code style

* tab not spaces

* .

* .

* last style fix

* get pokecountdata in crontabs.include

* add IDE files to .gitigonore

* updatet how counts are stored

* remove from data loader

* make scrutinizer happy

* remove lures from dashboard as well

* Update aru.php

* Added query.php and basic quieries for monocle and rocketmap & implemented in tester.php

* woops - the lines in data_loader where in use

* Added support in homepage

* finisched data.loader

* moved to classes instead

* close mysqli on destruct

* added gyms and stops

* add default values for all 801 pokemon

* fixes

* added raids

* added trainers in aru

* finished aru.php

* added trainer graph

* renames

* finished cron

* fixes

* styling fixes

* fixed time_offset for RocketMap

* renamed Hydro to Alt

* revert name change

* add example

* add posgresql for monocle-alt + fixes

* fix nest spawn time

* fix error when no active raids

* Fix Monocle-Alt-Psql tester

* fix monocle mysql

* replace && with AND in quieries

* fix empty last scanned

* init $nestsdatas

* fix getPokemonSinceLastUpdate query logic

* fix pokemon count

* fix top50

* fix top trainers

* removed unused select

* fix typos

* fix nests

* fix netst times

* fixed nest spawn times

* fix nest times

* fix pokemon count for monocle

* use spawn instead of despawn time

* fixe error if file is countfiles are empty

* Added Gymhistory (Not support for Monocle yet)

* fix $_GET used in QueryManagers

* Fixed seen per day

* fix getGymData

* Update home.page.php

* Update aru.php

* make getRecentMythic faster

* make getRecentMythic faster

* add Trainers and GymHistory

* fix recent

* Update QueryManagerMysqlMonocleAlternate.php

* Update QueryManagerPostgresqlMonocleAlternate.php

* Update QueryManagerMysqlMonocleAlternate.php

* Update QueryManagerPostgresqlMonocleAlternate.php

* Update QueryManagerMysqlMonocleAlternate.php

* Update QueryManagerPostgresqlMonocleAlternate.php

* Update QueryManagerMysqlMonocleAlternate.php

* Update QueryManagerPostgresqlMonocleAlternate.php

* fixes

* fix pokemon depolyment time

* Update trainer.content.js

* Update trainer.content.js

* Update trainer.content.js

* Update trainer.content.js

* Update trainer.content.js

* improve some pokemon-page queries

* fix conflict

* fix getTrainerLevelCount for RocketMap

* Improve Pokemon and Raid count storage

* Add Create Stats sql

* fix CreateStatsRocketMap.sql

* # This is a combination of 20 commits.
# The first commit's message is:
improve nests

# The 2nd commit message will be skipped:

#	remove debug comment

# The 3rd commit message will be skipped:

#	update variables example

# The 4th commit message will be skipped:

#	Update index.php

# The 5th commit message will be skipped:

#	scale by size

# The 6th commit message will be skipped:

#	remove

# The 7th commit message will be skipped:

#	add simple support for relations

# The 8th commit message will be skipped:

#	fix woops

# The 9th commit message will be skipped:

#	fix typo and improve error check

# The 10th commit message will be skipped:

#	Update nests.cron.php

# The 11th commit message will be skipped:

#	nature_reserve is not a nest

# The 12th commit message will be skipped:

#	Fix fast update

# The 13th commit message will be skipped:

#	fix order + fix 12h update

# The 14th commit message will be skipped:

#	Update crontabs.include.php

# The 15th commit message will be skipped:

#	Save last update date in case of abort

# The 16th commit message will be skipped:

#	use $prevNestTime

# The 17th commit message will be skipped:

#	improve memory usage (maybe?)

# The 18th commit message will be skipped:

#	fix if core/json/nests.parks.json doesn't exist

# The 19th commit message will be skipped:

#	improved multipolygon

# The 20th commit message will be skipped:

#	run 12h update from 12-24 after migration

* add option for min nest size

* split nest calc into 0.5x0.5 areas

* hide nest inside nests of same pokemon + fixes and improvements

* fix for relations with multiple polygons

* garden is leisure not landuse

* How did this get here?

* Update nests.cron.php

* fix osm query date and reorder it

* Fix timezone in CreateStatsRocketMap

* fix timezone in CreateStatsRocketMap.sql

* fix getTop50Trainers

* fix getTop50Trainers

* Update CreateStatsRocketMap.sql

* Update CreateStatsRocketMap.sql

* fix timezone in nest update timing

* fix Postgre - Monocle

* fix Postgre - Monocle

* Fix QueryManagerPostgresqlMonocleAlternate

* Format php files

* Format Rocketmap queries

* Temporary disable start and end times of nests spawns

* Fix broken queries

* Format php files

* Fix nest query

* Readd css to cached files

* Minor fix

* Use namespaces

* Minor fix

* Check for file existence
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.