From b3cac538cced1f9596c24a48dff0cf4b17147e20 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Mon, 18 Apr 2016 15:48:33 -0700
Subject: [PATCH] Store lat/lon too for testing and future display use.

---
 service/ClusterGeoIpService.cpp | 8 ++++----
 service/ClusterGeoIpService.hpp | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/service/ClusterGeoIpService.cpp b/service/ClusterGeoIpService.cpp
index a4ff09a72..3ad697537 100644
--- a/service/ClusterGeoIpService.cpp
+++ b/service/ClusterGeoIpService.cpp
@@ -123,8 +123,8 @@ void ClusterGeoIpService::_parseLine(const char *line,std::vector<_V4E> &v4db,st
 				v4db.push_back(_V4E());
 				v4db.back().start = Utils::ntoh((uint32_t)(reinterpret_cast<const struct sockaddr_in *>(&ipStart)->sin_addr.s_addr));
 				v4db.back().end = Utils::ntoh((uint32_t)(reinterpret_cast<const struct sockaddr_in *>(&ipEnd)->sin_addr.s_addr));
-				//v4db.back().lat = (float)lat;
-				//v4db.back().lon = (float)lon;
+				v4db.back().lat = (float)lat;
+				v4db.back().lon = (float)lon;
 				v4db.back().x = x;
 				v4db.back().y = y;
 				v4db.back().z = z;
@@ -133,8 +133,8 @@ void ClusterGeoIpService::_parseLine(const char *line,std::vector<_V4E> &v4db,st
 				v6db.push_back(_V6E());
 				memcpy(v6db.back().start,reinterpret_cast<const struct sockaddr_in6 *>(&ipStart)->sin6_addr.s6_addr,16);
 				memcpy(v6db.back().end,reinterpret_cast<const struct sockaddr_in6 *>(&ipEnd)->sin6_addr.s6_addr,16);
-				//v6db.back().lat = (float)lat;
-				//v6db.back().lon = (float)lon;
+				v6db.back().lat = (float)lat;
+				v6db.back().lon = (float)lon;
 				v6db.back().x = x;
 				v6db.back().y = y;
 				v6db.back().z = z;
diff --git a/service/ClusterGeoIpService.hpp b/service/ClusterGeoIpService.hpp
index bbbe9aea4..ff2fcdb8a 100644
--- a/service/ClusterGeoIpService.hpp
+++ b/service/ClusterGeoIpService.hpp
@@ -101,8 +101,8 @@ private:
 	{
 		uint32_t start;
 		uint32_t end;
-		//float lat,lon;
-		int x,y,z;
+		float lat,lon;
+		int16_t x,y,z;
 
 		inline bool operator<(const _V4E &e) const { return (start < e.start); }
 	};
@@ -111,8 +111,8 @@ private:
 	{
 		uint8_t start[16];
 		uint8_t end[16];
-		//float lat,lon;
-		int x,y,z;
+		float lat,lon;
+		int16_t x,y,z;
 
 		inline bool operator<(const _V6E &e) const { return (memcmp(start,e.start,16) < 0); }
 	};