Skip to content
Open
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
6 changes: 4 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
SKIP_PREFLIGHT_CHECK=true
REACT_APP_VALHALLA_URL=https://valhalla1.openstreetmap.de
REACT_APP_NOMINATIM_URL=https://nominatim.openstreetmap.org
GEOCODING_API='http://20.50.131.255:2322/api'
REACT_APP_VALHALLA_URL=http://4.245.108.25:8002
REACT_APP_NOMINATIM_URL=http://20.50.131.255:2322
REACT_APP_PHOTON_URL=http://20.50.131.255:2322
REACT_APP_TILE_SERVER_URL="https://tile.openstreetmap.org/{z}/{x}/{y}.png"
REACT_APP_CENTER_COORDS="52.51831,13.393707"

Expand Down
2 changes: 1 addition & 1 deletion src/actions/directionsActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
reverse_geocode,
forward_geocode,
parseGeocodeResponse,
} from 'utils/nominatim'
} from 'utils/geoencoder'

import {
VALHALLA_OSM_URL,
Expand Down
2 changes: 1 addition & 1 deletion src/actions/isochronesActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
reverse_geocode,
forward_geocode,
parseGeocodeResponse,
} from 'utils/nominatim'
} from 'utils/geoencoder'
import { VALHALLA_OSM_URL, buildIsochronesRequest } from 'utils/valhalla'

import {
Expand Down
33 changes: 33 additions & 0 deletions src/utils/geoencoder.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import {
reverse_geocode as ph_reverse_geocode,
forward_geocode as ph_forward_geocode,
parseGeocodeResponse as ph_parseGeocodeResponse,
} from 'utils/photon'
import {
reverse_geocode as nm_reverse_geocode,
forward_geocode as nm_forward_geocode,
parseGeocodeResponse as nm_parseGeocodeResponse,
} from 'utils/nominatim'

export const PHOTON_URL = `${process.env.REACT_APP_PHOTON_URL}`

export const forward_geocode = (userInput) => {
if (PHOTON_URL.length > 0 && PHOTON_URL !== 'null') {
return ph_forward_geocode(userInput)
}
return nm_forward_geocode(userInput)
}

export const reverse_geocode = (lon, lat) => {
if (PHOTON_URL.length > 0 && PHOTON_URL !== 'null') {
return ph_reverse_geocode(lon, lat)
}
return nm_reverse_geocode(lon, lat)
}

export const parseGeocodeResponse = (results, lngLat) => {
if (PHOTON_URL.length > 0 && PHOTON_URL !== 'null') {
return ph_parseGeocodeResponse(results, lngLat)
}
return nm_parseGeocodeResponse(results, lngLat)
}
73 changes: 73 additions & 0 deletions src/utils/photon.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import axios from 'axios'

export const PHOTON_URL = `${process.env.REACT_APP_PHOTON_URL}/api`
export const PHOTON_URL_REVERSE = `${process.env.REACT_APP_PHOTON_URL}/reverse`

export const forward_geocode = (userInput) =>
axios.get(PHOTON_URL, {
params: {
// eslint-disable-next-line
q: userInput,
limit: 5,
},
})

export const reverse_geocode = (lon, lat) =>
axios.get(PHOTON_URL_REVERSE, {
params: {
lon: lon,
lat: lat,
},
})

export const parseGeocodeResponse = (results, lngLat) => {
results = results.features
const processedResults = []
for (const [index, result] of results.entries()) {
if (
'error' in result &&
result.error.toLowerCase() === 'unable to geocode'
) {
processedResults.push({
title: lngLat.toString(),
description: '',
selected: true,
addresslnglat: '',
sourcelnglat: lngLat,
displaylnglat: lngLat,
key: index,
addressindex: index,
})
} else {
processedResults.push({
title:
result.properties.name.length > 0
? result.properties.name
: lngLat.toString(),
description: `https://www.openstreetmap.org/${result.properties.osm_type}/${result.properties.osm_id}`,
selected: false,
addresslnglat: [
parseFloat(result.geometry.coordinates[0]),
parseFloat(result.geometry.coordinates[1]),
],
sourcelnglat:
lngLat === undefined
? [
parseFloat(result.geometry.coordinates[0]),
parseFloat(result.geometry.coordinates[1]),
]
: lngLat,
displaylnglat:
lngLat !== undefined
? lngLat
: [
parseFloat(result.geometry.coordinates[0]),
parseFloat(result.geometry.coordinates[1]),
],
key: index,
addressindex: index,
})
}
}
return processedResults
}