From f497dfa1d1e8581ddac83986de9a55d88d0d2c93 Mon Sep 17 00:00:00 2001 From: Felix Date: Thu, 8 Sep 2016 21:22:43 +0200 Subject: [PATCH] Update - Cleaner object adding - Added spawn point support --- img/spawn_point.png | Bin 0 -> 4902 bytes js/main.js | 93 +++++++++++++++++++++++++++++++++----------- 2 files changed, 70 insertions(+), 23 deletions(-) create mode 100644 img/spawn_point.png diff --git a/img/spawn_point.png b/img/spawn_point.png new file mode 100644 index 0000000000000000000000000000000000000000..18552b5340f8f5e7d03fbc5b1c576917824865ec GIT binary patch literal 4902 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 Y7gHBXQ-~!eIsgCw07*qoM6N<$f)(I-P5=M^ literal 0 HcmV?d00001 diff --git a/js/main.js b/js/main.js index 2515154..e7652e1 100644 --- a/js/main.js +++ b/js/main.js @@ -9,23 +9,57 @@ var header = `
-
+
-
- +
+
-
+
+
+
+ +
+
+

- +
- - - - + + + + `; var gmap = new GMaps({ @@ -48,32 +82,40 @@ ], callback: function(data) { if (data !== false && Object.keys(data).length) { - e.name = data.name; - e.description = data.description; - e.imageUrl = data.image_url; - e.experience = data.experience; + var ed = e.data = {}; + if (data.type === "SPAWN") { + ed.interval = data.interval; + ed.encounters = data.encounters; + } + else if (data.type === "CHECKPOINT") { + ed.name = data.name; + ed.description = data.description; + ed.imageUrl = data.image_url; + ed.experience = data.experience; + } + else if (data.type === "GYM") { + ed.team = data.team; + } e.type = data.type; - addFort(e); + addFort(e, ed); } } }) } }); - function addFort(e) { + function addFort(e, data) { let lat = e.latLng.lat(); let lng = e.latLng.lng(); - send({ + let obj = { action: "addFortToPosition", latitude: lat, longitude: lng, zoom: gmap.zoom, - name: e.name, - description: e.description, - image: e.imageUrl, - experience: e.experience, type: e.type - }, function(res) { + }; + Object.assign(obj, data); + send(obj, function(res) { console.log(res); refreshMapForts(); }); @@ -93,7 +135,11 @@ setStatus("Connected!", "green"); } else { - setStatus("Connection failed!", "red"); + if (res.reason !== void 0) { + setStatus(res.reason); + } else { + setStatus("Connection failed!", "red"); + } return void 0; } }); @@ -185,6 +231,7 @@ result.forts.map((fort) => { let icon = null; if (fort.type === "CHECKPOINT") icon = "img/pokestop_blue.png"; + else if (fort.uid[fort.uid.length - 1] === "S") icon = "img/spawn_point.png"; else icon = "img/gym_" + fort.owned_by_team + ".png"; gmap.addMarker({ lat: fort.latitude, @@ -246,4 +293,4 @@ }, 3e3); } -})(); +})(); \ No newline at end of file