Suyeon Jung

Fix conflict at category.js

...@@ -9,6 +9,7 @@ let SIGUNDONG_CODE; ...@@ -9,6 +9,7 @@ let SIGUNDONG_CODE;
9 9
10 // 사용자가 index 페이지에서 주소를 입력하고 넘어오면 10 // 사용자가 index 페이지에서 주소를 입력하고 넘어오면
11 router.post('/', function(req, res) { 11 router.post('/', function(req, res) {
12 + console.log(req.body);
12 let userLocation = req.body.userLocation; 13 let userLocation = req.body.userLocation;
13 // let userSi = req.body.si 14 // let userSi = req.body.si
14 // let userDong = req.body.dong; 15 // let userDong = req.body.dong;
...@@ -31,14 +32,16 @@ router.post('/', function(req, res) { ...@@ -31,14 +32,16 @@ router.post('/', function(req, res) {
31 if (!err && res.statusCode == 200) { 32 if (!err && res.statusCode == 200) {
32 var result = JSON.parse(body); 33 var result = JSON.parse(body);
33 console.log('result', result); 34 console.log('result', result);
34 - xyList.push(result.documents[0].address.x); 35 + x = result.documents[0].address.x;
35 - xyList.push(result.documents[0].address.y); 36 + y = result.documents[0].address.y;
36 - console.log(xyList); 37 +
38 +
37 } 39 }
38 }) 40 })
39 res.render('category', { userLocation: req.body.userLocation }); 41 res.render('category', { userLocation: req.body.userLocation });
40 }); 42 });
41 43
44 +
42 router.get('/food', function(req, res) { 45 router.get('/food', function(req, res) {
43 46
44 // 맛집 리스트 조회 47 // 맛집 리스트 조회
...@@ -57,7 +60,6 @@ router.get('/food', function(req, res) { ...@@ -57,7 +60,6 @@ router.get('/food', function(req, res) {
57 res.send(re); 60 res.send(re);
58 } 61 }
59 }); 62 });
60 -
61 }); 63 });
62 router.get('/school', function(req, res) { 64 router.get('/school', function(req, res) {
63 res.send('This is school'); 65 res.send('This is school');
...@@ -66,7 +68,7 @@ router.get('/park', function(req, res) { ...@@ -66,7 +68,7 @@ router.get('/park', function(req, res) {
66 res.send('This is park'); 68 res.send('This is park');
67 }); 69 });
68 router.get('/transport', function(req, res) { 70 router.get('/transport', function(req, res) {
69 - res.send('This is transport'); 71 + res.send(BusCnt);
70 }); 72 });
71 router.get('/safe', function(req, res) { 73 router.get('/safe', function(req, res) {
72 res.send('This is safe'); 74 res.send('This is safe');
......