Skip to content

display nests on map #274

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZeChrales wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

display nests on map #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69e8a56
display nests on map
ZeChrales May 30, 2017
9911353
nests
ZeChrales May 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions monocle/db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,3 +789,17 @@ def get_all_spawn_coords(session, pokemon_id=None):
if conf.REPORT_SINCE:
points = points.filter(Sighting.expire_timestamp > SINCE_TIME)
return points.all()

def get_top_pokemon_by_spawnpoint(session):
query = session.execute('''
select spawn_id, despawn_time, lat, lon, duration, pokemon_id, max(number)
from (
select sightings.spawn_id, spawnpoints.despawn_time, spawnpoints.lat, spawnpoints.lon, spawnpoints.duration, sightings.pokemon_id, count(pokemon_id) as number
from sightings, spawnpoints
where sightings.spawn_id = spawnpoints.spawn_id
Copy link
Contributor

@evenly-epic-mule evenly-epic-mule Jun 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

think you should add a limit for the time too, as nests are only valid since the last (soft) migration

group by spawn_id, pokemon_id
order by spawn_id, number desc
) test
group by spawn_id
''')
return query
14 changes: 11 additions & 3 deletions monocle/static/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,12 @@ function addGymsToMap (data, map) {

function addSpawnsToMap (data, map) {
data.forEach(function (item) {
var userPreference = getPreference('filter-'+item.top);
var circle = L.circle([item.lat, item.lon], 5, {weight: 2});
if (userPreference === 'pokemon'){
var icon = new PokemonIcon({iconUrl: '/static/monocle-icons/icons/' + item.top + '.png', expires_at: 0});
var circle = L.marker([item.lat, item.lon], {icon: icon, opacity: 1});
}
var time = '??';
if (item.despawn_time != null) {
time = '' + Math.floor(item.despawn_time/60) + 'min ' +
Expand Down Expand Up @@ -373,9 +378,12 @@ map.whenReady(function () {
overlays.Pokestops.once('add', function(e) {
getPokestops();
})
getScanAreaCoords();
getWorkers();
overlays.Workers.hidden = true;
overlays.ScanArea.once('add', function(e) {
getScanAreaCoords();
})
overlays.Workers.once('add', function(e) {
getWorkers();
})
setInterval(getWorkers, 14000);
getPokemon();
setInterval(getPokemon, 30000);
Expand Down
23 changes: 14 additions & 9 deletions monocle/web_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from time import time

from monocle import sanitized as conf
from monocle.db import get_forts, Pokestop, session_scope, Sighting, Spawnpoint
from monocle.db import get_forts, get_top_pokemon_by_spawnpoint, Pokestop, session_scope, Sighting, Spawnpoint
from monocle.utils import Units, get_address
from monocle.names import DAMAGE, MOVES, POKEMON

Expand Down Expand Up @@ -135,14 +135,19 @@ def get_gym_markers(names=POKEMON):

def get_spawnpoint_markers():
with session_scope() as session:
spawns = session.query(Spawnpoint)
return [{
'spawn_id': spawn.spawn_id,
'despawn_time': spawn.despawn_time,
'lat': spawn.lat,
'lon': spawn.lon,
'duration': spawn.duration
} for spawn in spawns]
stat_spawns = get_top_pokemon_by_spawnpoint(session)
spawn_list = []
for stat in stat_spawns:
if stat.spawn_id != -1:
spawn_list.append({
'spawn_id': stat.spawn_id,
'despawn_time': stat.despawn_time,
'lat': stat.lat,
'lon': stat.lon,
'duration': stat.duration,
'top': stat.pokemon_id
})
return spawn_list

if conf.BOUNDARIES:
from shapely.geometry import mapping
Expand Down