From ba22bcc267ec0900532ee58198a8a7908c5c9727 Mon Sep 17 00:00:00 2001 From: Morgan Denis Date: Fri, 12 Feb 2021 10:06:17 +0100 Subject: Allow using real city name when available --- lib/address.js | 13 +++++++++++++ lib/index.js | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/address.js b/lib/address.js index 38c1e38c..1ccbfdc9 100644 --- a/lib/address.js +++ b/lib/address.js @@ -60,6 +60,10 @@ function Address (faker) { * @param {String} format */ this.city = function (format) { + if (!format && faker.definitions.address.city_name) { + return this.cityName(); + } + var formats = [ '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}', '{{address.cityPrefix}} {{name.firstName}}', @@ -92,6 +96,15 @@ function Address (faker) { return faker.random.arrayElement(faker.definitions.address.city_suffix); } + /** + * Returns a random city name + * + * @method faker.address.cityName + */ + this.cityName = function() { + return faker.random.arrayElement(faker.definitions.address.city_name); + } + /** * Returns a random localized street name * diff --git a/lib/index.js b/lib/index.js index 16def0a3..205adec5 100644 --- a/lib/index.js +++ b/lib/index.js @@ -103,7 +103,7 @@ function Faker (opts) { var _definitions = { "name": ["first_name", "last_name", "prefix", "suffix", "gender", "title", "male_prefix", "female_prefix", "male_first_name", "female_first_name", "male_middle_name", "female_middle_name", "male_last_name", "female_last_name"], - "address": ["city_prefix", "city_suffix", "street_suffix", "county", "country", "country_code", "country_code_alpha_3", "state", "state_abbr", "street_prefix", "postcode", "postcode_by_state", "direction", "direction_abbr", "time_zone"], + "address": ["city_name", "city_prefix", "city_suffix", "street_suffix", "county", "country", "country_code", "country_code_alpha_3", "state", "state_abbr", "street_prefix", "postcode", "postcode_by_state", "direction", "direction_abbr", "time_zone"], "company": ["adjective", "noun", "descriptor", "bs_adjective", "bs_noun", "bs_verb", "suffix"], "lorem": ["words"], "hacker": ["abbreviation", "adjective", "noun", "verb", "ingverb", "phrase"], -- cgit v1.2.3 From d46704096eb49b683076441d9049ab1fbd23d7ff Mon Sep 17 00:00:00 2001 From: Morgan Denis Date: Fri, 12 Feb 2021 10:12:11 +0100 Subject: Order and fix city names --- lib/locales/fr/address/city_name.js | 168 ++++++++++++++++++------------------ 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/lib/locales/fr/address/city_name.js b/lib/locales/fr/address/city_name.js index 740dd2d9..b63c05aa 100644 --- a/lib/locales/fr/address/city_name.js +++ b/lib/locales/fr/address/city_name.js @@ -1,102 +1,102 @@ module["exports"] = [ - "Paris", - "Marseille", - "Lyon", - "Toulouse", - "Nice", - "Nantes", - "Strasbourg", - "Montpellier", - "Bordeaux", - "Lille", - "Rennes", - "Reims", - "Le Havre", - "Saint-Étienne", - "Toulon", - "Grenoble", - "Dijon", - "Angers", - "Saint-Denis", - "Villeurbanne", - "Le Mans", "Aix-en-Provence", - "Brest", - "Nîmes", - "Limoges", - "Clermont-Ferrand", - "Tours", + "Ajaccio", "Amiens", - "Metz", - "Perpignan", - "Besançon", - "Orléans", - "Boulogne-Billancourt", - "Mulhouse", - "Rouen", - "Caen", - "Nancy", - "Saint-Denis", - "Saint-Paul", - "Montreuil", + "Angers", + "Antibes", + "Antony", "Argenteuil", - "Roubaix", - "Dunkerque14", - "Tourcoing", - "Nanterre", - "Avignon", - "Créteil", - "Poitiers", - "Fort-de-France", - "Courbevoie", - "Versailles", - "Vitry-sur-Seine", - "Colombes", - "Pau", - "Aulnay-sous-Bois", "Asnières-sur-Seine", - "Rueil-Malmaison", - "Saint-Pierre", - "Antibes", - "Saint-Maur-des-Fossés", - "Champigny-sur-Marne", - "La Rochelle", "Aubervilliers", + "Aulnay-sous-Bois", + "Avignon", + "Beauvais", + "Besançon", + "Béziers", + "Bordeaux", + "Boulogne-Billancourt", + "Bourges", + "Brest", + "Caen", "Calais", "Cannes", - "Le Tampon", - "Béziers", + "Cayenne", + "Cergy", + "Chambéry", + "Champigny-sur-Marne", + "Cholet", + "Clermont-Ferrand", + "Clichy", "Colmar", - "Bourges", + "Colombes", + "Courbevoie", + "Créteil", + "Dijon", "Drancy", - "Mérignac", - "Saint-Nazaire", - "Valence", - "Ajaccio", + "Dunkerque", + "Fort-de-France", + "Grenoble", + "Hyères", "Issy-les-Moulineaux", - "Villeneuve-d'Ascq", - "Levallois-Perret", - "Noisy-le-Grand", - "Quimper", + "Ivry-sur-Seine", + "La Rochelle", "La Seyne-sur-Mer", - "Antony", - "Troyes", - "Neuilly-sur-Seine", - "Sarcelles", + "Le Havre", + "Le Mans", + "Le Tampon", "Les Abymes", - "Vénissieux", - "Clichy", + "Levallois-Perret", + "Lille", + "Limoges", "Lorient", - "Pessac", - "Ivry-sur-Seine", - "Cergy", - "Cayenne", - "Niort", - "Chambéry", + "Lyon", + "Marseille", + "Mérignac", + "Metz", "Montauban", + "Montpellier", + "Montreuil", + "Mulhouse", + "Nancy", + "Nanterre", + "Nantes", + "Neuilly-sur-Seine", + "Nice", + "Nîmes", + "Niort", + "Noisy-le-Grand", + "Orléans", + "Paris", + "Pau", + "Perpignan", + "Pessac", + "Poitiers", + "Quimper", + "Reims", + "Rennes", + "Roubaix", + "Rouen", + "Rueil-Malmaison", + "Saint-Denis", + "Saint-Denis", + "Saint-Étienne", + "Saint-Maur-des-Fossés", + "Saint-Nazaire", + "Saint-Paul", + "Saint-Pierre", "Saint-Quentin", + "Sarcelles", + "Strasbourg", + "Toulon", + "Toulouse", + "Tourcoing", + "Tours", + "Troyes", + "Valence", + "Vénissieux", + "Versailles", "Villejuif", - "Hyères", - "Beauvais", - "Cholet" + "Villeneuve-d'Ascq", + "Villeurbanne", + "Vitry-sur-Seine" ]; -- cgit v1.2.3 From 5601772511abacfa3278a303e02a4199c70e6715 Mon Sep 17 00:00:00 2001 From: Morgan Denis Date: Wed, 17 Feb 2021 10:04:50 +0100 Subject: Use randmly cityname when available --- lib/address.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/address.js b/lib/address.js index 1ccbfdc9..29a0653a 100644 --- a/lib/address.js +++ b/lib/address.js @@ -55,15 +55,12 @@ function Address (faker) { * * `{{address.cityPrefix}} {{name.firstName}}` * * `{{name.firstName}}{{address.citySuffix}}` * * `{{name.lastName}}{{address.citySuffix}}` + * * `{{address.cityName}}` when city name is available * * @method faker.address.city * @param {String} format */ this.city = function (format) { - if (!format && faker.definitions.address.city_name) { - return this.cityName(); - } - var formats = [ '{{address.cityPrefix}} {{name.firstName}}{{address.citySuffix}}', '{{address.cityPrefix}} {{name.firstName}}', @@ -71,6 +68,10 @@ function Address (faker) { '{{name.lastName}}{{address.citySuffix}}' ]; + if (!format && faker.definitions.address.city_name) { + formats.push('{{address.cityName}}'); + } + if (typeof format !== "number") { format = faker.random.number(formats.length - 1); } -- cgit v1.2.3 From dc34993d64668bc34a9d9388bb177c8c90df0742 Mon Sep 17 00:00:00 2001 From: Marak Date: Thu, 18 Feb 2021 21:20:58 -0500 Subject: Fix typo --- lib/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/index.js b/lib/index.js index 9f028df7..433a6b81 100644 --- a/lib/index.js +++ b/lib/index.js @@ -106,7 +106,7 @@ function Faker (opts) { var _definitions = { "name": ["first_name", "last_name", "prefix", "suffix", "binary_gender", "gender", "title", "male_prefix", "female_prefix", "male_first_name", "female_first_name", "male_middle_name", "female_middle_name", "male_last_name", "female_last_name"], - "address": ["city_name"", city_prefix", "city_suffix", "street_suffix", "county", "country", "country_code", "country_code_alpha_3", "state", "state_abbr", "street_prefix", "postcode", "postcode_by_state", "direction", "direction_abbr", "time_zone"], + "address": ["city_name", "city_prefix", "city_suffix", "street_suffix", "county", "country", "country_code", "country_code_alpha_3", "state", "state_abbr", "street_prefix", "postcode", "postcode_by_state", "direction", "direction_abbr", "time_zone"], "animal": ["dog", "cat", "snake", "bear", "lion", "cetacean", "insect", "crocodilia", "cow", "bird", "fish", "rabbit", "horse", "type"], "company": ["adjective", "noun", "descriptor", "bs_adjective", "bs_noun", "bs_verb", "suffix"], "lorem": ["words"], -- cgit v1.2.3