-
${i18n('popup_team')}: ${getTeamName(gym.team_id)}
${i18n('popup_slots_available')}: (${gym.availble_slots === 0 ? i18n('popup_full') : gym.availble_slots === 6 ? i18n('popup_empty') : gym.availble_slots})
`;
+
${i18n('popup_team')}: ${getTeamName(gym.team_id)}
${i18n('popup_slots_available')}: (${gym.available_slots === 0 ? i18n('popup_full') : gym.available_slots === 6 ? i18n('popup_empty') : gym.available_slots})
`;
if (gym.guarding_pokemon_id !== null) {
content += `
${i18n('popup_guard')}: ${getPokemonName(gym.guarding_pokemon_id)}
`;
}
@@ -4456,12 +4520,50 @@ function getPokestopMarker (pokestop, ts) {
return marker;
}
+function getInvasionMarker (invasion, ts) {
+ const id = 'i' + invasion.character;
+ const stopSize = getIconSize('invasion', id);
+ const sizeId = 'i0';
+ const iconAnchorY = stopSize * .896; //availableIconStyles[selectedIconStyle].pokestopAnchorY;
+ let popupAnchorY = -8 - iconAnchorY;
+ const icon = L.divIcon({
+ iconSize: [stopSize, stopSize],
+ iconAnchor: [stopSize / 2, iconAnchorY],
+ popupAnchor: [0, popupAnchorY],
+ className: 'pokestop-marker',
+ html: `
`,
+ });
+ const marker = L.marker([invasion.lat, invasion.lon], {
+ icon: icon,
+ //forceZIndex: 20 + zIndex,
+ virtual: true
+ });
+ marker.bindPopup(invasion.name);
+ marker.on('popupopen', function (popup) {
+ openedInvasion = invasion;
+ marker._popup.setContent(getInvasionPopupContent(invasion));
+ });
+ return marker;
+}
+
function getSpawnpointMarker (spawnpoint, ts) {
let content = '
Spawnpoint
';
const hasTimer = spawnpoint.despawn_second !== null;
if (hasTimer) {
const timer = Math.round(spawnpoint.despawn_second / 60);
content += `
${i18n('popup_despawn_timer')}: ${timer} ${i18n('popup_minutes')}`;
+ if (spawnpoint.last_seen) {
+ // TODO: spawnpoint.last_seen x hours/minutes ago
+ const lastSeenDate = new Date(spawnpoint.last_seen * 1000);
+ const todayMidnight = new Date();
+ todayMidnight.setHours(0, 0, 0, 0);
+ // Check if last seen date is greater than today at midnight. If spawnpoint
+ // was seen today omit the date string and only show time.
+ const date = todayMidnight < lastSeenDate
+ ? lastSeenDate.toLocaleTimeString(dateTimeLocale)
+ : lastSeenDate.toLocaleString(dateTimeLocale);
+ content += `
${i18n('popup_last_seen')}: ${date}`;
+ }
}
const circle = L.circle([spawnpoint.lat, spawnpoint.lon], {
color: hasTimer ? 'green' : 'red',
@@ -4475,10 +4577,10 @@ function getSpawnpointMarker (spawnpoint, ts) {
function getGymMarkerIcon (gym, ts) {
let size;
- if (gym.availble_slots === 6 || gym.team_id === 0) {
+ if (gym.available_slots === 6 || gym.team_id === 0) {
size = 0;
} else {
- size = (6 - gym.availble_slots);
+ size = (6 - gym.available_slots);
}
// Gym
@@ -7847,7 +7949,7 @@ function registerFilterButtonCallbacks() {
$('#reset-raid-filter').on('click', function (event) {
const defaultRaidFilter = {};
let i;
- for (i = 1; i <= 6; i++) {
+ for (i = 1; i <= 8; i++) {
defaultRaidFilter['l' + i] = { show: true, size: 'normal' };
}
for (i = 0; i < availableRaidBosses.length; i++) {
@@ -7865,7 +7967,7 @@ function registerFilterButtonCallbacks() {
$('#disable-all-raid-filter').on('click', function (event) {
const defaultRaidFilter = {};
let i;
- for (i = 1; i <= 6; i++) {
+ for (i = 1; i <= 8; i++) {
defaultRaidFilter['l' + i] = { show: false, size: raidFilterNew['l' + i].size };
}
for (i = 0; i < availableRaidBosses.length; i++) {
@@ -7883,7 +7985,7 @@ function registerFilterButtonCallbacks() {
$('#legendary-raid-filter').on('click', function (event) {
const defaultRaidFilter = {};
let i;
- for (i = 1; i <= 6; i++) {
+ for (i = 1; i <= 8; i++) {
defaultRaidFilter['l' + i] = { show: i === 5, size: raidFilterNew['l' + i].size };
}
for (i = 0; i < availableRaidBosses.length; i++) {
@@ -7901,7 +8003,7 @@ function registerFilterButtonCallbacks() {
$('#normal-raid-filter').on('click', function (event) {
const defaultRaidFilter = {};
let i;
- for (i = 1; i <= 6; i++) {
+ for (i = 1; i <= 8; i++) {
defaultRaidFilter['l' + i] = { show: i !== 5, size: raidFilterNew['l' + i].size };
}
for (i = 0; i < availableRaidBosses.length; i++) {
diff --git a/static/locales/_en.json b/static/locales/_en.json
index 83622967..09cbd5fb 100644
--- a/static/locales/_en.json
+++ b/static/locales/_en.json
@@ -131,6 +131,8 @@
"filter_raid_level_4": "Level 4",
"filter_raid_level_5": "Level 5",
"filter_raid_level_6": "Mega",
+ "filter_raid_level_7": "Level 7",
+ "filter_raid_level_8": "Ultra Beast",
"filter_raid_levels": "Raid Levels",
"filter_raid_ex": "Only EX Raids",
"filter_gym_in_battle": "Only In-Battle",
diff --git a/static/locales/_pl.json b/static/locales/_pl.json
index e1674999..b758da8e 100644
--- a/static/locales/_pl.json
+++ b/static/locales/_pl.json
@@ -131,6 +131,8 @@
"filter_raid_level_4": "Poziom 4",
"filter_raid_level_5": "Poziom 5",
"filter_raid_level_6": "Mega",
+ "filter_raid_level_7": "Level 7",
+ "filter_raid_level_8": "Ultra Beast",
"filter_raid_levels": "Poziomy raidów",
"filter_raid_ex": "Tylko EX raidy",
"filter_gym_in_battle": "Tylko w trakcie walki",
