From 4b0f6084d38e29276179789cb42990d072e845b7 Mon Sep 17 00:00:00 2001 From: Andrew Harvey Date: Mon, 2 Oct 2023 16:24:13 +1100 Subject: handle a few more overloaded addr:housenumber values in OSM --- lib/withinRange.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/withinRange.js') diff --git a/lib/withinRange.js b/lib/withinRange.js index 81bb6d4..4a490ca 100644 --- a/lib/withinRange.js +++ b/lib/withinRange.js @@ -37,7 +37,9 @@ module.exports = (feature, rangeFeature, options) => { ) : true ) ) { - const rangeNumber = rangeFeature.properties["addr:housenumber"].split("/").length > 1 ? rangeFeature.properties["addr:housenumber"].split("/")[1] : rangeFeature.properties["addr:housenumber"]; + const housenumber = rangeFeature.properties['addr:housenumber'].replace(/^(unit|level|shop|factory) \d*[ ]?\&?[ ]?\d*,?[ ]*/i, '') + + const rangeNumber = housenumber.split("/").length > 1 ? housenumber.split("/")[1] : housenumber; const rangeParts = rangeNumber.split('-') if (rangeParts.length === 2) { const fromMatch = rangeParts[0].match(regexp) -- cgit v1.2.3 From d356fe07f1be877ce76b9721bc06fd89eb535cc6 Mon Sep 17 00:00:00 2001 From: Andrew Harvey Date: Mon, 2 Oct 2023 16:33:31 +1100 Subject: handle a few more overloaded addr:housenumber values in OSM --- lib/withinRange.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/withinRange.js') diff --git a/lib/withinRange.js b/lib/withinRange.js index 4a490ca..90665ff 100644 --- a/lib/withinRange.js +++ b/lib/withinRange.js @@ -37,7 +37,7 @@ module.exports = (feature, rangeFeature, options) => { ) : true ) ) { - const housenumber = rangeFeature.properties['addr:housenumber'].replace(/^(unit|level|shop|factory) \d*[ ]?\&?[ ]?\d*,?[ ]*/i, '') + const housenumber = rangeFeature.properties['addr:housenumber'].replace(/^(unit|level|shop|factory) \D*\d*[ ]?\&?[ ]?\D*\d*,?[ ]*/i, '') const rangeNumber = housenumber.split("/").length > 1 ? housenumber.split("/")[1] : housenumber; const rangeParts = rangeNumber.split('-') -- cgit v1.2.3