-
Notifications
You must be signed in to change notification settings - Fork 17
Gestion des mots contractés #72
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
tmerlier
wants to merge
4
commits into
master
Choose a base branch
from
abbreviations
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| const normalizeString = require('../normalizeString'); | ||
| const replaceAbbreviations = require('../replaceAbbreviations'); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Le nom me parait trop spécifique
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. À modifier |
||
| const lunr = require('lunr'); | ||
| const { clone, sortBy } = require('lodash'); | ||
|
|
||
|
|
@@ -7,6 +8,7 @@ class TextIndex { | |
| if (!key) throw new Error('key is required'); | ||
| this._key = key; | ||
| this._boost = options.boost || {}; | ||
| this._replacePatterns = options.replacePatterns; | ||
| const refKey = this._refKey = options.ref || 'id'; | ||
| this._refIndex = new Map(); | ||
| this._index = lunr(function () { | ||
|
|
@@ -31,6 +33,11 @@ class TextIndex { | |
|
|
||
| find(terms, options = {}) { | ||
| let boosted = false; | ||
|
|
||
| if (this._replacePatterns) { | ||
| terms = replaceAbbreviations(terms, this._replacePatterns); | ||
| } | ||
|
|
||
| const results = this._index.search(terms) | ||
| .map(result => { | ||
| const item = clone(this._refIndex.get(result.ref)); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| function replaceAbbreviations(terms, patterns) { | ||
| if (!terms.includes(' ') && !terms.includes('-')) return terms; | ||
|
|
||
| return terms | ||
| .toLocaleLowerCase() | ||
| .replace(/-/g, ' ') | ||
| .split(' ') | ||
| .map(token => token in patterns ? patterns[token] : token) | ||
| .join(' '); | ||
| } | ||
|
|
||
| module.exports = replaceAbbreviations; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* eslint-env mocha */ | ||
| const expect = require('expect.js'); | ||
| const replaceAbbreviations = require('../lib/searchableCollection/replaceAbbreviations'); | ||
|
|
||
| describe('replaceAbbreviations()', function () { | ||
| const abbreviations = { | ||
| 'st': 'saint', | ||
| 'ste': 'sainte', | ||
| 'cgne': 'campagne', | ||
| }; | ||
|
|
||
| beforeEach(done => { | ||
| done(); | ||
| }); | ||
|
|
||
| describe('Words separated by spaces', function () { | ||
| it('should replace Pattern', function () { | ||
| const str = 'st louis'; | ||
| const out = 'saint louis'; | ||
|
|
||
| expect(replaceAbbreviations(str, abbreviations)).to.equal(out); | ||
| }); | ||
|
|
||
| it('should replace Pattern', function () { | ||
| const str = 'marcilly la cgne'; | ||
| const out = 'marcilly la campagne'; | ||
|
|
||
| expect(replaceAbbreviations(str, abbreviations)).to.equal(out); | ||
| }); | ||
| }); | ||
|
|
||
| describe('Words separated by dashes', function () { | ||
| it('should replace Pattern', function () { | ||
| const str = 'st-louis'; | ||
| const out = 'saint louis'; | ||
|
|
||
| expect(replaceAbbreviations(str, abbreviations)).to.equal(out); | ||
| }); | ||
|
|
||
| it('should replace Pattern', function () { | ||
| const str = 'marcilly-la-cgne'; | ||
| const out = 'marcilly la campagne'; | ||
|
|
||
| expect(replaceAbbreviations(str, abbreviations)).to.equal(out); | ||
| }); | ||
| }); | ||
|
|
||
| describe('search contained only one word', () => { | ||
| it('should not replace Pattern', () => { | ||
| const str = 'st'; | ||
|
|
||
| expect(replaceAbbreviations(str, abbreviations)).to.equal(str); | ||
| }); | ||
| }); | ||
|
|
||
| describe('Pattern is contained in a word', () => { | ||
| it('should not replace Pattern', () => { | ||
| const str = 'le stinx'; | ||
|
|
||
| expect(replaceAbbreviations(str, abbreviations)).to.equal(str); | ||
| }); | ||
| }); | ||
|
|
||
| }); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A rapprocher de la liste utilisée pour les noms de rues dans la BAN ?
https://github.com/etalab/ban-data/blob/master/data/abbrev.txt