Split street into number and name properties RandomAPI#112

kwdly · Sep 28, 2019 · ffe1cd5 · ffe1cd5
1 parent 2aca690
commit ffe1cd5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/api/1.3/api.js b/api/1.3/api.js
@@ -152,7 +152,10 @@ class Generator {
 
         let timezone = JSON.parse(randomItem(this.datasets.common.timezones));
         this.include('location', {
-          street: range(1, 9999) + ' ' + randomItem(this.datasets[nat].street),
+          street: {
+            number: range(1, 9999),
+            name: randomItem(this.datasets[nat].street)
+          },
           city: randomItem(this.datasets[nat].cities),
           state: randomItem(this.datasets[nat].states),
           country: this.fullNatName(nat),

diff --git a/api/1.3/data/AU/inject.js b/api/1.3/data/AU/inject.js
@@ -13,9 +13,5 @@ module.exports = (inc, contents) => {
     include(inc, contents, 'picture', pic);
     include(inc, contents, 'location', () => {
         contents.location.postcode = range(200, 9999); // Override common postcode with AU range
-
-        // Override common postcode with AU range
-        const oldStreet = contents.location.street;
-        contents.location.street = contents.location.street.replace(/(\d+)/, range(1,9999));
     });
 };
diff --git a/api/1.3/data/DE/inject.js b/api/1.3/data/DE/inject.js
@@ -10,9 +10,5 @@ module.exports = (inc, contents) => {
         name: '',
         value: null
     });
-    include(inc, contents, 'location', () => {
-        const oldStreet = contents.location.street.replace(/(\d+) /, '');
-        contents.location.street = oldStreet + ' ' + range(1, 200);
-    });
     include(inc, contents, 'picture', pic);
 };
diff --git a/api/1.3/data/NO/inject.js b/api/1.3/data/NO/inject.js
@@ -62,8 +62,6 @@ module.exports = (inc, contents, datasets) => {
   });
 
   include(inc, contents, 'location', () => {
-    const oldStreet = contents.location.street.replace(/(\d+) /, '');
-    contents.location.street = oldStreet + ' ' + range(1, 9998);
     contents.location.postcode = randomItem(datasets['NO'].post_codes);
   });
   include(inc, contents, 'picture', pic);