Merge selector to dev for comparison

.github/ISSUE_TEMPLATE.md

@@ -9,10 +9,6 @@
   ISSUES ARE NOT FOR SUPPORT!!!
   ISSUES ARE NOT FOR SUPPORT!!!
 
-  Join discord (channel: #help) for support at this link: https://discord.gg/rocketmap
-
-  Submit feature requests @ http://vote.devkat.org
-
 -->
 
 <!--- Provide a general summary of the issue in the Title above -->

Gruntfile.js

@@ -45,10 +45,9 @@ module.exports = function (grunt) {
                     'static/dist/js/statistics.built.js': 'static/js/statistics.js',
                     'static/dist/js/status.built.js': 'static/js/status.js',
                     'static/dist/js/custom.built.js': 'static/js/custom.js',
-                    'static/dist/js/vendor/markerclusterer.built.js': 'static/js/vendor/markerclusterer.js',
                     'static/dist/js/serviceWorker.built.js': 'static/js/serviceWorker.js',
                     'static/dist/js/weather.built.js': 'static/js/weather.js'
-                }
+               }
             }
         },
         uglify: {
@@ -69,7 +68,6 @@ module.exports = function (grunt) {
                     'static/dist/js/statistics.min.js': 'static/dist/js/statistics.built.js',
                     'static/dist/js/status.min.js': 'static/dist/js/status.built.js',
                     'static/dist/js/custom.min.js': 'static/dist/js/custom.built.js',
-                    'static/dist/js/vendor/markerclusterer.min.js': 'static/dist/js/vendor/markerclusterer.built.js',
                     'static/dist/js/serviceWorker.min.js': 'static/dist/js/serviceWorker.built.js',
                     'static/dist/js/weather.min.js': 'static/dist/js/weather.built.js'
                 }

README.md

@@ -20,10 +20,7 @@ Live visualization of all the Pokémon (with option to show gyms, raids and Pok
 * Incredibly fast, efficient searching algorithm (compared to everything else available)
 
 ## Information
-* [Discord](https://discord.gg/rocketmap) for general support
-* [Documentation](https://rocketmap.readthedocs.io/) for installation and usage docs
-* [vote.devkat.org](http://vote.devkat.org) to request new features
-* [Github Issues](https://github.com/RocketMap/RocketMap/issues) for reporting bugs (not for support!)
+* [Github Issues](https://github.com/SenorKarlos/RocketMap/issues) for reporting bugs (not for support!)
 
 ## Installation
 

pogom/altitude.py

@@ -12,20 +12,20 @@
 fallback_altitude = None
 
 
-def get_gmaps_altitude(lat, lng, gmaps_key):
+def get_gmaps_altitude(lat, lng):
     try:
         r_session = requests.Session()
         response = r_session.get((
-            'https://maps.googleapis.com/maps/api/elevation/json?' +
-            'locations={},{}&key={}').format(lat, lng, gmaps_key),
-            timeout=5)
+            'https://api.open-elevation.com/api/v1/lookup?' +
+            'locations={},{}').format(lat, lng),
+            timeout=30)
         response = response.json()
-        status = response['status']
+        status = response['results']
         results = response.get('results', [])
         result = results[0] if results else {}
         altitude = result.get('elevation', None)
     except Exception as e:
-        log.exception('Unable to retrieve altitude from Google APIs: %s.', e)
+        log.exception('Unable to retrieve altitude from OSM APIs: %s.', e)
         status = 'UNKNOWN_ERROR'
         altitude = None
 
@@ -50,8 +50,7 @@ def get_fallback_altitude(args, loc):
 
     # Only query if it's not set, and if it didn't fail already.
     if fallback_altitude is None and fallback_altitude != -1:
-        (fallback_altitude, status) = get_gmaps_altitude(loc[0], loc[1],
-                                                         args.gmaps_key)
+        (fallback_altitude, status) = get_gmaps_altitude(loc[0], loc[1])
 
     # Failed, don't try again.
     if fallback_altitude is None:
@@ -66,7 +65,7 @@ def cached_get_altitude(args, loc):
     altitude = LocationAltitude.get_nearby_altitude(loc)
 
     if altitude is None:
-        (altitude, status) = get_gmaps_altitude(loc[0], loc[1], args.gmaps_key)
+        (altitude, status) = get_gmaps_altitude(loc[0], loc[1])
         if altitude is not None and altitude != -1:
             LocationAltitude.save_altitude(loc, altitude)
 

pogom/app.py

@@ -374,7 +374,6 @@ def fullmap(self, statusname=None):
             lng=map_lng,
             showAllZoomLevel=args.show_all_zoom_level,
             generateImages=str(args.generate_images).lower(),
-            gmaps_key=args.gmaps_key,
             lang=args.locale,
             show=visibility_flags,
             rarityFileName=args.rarity_filename)
@@ -701,7 +700,6 @@ def get_stats(self):
             lat=self.current_location[0],
             lng=self.current_location[1],
             generateImages=str(args.generate_images).lower(),
-            gmaps_key=args.gmaps_key,
             show=visibility_flags)
 
     def get_gymdata(self):

pogom/dyn_img.py

@@ -187,7 +187,6 @@ def get_gym_icon(team, level, raidlevel, pkm, is_in_battle):
     if is_in_battle:
         out_filename = out_filename.replace('.png', '_B.png')
         im_lines.extend(draw_battle_indicator())
-
     gym_image = os.path.join(path_gym, '{}.png'.format(team))
     return run_imagemagick(gym_image, im_lines, out_filename)
 
@@ -326,9 +325,9 @@ def pokemon_asset_path(pkm, classifier=None, gender=GENDER_UNSET,
             log.warning("Cannot find PogoAssets file {}".format(
                 assets_fullname))
             # Dummy Pokemon icon
-            return os.path.join(
-                assets_basedir, 'pokemon_icon_000.png'),
-        os.path.join(target_path, 'pkm_000.png')
+            return (
+                os.path.join(assets_basedir, 'pokemon_icon_000.png'),
+                os.path.join(target_path, 'pkm_000.png'))
         return pokemon_asset_path(pkm, classifier=classifier,
                                   gender=MALE, form=form,
                                   costume=costume, weather=weather,
@@ -338,10 +337,10 @@ def pokemon_asset_path(pkm, classifier=None, gender=GENDER_UNSET,
 def draw_gym_subject(image, size, gravity='north', trim=False):
     trim_cmd = ' -fuzz 0.5% -trim +repage' if trim else ''
     lines = [
-        '-gravity {} ( "{}"{} -scale {}x{} -unsharp 0x1 ( +clone ' +
+        '-gravity {} ( "{}"{} -scale {}x{} -unsharp 0x1 ( +clone '.format(
+            gravity, image, trim_cmd, size, size),
         '-background black -shadow 80x3+5+5 ) +swap -background ' +
-        'none -layers merge +repage ) -geometry +0+0 -composite'.format(
-            gravity, image, trim_cmd, size, size)
+        'none -layers merge +repage ) -geometry +0+0 -composite'
     ]
     return lines
 
@@ -351,9 +350,10 @@ def draw_badge(pos, fill_col, text_col, text):
     lines = [
         '-fill {} -stroke black -draw "circle {},{} {},{}"'.format(
             fill_col, x, y, x + gym_badge_radius, y),
-        '-gravity center -fill {} -stroke none ' +
+        '-gravity center -fill {} -stroke none '.format(
+            text_col),
         '-draw "text {},{} \'{}\'"'.format(
-            text_col, x - 48, y - 49, text)
+            x - 48, y - 49, text)
     ]
     return lines
 

pogom/pgscout.py

@@ -1,5 +1,4 @@
 import logging
-import sys
 
 import requests
 
@@ -34,7 +33,7 @@ def pgscout_encounter(p, forced=False):
         r = requests.get(args.pgscout_url, params=params)
     except Exception:
         return scout_error(
-            "Exception on scout: {}".format(repr(sys.exc_info()[1])))
+            "Exception on scout")
 
     return r.json() if r.status_code == 200 else scout_error(
         "Got error {} from scout service.".format(r.status_code))
@@ -52,7 +51,7 @@ def perform_lure(p):
         r = requests.get(args.lure_url, params=params)
     except Exception:
         return scout_error(
-            "Exception on request: {}".format(repr(sys.exc_info()[1])))
+            "Exception on request")
 
     return r.json() if r.status_code == 200 else scout_error(
         "Got error {} from service.".format(r.status_code))

pogom/utils.py

@@ -17,7 +17,7 @@
 import requests
 
 from s2sphere import CellId, LatLng
-from geopy.geocoders import GoogleV3
+from geopy.geocoders import Nominatim
 from requests_futures.sessions import FuturesSession
 from requests.packages.urllib3.util.retry import Retry
 from requests.adapters import HTTPAdapter
@@ -288,9 +288,6 @@ def get_args():
                         'search bar for use in shared maps.',
                         action='store_false', dest='fixed_location',
                         default=True)
-    parser.add_argument('-k', '--gmaps-key',
-                        help='Google Maps Javascript API Key.',
-                        required=True)
     parser.add_argument('--skip-empty',
                         help=('Enables skipping of empty cells in normal ' +
                               'scans - requires previously populated ' +
@@ -1183,10 +1180,23 @@ def calc_pokemon_level(cp_multiplier):
     return pokemon_level
 
 
+def get_pos_by_name(location_name):
+    geolocator = Nominatim()
+    loc = geolocator.geocode(location_name, timeout=10)
+    if not loc:
+        return None
+
+    log.info("Location for '%s' found: %s", location_name, loc.address)
+    log.info('Coordinates (lat/long/alt) for location: %s %s %s', loc.latitude,
+             loc.longitude, loc.altitude)
+
+    return (loc.latitude, loc.longitude, loc.altitude)
+
+
 @memoize
-def gmaps_reverse_geolocate(gmaps_key, locale, location):
+def gmaps_reverse_geolocate(locale, location):
     # Find the reverse geolocation
-    geolocator = GoogleV3(api_key=gmaps_key)
+    geolocator = Nominatim()
 
     player_locale = {
         'country': 'US',
@@ -1216,11 +1226,8 @@ def gmaps_reverse_geolocate(gmaps_key, locale, location):
                 'timezone': str(timezone)
             })
         except Exception as e:
-            log.exception('Exception on Google Timezone API. '
-                          + 'Please check that you have Google Timezone API'
-                          + ' enabled for your API key'
-                          + ' (https://developers.google.com/maps/'
-                          + 'documentation/timezone/intro): %s.', e)
+            log.exception('Exception on  Timezone API. '
+                          + 'Please check that you have Timezone API', e)
     except Exception as e:
         log.exception('Exception while obtaining player locale: %s.'
                       + ' Using default locale.', e)

runserver.py

@@ -23,7 +23,7 @@
 from pogom.app import Pogom
 from pogom.utils import (get_args, now, gmaps_reverse_geolocate, init_args,
                          log_resource_usage_loop, get_debug_dump_link,
-                         dynamic_rarity_refresher)
+                         dynamic_rarity_refresher, get_pos_by_name)
 from pogom.altitude import get_gmaps_altitude
 
 from pogom.models import (init_database, create_tables, drop_tables,
@@ -89,7 +89,7 @@ def filter(self, record):
 # Assert pgoapi is installed.
 try:
     import pgoapi
-    from pgoapi import PGoApi, utilities as util
+    from pgoapi import PGoApi
 except ImportError:
     log.critical(
         "It seems `pgoapi` is not installed. Try running " +
@@ -262,7 +262,7 @@ def extract_coordinates(location):
         position = (float(res.group(1)), float(res.group(2)), 0)
     else:
         log.debug('Looking up coordinates in API')
-        position = util.get_pos_by_name(location)
+        position = get_pos_by_name(location)
 
     if position is None or not any(position):
         log.error("Location not found: '{}'".format(location))
@@ -334,20 +334,18 @@ def main():
 
     position = extract_coordinates(args.location)
     # Use the latitude and longitude to get the local altitude from Google.
-    (altitude, status) = get_gmaps_altitude(position[0], position[1],
-                                            args.gmaps_key)
+    (altitude, results) = get_gmaps_altitude(position[0], position[1])
+
     if altitude is not None:
         log.debug('Local altitude is: %sm.', altitude)
         position = (position[0], position[1], altitude)
     else:
-        if status == 'REQUEST_DENIED':
+        if results == 'REQUEST_DENIED':
             log.error(
-                'Google API Elevation request was denied. You probably ' +
-                'forgot to enable elevation api in https://console.' +
-                'developers.google.com/apis/api/elevation_backend/')
+                'OSM API Elevation request was denied.')
             sys.exit()
         else:
-            log.error('Unable to retrieve altitude from Google APIs' +
+            log.error('Unable to retrieve altitude from OSM APIs' +
                       'setting to 0')
 
     log.info('Parsed location is: %.4f/%.4f/%.4f (lat/lng/alt).',
@@ -452,7 +450,6 @@ def main():
         args.player_locale = PlayerLocale.get_locale(args.location)
         if not args.player_locale:
             args.player_locale = gmaps_reverse_geolocate(
-                args.gmaps_key,
                 args.locale,
                 str(position[0]) + ', ' + str(position[1]))
             db_player_locale = {

static/data/mapstyle.json

@@ -1,15 +1,7 @@
 {
-  "roadmap": "Roadmap",
-  "satellite": "Satellite",
-  "hybrid": "Hybrid",
-  "nolabels_style": "No Labels",
-  "dark_style": "Dark",
-  "style_light2": "Light2",
-  "style_pgo": "Pokémon Go",
-  "dark_style_nl": "Dark (No Labels)",
-  "style_light2_nl": "Light2 (No Labels)",
-  "style_pgo_nl": "Pokémon Go (No Labels)",
-  "style_pgo_day": "Pokémon Go Day",
-  "style_pgo_night": "Pokémon Go Night",
-  "style_pgo_dynamic": "Pokémon Go Dynamic"
+  "stylemapnik": "Mapnik",
+  "styleblackandwhite": "Black and White",
+  "styletopo": "ToPo Map",
+  "stylesatellite": "Satellite",
+  "stylewikipedia": "Wikipedia"
 }

static/data/searchmarkerstyle.json

@@ -11,8 +11,8 @@
     "name": "Compass",
     "icon": "static/images/markers/compass.png"
   },
-  "google": {
-    "name": "Default Google Marker",
+  "osm": {
+    "name": "Default OSM Marker",
     "icon": null
   },
   "female": {