Skip to content

Commit 13db172

Browse files
author
Muhammad Imran Siddique
committed
'update'
1 parent 3b9e30f commit 13db172

7 files changed

+44
-34
lines changed

Dockerfile

-12
This file was deleted.

package-lock.json

+34-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
"dependencies": {
2323
"cors": "^2.8.5",
2424
"express": "^4.17.1",
25+
"fb-watchman": "^2.0.0",
26+
"graphql": "^14.5.4",
2527
"pg": "^7.12.0"
2628
},
2729
"devDependencies": {

src/config/config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ const port_exp = 3000;
2020

2121
const table = 'line';
2222
const vertices_table = 'line_vertices_pgr';
23-
const input_srid = '3857';
24-
const output_srid = '3857';
23+
const input_srid = '4326';
24+
const output_srid = '4326';
2525

2626

2727
exports.config_db = {

src/model/pgRouting.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const {pool, query} = require('../config/database');
2-
32
const {config_pg} = require('../config/config');
43

54
function distanceQuery(start, end) {
@@ -36,10 +35,9 @@ function route(start, end) {
3635
return new Promise((resolve, reject) => {
3736
query(routeQuery(start, end), (err, res) => {
3837
if (err) {
39-
reject('error running query', err);
38+
reject('query error', err);
4039
return;
4140
}
42-
4341
resolve({
4442
route: res.rows,
4543
// route: res.rows.map(r => ({
@@ -55,12 +53,10 @@ function distance(start, end) {
5553
return new Promise((resolve, reject) => {
5654
query(distanceQuery(start, end), (err, res) => {
5755
if (err) {
58-
reject('error running query', err);
56+
reject('query error', err);
5957
return;
6058
}
61-
6259
// let cost = res.rows.map(r => r.cost).reduce((a, b) => a + b);
63-
6460
resolve({
6561
// distance: cost
6662
distance_meters: res.rows[res.rows.length - 1].agg_cost,

src/server.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ app.get('/', (req, res) => {
3131
app.get('/route', (req, res, next) => {
3232

3333
const { start, end } = req.query;
34+
console.log(start);
3435
routing.route(start, end)
3536
.then((result) => {
3637
res.status(200).json(result);
@@ -64,4 +65,4 @@ app.get('/closest', (req, res, next) => {
6465
});
6566
});
6667

67-
app.listen(exp_config.port, () => console.log(`app listening on port ${exp_config.port}!`));
68+
app.listen(exp_config.port, () => console.log(`app listening on port ${exp_config.port}!`));

webpack.config.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ module.exports = {
4444
optimization: {
4545
splitChunks: {
4646
chunks: 'all',
47-
}
48-
,
47+
},
4948
minimizer: [
5049
new TerserPlugin({
5150
parallel: true,
@@ -88,4 +87,4 @@ module.exports = {
8887
})
8988
],
9089
}
91-
}
90+
}

0 commit comments

Comments
 (0)