Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into ru-grammar-flags
Browse files Browse the repository at this point in the history
@yuryleb
yuryleb committed Mar 6, 2019
2 parents 0b3f41d + ed1a4a9 commit 84138f2
Showing 5 changed files with 285 additions and 317 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. For change

- Added an Arabic localization. [#267](https://github.com/Project-OSRM/osrm-text-instructions/pull/267)
- Added a Slovenian localization. [#264](https://github.com/Project-OSRM/osrm-text-instructions/pull/264)
- Updated French grammar with 'chaussée' status street name. [#268](https://github.com/Project-OSRM/osrm-text-instructions/pull/268)
- Global search option is now required for all grammar rules. [#228] (https://github.com/Project-OSRM/osrm-text-instructions/pull/228)

## 0.13.2 2018-08-13
9 changes: 9 additions & 0 deletions languages/grammar/fr.json
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
["^ Chemin ", " le chemin "],
["^ Petit[\\- ]Chemin ", " le petit chemin "],
["^ Cit[ée] ", " la cité "],
["^ Chauss[ée]e ", " la chaussée "],
["^ Clos ", " le clos "],
["^ Corniche ", " la corniche "],
["^ Cour ", " la cour "],
@@ -37,9 +38,11 @@
["^ Rocade ", " la rocade "],
["^ Rond[\\- ]?Point ", " le rond-point "],
["^ Route ", " la route "],
["^ Ancienne Route ", " la ancienne route "],
["^ Rue ", " la rue "],
["^ Grande Rue ", " la grande rue "],
["^ Sente ", " la sente "],
["^ Grande Sente ", " la grande sente "],
["^ Sentier ", " le sentier "],
["^ Sortie ", " la sortie "],
["^ Souterrain ", " le souterrain "],
@@ -70,6 +73,7 @@
["^ Chemin ", " du chemin "],
["^ Petit[\\- ]Chemin ", " du petit chemin "],
["^ Cit[ée] ", " de la cité "],
["^ Chauss[ée]e ", " de la chaussée "],
["^ Clos ", " du clos "],
["^ Corniche ", " de la corniche "],
["^ Cour ", " de la cour "],
@@ -92,9 +96,11 @@
["^ Rocade ", " de la rocade "],
["^ Rond[\\- ]?Point ", " du rond-point "],
["^ Route ", " de la route "],
["^ Ancienne Route ", " de la ancienne route "],
["^ Rue ", " de la rue "],
["^ Grande Rue ", " de la grande rue "],
["^ Sente ", " de la sente "],
["^ Grande Sente ", " de la grande sente "],
["^ Sentier ", " du sentier "],
["^ Sortie ", " de la sortie "],
["^ Souterrain ", " du souterrain "],
@@ -127,6 +133,7 @@
["^ Chemin ", " le rond-point du chemin "],
["^ Petit[\\- ]Chemin ", " le rond-point du petit chemin "],
["^ Cit[ée] ", " le rond-point de la cité "],
["^ Chauss[ée]e ", " le rond-point de la chaussée "],
["^ Clos ", " le rond-point du clos "],
["^ Corniche ", " le rond-point de la corniche "],
["^ Cour ", " le rond-point de la cour "],
@@ -149,9 +156,11 @@
["^ Rocade ", " le rond-point de la rocade "],
["^ Rond[\\- ]?Point ", " le rond-point "],
["^ Route ", " le rond-point de la route "],
["^ Ancienne Route ", " le rond-point de la ancienne route "],
["^ Rue ", " le rond-point de la rue "],
["^ Grande Rue ", " le rond-point de la grande rue "],
["^ Sente ", " le rond-point de la sente "],
["^ Grande Sente ", " le rond-point de la grande sente "],
["^ Sentier ", " le rond-point du sentier "],
["^ Sortie ", " le rond-point de la sortie "],
["^ Souterrain ", " le rond-point du souterrain "],
578 changes: 265 additions & 313 deletions package-lock.json
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -14,10 +14,10 @@
"url": "git://github.com/Project-OSRM/osrm-text-instructions.js/"
},
"devDependencies": {
"eslint": "^3.4.0",
"tape": "^4.2.2",
"mkdirp": "0.5.1",
"request": "2.79.0"
"eslint": "^3.19.0",
"mkdirp": "^0.5.1",
"request": "^2.79.0",
"tape": "^4.9.2"
},
"scripts": {
"lint": "eslint *.js test/*.js scripts/*.js",
6 changes: 6 additions & 0 deletions test/grammar_test.js
View file
Original file line number Diff line number Diff line change
@@ -42,6 +42,8 @@ const grammarTests = {
['Petit Chemin de Carpentras', 'preposition', 'du petit chemin de Carpentras'],
['Cité Falguière', 'article', 'la cité Falguière'],
['Cité Falguière', 'preposition', 'de la cité Falguière'],
['Chaussée Jules César', 'article', 'la chaussée Jules César'],
['Chaussée Jules César', 'preposition', 'de la chaussée Jules César'],
['Clos de Baumillons', 'article', 'le clos de Baumillons'],
['Clos de Baumillons', 'preposition', 'du clos de Baumillons'],
['Corniche du Président John Fitzgerald Kennedy', 'article', 'la corniche du Président John Fitzgerald Kennedy'],
@@ -91,12 +93,16 @@ const grammarTests = {
['Rondpoint', 'rotary', 'le rond-point'],
['Route Principale du Port', 'article', 'la route Principale du Port'],
['Route Principale du Port', 'preposition', 'de la route Principale du Port'],
['Ancienne Route de Rouen', 'article', 'la ancienne route de Rouen'],
['Ancienne Route de Rouen', 'preposition', 'de la ancienne route de Rouen'],
['Rue de Jarménil', 'article', 'la rue de Jarménil'],
['Rue de Jarménil', 'preposition', 'de la rue de Jarménil'],
['Grande Rue de Saint-Rambert', 'article', 'la grande rue de Saint-Rambert'],
['Grande Rue de Saint-Rambert', 'preposition', 'de la grande rue de Saint-Rambert'],
['Sente de l\'Esseau', 'article', 'la sente de l’Esseau'],
['Sente de l\'Esseau', 'preposition', 'de la sente de l’Esseau'],
['Grande Sente des Noyers', 'article', 'la grande sente des Noyers'],
['Grande Sente des Noyers', 'preposition', 'de la grande sente des Noyers'],
['Sentier de l\'Échelle', 'article', 'le sentier de l’Échelle'],
['Sentier de l\'Échelle', 'preposition', 'du sentier de l’Échelle'],
['Souterrain Sortie Pont Neuf', 'article', 'le souterrain Sortie Pont Neuf'],

0 comments on commit 84138f2

Please sign in to comment.