JAN 2020 UPDATE (v2.0.0)

- Added Google Map for Mini-Map Overlay use.

- Added Unique-Code for security.

** Updated Readme, MUST read for a thorough understanding of new features and updates. **

Author: b3ck

README.md

@@ -1,4 +1,5 @@
 # gps-logger by 715209
+# live-map by b3ck
 
 Download and install this on your android phone:
 https://github.com/mendhak/gpslogger/releases
@@ -15,14 +16,26 @@ Once it's started go into the settings and turn everything off for logging besid
   
   > [JS REST APP ID & APP CODE EXAMPLE](https://i.imgur.com/74eEKEr.png/)
 
-- 4.) [Open and Forward your ports](https://www.noip.com/support/knowledgebase/general-port-forwarding-guide/), otherwise all of this won't work.
-- 5.) Run 'npm start.bat' to start the gps-logger server
+- 4.) Also in the `config.js` is a section for a 'UNIQUE_CODE', if you want to protect access to the GPS-LOGGER either generate it or put in your own code, if not then leave it blank;
+
+  Get a Code here => https://www.randomcodegenerator.com/en/generate-codes or make up your own.
+  
+  Add `&key=<UNIQUE_CODE>` at the end of your GPS-LOGGER 'custom url' URL, this will secure your data and everything in turn needs this key to access data and send data.
+  
+  My Custom URL in GPS-Logger looks like this: ```http://<YOUR-IP-or-DNS>:<PORT>/log?s=%SPD&b=%BATT&lat=%LAT&lon=%LON&a=%ALT&key=<UNIQUE_CODE>```
+  
+  If you want to access the gps-logger from outside your local network you'll need to add `?key=<UNIQUE-CODE>` to the end of the URL, for example ```http://<YOUR-IP-or-DNS>:<PORT>/map?key=<UNIQUE-CODE>```
+  
+  This could be a neat tool to give to your most trusted MODs just in case something happens to you, they 'could' provide emergency services with your exact location.
+
+- 5.) [Open and Forward your ports](https://www.noip.com/support/knowledgebase/general-port-forwarding-guide/), otherwise all of this won't work.
+- 6.) Run 'npm start.bat' to start the gps-logger server
 
 It should say something like this:
 
 ```
 PS C:\github\gps-logger> npm start
-gps-logger@1.0.0 start C:\github\gps-logger
+gps-logger@2.0.0 start C:\github\gps-logger
 node app
 listening on *:3000
 ```
@@ -32,11 +45,23 @@ listening on *:3000
  > - or http://localhost:3000/stats/a
  > - or http://localhost:3000/stats/b
 
+ > Other links to know:
+ > - http://localhost:3000/map
+ > - > is your regular map
+
+ > - http://localhost:3000/map_rotate
+ > - > is a basic attempt to make the map rotate depending on your current direction, you will need to add &d=%DIR to your Custom URL in the GPS-LOGGER app on your phone, before the UNIQUE-CODE. ```ex; http://<YOUR-IP-or-DNS>:<PORT>/log?s=%SPD&b=%BATT&lat=%LAT&lon=%LON&a=%ALT&d=%DIR&key=<UNIQUE_CODE>```
+
+ > - http://localhost:3000/mod_map
+ > - > this will show a map with all details and stats to help your most trusted MODs in an emergency situtation.
+ > - > MODs can access this from: ```http://<YOUR-IP-or-DNS>:<PORT>/mod_map?key=<UNIQUE-CODE>```
+
 Now just pull whatever you want into your OBS Scene, and Bob's your uncle. :man:
 
   > Please keep in mind I just left everything styled like I have it in my stream, to truly make it your own all it takes is a little tinkering with CSS.
 
-If you have any issues feel free to submit them here on GitHub.
+If you have any issues feel free to submit them here on GitHub, or message me on Discord.
+- To see it in action check out my livestream or VODs @ https://twitch.tv/b3ck
 
 
 

app.js

@@ -7,11 +7,11 @@ const http = require("http").Server(app);
 const io = require("socket.io")(http);
 const config = require("./config.js");
 const fetch = require("node-fetch");
+const geoTz = require('geo-tz');
 
 // Don't touch this!
 let waitForTheStuff = false; //really you don't want to touch this, like ever, if you do.. nothing will work... seriously.
 
