Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/application/create-app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
import { routes as createFaseSucessionalRoutes } from './fase-sucessional'
import { routes as createPaisRoutes } from './pais'
import { routes as createVegetacaoRoutes } from './vegetacao'

Check warning on line 19 in src/application/create-app.ts

View workflow job for this annotation

GitHub Actions / lint

`./relevo` import should occur before import of `./solo`
interface CorsParameters {
origins: string[]
origins: string | string[]
methods: string[]
allowedHeaders: string[]
}
Expand Down
5 changes: 3 additions & 2 deletions src/application/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@ import { createApp } from './create-app'

const environment = process.env.NODE_ENV ?? 'development'

const corsOrigins = process.env.CORS_ORIGINS ?? '*'
const corsOriginsRaw = process.env.CORS_ORIGINS ?? '*'
const corsOrigins = corsOriginsRaw === '*' ? '*' : corsOriginsRaw.split(',')
const corsMethods = process.env.CORS_METHODS ?? 'HEAD,GET,POST,PUT,PATCH,DELETE'
const corsAllowedHeaders = process.env.CORS_ALLOWED_HEADERS ?? 'Content-Type,Authorization'

const logger = new ConsoleLogger()
const application = createApp({
logger,
cors: {
origins: corsOrigins.split(','),
origins: corsOrigins,
methods: corsMethods.split(','),
allowedHeaders: corsAllowedHeaders.split(',')
},
Expand Down
45 changes: 27 additions & 18 deletions src/helpers/coordenadas.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,34 +171,43 @@ export const converteDecimalParaGMSSinal = (decimal, isLat) => {
};

export const converteDecimalParaGrausMinutosSegundos = (gDec, ehLat, formatada) => {
let graus;
let minutos;
let aux;
let segundos;
let direcao;
const sinal = gDec < 0 ? -1 : 1;
const abs = Math.abs(gDec);

graus = parseInt(gDec);
aux = (graus - gDec) * 60;
minutos = parseInt(aux);
aux = (aux - minutos) * 60;
segundos = aux;
let graus = Math.floor(abs);
const minutosDecimal = (abs - graus) * 60;
let minutos = Math.floor(minutosDecimal);
const segundosRaw = (minutosDecimal - minutos) * 60;

// Arredonda para 2 casas decimais e propaga carry se segundos >= 60
// (evita exibicao de "60.00" causada por erro de ponto flutuante)
let segundos = Math.round(segundosRaw * 100) / 100;
if (segundos >= 60) {
segundos = 0;
minutos += 1;
}
if (minutos >= 60) {
minutos = 0;
graus += 1;
}

let direcao;
if (ehLat) {
direcao = graus < 0 ? 'S' : 'N';
direcao = sinal < 0 ? 'S' : 'N';
} else {
direcao = graus < 0 ? 'W' : 'E';
direcao = sinal < 0 ? 'W' : 'E';
}

const segundosStr = segundos.toFixed(2).replace('.', ',');

if (formatada) {
return `${Math.abs(graus)}°${Math.abs(minutos)}'${Math.abs(segundos).toFixed(2)
.replace('.', ',')}" ${direcao}`;
return `${graus}\u00B0${minutos}'${segundosStr}" ${direcao}`;
}

return {
graus: Math.abs(graus),
minutos: Math.abs(minutos),
segundos: Math.abs(segundos).toFixed(2)
.replace('.', ','),
graus,
minutos,
segundos: segundosStr,
direcao,
};
};
Loading