add city, county, village / convert lat, lon

+const db = require('./db.js');
+const secret_key = require('./keys/api_option').key;
+const requesting = require('request');
+const key = require('./keys/api_map').key;
+const lat = "37.239795";
+const lon = "127.083240";
+//const city = client_data.city;
+//const county = client_data.county;
+//const village = client_data.village;
+module.exports = (server, app) => {
+
+    const io = require('socket.io')(server, {
+        transports: ['websocket'] // websocket 사용시 polling 사용을 배제하고 안정적인 websocket만 사용함
+    });
+    //명시적 형 선언 
+    let Current_Weather = {};
+    let Sensible_T = {};
+    let Heat_index = {};
+    let Discomport_index = {};
+    let Ultra_Violet_index = {};
+    let sending_to_client_info = {};
+    let client_send = {};
+    let client_name = "";
+    let client_birth ;
+    let Destiny;
+    let sql;
+    let city;
+    let county;
+    let village;
+    let info = {};
+    let query;
+
+    const req_API = (when, what) => {
+        //async await 사용하기 위하여 promise 사용
+        return new Promise((resolve, reject) => {
+            requesting.get({
+                // api를 요청할 주소 -- 시크릿키,위도,경도 입력
+		url: encodeURI(`https://api2.sktelecom.com/weather/${when}/${what}?version=1&city=${city}&county=${county}&village=${village}&appKey=${secret_key}`),
+                json: true
+            },
+                //api에게 응답 받았을때 실행되는 callback function
+                function (err, api_res, api_body) {
+                    //err 존재시 promise reject 호출
+                    if (err) reject(err);
+
+                    // api의 response이 있을경우 promise resolve 호출
+                    if (api_res) {
+                        console.log("calling api");
+                        resolve(api_body);
+                    }
+                });
+        })
+
+    }
+
+    const API_bundle = async () => {
+
+        try {
+            Current_Weather = await req_API("current", "minutely"); //현재날씨 (분별)
+            Sensible_T = await req_API("index", "wct"); //체감온도
+            Heat_index = await req_API("index", "heat"); //열지수
+            Discomport_index = await req_API("index", "th"); //불쾌지수
+            Ultra_Violet_index = await req_API("index", "uv"); //자외선지수
+
+            info = {
+                heat: Heat_index.weather.wIndex.heatIndex[0].current.index, //열지수
+                sensible_temperature: Sensible_T.weather.wIndex.wctIndex[0].current.index, //체감온도
+                discomport: Discomport_index.weather.wIndex.thIndex[0].current.index, //불쾌지수
+                UV: Ultra_Violet_index.weather.wIndex.uvindex[0].day01.index, //자외선지수
+                windspd: Current_Weather.weather.minutely[0].wind.wspd, //바람 속도
+                sky: Current_Weather.weather.minutely[0].sky.code, //하늘 상태
+                rain: Current_Weather.weather.minutely[0].rain.last24hour, //강수량 
+                current_temperature: Current_Weather.weather.minutely[0].temperature.tc, //현재 온도
+                lightning: Current_Weather.weather.minutely[0].lightning, //현재 낙뢰
+                warning: Current_Weather.common.alertYn, //현재 특유무
+                typhoon: Current_Weather.common.stormYn, //현재 태풍
+                time: Current_Weather.weather.minutely[0].timeObservation, // 불러온 시각
+                death_prob: 0 //확률
+            }
+            console.log("API INFO \n", info);
+
+            //  ------------------------------ death_prob 정의 ------------------------------
+
+            info.death_prob += info.sky.substr(5) * 1  //하늘 상태에 따라 확률 증가
+
+            if (info.lightning === 1)    //낙뢰시에 확률 증가
+                info.death_prob += 1.5;
+            if (info.typhoon === "Y")   //태풍시에 확률 증가
+                info.death_prob += 1.5;
+            if (info.warning === "Y") // 특보 발령시 확률 증가
+                info.death_prob += 1
+
+            //죽을 확률 계산(내맘대로 커스텀)
+            info.death_prob = (
+                (info.heat / 50) + (Math.abs(info.sensible_temperature - 15) / 10) + (info.discomport / 10) + (info.UV / 10)
+                + info.windspd*1 + (info.rain / 10) + (Math.abs(info.current_temperature - 15) / 10)
+            );
+
+            //이벤트 기반으로 일정 시간 간격으로 클라이언트에게 보낼 정보 
+            client_send = {
+                time: info.time,
+                wind: info.windspd,
+                temperature: info.current_temperature,
+                rain: info.rain,
+                death: info.death_prob
+            };
+            function getRandom_add_prob(min, max) {
+                return Math.random() * (max - min) + min;
+              }
+              
+
+              // 심장이 크게 뛰며 확률이 증가하거나 감소 할 수 있음
+               Math.random() * 2 >= 1  ?  client_send.death += getRandom_add_prob(0,5) :  client_send.death -= getRandom_add_prob(0,5) ;
+               
+               
+               //운명의 장난으로 죽을 확률이 증가하거나 감소함 
+              const rand = Math.floor(Math.random() * 6) //생년월일 중 한자리 뽑음
+              
+              Destiny=client_birth.charAt(rand)/3;  //명시적 형 변환
+              if(Destiny==0)Destiny=1; //사용자 잘못 입력했을때 예외처리
+               Math.random() * 2 >= 1  ?  client_send.death += Destiny :  client_send.death -= Destiny ;
+
+
+            //만약 날이 너무 안좋아서 확률이 100을 넘긴다면 100으로 예외처리
+            if (client_send.death >= 100) {
+                client_send.death = 100;
+            }
+
+            console.log("client send data \n",client_send)
+              
+            app.get("socket").emit("weatherInfo_minutely_send_to_client", client_send); // 클라이언트에게 정보 담아서 이벤트 발산
+            console.log("emit");
+
+            //db에 저장
+            sql = "INSERT INTO weatherInfo (time,wind,temperature,rain,prob) VALUES (?,?,?,?,?)";
+            db.query(sql, [client_send.time, client_send.wind, client_send.temperature, client_send.rain, client_send.death], (err, result) => {
+                if (err) console.log(err);
+            })
+        } catch (err) {  //promise err or try err catch
+            console.log("================Error Occured !!================\n", err);
+        }
+    }
+
+    let call_interval;
+
+    const Start_Interval = (second, CALL) => {
+        CALL(); //처음 불러올때 한번 호출하고
+        call_interval = setInterval(CALL, second * 1000); //그 후에 1분마다 호출
+    }   
+
+    io.on('connection', (socket) => { //프론트와 소켓 연결시 이벤트 루프 동작
+
+        app.set("socket", socket);
+        socket.on("connection", (client_data) => {
+            console.log("SOCKET CONNECTED");
+            client_name = client_data.name;
+            client_birth = client_data.birth;
+	    city = client_data.city;
+	    county = client_data.county;
+	    village = client_data.village;  
+	    query = city+' '+county+' '+village;
+var headers = {
+    'Authorization': 'KakaoAK '+ key
+};
+
+var options = {
+    url: encodeURI('https://dapi.kakao.com/v2/local/search/address.json?query=' + query),
+    headers: headers
+};
+
+function callback(error, response, body) {
+    if (!error && response.statusCode == 200) {
+        console.log(body);
+	console.log(body.documents[1].y);
+    }
+//        console.log(response);
+}
+
+requesting.get(options, callback);
+
+
+
+            Start_Interval(60, API_bundle); //소켓 연결후 interval 활성화하여 1분마다 API 호출
+
+        });
+
+        socket.on('disconnect', (reason) => {
+            console.log("disconnected");
+            clearInterval(call_interval); //연결 종료시 interval 해제
+        })
+    })
+
+}

