dikkedeur · coreyman2000 · Dec 1, 2017 · Dec 1, 2017 · Dec 4, 2017 · Dec 8, 2017
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -59,6 +59,10 @@
     "countMarkers": true,
     "skel": true,
     "setupPokemonMarker": true,
-    "updatePokemonMarker": true
+    "updatePokemonMarker": true,
+
+    "pokemonLabel": true,
+    "updatePokemonLabel": true,
+    "updatePokemonLabels": true
   }
 }
diff --git a/.gitignore b/.gitignore
@@ -35,4 +35,7 @@ static/js/custom.js
 !contrib/supervisord/install-reinstall.sh
 !static/data/*
 !static/icons/hsl*.png
-!static/app/settings.json
+!static/app/settings.json
+docs/basic-install/mysql.md
+config/config.ini.example
+docs/first-run/commandline.md
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at thunderfox@rocketmap.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Live visualization of all the Pokémon (with option to show gyms, raids and Pok
 * Filters
 * Independent worker threads (many can be used simultaneously to quickly generate a livemap of a huge geographical area)
 * Localization (en, fr, pt_br, de, ru, ko, ja, zh_tw, zh_cn, zh_hk)
-* DB storage (sqlite or mysql) of all found Pokémon
+* DB storage (mysql) of all found Pokémon
 * Incredibly fast, efficient searching algorithm (compared to everything else available)
 
 ## Information

diff --git a/config/config.ini.example b/config/config.ini.example
@@ -25,7 +25,7 @@
 #speed-scan                     # Use speed-scan as the search scheduler.
 #location:                      # Location, can be an address or coordinates.
 #step-limit:                    # Steps (default=10)
-#scan-delay:                    # Time delay between requests in scan threads. (default=12)
+#scan-delay:                    # Time delay between requests in scan threads. (default=10)
 #no-gyms                        # Disables gym scanning (default=False)
 #no-pokemon                     # Disables pokemon scanning. (default=False)
 #no-pokestops                   # Disables pokestop scanning. (default=False)
@@ -39,8 +39,6 @@
 # Database settings
 ###################
 
-#db-type: sqlite                # sqlite (default) or mysql
-#db:                            # Database filename for SQLite. (default='pogom.db')
 #db-host:                       # Required for mysql ()
 #db-name:                       # Required for mysql
 #db-user:                       # Required for mysql
@@ -79,7 +77,7 @@
 #workers-per-hive:              # Only referenced when using --beehive. Sets number of workers per hive. (default=1)
 #workers:                       # Number of search worker threads to start. (default=#accounts)
 #spawn-delay:                   # Number of seconds after spawn time to wait before scanning to be sure the Pokemon is there. (default=10)
-#kph:                           # Set a maximum speed in km/hour for scanner movement. (default=35)
+#kph:                           # Set a maximum speed in km/hour for scanner movement. 0 to disable. (default=35)
 #bad-scan-retry:                # Number of bad scans before giving up on a step. (default=2, 0 to disable)
 #skip-empty                     # Enables skipping of empty cells in normal scans - requires previously populated database. (not to be used with -ss)
 #min-seconds-left:              # Time that must be left on a spawn before considering it too late and skipping it. (default=0)
@@ -109,7 +107,7 @@
 #encounter-delay:               # Delay in seconds before starting an encounter. Must not be zero. (default=1)
 #high-lvl-accounts:             # File containing a list high level accounts, in the format "auth_service,username,password"
 #enc-whitelist-file:            # File containing a list of Pokemon IDs to encounter for IV/CPs. Requires L30 or higher accounts in --high-lvl-accounts.
-#hlvl-kph:                      # Set a maximum speed in km/hour for high level account scanning. (default=25)
+#hlvl-kph:                      # Set a maximum speed in km/hour for high level account scanning. 0 to disable. (default=25)
 
 
 # Webserver settings
@@ -152,7 +150,12 @@
 #wh-types:[]                    # List of events to be sent: pokemon, gym, raid, egg, tth, gym-info, pokestop, lure, captcha. (default= nothing)
 #wh-threads:                    # Number of webhook threads; increase if the webhook queue falls behind. (default=1)
 #wh-retries:                    # Number of times to retry sending webhook data on failure (default=5)
+<<<<<<< HEAD
 #wh-timeout:                    # Timeout (in seconds) for webhook requests (default=1).
+=======
+#wh-connect-timeout:            # Connect timeout (in seconds) for webhook requests (default=1).
+#wh-read-timeout:               # Read timeout (in seconds) for webhook requests (default=1).
+>>>>>>> origin/develop
 #wh-concurrency:                # Async requests pool size. (default=25)
 #wh-backoff-factor:             # Factor (in seconds) by which the delay until next retry will increase. (default=0.25).
 #wh-lfu-size:                   # Webhook LFU cache max size (default=1000).

diff --git a/config/shared-config.ini.example b/config/shared-config.ini.example
@@ -14,8 +14,6 @@
 # Other shared settings 
 ###################
 
-#db-type:                       # sqlite (default) or mysql
-#db:                            # Database filename for SQLite. (default='pogom.db')
 #db-host:                       # Required for mysql ()
 #db-name:                       # Required for mysql
 #db-user:                       # Required for mysql

diff --git a/docs/advanced-install/docker.md b/docs/advanced-install/docker.md
@@ -11,9 +11,7 @@ If you are not familiar or don't feel confortable with Python, pip or any of the
 
 ## Introduction
 
-The quickest way to get RocketMap up and running with docker is quite simple. However, given the disposable nature of docker containers, and the fact that the default database for RocketMap is SQLite, your data won't be persistent. In case the container is stopped or crashes, all the collected data will be lost.
-
-If that doesn't bother you, and you just want to give RocketMap a go, keep on reading. If you prefer a persistent setup, skip to "Advanced Docker Setup"
+The quickest way to get RocketMap up and running with docker is quite simple. However you need to setup an external mysql database to make it work so be sure to read the tutorial until the "Advanced Docker Setup"
 
 ## Simple Docker Setup
 
@@ -166,7 +164,6 @@ docker run -d --name pogomap --net=pogonw -p 5000:5000 \
     -k 'your-google-maps-key' \
     -l 'lat, lon' \
     -st 5 \
-    --db-type mysql \
     --db-host db \
     --db-port 3306 \
     --db-name pogodb \
@@ -195,7 +192,6 @@ docker run -d --name pogomap2 --net=pogonw \
     -k 'your-google-maps-key' \
     -l 'newlat, newlon' \
     -st 5 \
-    --db-type mysql \
     --db-host db \
     --db-port 3306 \
     --db-name pogodb \
@@ -251,7 +247,6 @@ docker run -d --name pogomap --net=pogonw -p 5000:5000 \
     -k 'your-google-maps-key' \
     -l 'lat, lon' \
     -st 5 \
-    --db-type mysql \
     --db-host db \
     --db-port 3306 \
     --db-name pogodb \

diff --git a/docs/basic-install/index.rst b/docs/basic-install/index.rst
@@ -11,7 +11,11 @@ Follow one of the guides below to get the basic prerequisites installed:
  * :doc:`osx`
  * :doc:`windows`
  * :doc:`linux`
-
+
+You will also need a MySQL server installed:
+
+ * :doc:`mysql`
+
 Credentials
 ***********
 
@@ -140,19 +144,19 @@ Enables captcha solving and 2Captcha API key. (Manual captcha available, see `Fu
 Things to Know
 **************
 
- * You may want to use more than one account to scan with RocketMap. `Here <https://rocketmap.readthedocs.io/en/develop/first-run/multi-account.html>`_ is how to use as many accounts as your heart desires. 
- * Your accounts need to complete the tutorial before they will be any use to RocketMap! `Here <https://rocketmap.readthedocs.io/en/develop/first-run/tutorial.html>`_ is how do that with RM. 
- * You might experience your accounts encountering Captchas at some point. `Here <https://rocketmap.readthedocs.io/en/develop/first-run/captchas.html>`_ is how we handle those. 
+ * You may want to use more than one account to scan with RocketMap. `Here <https://rocketmap.readthedocs.io/en/develop/first-run/multi-account.html>`_ is how to use as many accounts as your heart desires.
+ * Your accounts need to complete the tutorial before they will be any use to RocketMap! `Here <https://rocketmap.readthedocs.io/en/develop/first-run/tutorial.html>`_ is how do that with RM.
+ * You might experience your accounts encountering Captchas at some point. `Here <https://rocketmap.readthedocs.io/en/develop/first-run/captchas.html>`_ is how we handle those.
  * Due to recent updates, you might experience a shaddow ban. `Here <https://rocketmap.readthedocs.io/en/develop/first-run/Blinding.html>`_ is what you need to know.
- * All of these flags can be set inside of a configuration file to avoid clutter in the command line. Go `here <http://rocketmap.readthedocs.io/en/develop/first-run/configuration-files.html>`_ to see how. 
- * A full list of all commands are available `here. <https://rocketmap.readthedocs.io/en/develop/first-run/commandline.html>`_ 
+ * All of these flags can be set inside of a configuration file to avoid clutter in the command line. Go `here <http://rocketmap.readthedocs.io/en/develop/first-run/configuration-files.html>`_ to see how.
+ * A full list of all commands are available `here. <https://rocketmap.readthedocs.io/en/develop/first-run/commandline.html>`_
  * A few tools to help you along the way are located `here. <https://rocketmap.readthedocs.io/en/develop/extras/Community-Tools.html>`_
 
 
 Updating the Application
 ************************
 
-RocketMap is a very active project and updates often. You can follow the `latest changes <https://github.com/RocketMap/RocketMap/commits/develop>`_ to see what's changing. 
+RocketMap is a very active project and updates often. You can follow the `latest changes <https://github.com/RocketMap/RocketMap/commits/develop>`_ to see what's changing.
 
 You can update with a few quick commands:
 
@@ -162,6 +166,6 @@ You can update with a few quick commands:
   pip install -r requirements.txt --upgrade (Prepend sudo -H on Linux)
   npm run build
 
-Watch the `latest changes <https://github.com/RocketMap/RocketMap/commits/develop>`_ on `Discord <https://discord.gg/RocketMap>`_ to know when updating will require commands other than above. 
-  
+Watch the `latest changes <https://github.com/RocketMap/RocketMap/commits/develop>`_ on `Discord <https://discord.gg/RocketMap>`_ to know when updating will require commands other than above.
+
 **IMPORTANT** Some updates will include database changes that run on first startup. You should run only **one** ``runserver.py`` command until you are certain that the DB has been updated. You will know almost immediately that your DB needs updating if **Detected database version x, updating to x** is printed in the console. This can take a while so please be patient. Once it's done, you can start all your instances like you normally would.
diff --git a/docs/basic-install/linux.rst b/docs/basic-install/linux.rst
@@ -24,7 +24,9 @@ Debian's sources lists are out of date and will not fetch the correct versions o
 
     curl -sL https://raw.githubusercontent.com/nodesource/distributions/master/deb/setup_8.x | sudo -E bash -
 
-    sudo apt-get install -y build-essential libbz2-dev libsqlite3-dev libreadline-dev libssl-dev libffi-dev zlib1g-dev libncurses5-dev libssl-dev libgdbm-dev python python-dev nodejs
+    sudo apt-get install -y build-essential libbz2-dev libreadline-dev libssl-dev libffi-dev zlib1g-dev libncurses5-dev libssl-dev libgdbm-dev python python-dev nodejs
+
+    curl -sL https://bootstrap.pypa.io/get-pip.py | sudo python -
 
     curl -sL https://bootstrap.pypa.io/get-pip.py | sudo python -
 

diff --git a/docs/extras/mysql.md → docs/basic-install/mysql.md b/docs/extras/mysql.md → docs/basic-install/mysql.md
@@ -1,13 +1,12 @@
-# Using a MySQL Server
+# Installing MySQL
 
-**This is a guide for windows only currently.**
-**Preliminary Linux (Debian) instructions below (VII)**
+**This guide is primarily for Windows.**
+**However, preliminary Linux (Debian) instructions are below (VII)**
 **Preliminary Docker (modern Linux OS w/ Docker & git installed) instructions below (VIII)**
 
 ## I. Prerequisites
-1. Have already ran/operated the RocketMap using the default database setup.
-2. Have the "develop" build of RocketMap. [Available here.](https://rocketmap.readthedocs.io/en/develop/basic-install/index.html)
-3. Downloaded [MariaDB](https://downloads.mariadb.org/)
+1. Have the "develop" build of RocketMap. [Available here.](https://rocketmap.readthedocs.io/en/develop/basic-install/index.html)
+2. Downloaded [MariaDB](https://downloads.mariadb.org/)
 
 ## II. Installing MariaDB
 1. Run the install file, for me this was: mariadb-10.1.16-winx64.msi
@@ -59,7 +58,6 @@
         - Change "username" to your respective username for the selected service.
         - Change "password" to your respective password for the username on the selected service.
     - **Database Settings:** This is the important section you will want to modify.
-        - Change the "db-type" to "mysql"
         - Change "db-host" to "127.0.0.1"
         - Change "db-name:" to "rocketmapdb"
         - Change "db-user:" to "rocketmapuser"
@@ -73,14 +71,15 @@
 5. Make sure you've removed all of the `#` from any line with a value you inputted. Indent the comments that are after the values as well, so they are on the following line below the variable they represent. For example:
    ```
    # Database settings
-   db-type: mysql
-   # sqlite (default) or mysql
+   db-name: mydb
+   # Required
    ```
 6. Go to File->Save as... and make sure you save this file into the same directory as the "config.ini.example", but obviously save it as "config.ini". Make sure it's saved as a .ini file type, and not anything else or it won't work.
 7. You're now done configuring your config.ini file.
 
-## V. Run it!
+MySQL is now installed, return to the main install guide. If you've encountered any errors it's most likely due to missing a parameter you commented out when you call runserver.py or you mis-typed something in your `config.ini`. However, if it's neither of those issues and something not covered in this guide hop into the RocketMap discord server, and go to the help channel. People there are great, and gladly assist people with troubleshooting issues.
 
+<<<<<<< HEAD:docs/extras/mysql.md
 Now that we have our server setup and our config.ini filled out it's time to actually run the workers to make sure everything is in check. Remember from above if you commented out any parameters in the util.py file that all of those parameters need to be met and filled out when you run the runserver.py script. In our case we commented out location, and steps so we could individual choose where each worker scanned, and the size of the scan. I've put two code snippets below, one would be used if you didn't comment out anything and instead filled out the **[Search_Settings]** in section IV step 4 above. The other code snippet is what you would run if you commented out the same lines as I did in our running example.
 
 ```
@@ -96,6 +95,8 @@ python runserver.py -st 10 -l "[LOCATION]"
 You should now be up and running. If you've encountered any errors it's most likely due to missing a parameter you commented out when you call runserver.py or you mis-typed something in your `config.ini`. However, if it's neither of those issues and something not covered in this guide hop into the RocketMap discord server, and go to the help channel. People there are great, and gladly assist people with troubleshooting issues.
 
 
+=======
+>>>>>>> origin/develop:docs/basic-install/mysql.md
 ## Set up MySQL on a second computer, seperate from RM instances.
 
 In this example, computer running RocketMap will be `Server A` while computer running MySQL will be `Server B`.
@@ -120,7 +121,6 @@ You need to tell RocketMap where the database is!
 
 ```
 **Database Settings:** This is the important section you will want to modify.
- - Change the "db-type" to "mysql"
  - Change "db-host" to [IP ADDDRESS OF SERVER B]
  - Change "db-name:" to "rocketmapdb"
  - Change "db-user:" to "rocketmapuser"
@@ -151,11 +151,10 @@ You need to tell RocketMap where the database is!
 
    ```
    # Database settings
-   db-type: mysql          # sqlite (default) or mysql
-   db-host: 127.0.0.1      # required for mysql
-   db-name: rocketmapdb # required for mysql
-   db-user: rocketmapuser    # required for mysql
-   db-pass: YourPW         # required for mysql
+   db-host: 127.0.0.1      
+   db-name: rocketmapdb # required
+   db-user: rocketmapuser    # required
+   db-pass: YourPW         # required
    ```
 
 ## Docker Settings w/ Let's Encrypt
@@ -172,7 +171,7 @@ _only pain comes from mysql5.7 and beyond_
 
 ```
 docker run --name mainmap -d --link pokesql pokemap --auth-service=ptc \
-  --username=youruser --password=yourpassword --db-type=mysql --db-host=pokesql \
+  --username=youruser --password=yourpassword --db-host=pokesql \
   --db-name=pokemap --db-user=root --db-pass=some-string --gmaps-key=someapikey
 ```
 
@@ -183,7 +182,7 @@ _OPTIONAL: always scan Austin, TX (SQL benchmark?)_
 ```
 docker run --name scanagent -d --link pokesql pokemap --no-server \
  --auth-service=ptc --location="Austin, TX" --username=yourotheruser \
- --password=yourotherpassword --db-type=mysql --db-host=pokemap \
+ --password=yourotherpassword --db-host=pokemap \
  --db-name=pokemap --db-user=root --db-pass=some-string \
  --gmaps-key=some-api-key
 ```