-
Notifications
You must be signed in to change notification settings - Fork 270
feat: modifiable nominatim endpoint #385
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ function applyReplacements(content, env) { | |
| const BACKEND = env.OSRM_BACKEND || 'https://router.project-osrm.org' | ||
| const LANGUAGE = env.OSRM_LANGUAGE || 'en' | ||
| const DEFAULT_LAYER = env.OSRM_DEFAULT_LAYER || 'streets' | ||
| const NOMINATIM_ENDPOINT = env.NOMINATIM_ENDPOINT || 'https://nominatim.openstreetmap.org/' | ||
|
|
||
| let options = content | ||
|
|
||
|
|
@@ -34,6 +35,7 @@ function applyReplacements(content, env) { | |
| // Leaflet uses LatLng | ||
| else options = options.replace('38.8995,-77.0269', latlng) | ||
| } | ||
| if (NOMINATIM_ENDPOINT) options = options.replace('https://nominatim.openstreetmap.org/', NOMINATIM_ENDPOINT) | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
|
||
| return options | ||
| } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -51,8 +51,8 @@ function parseCoords(query) { | |
| // For non-coordinate input, falls through to Nominatim forward-geocode as normal. | ||
| // Also bridges leaflet-control-geocoder's Promise API to the callback-based API | ||
| // that leaflet-routing-machine's autocomplete expects. | ||
| geocoder.coordPreserving = function() { | ||
| var nominatim = L.Control.Geocoder.nominatim(); | ||
| geocoder.coordPreserving = function(nominatimUrl) { | ||
| var nominatim = L.Control.Geocoder.nominatim({serviceUrl: nominatimUrl}); | ||
|
Comment on lines
+54
to
+55
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nominatimUrl never gets null.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Like other variables |
||
|
|
||
| function withCallback(promise, cb, context) { | ||
| return promise.then(function(results) { | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -120,7 +120,7 @@ function makeIcon(i, n) { | |
| } | ||
|
|
||
| var plan = new ReversablePlan([], { | ||
| geocoder: createGeocoder.coordPreserving(), | ||
| geocoder: createGeocoder.coordPreserving(leafletOptions.nominatim && leafletOptions.nominatim.path), | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is changed following AI code comment. Both are fine for me and just which is preferred by code owners. |
||
| language: mergedOptions.language, | ||
| routeWhileDragging: true, | ||
| createMarker: function(i, wp, n) { | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -292,6 +292,9 @@ var leafletOptions = { | |
| three: satellite, | ||
| four: osm, | ||
| five: osm_de | ||
| }, | ||
| nominatim: { | ||
| path: 'https://nominatim.openstreetmap.org/' | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is just like neighbor code is. |
||
| } | ||
|
Comment on lines
+295
to
298
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. test/leaflet_options.test.js looks like not having this kind of test for other parameters |
||
| }; | ||
|
|
||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.