Merge pull request PokemonGoF#2 from AHAAAAAAA/master

Merge changes

ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md

@@ -1,5 +1,5 @@
-GitHub issues are for bug reporting.  
-For general support, and feature request, join [our discord server](https://discord.gg/kwAcr7e).
+GitHub issues are for bug reporting and feature requests.  
+For general support, join [our discord server](https://discordapp.com/invite/qbpVH6b).
 To make bug reports easy to find and organized, we close issues that are deemed
 out of scope for GitHub Issues and point people to Discord.
 

.travis.yml

@@ -0,0 +1,8 @@
+language: python
+python:
+  - "2.7"
+# command to install dependencies
+install: "pip install -r requirements.txt"
+script:
+  echo "nop"
+#     - coveralls

Easy Setup/requirements.txt

@@ -0,0 +1,8 @@
+geopy==1.11.0
+protobuf==2.6.1
+requests==2.10.0
+flask-googlemaps==0.2.0
+s2sphere==0.2.4
+flask==0.11.1
+gpsoauth==0.3.0
+coveralls==1.1

Easy Setup/setup.bat

@@ -0,0 +1,3 @@
+@echo off
+C:\Python27\python get-pip.py
+C:\Python27\Scripts\pip install -r requirements.txt

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Ahmed Almutawa
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,39 +1,63 @@
 <p align="center">
-<img src="https://cloud.githubusercontent.com/assets/1760334/16904125/5621e800-4c4d-11e6-9906-55cfd778fd27.png">
+<img src="https://cloud.githubusercontent.com/assets/7145349/16916971/6bd3343a-4cb4-11e6-86cc-e3bc9399a9b0.png">
 </p>
 
 # PokemonGo Map
-Live visualization of all the pokemon in your area, building off [Mila432](https://github.com/Mila432/Pokemon_Go_API)'s PokemonGo API, [tejado's additions](https://github.com/tejado/pokemongo-api-demo), [leegao's additions](https://github.com/leegao/pokemongo-api-demo/tree/simulation) and [Flask-GoogleMaps](https://github.com/rochacbruno/Flask-GoogleMaps). Proof of concept that we can load all the pokemon visible nearby given a location.
 
-Currently really rough, shows duplicate pokemon and requires refreshing page a lot (until the PokemonGo servers decide we're worthy). However, it works. Be warned, ugly ugly code ahead.
+[![Build Status](https://travis-ci.org/AHAAAAAAA/PokemonGo-Map.svg?branch=master)](https://travis-ci.org/AHAAAAAAA/PokemonGo-Map)  [![Coverage Status](https://coveralls.io/repos/github/AHAAAAAAA/PokemonGo-Map/badge.svg?branch=master)](https://coveralls.io/github/AHAAAAAAA/PokemonGo-Map?branch=master)
 
-Team icons from [israelvicars](https://github.com/israelvicars/pkmn-go-emoji).
+Live visualization of all the pokemon (with option to show gyms and pokestops) in your area. This is a proof of concept that we can load all the pokemon visible nearby given a location. Currently runs on a Flask server displaying a Google Maps with markers on it.
+
+Building off [Mila432](https://github.com/Mila432/Pokemon_Go_API)'s PokemonGo API, [tejado's additions](https://github.com/tejado/pokemongo-api-demo), [leegao's additions](https://github.com/leegao/pokemongo-api-demo/tree/simulation) and [Flask-GoogleMaps](https://github.com/rochacbruno/Flask-GoogleMaps).
+
+---
+
+# Requirements
+* Python 2.7.x
 
 # Installation
 `pip install -r requirements.txt`
 
 # Usage
-`python example.py -u myUsername -p myPassword -l "Boulder, CO" -st 5`
+`python example.py -a authService -u myUsername -p myPassword -l "Boulder, CO" -st 5`
+
+| Flag                            | Description                                               | Required | 
+|---------------------------------|-----------------------------------------------------------|----------| 
+| `-a`                            | Auth Service (ptc or google)                              |          | 
+| `-u`                            | Username                                                  | ✓        | 
+| `-p`                            | Password                                                  | ✓        | 
+| `-l`                            | Any location Google Maps can understand                   | ✓        | 
+| `-st`                           | Steps to take                                             | ✓        | 
+| `-ar` `--auto_refresh` `seconds`| Enables auto page reload. Value in seconds                |          | 
+| `-i` `--ignore`                 | Comma-separated list of Pokémon to ignore                 |          | 
+| `-o` `--only`                   | Comma-separated list of Pokemon to search for exclusively |          | 
+| `-dp` `--display-pokestop`      | Display pokestop                                          |          | 
+| `-dg` `--display-gym`           | Display gym                                               |          | 
+| `-H` `--host`                   | Set web server listening host                             |          | 
+| `-P` `--port`                   | Set web server listening port                             |          |
+|`-L` `--locale`                  | Locale for Pokemon names: en (default), fr, de            |          |
+
+_Note:
+5 steps is approximately a 1.2km radius. More than 10 is redundant (you usually can't walk that far before despawn anyway)_
 
-| Flag | Description                             | 
-|------|-----------------------------------------| 
-| -u   | Username                                | 
-| -p   | Password                                | 
-| -l   | Any location Google Maps can understand | 
-| -st  | Steps to take                           | 
-| -i, --ignore | Comma-separated list of Pokémon to ignore |
 
-# FAQ
 
-`Exception, e <-`
-`Invalid syntax.`
+## Common Errors
+> _`Exception, e <- Invalid syntax.`_
+
 * You are using python 3, download python 2.7 instead.
 
-`pip or python is not recognized as an internal or external command`
 
-* replace pip with C:\Python27\Scripts\pip
-* replace python with C:\Python27\python
+> _`pip or python is not recognized as an internal or external command`_
+
+* Replace pip with C:\Python27\Scripts\pip
+* Replace python with C:\Python27\python
+
+## FAQ
+> _Can I sign in with Google?_
+
+* Yes you can! Pass the flag `-a google` to use Google authentication
 
-* Can I sign in with Google? Not yet, we're working on it, until then get a Trainer Club account
+> _I'm on Windows, why does nothing work?_
 
-* I'm on Windows, why does nothing work? See if anything in https://www.reddit.com/r/pokemongodev/comments/4t80df/wip_pokemon_go_map_visualization_google_maps_view/d5feu2f helps
+* See if anything in https://www.reddit.com/r/pokemongodev/comments/4t80df/wip_pokemon_go_map_visualization_google_maps_view/d5feu2f helps

credentials.json

@@ -0,0 +1,7 @@
+{
+	"ptc_client_secret"	: "w8ScCUXJQc6kXKw8FiOhd8Fixzht18Dq3PEVkUCP5ZPxtgyWsbTvWHFLm2wNY0JR",
+	"android_id"		: "9774d56d682e549c",
+	"service"			: "audience:server:client_id:848232511240-7so421jotr2609rmqakceuu1luuq0ptb.apps.googleusercontent.com",
+	"client_sig"		: "321187995bc7cdc2b5fc91b11a96e2baa8602c62",
+	"gmaps_key"			: "AIzaSyAZzeHhs-8JZ7i18MjFuM35dJHq70n3Hx4"
+}