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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 138 commits into from Apr 1, 2019

Conversation

Projects
None yet
4 participants
@michikrug
Copy link
Collaborator

commented Feb 3, 2019

Description

With this PR I combined PR #353 and #363 with a complete run of a php linter for nice code formatting.

馃挴馃挴馃挴馃挴馃挴馃挴馃挴馃挴馃挴馃挴馃挴馃挴馃挴馃挴
All credit for the work goes to @123FLO321 !
馃挴馃挴馃挴馃挴馃挴馃挴馃挴馃挴馃挴馃挴馃挴馃挴馃挴馃挴

It should be mergeable without conflicts.

Motivation and Context

Finally, we introduce support for various database schemata.

Notes for DB rework

Moved all queries to a new class.
This allows easy support for different Scanners and even DB types.
Currently RocketMap [MySQL] and the Monocle-Alternate [MySQL and PgSQL] fork is implemented.
The DB Type can be set via in config.php. ["rocketmap", "monocle-alt-mysql" or "monocle-alt-pgsql"].

Run CreateStatsRocketMap.sql or CreateStatsMonocle.sql for counts to work.

Requires PR 27 Moncole-Alternate
Recommended Settings for Moncole-Alternate:

KEEP_GYM_HISTORY = True
CLEANUP_SIGHTINGS_OLDER_THAN_X_HR = 168.0 (or higher | min: 24.0)
CLEANUP_FORT_SIGHTINGS_OLDER_THAN_X_HR = -1.0 (or 168.0 or higher)
CLEANUP_GYM_DEFENDERS_OLDER_THAN_X_HR = -1.0 (or 168.0 or higher)
RAIDERS_PER_GYM = 0.1 (target update interval of ~60s)

Notes for new nests

It is recommended to set nest_exclude_pokemon to an empty array ( '[ ]' )
Update your .htaccess (cp htaccess .htaccess) according to the new changes.

  • 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

sc1

How Has This Been Tested?

Tested on own instance with only RM db.
Everything worked so far, but I did not test any other DB type than RM.
Also the new nests stuff worked very well.

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鈥
鈥o db-types

Conflicts:
	core/process/data.loader.php

123FLO321 and others added some commits Mar 18, 2018

@Obihoernchen

This comment has been minimized.

Copy link
Collaborator

commented Feb 4, 2019

FYI I lost my discord 2FA :D
That's why I'm not online.

michikrug added some commits Feb 5, 2019

@Obihoernchen

This comment has been minimized.

Copy link
Collaborator

commented Apr 1, 2019

Is this ready to be merged?

@michikrug

This comment has been minimized.

Copy link
Collaborator Author

commented Apr 1, 2019

Yes

@123FLO321

This comment has been minimized.

Copy link
Collaborator

commented Apr 1, 2019

Do it!

@Obihoernchen Obihoernchen merged commit 9cdd6ed into brusselopole:master Apr 1, 2019

1 check failed

Scrutinizer Analysis: Failure condition met 鈥 Tests: passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can鈥檛 perform that action at this time.