-
 // This area gives the data a nice little home to stay in, if you add anything in the below functions make sure it ends up here.
 let lastRequest = {
 	city: "",
@@ -23,9 +23,58 @@ let lastRequest = {
 	country: "",
 	country2: "",
 	temp: "",
-	time: ""
+	time: "",
+	direction: "",
+	gapi: ""
 };
 
+/////////////////
+// Timestamp Stuff //
+////////////////////////////////////////////////////////////////
+function formatAMPM(date) {
+	var month = ('0' + (date.getMonth() + 1)).slice(-2);
+	var day = ('0' + date.getDate()).slice(-2);
+	var year = date.getFullYear();
+	var hours = date.getHours();
+	var minutes = date.getMinutes();
+	var seconds = date.getSeconds();
+	var ampm = hours >= 12 ? 'PM' : 'AM';
+	hours = hours % 12;
+	hours = hours ? hours : 12; // the hour '0' should be '12'
+	minutes = minutes < 10 ? '0'+minutes : minutes;
+	seconds = seconds < 10 ? '0'+seconds : seconds;
+	var strTime = month + '/' + day + '/' + year + ' - ' + hours + ':' + minutes + ':' + seconds + ' ' + ampm;
+	return strTime;
+}
+////////////////////////////////////////////////////////////////
+
+// Map Style Stuff
+mapstyle = config.MAPSTYLE + '.json';
+
+// Google Map API Stuff
+lastRequest.gapi = config.GOOGLEAPI
+
+// Unqiue Code Stuff
+app.use(function checkKey(req, res, next) {
+
+	const timestamp = formatAMPM(new Date);
+	const ip = req.header('x-forwarded-for') || req.connection.remoteAddress;
+	// console.log(timestamp, ip);
+	if (ip == "::ffff:127.0.0.1" || ip == "127.0.0.1" || ip == "localhost") {
+		console.log(timestamp, ip, "- Access Granted")
+		next();
+	} else {
+		if (req.query.key != config.UNIQUE_CODE) {
+			console.log(timestamp, ip, "- Access Denied")
+			res.sendStatus(401);
+		} else {
+			console.log(timestamp, ip, "- Access Granted")
+			next();
+		}
+	}
+
+});
+
 // Log output page
 app.get("/", (req, res) => {
 	res.sendFile(__dirname + "/index.html");
@@ -36,6 +85,30 @@ app.get("/thestuff", (req, res) => {
 	res.sendFile(__dirname + "/the_stuff.html");
 });
 
+// The Google Maps output page
+app.get("/map", (req, res) => {
+	res.sendFile(__dirname + "/map.html");
+});
+
+// The Google Maps output page
+app.get("/map_rotate", (req, res) => {
+	res.sendFile(__dirname + "/map_rotate.html");
+});
+
+// The way to get map style
+app.get("/style", (req, res) => {
+	res.sendFile(__dirname + "/map_styles/" + mapstyle);
+});
+
+// The way to get default map style
+app.get("/default", (req, res) => {
+	res.sendFile(__dirname + "/map_styles/default.json");
+});
+
+app.get("/mod_map", (req, res) => {
+	res.sendFile(__dirname + "/mod_map.html");
+});
+
 // ----------------------------------------------------------------------------------------------------------------------------------------------------------
 // Endpoint(s) to grab data for use with nightbot twitch chatbot, or anything really..
 //
@@ -55,10 +128,11 @@ app.get("/stats/:anything", (req, res) => {
 	res.send(`${lastRequest[req.params.anything]}`);
 });
 
-
-// My Custom URL in GPS-Logger looks like this: http://<YOUR-IP-or-DNS>:3000/log?s=%SPD&b=%BATT&lat=%LAT&lon=%LON&a=%ALT
+// My Custom URL in GPS-Logger looks like this: http://<YOUR-IP-or-DNS>:3000/log?s=%SPD&b=%BATT&lat=%LAT&lon=%LON&a=%ALT&key=<UNIQUE_CODE>
 app.get("/log", (req, res) => {
 
+	delete req.query.key;
+
 	//Current Altitude (FT) - a=%ALT
 	if (req.query.a) {
 		req.query.a = `${Math.round(req.query.a / 0.3048)} FT`;
@@ -82,6 +156,8 @@ app.get("/log", (req, res) => {
 	if (req.query.lat && req.query.lon) {
 		const { lat, lon } = req.query;
 
+		lastRequest.time = new Date().toLocaleTimeString("en-US", { timeZone: geoTz(lat, lon)[0], hour: '2-digit', minute: '2-digit' });
+
 		!waitForTheStuff && getTheStuff(lat, lon);
 		io.emit("THESTUFF", lastRequest);
 
@@ -104,7 +180,12 @@ const getTheStuff = (lat, lon) => {
 
 	getOpenWeatherMap(lat, lon, config.UNITS, config.OWM_Key);
 	getHEREdotcom(lat, lon, config.HERE_appid, config.HERE_appcode);
-	getWeatherGov(lat, lon);
+}
+
+const degToCompass = (num) => {
+	let val = Math.floor((num / 22.5) + 0.5);
+	let arr = ["N", "NNE", "NE", "ENE", "E", "ESE", "SE", "SSE", "S", "SSW", "SW", "WSW", "W", "WNW", "NW", "NNW"];
+	return arr[(val % 16)];
 }
 
 // OpenWeatherMap needs an API, please set this in the 'config.js' file.
@@ -113,27 +194,18 @@ const getOpenWeatherMap = async (lat, lon, units, apikey) => {
 		let data = await fetch(`https://api.openweathermap.org/data/2.5/weather?lat=${lat}&lon=${lon}&units=${units}&appid=${apikey}`);
 		let openweathermap = await data.json();
 
+		icon = openweathermap.weather[0].icon
+
+		lastRequest.icon = `http://openweathermap.org/img/wn/${icon}@2x.png`
+
+		lastRequest.direction = degToCompass(openweathermap.wind.deg)
 		lastRequest.temp = Math.floor(openweathermap.main.temp)
 	} catch (error) {
 		console.log("getOpenWeatherMap request failed or something.", error);
 	}
 
 }
 
-// Weather.gov needs no API Key. POGGERS
-const getWeatherGov = async (lat, lon) => {
-	try {
-		let data = await fetch(`https://api.weather.gov/points/${lat},${lon}`);
-		let weathergov = await data.json();
-		
-		// This will grab the current time in 12 hour format based on your LON & LAT.
-		lastRequest.time = new Date().toLocaleTimeString("en-US", { timeZone: weathergov.properties.timeZone, hour: '2-digit', minute: '2-digit' });
-
-	} catch (error) {
-		console.log("getWeatherGov request failed or something.", error);
-	}
-}
-
 // HERE.com ( https://developer.here.com/sign-up?create=Freemium-Basic&keepState=true&step=account )
 const getHEREdotcom = async (lat, lon, appid, appcode) => {
 	try {
@@ -144,10 +216,15 @@ const getHEREdotcom = async (lat, lon, appid, appcode) => {
 		here_city = heredotcom.Response.View[0].Result[1].Location.Address.City
 		here_country = heredotcom.Response.View[0].Result[1].Location.Address.Country
 
-		if (here_town == 'undefined' || here_town == null || here_town == here_city) {
-			lastRequest.town2 = ""
+		// I wanted to customize certain city names, so this is how I did it.
+        if (here_town == "Coon Rapids") {
+			lastRequest.town2 = "( Raccoon City ) - "
+        } else if (here_town == "Fridley") {
+			lastRequest.town2 = "( Friendly Fridley ) - "
+        } else if (here_town == null || here_town == 'undefined' || here_town == here_city) {
+            lastRequest.town2 = ""
         } else {
-            lastRequest.town2 = `${here_town} - `
+            lastRequest.town2 = `( ${here_town} ) - `
         }
 
 		// Result [0]
@@ -157,11 +234,11 @@ const getHEREdotcom = async (lat, lon, appid, appcode) => {
 		// Result [1]
 		lastRequest.city = here_city
 
-		if (here_city == 'undefined' || here_city == null) {
+		if (here_city == null || here_town == 'undefined') {
 			lastRequest.city2 = ""
-        } else {
-            lastRequest.city2 = `${here_city}, `
-        }
+		} else {
+			lastRequest.city2 = `${here_city}, `
+		}
 
 		lastRequest.state = heredotcom.Response.View[0].Result[1].Location.Address.State
 		lastRequest.country = heredotcom.Response.View[0].Result[1].Location.Address.Country
@@ -175,4 +252,4 @@ const getHEREdotcom = async (lat, lon, appid, appcode) => {
 //don't touch this either =p
 http.listen(config.PORT, () => {
 	console.log(`listening on *:${config.PORT}`);
-});
+});