@@ -20,9 +20,8 @@ app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
 app.use('/',express.static(path.join(__dirname, 'public')));
 app.use('/',express.static(path.join(__dirname, 'code')));
-app.use('/name/:name/birth',express.static(path.join(__dirname, 'public')));
-app.use('/name/:name/birth',express.static(path.join(__dirname, 'code')));
-
+app.use('/name/:name/birth/:birth/city/:city/county/:county/village/:village',express.static(path.join(__dirname, 'public')));
+app.use('/name/:name/birth/:birth/city/:city/county/:county/village/:village',express.static(path.join(__dirname, 'code')));
 app.use('/', indexRouter);
 app.use('/users', usersRouter);
 

 const db = require('./db.js');
 const secret_key = require('./keys/api_option').key;
 const requesting = require('request');
-const lat = "37.239795";
-const lon = "127.083240";
+const key = require('./keys/api_map').key;
+
+//const city = client_data.city;
+//const county = client_data.county;
+//const village = client_data.village;
 module.exports = (server, app) => {
 
     const io = require('socket.io')(server, {
@@ -20,15 +23,20 @@ module.exports = (server, app) => {
     let client_birth ;
     let Destiny;
     let sql;
-
-    let info = {}
+    let city;
+    let county;
+    let village;
+    let info = {};
+    let query;
+    let lat;
+    let lon;
 
     const req_API = (when, what) => {
         //async await 사용하기 위하여 promise 사용
         return new Promise((resolve, reject) => {
             requesting.get({
                 // api를 요청할 주소 -- 시크릿키,위도,경도 입력
-                url: `https://api2.sktelecom.com/weather/${when}/${what}?lat=${lat}&lon=${lon}&appKey=${secret_key}`,
+		url: encodeURI(`https://api2.sktelecom.com/weather/${when}/${what}?version=1&lat=${lat}&lon=${lon}&appKey=${secret_key}`),
                 json: true
             },
                 //api에게 응답 받았을때 실행되는 callback function
@@ -45,10 +53,12 @@ module.exports = (server, app) => {
         })
 
     }
+
     const API_bundle = async () => {
 
         try {
             Current_Weather = await req_API("current", "minutely"); //현재날씨 (분별)
+console.log(Current_Weather);
             Sensible_T = await req_API("index", "wct"); //체감온도
             Heat_index = await req_API("index", "heat"); //열지수
             Discomport_index = await req_API("index", "th"); //불쾌지수
@@ -64,7 +74,7 @@ module.exports = (server, app) => {
                 rain: Current_Weather.weather.minutely[0].rain.last24hour, //강수량 
                 current_temperature: Current_Weather.weather.minutely[0].temperature.tc, //현재 온도
                 lightning: Current_Weather.weather.minutely[0].lightning, //현재 낙뢰
-                warning: Current_Weather.common.alertYn, //현재 특보 유무
+                warning: Current_Weather.common.alertYn, //현재 특유무
                 typhoon: Current_Weather.common.stormYn, //현재 태풍
                 time: Current_Weather.weather.minutely[0].timeObservation, // 불러온 시각
                 death_prob: 0 //확률
@@ -146,7 +156,34 @@ module.exports = (server, app) => {
         socket.on("connection", (client_data) => {
             console.log("SOCKET CONNECTED");
             client_name = client_data.name;
-            client_birth = client_data.birth;  
+            client_birth = client_data.birth;
+	    city = client_data.city;
+	    county = client_data.county;
+	    village = client_data.village;  
+	    query = city+' '+county+' '+village;
+var headers = {
+    'Authorization': 'KakaoAK '+ key
+};
+
+var options = {
+    url: encodeURI('https://dapi.kakao.com/v2/local/search/address.json?query=' + query),
+    headers: headers,
+    json : true
+};
+
+function callback(error, response, body) {
+    if (!error && response.statusCode == 200) {
+        console.log(body);
+	lat = body.documents[0].x;
+	lat = lat.substring(0, 6);
+console.log(lat);
+	lon = body.documents[0].y;
+	lon = lon.substring(0, 6);
+    }
+
+}
+
+	requesting.get(options, callback);
             Start_Interval(60, API_bundle); //소켓 연결후 interval 활성화하여 1분마다 API 호출
 
         });

@@ -9,6 +9,7 @@
     "body-parser": "^1.18.3",
     "compression": "^1.7.3",
     "cookie-parser": "~1.4.3",
+    "curl-request": "^1.1.1",
     "date-utils": "^1.2.21",
     "debug": "~2.6.9",
     "ejs": "~2.5.7",

@@ -5,9 +5,9 @@ var db = require('../lib/db');
 /* GET home page. */
 
 router.post('/starting' , (req,res) => {
-  res.redirect(`/name/${req.body.name}/birth/${req.body.birth}`);
+  res.redirect(`/name/${req.body.name}/birth/${req.body.birth}/city/${req.body.city}/county/${req.body.county}/village/${req.body.village}`);
 })
-router.get('/name/:name/birth/:birth', (req,res) => {
+router.get('/name/:name/birth/:birth/city/:city/county/:county/village/:village', (req,res) => {
   
   // 렌더링 변수
   var time = new Array(); // 타임스탬프
@@ -21,6 +21,9 @@ router.get('/name/:name/birth/:birth', (req,res) => {
   var count = 0;
   const name = req.params.name;
   const birth = req.params.birth;
+  const city = req.params.city;
+  const county = req.params.county;
+  const village = req.params.village;
 
   // 이전 10분간 데이터 찾기
   sql = "SELECT * FROM weatherInfo WHERE time >= DATE_FORMAT(DATE_ADD(now(), INTERVAL -20 MINUTE), '%Y-%m-%d %H:%i:%s')";
@@ -62,7 +65,10 @@ router.get('/name/:name/birth/:birth', (req,res) => {
         probArr,
         dataLen,
         name,
-        birth
+        birth,
+	city,
+	county,
+	village
       });
     }
   });

@@ -61,7 +61,10 @@
   <script type="text/javascript">
       let client_data = {
       birth: "<%=birth%>",
-      name: "<%=name%>"
+      name: "<%=name%>",
+      city: "<%=city%>",
+      county: "<%=county%>",
+      village: "<%=village%>"
     }
     
 
@@ -630,4 +633,4 @@ plotOptions: {
 
 </body>
 
-</html>
\ No newline at end of file
+</html>

@@ -85,7 +85,14 @@
                     &nbsp &nbsp&nbsp&nbsp
                     <label>생년월일</label>
                     <input type="text" name="birth" class="form-control" placeholder="971009" style="width:200px;">
-                    <br><br><br>
+                   
+<label>현재 장소(시)</label>
+                    <input type="text" name="city" class="form-control" placeholder="서울" style="width:200px;">
+                    <label>현재 장소(구)(</label>
+                    <input type="text" name="county" class="form-control" placeholder="강남구" style="width:200px;">
+                    <label>현재 장소(동)</label>
+                    <input type="text" name="village" class="form-control" placeholder="삼성동" style="width:200px;">
+<br><br><br>
                     <input type="submit" value="시작하기" class="btn btn-default" style="font-family: 'Yeon Sung', cursive; width:100px;font-weight: bold; font-size: 18px; background-color: white;">
                 </div>
             </form>
@@ -93,7 +100,7 @@
 
     </div>
 
-    <div id="footer">오픈소스SW개발 조민지 강환석 배희수</div>
+    <div id="footer">오픈소스SW개발 조민지 강환석 배희수/ 개선_김가영 /</div>
 </body>
 
-</html>
\ No newline at end of file
+</html>

@@ -61,7 +61,10 @@
     <script>
       let client_data = {
         birth: "<%=birth%>",
-        name: "<%=name%>"
+        name: "<%=name%>",
+	city: "<%=city%>",
+	county: "<%=county%>",
+	village: "<%=village%>"
       }
       var socket = io.connect('/', { transports: ['websocket'], upgrade: false });
       socket.emit("connection", client_data);
@@ -638,4 +641,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>