Skip to content

Commit cd80644

Browse files
committed
1 parent 49f898a commit cd80644

2 files changed

Lines changed: 18 additions & 1 deletion

File tree

proxy/src/main/kotlin/no/entur/geocoder/proxy/photon/PhotonFilterBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ object PhotonFilterBuilder {
102102
} else {
103103
// Typically takes care of "Oslo C" returning addresses.
104104
req.text
105-
.takeIf { !it.contains("\\s\\d".toRegex()) }
105+
.takeIf { !it.contains("(\\s\\d|\\d\\s)".toRegex()) }
106106
?.let { Category.OSM_ADDRESS }
107107
}
108108

proxy/src/test/kotlin/no/entur/geocoder/proxy/pelias/PeliasApiTest.kt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,23 @@ class PeliasApiTest {
6060
assertEquals("Oslo", req.url.parameters["q"])
6161
assertEquals("${(1 + RESULT_PRUNING_HEADROOM)}", req.url.parameters["limit"])
6262
assertEquals("en", req.url.parameters["lang"])
63+
assertEquals(listOf("multimodal.child", "osm.public_transport.address"), req.url.parameters.getAll("exclude"))
64+
}
65+
66+
@Test
67+
fun `autocomplete endpoint returns expected response with housenumber`() =
68+
testApplication {
69+
recordedRequests.clear()
70+
application { setupRouting() }
71+
val response =
72+
client.get("/v2/autocomplete?text=10+Oslo+gate") {
73+
header(HttpHeaders.Accept, ContentType.Application.Json.toString())
74+
header(HttpHeaders.ContentType, ContentType.Application.Json.toString())
75+
}
76+
assertEquals(HttpStatusCode.OK, response.status)
77+
78+
val req = recordedRequests.first()
79+
assertEquals("Oslo gate 10", req.url.parameters["q"])
6380
}
6481

6582
@Test

0 commit comments

Comments
 (0)