aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package.json2
-rw-r--r--test/cluster.js2
-rw-r--r--test/index.js49
-rw-r--r--test/toOSM.js119
-rw-r--r--yarn.lock7
5 files changed, 121 insertions, 58 deletions
diff --git a/package.json b/package.json
index 78a92ba..09d67f4 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
"author": "Andrew Harvey <andrew@alantgeo.com.au>",
"license": "MIT",
"scripts": {
- "test": "./node_modules/.bin/tape test/index.js test/cluster.js"
+ "test": "./node_modules/.bin/tape test/toOSM.js test/cluster.js"
},
"dependencies": {
"capital-case": "^1.0.4",
diff --git a/test/cluster.js b/test/cluster.js
index ddec552..51d60a1 100644
--- a/test/cluster.js
+++ b/test/cluster.js
@@ -1,6 +1,6 @@
const test = require('tape')
-const cluster = require('../cluster.js')
+const cluster = require('../lib/cluster.js')
const A = {
type: 'Feature',
diff --git a/test/index.js b/test/index.js
deleted file mode 100644
index 98ce311..0000000
--- a/test/index.js
+++ /dev/null
@@ -1,49 +0,0 @@
-const test = require('tape')
-
-const toOSM = require('../toOSM.js')
-
-test('toOSM basic address schema', t => {
- t.plan(1)
-
- const input = { "type": "Feature", "properties": { "PFI": "52043942", "PR_PFI": "602441", "EZI_ADD": "3 BAY ROAD JAM JERRUP 3984", "SOURCE": "LGO", "SRC_VERIF": "2008-12-29", "IS_PRIMARY": "Y", "PROPSTATUS": "A", "GCODEFEAT": "E", "DIST_FLAG": "Y", "LOC_DESC": null, "BLGUNTTYP": null, "HSA_FLAG": "N", "HSAUNITID": null, "BUNIT_PRE1": null, "BUNIT_ID1": 0, "BUNIT_SUF1": null, "BUNIT_PRE2": null, "BUNIT_ID2": 0, "BUNIT_SUF2": null, "FLOOR_TYPE": null, "FL_PREF1": null, "FLOOR_NO_1": 0, "FL_SUF1": null, "FL_PREF2": null, "FLOOR_NO_2": 0, "FL_SUF2": null, "BUILDING": null, "COMPLEX": null, "HSE_PREF1": null, "HSE_NUM1": 3, "HSE_SUF1": null, "HSE_PREF2": null, "HSE_NUM2": 0, "HSE_SUF2": null, "DISP_PREF1": null, "DISP_NUM1": 0, "DISP_SUF1": null, "DISP_PREF2": null, "DISP_NUM2": 0, "DISP_SUF2": null, "ROAD_NAME": "BAY", "ROAD_TYPE": "ROAD", "RD_SUF": null, "LOCALITY": "JAM JERRUP", "LGA_CODE": "304", "STATE": "VIC", "POSTCODE": "3984", "MESH_BLOCK": "20034062000", "NUM_RD_ADD": "3 BAY ROAD", "NUM_ADD": "3", "ADD_CLASS": "S", "ACCESSTYPE": "L", "OUT_PROP": "N", "COMPLXSITE": "N", "LABEL_ADD": "Y", "FQID": "RA_NO_208", "UFI": 461425466, "UFI_CR": "2009-09-23", "UFI_OLD": 0 }, "geometry": { "type": "Point", "coordinates": [ 145.5434286, -38.326053 ] } }
-
- const output = {
- type: 'Feature',
- properties: {
- 'addr:housenumber': '3',
- 'addr:street': 'Bay Road',
- 'addr:suburb': 'Jam Jerrup',
- 'addr:state': 'VIC',
- 'addr:postcode': '3984'
- },
- geometry: {
- type: 'Point',
- coordinates: [ 145.5434286, -38.326053 ]
- }
- }
-
- t.same(toOSM(input), output)
-})
-
-test('toOSM suffix', t => {
- t.plan(1)
-
- const input = { "type": "Feature", "properties": { "PFI": "212027680", "PR_PFI": "212027679", "EZI_ADD": "24A FORESHORE ROAD JAM JERRUP 3984", "SOURCE": "LGO", "SRC_VERIF": "2009-01-05", "IS_PRIMARY": "Y", "PROPSTATUS": "A", "GCODEFEAT": "V", "DIST_FLAG": "N", "LOC_DESC": null, "BLGUNTTYP": null, "HSA_FLAG": "N", "HSAUNITID": null, "BUNIT_PRE1": null, "BUNIT_ID1": 0, "BUNIT_SUF1": null, "BUNIT_PRE2": null, "BUNIT_ID2": 0, "BUNIT_SUF2": null, "FLOOR_TYPE": null, "FL_PREF1": null, "FLOOR_NO_1": 0, "FL_SUF1": null, "FL_PREF2": null, "FLOOR_NO_2": 0, "FL_SUF2": null, "BUILDING": null, "COMPLEX": null, "HSE_PREF1": null, "HSE_NUM1": 24, "HSE_SUF1": "A", "HSE_PREF2": null, "HSE_NUM2": 0, "HSE_SUF2": null, "DISP_PREF1": null, "DISP_NUM1": 0, "DISP_SUF1": null, "DISP_PREF2": null, "DISP_NUM2": 0, "DISP_SUF2": null, "ROAD_NAME": "FORESHORE", "ROAD_TYPE": "ROAD", "RD_SUF": null, "LOCALITY": "JAM JERRUP", "LGA_CODE": "304", "STATE": "VIC", "POSTCODE": "3984", "MESH_BLOCK": "20034980000", "NUM_RD_ADD": "24A FORESHORE ROAD", "NUM_ADD": "24A", "ADD_CLASS": "S", "ACCESSTYPE": "L", "OUT_PROP": "N", "COMPLXSITE": "N", "LABEL_ADD": "Y", "FQID": null, "PFI_CR": "2008-11-06", "UFI": 462075378, "UFI_CR": "2009-09-23", "UFI_OLD": 0 }, "geometry": { "type": "Point", "coordinates": [ 145.5171569, -38.3251239 ] } }
-
- const output = {
- type: 'Feature',
- properties: {
- 'addr:housenumber': '24A',
- 'addr:street': 'Foreshore Road',
- 'addr:suburb': 'Jam Jerrup',
- 'addr:state': 'VIC',
- 'addr:postcode': '3984'
- },
- geometry: {
- type: 'Point',
- coordinates: [ 145.5171569, -38.3251239 ]
- }
- }
-
- t.same(toOSM(input), output)
-})
diff --git a/test/toOSM.js b/test/toOSM.js
new file mode 100644
index 0000000..e5afa54
--- /dev/null
+++ b/test/toOSM.js
@@ -0,0 +1,119 @@
+const test = require('tape')
+
+const toOSM = require('../lib/toOSM.js')
+
+test('toOSM basic address schema', t => {
+ t.plan(1)
+
+ const input = { "type": "Feature", "properties": { "PFI": "52043942", "PR_PFI": "602441", "EZI_ADD": "3 BAY ROAD JAM JERRUP 3984", "SOURCE": "LGO", "SRC_VERIF": "2008-12-29", "IS_PRIMARY": "Y", "PROPSTATUS": "A", "GCODEFEAT": "E", "DIST_FLAG": "Y", "LOC_DESC": null, "BLGUNTTYP": null, "HSA_FLAG": "N", "HSAUNITID": null, "BUNIT_PRE1": null, "BUNIT_ID1": 0, "BUNIT_SUF1": null, "BUNIT_PRE2": null, "BUNIT_ID2": 0, "BUNIT_SUF2": null, "FLOOR_TYPE": null, "FL_PREF1": null, "FLOOR_NO_1": 0, "FL_SUF1": null, "FL_PREF2": null, "FLOOR_NO_2": 0, "FL_SUF2": null, "BUILDING": null, "COMPLEX": null, "HSE_PREF1": null, "HSE_NUM1": 3, "HSE_SUF1": null, "HSE_PREF2": null, "HSE_NUM2": 0, "HSE_SUF2": null, "DISP_PREF1": null, "DISP_NUM1": 0, "DISP_SUF1": null, "DISP_PREF2": null, "DISP_NUM2": 0, "DISP_SUF2": null, "ROAD_NAME": "BAY", "ROAD_TYPE": "ROAD", "RD_SUF": null, "LOCALITY": "JAM JERRUP", "LGA_CODE": "304", "STATE": "VIC", "POSTCODE": "3984", "MESH_BLOCK": "20034062000", "NUM_RD_ADD": "3 BAY ROAD", "NUM_ADD": "3", "ADD_CLASS": "S", "ACCESSTYPE": "L", "OUT_PROP": "N", "COMPLXSITE": "N", "LABEL_ADD": "Y", "FQID": "RA_NO_208", "UFI": 461425466, "UFI_CR": "2009-09-23", "UFI_OLD": 0 }, "geometry": { "type": "Point", "coordinates": [ 145.5434286, -38.326053 ] } }
+
+ const output = {
+ type: 'Feature',
+ properties: {
+ 'addr:housenumber': '3',
+ 'addr:street': 'Bay Road',
+ 'addr:suburb': 'Jam Jerrup',
+ 'addr:state': 'VIC',
+ 'addr:postcode': '3984'
+ },
+ geometry: {
+ type: 'Point',
+ coordinates: [ 145.5434286, -38.326053 ]
+ }
+ }
+
+ t.same(toOSM(input), output)
+})
+
+test('toOSM suffix', t => {
+ t.plan(1)
+
+ const input = { "type": "Feature", "properties": { "PFI": "212027680", "PR_PFI": "212027679", "EZI_ADD": "24A FORESHORE ROAD JAM JERRUP 3984", "SOURCE": "LGO", "SRC_VERIF": "2009-01-05", "IS_PRIMARY": "Y", "PROPSTATUS": "A", "GCODEFEAT": "V", "DIST_FLAG": "N", "LOC_DESC": null, "BLGUNTTYP": null, "HSA_FLAG": "N", "HSAUNITID": null, "BUNIT_PRE1": null, "BUNIT_ID1": 0, "BUNIT_SUF1": null, "BUNIT_PRE2": null, "BUNIT_ID2": 0, "BUNIT_SUF2": null, "FLOOR_TYPE": null, "FL_PREF1": null, "FLOOR_NO_1": 0, "FL_SUF1": null, "FL_PREF2": null, "FLOOR_NO_2": 0, "FL_SUF2": null, "BUILDING": null, "COMPLEX": null, "HSE_PREF1": null, "HSE_NUM1": 24, "HSE_SUF1": "A", "HSE_PREF2": null, "HSE_NUM2": 0, "HSE_SUF2": null, "DISP_PREF1": null, "DISP_NUM1": 0, "DISP_SUF1": null, "DISP_PREF2": null, "DISP_NUM2": 0, "DISP_SUF2": null, "ROAD_NAME": "FORESHORE", "ROAD_TYPE": "ROAD", "RD_SUF": null, "LOCALITY": "JAM JERRUP", "LGA_CODE": "304", "STATE": "VIC", "POSTCODE": "3984", "MESH_BLOCK": "20034980000", "NUM_RD_ADD": "24A FORESHORE ROAD", "NUM_ADD": "24A", "ADD_CLASS": "S", "ACCESSTYPE": "L", "OUT_PROP": "N", "COMPLXSITE": "N", "LABEL_ADD": "Y", "FQID": null, "PFI_CR": "2008-11-06", "UFI": 462075378, "UFI_CR": "2009-09-23", "UFI_OLD": 0 }, "geometry": { "type": "Point", "coordinates": [ 145.5171569, -38.3251239 ] } }
+
+ const output = {
+ type: 'Feature',
+ properties: {
+ 'addr:housenumber': '24A',
+ 'addr:street': 'Foreshore Road',
+ 'addr:suburb': 'Jam Jerrup',
+ 'addr:state': 'VIC',
+ 'addr:postcode': '3984'
+ },
+ geometry: {
+ type: 'Point',
+ coordinates: [ 145.5171569, -38.3251239 ]
+ }
+ }
+
+ t.same(toOSM(input), output)
+})
+
+test('toOSM simple range X-Y', t => {
+ t.plan(1)
+
+ const input = { "type": "Feature", "properties": { "PFI": "51988731", "PR_PFI": "910693", "EZI_ADD": "29-47 HILLMARTIN LANE DIAMOND CREEK 3089", "SOURCE": "LGO", "SRC_VERIF": "2010-01-13", "IS_PRIMARY": "Y", "PROPSTATUS": "A", "GCODEFEAT": "V", "DIST_FLAG": "N", "LOC_DESC": null, "BLGUNTTYP": null, "HSA_FLAG": "N", "HSAUNITID": null, "BUNIT_PRE1": null, "BUNIT_ID1": 0, "BUNIT_SUF1": null, "BUNIT_PRE2": null, "BUNIT_ID2": 0, "BUNIT_SUF2": null, "FLOOR_TYPE": null, "FL_PREF1": null, "FLOOR_NO_1": 0, "FL_SUF1": null, "FL_PREF2": null, "FLOOR_NO_2": 0, "FL_SUF2": null, "BUILDING": null, "COMPLEX": null, "HSE_PREF1": null, "HSE_NUM1": 29, "HSE_SUF1": null, "HSE_PREF2": null, "HSE_NUM2": 47, "HSE_SUF2": null, "DISP_PREF1": null, "DISP_NUM1": 0, "DISP_SUF1": null, "DISP_PREF2": null, "DISP_NUM2": 0, "DISP_SUF2": null, "ROAD_NAME": "HILLMARTIN", "ROAD_TYPE": "LANE", "RD_SUF": null, "LOCALITY": "DIAMOND CREEK", "LGA_CODE": "356", "STATE": "VIC", "POSTCODE": "3089", "MESH_BLOCK": "20515970000", "NUM_RD_ADD": "29-47 HILLMARTIN LANE", "NUM_ADD": "29-47", "ADD_CLASS": "S", "ACCESSTYPE": "L", "OUT_PROP": "N", "COMPLXSITE": "N", "LABEL_ADD": "Y", "FQID": null, "UFI": 461284870, "UFI_CR": "2008-07-23", "UFI_OLD": 0 }, "geometry": { "type": "Point", "coordinates": [ 145.1361835, -37.6704745 ] } }
+
+ const output = {
+ type: 'Feature',
+ properties: {
+ 'addr:housenumber': '29-47',
+ 'addr:street': 'Hillmartin Lane',
+ 'addr:suburb': 'Diamond Creek',
+ 'addr:state': 'VIC',
+ 'addr:postcode': '3089'
+ },
+ geometry: {
+ type: 'Point',
+ coordinates: [ 145.1361835, -37.6704745 ]
+ }
+ }
+
+ t.same(toOSM(input), output)
+})
+
+test('toOSM range with suffix Xa-Yb', t => {
+ t.plan(1)
+
+ const input = { "type": "Feature", "properties": { "PFI": "207999843", "PR_PFI": "207999842", "EZI_ADD": "9B-9D OLSEN PLACE BROADMEADOWS 3047", "SOURCE": "LGO", "SRC_VERIF": "2009-01-21", "IS_PRIMARY": "Y", "PROPSTATUS": "A", "GCODEFEAT": "V", "DIST_FLAG": "N", "LOC_DESC": null, "BLGUNTTYP": null, "HSA_FLAG": "N", "HSAUNITID": null, "BUNIT_PRE1": null, "BUNIT_ID1": 0, "BUNIT_SUF1": null, "BUNIT_PRE2": null, "BUNIT_ID2": 0, "BUNIT_SUF2": null, "FLOOR_TYPE": null, "FL_PREF1": null, "FLOOR_NO_1": 0, "FL_SUF1": null, "FL_PREF2": null, "FLOOR_NO_2": 0, "FL_SUF2": null, "BUILDING": null, "COMPLEX": null, "HSE_PREF1": null, "HSE_NUM1": 9, "HSE_SUF1": "B", "HSE_PREF2": null, "HSE_NUM2": 9, "HSE_SUF2": "D", "DISP_PREF1": null, "DISP_NUM1": 0, "DISP_SUF1": null, "DISP_PREF2": null, "DISP_NUM2": 0, "DISP_SUF2": null, "ROAD_NAME": "OLSEN", "ROAD_TYPE": "PLACE", "RD_SUF": null, "LOCALITY": "BROADMEADOWS", "LGA_CODE": "333", "STATE": "VIC", "POSTCODE": "3047", "MESH_BLOCK": "20295911000", "NUM_RD_ADD": "9B-9D OLSEN PLACE", "NUM_ADD": "9B-9D", "ADD_CLASS": "S", "ACCESSTYPE": "L", "OUT_PROP": "N", "COMPLXSITE": "N", "LABEL_ADD": "N", "FQID": null, "PFI_CR": "2006-08-17", "UFI": 461539675, "UFI_CR": "2008-07-23", "UFI_OLD": 0 }, "geometry": { "type": "Point", "coordinates": [ 144.9268536, -37.6898628 ] } }
+
+ const output = {
+ type: 'Feature',
+ properties: {
+ 'addr:housenumber': '9B-9D',
+ 'addr:street': 'Olsen Place',
+ 'addr:suburb': 'Broadmeadows',
+ 'addr:state': 'VIC',
+ 'addr:postcode': '3047'
+ },
+ geometry: {
+ type: 'Point',
+ coordinates: [ 144.9268536, -37.6898628 ]
+ }
+ }
+
+ t.same(toOSM(input), output)
+})
+
+test('toOSM range with prefix aX-bY', t => {
+ t.plan(1)
+
+ const input = { "type": "Feature", "properties": { "PFI": "427025011", "PR_PFI": "427025004", "EZI_ADD": "A1-A8 LAKESIDE VILLAGE DRIVE LILYDALE 3140", "SOURCE": "LGU", "SRC_VERIF": "2017-10-11", "IS_PRIMARY": "Y", "PROPSTATUS": "A", "GCODEFEAT": "E", "DIST_FLAG": "N", "LOC_DESC": null, "BLGUNTTYP": null, "HSA_FLAG": "N", "HSAUNITID": null, "BUNIT_PRE1": null, "BUNIT_ID1": 0, "BUNIT_SUF1": null, "BUNIT_PRE2": null, "BUNIT_ID2": 0, "BUNIT_SUF2": null, "FLOOR_TYPE": null, "FL_PREF1": null, "FLOOR_NO_1": 0, "FL_SUF1": null, "FL_PREF2": null, "FLOOR_NO_2": 0, "FL_SUF2": null, "BUILDING": "STUDENT RESIDENCE - SITE LV 4", "COMPLEX": "BOX HILL TAFE - LILLYDALE CAMPUS", "HSE_PREF1": "A", "HSE_NUM1": 1, "HSE_SUF1": null, "HSE_PREF2": "A", "HSE_NUM2": 8, "HSE_SUF2": null, "DISP_PREF1": null, "DISP_NUM1": 0, "DISP_SUF1": null, "DISP_PREF2": null, "DISP_NUM2": 0, "DISP_SUF2": null, "ROAD_NAME": "LAKESIDE VILLAGE", "ROAD_TYPE": "DRIVE", "RD_SUF": null, "LOCALITY": "LILYDALE", "LGA_CODE": "377", "STATE": "VIC", "POSTCODE": "3140", "MESH_BLOCK": "20651970000", "NUM_RD_ADD": "A1-A8 LAKESIDE VILLAGE DRIVE", "NUM_ADD": "A1-A8", "ADD_CLASS": "S", "ACCESSTYPE": "L", "OUT_PROP": "N", "COMPLXSITE": "N", "LABEL_ADD": "N", "FQID": "RA_NO_203", "PFI_CR": "2017-10-11", "UFI": 540188788, "UFI_CR": "2017-10-11", "UFI_OLD": 0 }, "geometry": { "type": "Point", "coordinates": [ 145.350969, -37.7670618 ] } }
+
+ const output = {
+ type: 'Feature',
+ properties: {
+ 'addr:housename': 'STUDENT RESIDENCE - SITE LV 4',
+ 'addr:housenumber': 'A1-A8',
+ 'addr:street': 'Lakeside Village Drive',
+ 'addr:suburb': 'Lilydale',
+ 'addr:state': 'VIC',
+ 'addr:postcode': '3140'
+ },
+ geometry: {
+ type: 'Point',
+ coordinates: [ 145.350969, -37.7670618 ]
+ }
+ }
+
+ t.same(toOSM(input), output)
+})
diff --git a/yarn.lock b/yarn.lock
index a402885..dfb00d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -615,13 +615,6 @@ through@^2.3.8, through@~2.3.4:
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
-title-case@^3.0.3:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/title-case/-/title-case-3.0.3.tgz#bc689b46f02e411f1d1e1d081f7c3deca0489982"
- integrity sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==
- dependencies:
- tslib "^2.0.3"
-
tslib@^2.0.3:
version "2.2.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-03 18:31:53 +0000