Merge remote-tracking branch 'origin/master'

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/withinRange.js b/lib/withinRange.js
index 81bb6d4..90665ff 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*[ ]?\&?[ ]?\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)