Skip to content

chore: rename lng to lon #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RubenSmn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: rename lng to lon #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/api/nearest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ const pool = new Pool({ connectionString: process.env.DATABASE_URL });

router.get("/", async function (req, res, next) {
try{
let { zoom_level, lng, lat } = req.query;
let { zoom_level, lon, lat } = req.query;
zoom_level = parseInt(zoom_level);
lng = parseFloat(lng);
lon = parseFloat(lon);
lat = parseFloat(lat);
console.log("lng:", lng);
console.log("lon:", lon);
chai.expect(zoom_level).above(0);
chai.expect(lng).not.NaN;
chai.expect(lon).not.NaN;
chai.expect(lat).not.NaN;
let query;
if (zoom_level <= 11) {
Expand All @@ -45,7 +45,7 @@ router.get("/", async function (req, res, next) {
zoom_level = ${zoom_level}
ORDER BY
active_tree_region.centroid <->
ST_SetSRID(ST_MakePoint(${lng}, ${lat}),4326)
ST_SetSRID(ST_MakePoint(${lon}, ${lat}),4326)
LIMIT 1;
`,
values: [],
Expand All @@ -59,7 +59,7 @@ router.get("/", async function (req, res, next) {
clusters
ORDER BY
location <->
ST_SetSRID(ST_MakePoint(${lng}, ${lat}),4326)
ST_SetSRID(ST_MakePoint(${lon}, ${lat}),4326)
LIMIT 1;
`,
values: [],
Expand All @@ -75,7 +75,7 @@ router.get("/", async function (req, res, next) {
active = true
ORDER BY
estimated_geometric_location <->
ST_SetSRID(ST_MakePoint(${lng}, ${lat}),4326)
ST_SetSRID(ST_MakePoint(${lon}, ${lat}),4326)
LIMIT 1;
`,
values: [],
Expand Down
12 changes: 6 additions & 6 deletions src/api/nearest.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ describe("nearest", () => {
jest.clearAllMocks();
});

it("/nearest?zoom_level=16&lng=85.5&lat=23.4", async () => {
it("/nearest?zoom_level=16&lon=85.5&lat=23.4", async () => {
query.mockResolvedValue({ rows: nearestResult });
const response = await request(app).get(
"/nearest?zoom_level=16&lng=85.5&lat=23.4"
"/nearest?zoom_level=16&lon=85.5&lat=23.4"
);
expect(new Pool().query).toBeDefined();
expect(response.statusCode).toBe(200);
Expand All @@ -42,10 +42,10 @@ describe("nearest", () => {
});
});

it("/nearest?zoom_level=14&lng=85.5&lat=23.4", async () => {
it("/nearest?zoom_level=14&lon=85.5&lat=23.4", async () => {
query.mockResolvedValue({ rows: nearestResult });
const response = await request(app).get(
"/nearest?zoom_level=14&lng=85.5&lat=23.4"
"/nearest?zoom_level=14&lon=85.5&lat=23.4"
);
expect(new Pool().query).toBeDefined();
expect(response.statusCode).toBe(200);
Expand All @@ -58,10 +58,10 @@ describe("nearest", () => {
});
});

it("/nearest?zoom_level=8&lng=85.5&lat=23.4", async () => {
it("/nearest?zoom_level=8&lon=85.5&lat=23.4", async () => {
query.mockResolvedValue({ rows: nearestResult });
const response = await request(app).get(
"/nearest?zoom_level=8&lng=85.5&lat=23.4"
"/nearest?zoom_level=8&lon=85.5&lat=23.4"
);
expect(new Pool().query).toBeDefined();
expect(response.statusCode).toBe(200);
Expand Down