Fix merge

.eslintrc.json

@@ -23,6 +23,7 @@
     "setupPokemonMarker": true,
 
     "isTouchDevice": true,
+    "isMobileDevice": true,
     "pokemonSprites": true,
     "noLabelsStyle": true,
     "darkStyle": true,

.github/PULL_REQUEST_TEMPLATE.md

@@ -23,6 +23,9 @@
 ## Checklist:
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
 <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+<!--  NOTE: In order to check code style locally and avoid having your build rejected by Travis, -->
+<!--  run the following commands before you commit: `flake8 .` and `npm run lint`. Fix any -->
+<!--  issues they point out. Note also that flake's NOQA is disabled on Travis. -->
 - [ ] My code follows the code style of this project.
 - [ ] My change requires a change to the documentation.
 - [ ] I have updated the documentation accordingly.

.gitignore

@@ -24,3 +24,4 @@ beehive.*
 !Tools/Easy-Setup/setup.bat
 !contrib/supervisord/gen-workers.sh
 !contrib/supervisord/install-reinstall.sh
+!static/data/*

Gruntfile.js

@@ -60,6 +60,7 @@ module.exports = function(grunt) {
       build: {
         files: {
           'static/dist/data/pokemon.min.json': 'static/data/pokemon.json',
+          'static/dist/data/moves.min.json': 'static/data/moves.json',
           'static/dist/data/mapstyle.min.json': 'static/data/mapstyle.json',
           'static/dist/data/searchmarkerstyle.min.json': 'static/data/searchmarkerstyle.json',
           'static/dist/locales/de.min.json': 'static/locales/de.json',

Tools/Easy-Setup/easy-setup.sh

@@ -8,7 +8,11 @@ echo ""
 
 if [ "$(grep -Ei 'debian|buntu|mint' /etc/*release)" ]; then
     echo "Installing python development tools..."
-    sudo apt-get install python python-dev
+    sudo apt-get install python python-dev build-essential -y
+    echo "Adding node repo..."
+    curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
+    echo "Installing node..."
+    sudo apt-get install nodejs -y
 else
     echo "This script only supports debain based Linux distros."
     echo "Please install manually."
@@ -18,7 +22,11 @@ fi
 echo "Installing pip..."
 sudo python get-pip.py
 echo "Installing required python packages..."
-pip install -r $scriptDir/../../requirements.txt
+sudo pip install -r $scriptDir/../../requirements.txt --upgrade
+echo "Installing frontend dependencies..."
+npm --prefix $scriptDir/../../ install $scriptDir/../../
+echo "Building frontend..."
+npm run build
 
 echo "Configuring Google Maps API..."
 cp $scriptDir/../../config/config.ini.example $scriptDir/../../config/config.ini

Tools/Easy-Setup/setup.bat

@@ -1,4 +1,5 @@
 @echo off
+echo Requesting Administrator Access...
 pushd %~dp0
     :: Running prompt elevated
 :-------------------------------------
@@ -22,23 +23,55 @@ if '%errorlevel%' NEQ '0' (
     pushd "%CD%"
     CD /D "%~dp0"
 :--------------------------------------
+echo.
+echo Setting PATHs...
+echo.
 
 IF EXIST C:\Python27 (
 set PATH2=C:\Python27
 ) ELSE (
 echo Python path not found, please specify or install.
+echo.
 set /p PATH2= Specify Python path: 
 )
 
+
+for /f "tokens=*" %%i in ('echo "%PATH%" ^| find /c /i "%PATH2%"') do set output=%%i
+if %output% equ 1 (
+goto found
+) else (
+goto notfound
+)
+
+:found
+cls
+echo Path is already set, skipping...
+goto Continue
+
+:notfound
+cls
 setx PATH "%PATH%;%PATH2%;%PATH2%\Scripts;"
+echo.
+echo Path set, continuing..
+goto Continue
+
+
+:Continue
 
 popd
 
+echo.
+echo Installing requirements...
+echo. 
+
 "%PATH2%\python" get-pip.py
 cd ..\..
 "%PATH2%\Scripts\pip" install -r requirements.txt
 "%PATH2%\Scripts\pip" install -r requirements.txt --upgrade
 
+call npm install
+call npm run build
+
 cd config
 set /p API= Enter your Google API key here:
 "%PATH2%\python" -c "print open('config.ini.example').read().replace('#gmaps-key:','gmaps-key:%API%')" > config.ini

config/config.ini.example

@@ -23,6 +23,12 @@
 #min-seconds-left:      # time that must be left on a spawn before considering it too late and skipping it (default 0)
 #status-name:           # enables writing status updates to the database - if you use multiple processes, each needs a unique value
 
+#Pokemon IV 
+#encounter:             # Set to true to start encounters to pull more info, like IVs or movesets. (default false)
+#encounter-delay:       # delay before starting an encounter. Must not be zero. (default 1)
+#encounter-whitelist:   # whitelist of pokemon ids to encounter. Syntax [id,id,id,id] (Do not use with blacklist)
+#encounter-blacklist:   # blacklist of pokemon ids to NOT encounter. Syntax [id,id,id,id] (Do not use with whitelist)
+
 # Misc
 #gmaps-key:             # your Google Maps API key
 #proxy:                 # Proxy URL e.g. socks5://127.0.0.1:9050 or a list of proxies e.g. [socks5://127.0.0.1:9050,socks5://127.0.0.1:9050]
@@ -41,4 +47,5 @@
 #status-page-password:  # enables and protects the /status page to view status of all workers
 
 #Uncomment a line when you want to change its default value (Remove # at the beginning)
+#Please ensure to leave a space after the : (example setting: value)
 #username, password, location and gmaps-key are required

docs/advanced-install/amazon-ecs.md

@@ -2,7 +2,7 @@
 
 > **Warning** -- Most cloud providers have been IP blocked from accessing the API
 
-Amazon ECS is essentially managed docker allowed you to run multi-container environments easily with minimal configuration. In this guide we'll create an ECS Task that will run a single pokemongo-map container with a MariaDB container
+Amazon ECS is essentially managed docker allowed you to run multi-container environments easily with minimal configuration. In this guide we'll create an ECS Task that will run a single pokemongo-map container with a MariaDB container for persisting the data
 
 ## Requirements
 
@@ -14,12 +14,12 @@ Amazon ECS is essentially managed docker allowed you to run multi-container envi
 
 In the AWS ECS console create a Task Definition with the JSON below. You will need to set the following values:
 
-* `POKEMON_USERNAME` - username for pokemongo
-* `POKEMON_PASSWORD` - password for pokemongo
-* `POKEMON_AUTH_SERVICE` - Define if you are using google or ptc auth
-* `POKEMON_LOCATION` - Location to search
-* `POKEMON_DB_USER` - Database user for MariaDB
-* `POKEMON_DB_PASS` - Database password for MariaDB
+* `POGOM_USERNAME` - username for pokemongo
+* `POGOM_PASSWORD` - password for pokemongo
+* `POGOM_AUTH_SERVICE` - Define if you are using google or ptc auth
+* `POGOM_LOCATION` - Location to search
+* `POGOM_DB_USER` - Database user for MariaDB
+* `POGOM_DB_PASS` - Database password for MariaDB
 
 ```json
 {
@@ -48,51 +48,47 @@ In the AWS ECS console create a Task Definition with the JSON below. You will ne
             "dockerSecurityOptions": null,
             "environment": [
                 {
-                    "name": "POKEMON_DB_TYPE",
+                    "name": "POGOM_DB_TYPE",
                     "value": "mysql"
                 },
                 {
-                    "name": "POKEMON_LOCATION",
+                    "name": "POGOM_LOCATION",
                     "value": "Seattle, WA"
                 },
                 {
-                    "name": "POKEMON_DB_HOST",
+                    "name": "POGOM_DB_HOST",
                     "value": "database"
                 },
                 {
-                    "name": "POKEMON_NUM_THREADS",
+                    "name": "POGOM_NUM_THREADS",
                     "value": "1"
                 },
                 {
-                    "name": "POKEMON_DB_NAME",
+                    "name": "POGOM_DB_NAME",
                     "value": "pogom"
                 },
                 {
-                    "name": "POKEMON_PASSWORD",
+                    "name": "POGOM_PASSWORD",
                     "value": "MyPassword"
                 },
                 {
-                    "name": "POKEMON_GMAPS_KEY",
+                    "name": "POGOM_GMAPS_KEY",
                     "value": "SUPERSECRET"
                 },
                 {
-                    "name": "POKEMON_AUTH_SERVICE",
+                    "name": "POGOM_AUTH_SERVICE",
                     "value": "ptc"
                 },
                 {
-                    "name": "POKEMON_DB_PASS",
+                    "name": "POGOM_DB_PASS",
                     "value": "somedbpassword"
                 },
                 {
-                    "name": "POKEMON_DB_USER",
+                    "name": "POGOM_DB_USER",
                     "value": "pogom"
                 },
                 {
-                    "name": "POKEMON_STEP_LIMIT",
-                    "value": "10"
-                },
-                {
-                    "name": "POKEMON_USERNAME",
+                    "name": "POGOM_USERNAME",
                     "value": "MyUser"
                 }
             ],
@@ -101,7 +97,7 @@ In the AWS ECS console create a Task Definition with the JSON below. You will ne
             ],
             "workingDirectory": null,
             "readonlyRootFilesystem": null,
-            "image": "ashex/pokemongo-map",
+            "image": "frostthefox/pokemongo-map",
             "command": null,
             "user": null,
             "dockerLabels": null,
@@ -160,6 +156,6 @@ In the AWS ECS console create a Task Definition with the JSON below. You will ne
 ```
 
 
-If you would like to add workers you can easily do so by adding another container with the additional variable `POKEMON_NO_SERVER` set to `true`. You have to let one of the pokemongo-map containers start first to create the database, an easy way to control this is to create a link from the worker to the primary one as it will delay the start.
+If you would like to add workers you can easily do so by adding another container with the additional variable `POGOM_NO_SERVER` set to `true`. You have to let one of the pokemongo-map containers start first to create the database, an easy way to control this is to create a link from the worker to the primary one as it will delay the start.
 
-Once the Task is running you'll be able to access the app via the Instances IP on port 80.
+Once the Task is running you'll be able to access the app via the Instances IP on port 80.

docs/advanced-install/docker.md

@@ -22,14 +22,14 @@ If that doesn't bother you, and you just want to give PokemonGo-Map a go, keep o
 In order to start the map, you've got to run your docker container with a few arguments, such as authentication type, account, password, desired location and steps. If you don't know which arguments are necessary, you can use the following command to get help:
 
 ```
-docker run --rm pokemap/pokemongo-map -h
+docker run --rm frostthefox/pokemongo-map -h
 ```
 
 To be able to access the map in your machine via browser, you've got to bind a port on your host machine to the one wich will be exposed by the container (default is 5000). The following docker run command is an example of to launch a container with a very basic setup of the map, following the instructions above:
 
 ```
 docker run -d --name pogomap -p 5000:5000 \
-  pokemap/pokemongo-map \
+  frostthefox/pokemongo-map \
     -a ptc -u username -p password \
     -k 'your-google-maps-key' \
     -l 'lat, lon' \
@@ -94,24 +94,23 @@ Open that URL in your browser and you're ready to rock!
 In order to update your PokemonGo-Map docker image, you should stop/remove all the containers running with the current (outdated) version (refer to "Stopping the server"), pull the latest docker image version, and restart everything. To pull the latest image, use the following command:
 
 ```
-docker pull pokemap/pokemongo-map
+docker pull frostthefox/pokemongo-map
 ```
 
 If you are running a ngrok container, you've got to stop it as well. To start the server after updating your image, simply use the same commands that were used before, and the containers will be launched with the latest version.
 
 ## Running on docker cloud 
 
-If you want to run pokemongo-map on a service that doesn't support arguments like docker cloud or ECS, you'll need to use one of the more specialised images out there that supports variables. The image `ashex/pokemongo-map` handles variables, below is an example:
+If you want to run pokemongo-map on a service that doesn't support arguments like docker cloud or ECS, you'll need to pass settings via variables below is an example:
 
 ```bash
   docker run -d -P \
-    -e "AUTH_SERVICE=ptc" \
-    -e "USERNAME=UserName" \
-    -e "PASSWORD=Password" \
-    -e "LOCATION=Seattle, WA" \
-    -e "STEP_LIMIT=5" \
-    -e "GMAPS_KEY=SUPERSECRET" \
-    ashex/pokemongo-map
+    -e "POGOM_AUTH_SERVICE=ptc" \
+    -e "POGOM_USERNAME=UserName" \
+    -e "POGOM_PASSWORD=Password" \
+    -e "POGOM_LOCATION=Seattle, WA" \
+    -e "POGOM_GMAPS_KEY=SUPERSECRET" \
+    frostthefox/pokemongo-map
 ```
 
 ## Advanced Docker Setup
@@ -162,7 +161,7 @@ Now that we have a persistent database up and running, we need to launch our Pok
 
 ```
 docker run -d --name pogomap --net=pogonw -p 5000:5000 \
-  pokemap/pokemongo-map \
+  frostthefox/pokemongo-map \
     -a ptc -u username -p password \
     -k 'your-google-maps-key' \
     -l 'lat, lon' \
@@ -191,7 +190,7 @@ If you would like to launch a different worker sharing the same db, to scan a di
 
 ```
 docker run -d --name pogomap2 --net=pogonw \
-  pokemap/pokemongo-map \
+  frostthefox/pokemongo-map \
     -a ptc -u username2 -p password2 \
     -k 'your-google-maps-key' \
     -l 'newlat, newlon' \
@@ -247,7 +246,7 @@ If you have a docker image for a notification webhook that you want to be called
 
 ```
 docker run -d --name pogomap --net=pogonw -p 5000:5000 \
-  pokemap/pokemongo-map \
+  frostthefox/pokemongo-map \
     -a ptc -u username -p password \
     -k 'your-google-maps-key' \
     -l 'lat, lon' \

docs/basic-install/index.rst

@@ -87,7 +87,7 @@ Linux/OSX:
 
 In order to run from a git clone, you must compile the front-end assets with node. Make sure you have node installed for your platform:
 
- * `Windows <https://nodejs.org/dist/v4.4.7/node-v4.4.7-x64.msi>`_
+ * `Windows <https://nodejs.org/dist/v4.5.0/node-v4.5.0-x64.msi>`_
  * `OSX <https://nodejs.org/dist/v4.4.7/node-v4.4.7.pkg>`_
  * Linux -- refer to the `package installation <https://nodejs.org/en/download/package-manager/>`_ for your flavor of OS
 
@@ -150,7 +150,7 @@ If you are running a ``git`` version, you can update with a few quick commands:
 .. code-block:: bash
 
   git pull
-  pip install -r requirements.txt --upgrade
+  pip install -r requirements.txt --upgrade (Prepend sudo -H on Linux)
   npm install
   npm run build
 

docs/basic-install/linux.rst

@@ -10,8 +10,10 @@ You can install the required packages on Ubuntu by running the following command
 
 .. code-block:: bash
 
+  sudo apt-get install -y python python-pip python-dev build-essential git
   curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
-  sudo apt-get install -y python python-pip python-dev nodejs nodejs-legacy build-essential
+  sudo apt-get install -y nodejs
+
 
 Debian 7/8
 **********

docs/extras/Community-Tools.md

@@ -1,10 +1,19 @@
 # Community Tools
 Some useful tools made by the community for the community
 
-## [PTC Account Generator](https://github.com/skvvv/pikapy)
+## [ptc-acc-gen](https://github.com/FrostTheFox/ptc-acc-gen)
+A PTC account generation script, generates any # of accounts. ToS verification/trainer name setting via PogoPlayer. Google Scripts script to accept email verification included. Outputs in .csv format. Semi-auto (Manually finish captcha) and automatic (Automatically finish captcha using 2captcha) modes.
+
+## [PTC Account Generator](https://github.com/sriyegna/Pikaptcha)
 ### An automation script that can create any number of Nintendo Pokémon Trainer Club accounts
 Used to generate any desired number of PTC accounts - TOS verifies them and includes a google script that can be used to verify all the emails. Outputs generated account information in .csv format.
 
+## [PGM Multi Loc](https://beccasafan.github.io/pgm-multiloc/)
+### Easily visualize locations on a map before scanning, and generate a customized launch script.
+Add multiple scan locations on the map. Automatically convert an area to a beehive. Resize and move the location on the map. Disable individual hives to stop scanning a specific location.
+
+Generate a customized launch script, with the ability to edit the templates used for the individual commands. Pass in a list of account information that contains usernames, passwords, proxies, etc.
+
 ## [Cor3Zer0's Map Calculator](https://github.com/Cor3Zer0/Map-Calculator)
 ### Calculator that helps in the creation of PokemonGo Map
 Used to calculate optimized flags for particular use cases given a set situation.