Skip to content

feat(900): add configurable radius for reverse geocoding in Photon #905

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

Merged
dgraf-gh merged 2 commits into from
Apr 13, 2026
Merged

feat(900): add configurable radius for reverse geocoding in Photon #905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ceb545
feat(900): add configurable radius for reverse geocoding in Photon
dgraf-gh Apr 13, 2026
064bf69
feat(900): update test for configurable reverse geocoding radius in P…
dgraf-gh Apr 13, 2026
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
12 changes: 10 additions & 2 deletions src/main/java/com/dedicatedcode/reitti/controller/settings/GeoCodingSettingsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,12 @@ public String testConfiguration(@RequestParam GeocoderType type,
@RequestParam(required = false) String apiKey,
@RequestParam(required = false) String lang,
@RequestParam(required = false) Integer limit,
@RequestParam(required = false) Double radius,
Model model) {
try {
double testLat = 48.8584;
double testLng = 2.2945;
GeocodeService tmpService = verifySelection(type, url, apiKey, lang, limit);
GeocodeService tmpService = verifySelection(type, url, apiKey, lang, limit, radius);

GeocodeResult result = geocodeServiceManager.test(tmpService, testLat, testLng);
model.addAttribute("testResult", result);
Expand All @@ -125,7 +126,7 @@ public String testConfiguration(@RequestParam GeocoderType type,
return "settings/fragments/geocoding :: test-result-display";
}

private GeocodeService verifySelection(GeocoderType type, String url, String apiKey, String lang, Integer limit) {
private GeocodeService verifySelection(GeocoderType type, String url, String apiKey, String lang, Integer limit, Double radius) {
if (type != GEO_APIFY && (url == null || url.isEmpty())) {
throw new IllegalArgumentException("Url must not be empty");
}
Expand All @@ -142,6 +143,9 @@ private GeocodeService verifySelection(GeocoderType type, String url, String api
if (limit != null) {
params.put("limit", limit.toString());
}
if (radius != null) {
params.put("radius", radius.toString());
}
if (apiKey != null && !apiKey.isEmpty()) {
params.put("apiKey", apiKey);
}
Expand All @@ -159,6 +163,7 @@ public String saveGeocodeService(@RequestParam(required = false) Long id,
@RequestParam(required = false) String apiKey,
@RequestParam(required = false) String language,
@RequestParam(required = false) Integer limit,
@RequestParam(required = false) Double radius,
@RequestParam int priority,
Model model) {
try {
Expand All @@ -169,6 +174,9 @@ public String saveGeocodeService(@RequestParam(required = false) Long id,
if (limit != null) {
params.put("limit", limit.toString());
}
if (radius != null) {
params.put("radius", radius.toString());
}
if (apiKey != null && !apiKey.isEmpty()) {
params.put("apiKey", apiKey);
}
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/com/dedicatedcode/reitti/service/geocoding/GeocodeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,16 @@ public Map<String, String> getAdditionalParameters() {

public String getUrlTemplate() {
return switch (type) {
case PHOTON -> this.url + "/reverse?lon={lng}&lat={lat}&limit=10&layer=house&layer=locality&radius=0.03";
case PHOTON -> {
String urlTemplate = this.url + "/reverse?lon={lng}&lat={lat}&layer=house&layer=locality";
if (this.additionalParameters.containsKey("radius")) {
urlTemplate += "&radius=" + this.additionalParameters.get("radius");
}
if (this.additionalParameters.containsKey("limit")) {
urlTemplate += "&limit=" + this.additionalParameters.get("limit");
}
yield urlTemplate;
}
case PAIKKA -> {
String urlTemplate = this.url + "/api/v1/reverse?lat={lat}&lon={lng}";
if (this.additionalParameters.containsKey("language")) {
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/db/migration/V90__add_additional_parameters_to_photon.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UPDATE geocode_services SET additional_params = '{"limit": "10", "radius": "0.03"}' WHERE type = 'PHOTON';
2 changes: 1 addition & 1 deletion src/main/resources/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,7 @@ geocoding.service.url=URL Template
geocoding.service.api_key=API Key
geocoding.service.language=Language (Optional)
geocoding.service.limit=Limit (Optional)

geocoding.service.additional_parameters.search_distance=Search Distance (Optional)
geocoding.test.button=Test Connection
geocoding.test.success=Connection successful!
geocoding.test.error=Connection failed: {0}
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/static/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,11 @@ details > div {
padding: 16px;
}

.form-group details summary {
font-weight: normal;
font-size: 1em;
}

input:focus {
outline: 0;
/* some people use shadows too */
Expand Down
15 changes: 14 additions & 1 deletion src/main/resources/templates/settings/fragments/geocoding.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
placeholder="e.g. en, de, fi">
</div>

<div class="form-group" th:if="${type.name() == 'PAIKKA'}">
<div class="form-group" th:if="${type.name() == 'PAIKKA' || type.name() == 'PHOTON'}">
<label for="limit" th:text="#{geocoding.service.limit}">Limit (Optional)</label>
<input type="number" id="limit" name="limit"
th:value="${service != null ? service.additionalParameters['limit'] : ''}"
Expand All @@ -62,6 +62,19 @@
</option>
</select>
</div>


<div class="form-group">
<details th:if="${type.name() == 'PHOTON'}">
<summary>Additional Parameters</summary>
<div class="form-group" th:if="${type.name() == 'PHOTON'}">
<label for="additionalParameters" th:text="#{geocoding.service.additional_parameters.search_distance}">Search Distance</label>
<input type="text" id="additionalParameters" name="radius"
th:value="${service != null ? service.additionalParameters['radius'] : ''}"
placeholder="0.03">
</div>
</details>
</div>
</div>

<div th:fragment="edit-form">
Expand Down
6 changes: 4 additions & 2 deletions src/test/java/com/dedicatedcode/reitti/service/geocoding/GeocodeServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ class GeocodeServiceTest {

@Test
void testGetUrlTemplatePhoton() {
GeocodeService service = new GeocodeService("Photon", "https://photon.example.com", true, 0, null, null, GeocoderType.PHOTON, 1, Map.of());

Map<String, String> additionalParameters = Map.of("radius", "0.03", "limit", "10");
GeocodeService service = new GeocodeService("Photon", "https://photon.example.com", true, 0, null, null, GeocoderType.PHOTON, 1, additionalParameters);
String template = service.getUrlTemplate();
assertEquals("https://photon.example.com/reverse?lon={lng}&lat={lat}&limit=10&layer=house&layer=locality&radius=0.03", template);
assertEquals("https://photon.example.com/reverse?lon={lng}&lat={lat}&layer=house&layer=locality&radius=0.03&limit=10", template);
}

@Test
Expand Down
Loading