Update .nextRelease with latest changes from v1.3

Author: keitharm

api/.nextRelease/api.js

@@ -3,6 +3,8 @@
   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
 */
 
 const fs           = require('fs');
@@ -153,6 +155,7 @@ class Generator {
           street: range(1, 9999) + ' ' + randomItem(this.datasets[nat].street),
           city: randomItem(this.datasets[nat].cities),
           state: randomItem(this.datasets[nat].states),
+          country: this.fullNatName(nat),
           postcode: range(10000, 99999),
           coordinates: {
             latitude: faker.address.latitude(),
@@ -369,6 +372,28 @@ class Generator {
 
     return password;
   }
+
+  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",
+    };
+    return mapping[nat];
+  }
 }
 
 function random(mode, length) {

api/.nextRelease/data/CH/inject.js

@@ -13,8 +13,9 @@ module.exports = (inc, contents) => {
         contents.location.postcode = range(1000, 9999);
     });
 
-    include(inc, contents, 'phone', '(' + random(3, 3) + ')-' + random(3, 3) + '-' + random(3, 4));
-    include(inc, contents, 'cell', '(' + random(3, 3) + ')-' + random(3, 3) + '-' + random(3, 4));
+    let prefix = ['075', '076', '077', '078', '079'];
+    include(inc, contents, 'phone', `${randomItem(prefix)} ${random(3, 3)} ${random(3, 2)} ${random(3, 2)}`);
+    include(inc, contents, 'cell', `${randomItem(prefix)} ${random(3, 3)} ${random(3, 2)} ${random(3, 2)}`);
     include(inc, contents, 'id', {
         name: 'AVS',
         value: '756.' + random(3, 4) + '.' + random(3, 4) + '.' + random(3, 2)