Merge pull request #46 from versx/quest-filter-popup

Filter Quest via Marker Popup
WatWowMap · Aug 19, 2020 · 4b16f2f · 4b16f2f
2 parents d7ffe2e + 509c598
commit 4b16f2f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/config.example.json b/src/config.example.json
@@ -72,7 +72,7 @@
         }
     },
     "discord": {
-        "enabled": true,
+        "enabled": false,
         "status": "Map Status: Online",
         "botToken": "",
         "clientId": "",

diff --git a/src/views/index-js.mustache b/src/views/index-js.mustache
@@ -3038,6 +3038,25 @@ function addPokemonFilter (pokemonId, formId, show) {
     });
 }
 
+function addQuestFilter (pokemonId, itemId, show) {
+    if (pokemonId > 0) {
+        questFilter['p' + pokemonId].show = show;
+    }
+    if (itemId > 0) {
+        questFilter['i' + itemId].show = show;
+    }
+    store('quest_filter', JSON.stringify(questFilter));
+
+    $.each(pokestopMarkers, function (index, pokestop) {
+        const reward = pokestop.quest_rewards ? pokestop.quest_rewards[0] : {};
+        const rewardPokemonId = reward.info.pokemon_id || 0;
+        const rewardItemId = reward.info.item_id || 0;
+        if (rewardPokemonId === pokemonId && rewardItemId === itemId) {
+            map.removeLayer(pokestop.marker);
+        }
+    });
+}
+
 function getPokestopPopupContent (pokestop) {
     const now = new Date();
     const lureExpireDate = new Date(pokestop.lure_expire_timestamp * 1000);
@@ -3113,9 +3132,16 @@ function getPokestopPopupContent (pokestop) {
         content += '<small><b>Last Updated:</b> ' + updatedDate.toLocaleDateString() + ' ' + updatedDate.toLocaleTimeString() + ' (' + getTimeSince(updatedDate) + ')<br></small>';
     }
 
+    const questReward = pokestop.quest_rewards ? pokestop.quest_rewards[0] : {};
+    content +=
+        '<br>';
+    if (pokestop.quest_type !== null) {
+        content += '<center><a title="Filter Quest" href="#" onclick="addQuestFilter(' + ((questReward.info || {}).pokemon_id || 0) + ', ' + ((questReward.info || {}).item_id || 0) + ', false);return false;"><b>[Exclude]</b></a></center>';
+    }
     content +=
         '<br>' +
         '<div class="row text-center">' +
+            '<br>' +
             '<div class="col">' +
                 '<a href="https://www.google.com/maps/place/' + pokestop.lat + ',' + pokestop.lon + '" title="Open in Google Maps">' +
                     `<img src="${availableIconStyles[selectedIconStyle]}/navigation/gmaps.png" height="32" width="32">` +