Copy 1.3 to .nextRelease

Author: keitharm

api/.nextRelease/api.js

@@ -1,10 +1,13 @@
 /*
-  Use native js dates instead of moment for ~60% increase in dates calculation
-  Email addresses are now transliterated
-  More street/city names for NL dataset
-  Fixed Norwegian id generation bug
-  Fixed Switzerland phone number format
-  Add country name to location block
+  • Use native js dates instead of moment for ~60% increase in dates calculation
+  • Email addresses are now transliterated
+  • More street/city names for NL dataset
+  • Add country name to location block
+  • Capitalized proper nouns
+  • Split street into number and name properties
+  • Fixed Norwegian id generation bug
+  • Fixed Switzerland phone number format
+  • Fixed Danish CPR number calculation
 */
 
 const fs           = require('fs');
@@ -145,14 +148,17 @@ class Generator {
 
         let name = this.randomName(this.current.gender, nat);
         this.include('name', {
-          title: this.current.gender === 'male' ? 'mr' : randomItem(this.datasets.common.title),
+          title: this.current.gender === 'male' ? 'Mr' : randomItem(this.datasets.common.title),
           first: name[0],
           last: name[1]
         });
 
         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),
@@ -375,22 +381,22 @@ class Generator {
 
   fullNatName(nat) {
     let mapping = {
-      AU: "australia",
-      BR: "brazil",
-      CA: "canada",
-      CH: "switzerland",
-      DE: "germany",
-      DK: "denmark",
-      ES: "spain",
-      FI: "finland",
-      FR: "france",
-      GB: "united kingdom",
-      IE: "ireland",
-      IR: "iran",
-      NL: "netherlands",
-      NZ: "new zealand",
-      TR: "turkey",
-      US: "united states",
+      AU: "Australia",
+      BR: "Brazil",
+      CA: "Canada",
+      CH: "Switzerland",
+      DE: "Germany",
+      DK: "Denmark",
+      ES: "Spain",
+      FI: "Finland",
+      FR: "France",
+      GB: "United Kingdom",
+      IE: "Ireland",
+      IR: "Iran",
+      NL: "Netherlands",
+      NZ: "New Zealand",
+      TR: "Turkey",
+      US: "United States",
     };
     return mapping[nat];
   }

api/.nextRelease/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));
     });
 };

api/.nextRelease/data/AU/lists/cities.txt

@@ -1,46 +1,46 @@
-adelaide
-albany
-albury
-australian capital territory
-ballarat
-bathurst
-bendigo
-bowral
-brisbane
-bunbury
-bundaberg
-busselton
-cairns
-coffs harbour
-darwin
-devonport
-dubbo
-geelong
-geraldton
-gladstone
-hervey bay
-hobart
-kalgoorlie
-launceston
-mackay
-maitland
-melbourne
-mildura
-nowra
-orange
-perth
-port macquarie
-queanbeyan
-rockhampton
-shepparton
-sunshine coast
-sydney
-tamworth
-toowoomba
-townsville
-traralgon
-tweed
-wagga wagga
-warragul
-warrnambool
-wollongong
+Adelaide
+Albany
+Albury
+Australian Capital Territory
+Ballarat
+Bathurst
+Bendigo
+Bowral
+Brisbane
+Bunbury
+Bundaberg
+Busselton
+Cairns
+Coffs Harbour
+Darwin
+Devonport
+Dubbo
+Geelong
+Geraldton
+Gladstone
+Hervey Bay
+Hobart
+Kalgoorlie
+Launceston
+Mackay
+Maitland
+Melbourne
+Mildura
+Nowra
+Orange
+Perth
+Port Macquarie
+Queanbeyan
+Rockhampton
+Shepparton
+Sunshine Coast
+Sydney
+Tamworth
+Toowoomba
+Townsville
+Traralgon
+Tweed
+Wagga Wagga
+Warragul
+Warrnambool
+Wollongong