From e8b86a060a500f1e540483dadd3a13fa8adf1045 Mon Sep 17 00:00:00 2001
From: missinglink <insomnia@rcpt.at>
Date: Fri, 8 Nov 2019 12:17:53 +0100
Subject: [PATCH] feat(synonyms): add Spanish street suffix synonyms

---
 integration/analyzer_peliasPhrase.js |  6 ++--
 synonyms/street_suffix.txt           | 45 ++++++++++++++++++++++++++++
 test/fixtures/expected.json          | 45 +++++++++++++++++++++++++++-
 test/settings.js                     |  2 +-
 4 files changed, 94 insertions(+), 4 deletions(-)

diff --git a/integration/analyzer_peliasPhrase.js b/integration/analyzer_peliasPhrase.js
index a43d7151..eb10b9ec 100644
--- a/integration/analyzer_peliasPhrase.js
+++ b/integration/analyzer_peliasPhrase.js
@@ -21,7 +21,6 @@ module.exports.tests.analyze = function(test, common){
     assertAnalysis( 'asciifolding', 'ł', ['l']);
     assertAnalysis( 'asciifolding', 'ɰ', ['m']);
     assertAnalysis( 'trim', ' f ', ['f'] );
-    assertAnalysis( 'stop_words (disabled)', 'a st b ave c', ['0:a', '1:st', '1:street', '2:b', '3:ave', '3:avenue', '3:av', '4:c'] );
     assertAnalysis( 'ampersand', 'a and b', ['0:a', '1:and', '1:&', '2:b']);
     assertAnalysis( 'ampersand', 'a & b', ['0:a', '1:&', '1:and', '1:und', '2:b']);
     assertAnalysis( 'ampersand', 'a and & and b', ['0:a', '1:and', '1:&', '2:&', '2:and', '2:und', '3:and', '3:&', '4:b']);
@@ -68,7 +67,10 @@ module.exports.tests.functional = function(test, common){
     ]);
 
     assertAnalysis( 'address', '101 geocode pl', [
-      '0:101', '1:geocode', '2:pl', '2:place', '2:platz'
+      '0:101',
+      '1:geocode',
+      '2:pca', '2:pl', '2:placa', '2:place', '2:platz',
+      '2:plaza', '2:plca', '2:plza', '2:pza'
     ]);
 
     // both terms should map to same tokens
diff --git a/synonyms/street_suffix.txt b/synonyms/street_suffix.txt
index 55aba03c..8fedcc9b 100644
--- a/synonyms/street_suffix.txt
+++ b/synonyms/street_suffix.txt
@@ -127,3 +127,48 @@ bruecke, brucke, br
 bahnhof, bhf, bf
 chaussee, ch
 platz, pl
+
+# Spanish street suffixes
+antic cami,ant cami
+antiga carretera,actra,actra
+autopista,auto,autop,autp,auto,autop,autp
+autovia,autov,autv,autov,autv
+avenida,av
+avinguda,av,avd,avda,avgda,agda,avgda
+baixada,bda,bajada,bda,bajada
+barranc,bnc,barranco,bnc,barranco
+calçada,cda,calzada,cda,calzada
+cami,camino
+carrer,carr,c,car,cl,calle
+carrera,carra,ctra,crt,crta,crtra,carret,cra,carra,ctra,crt,crta,crtra,carret
+carrerada,ca
+carrero,cro,carro,carr,carrero,carro,carr
+carretera,ctra,ctra
+cinturo,cint,cinto
+circumval lacio,cval,circunvalacion,circunvalacion
+corredor,cdor
+corriol,crol
+costa,cos,cuesta
+diagonal,diag,diag
+drecera,drec
+eix,eje
+entrada,entr
+gran via,gv,g v
+passadis,pdis,pasadizo
+passatge,ptge,ptg,pge,pstg,pasage,ptge,ptg,pge,pstg,pasage
+psg,passeig,pg,pje,paseo,passeig,pg,pje,paseo
+passera,psera
+placa,pl,pca,plca,plaza,pza,plza,placa
+placeta,plta
+portal,ptal
+pujada,pda
+rambla,rbla,rbl
+rambleta,rblt
+riera,ra
+ronda,rda
+rotonda,rtda
+sortida,sort,salida,slda,sort,salida,slda
+transversal,trval,trvsal,trval,trvsal
+travessera,trav,travesera,trav,travesera
+travessia,trv,trav,travesia
+via,v
\ No newline at end of file
diff --git a/test/fixtures/expected.json b/test/fixtures/expected.json
index 31e1638c..e88d79c4 100644
--- a/test/fixtures/expected.json
+++ b/test/fixtures/expected.json
@@ -490,7 +490,50 @@
             "bruecke,brucke,br",
             "bahnhof,bhf,bf",
             "chaussee,ch",
-            "platz,pl"
+            "platz,pl",
+            "antic cami,ant cami",
+            "antiga carretera,actra,actra",
+            "autopista,auto,autop,autp,auto,autop,autp",
+            "autovia,autov,autv,autov,autv",
+            "avenida,av",
+            "avinguda,av,avd,avda,avgda,agda,avgda",
+            "baixada,bda,bajada,bda,bajada",
+            "barranc,bnc,barranco,bnc,barranco",
+            "calçada,cda,calzada,cda,calzada",
+            "cami,camino",
+            "carrer,carr,c,car,cl,calle",
+            "carrera,carra,ctra,crt,crta,crtra,carret,cra,carra,ctra,crt,crta,crtra,carret",
+            "carrerada,ca",
+            "carrero,cro,carro,carr,carrero,carro,carr",
+            "carretera,ctra,ctra",
+            "cinturo,cint,cinto",
+            "circumval lacio,cval,circunvalacion,circunvalacion",
+            "corredor,cdor",
+            "corriol,crol",
+            "costa,cos,cuesta",
+            "diagonal,diag,diag",
+            "drecera,drec",
+            "eix,eje",
+            "entrada,entr",
+            "gran via,gv,g v",
+            "passadis,pdis,pasadizo",
+            "passatge,ptge,ptg,pge,pstg,pasage,ptge,ptg,pge,pstg,pasage",
+            "psg,passeig,pg,pje,paseo,passeig,pg,pje,paseo",
+            "passera,psera",
+            "placa,pl,pca,plca,plaza,pza,plza,placa",
+            "placeta,plta",
+            "portal,ptal",
+            "pujada,pda",
+            "rambla,rbla,rbl",
+            "rambleta,rblt",
+            "riera,ra",
+            "ronda,rda",
+            "rotonda,rtda",
+            "sortida,sort,salida,slda,sort,salida,slda",
+            "transversal,trval,trvsal,trval,trvsal",
+            "travessera,trav,travesera,trav,travesera",
+            "travessia,trv,trav,travesia",
+            "via,v"
           ]
         }
       },
diff --git a/test/settings.js b/test/settings.js
index 360370af..d843ed84 100644
--- a/test/settings.js
+++ b/test/settings.js
@@ -375,7 +375,7 @@ module.exports.tests.streetSynonymFilter = function(test, common) {
     var filter = s.analysis.filter.street_suffix;
     t.equal(filter.type, 'synonym');
     t.true(Array.isArray(filter.synonyms));
-    t.equal(filter.synonyms.length, 127);
+    t.equal(filter.synonyms.length, 170);
     t.end();
   });
 };