From 7272d44575061e232b29f71853c7f9b40edb9d97 Mon Sep 17 00:00:00 2001
From: Al <albarrentine@gmail.com>
Date: Fri, 15 Apr 2016 14:21:43 -0400
Subject: [PATCH] [dictionaries] Updates to Spanish dictionaries to support the
 new structure, new abbreviations for Colombia, etc.

---
 resources/dictionaries/es/ambiguous_expansions.txt  |  2 ++
 resources/dictionaries/es/building_types.txt        |  4 ++--
 resources/dictionaries/es/cross_streets.txt         |  5 +++++
 .../dictionaries/es/{entrance.txt => entrances.txt} |  0
 resources/dictionaries/es/house_number.txt          |  4 ++--
 resources/dictionaries/es/level_types_numbered.txt  |  2 +-
 .../dictionaries/es/level_types_standalone.txt      |  1 +
 resources/dictionaries/es/number.txt                |  1 +
 resources/dictionaries/es/qualifiers.txt            | 12 +++++++-----
 resources/dictionaries/es/street_types.txt          | 12 ++++++------
 resources/dictionaries/es/synonyms.txt              |  4 ----
 resources/dictionaries/es/toponyms.txt              |  1 +
 resources/dictionaries/es/unit_types_numbered.txt   | 13 +++++++------
 resources/dictionaries/es/unit_types_standalone.txt |  5 +++--
 14 files changed, 38 insertions(+), 28 deletions(-)
 create mode 100644 resources/dictionaries/es/cross_streets.txt
 rename resources/dictionaries/es/{entrance.txt => entrances.txt} (100%)
 create mode 100644 resources/dictionaries/es/number.txt

diff --git a/resources/dictionaries/es/ambiguous_expansions.txt b/resources/dictionaries/es/ambiguous_expansions.txt
index 86d63c8d..b8d29c19 100644
--- a/resources/dictionaries/es/ambiguous_expansions.txt
+++ b/resources/dictionaries/es/ambiguous_expansions.txt
@@ -1,4 +1,5 @@
 c
+cr
 d
 e
 g
@@ -7,4 +8,5 @@ n
 p
 s
 v
+un
 w
\ No newline at end of file
diff --git a/resources/dictionaries/es/building_types.txt b/resources/dictionaries/es/building_types.txt
index 56c3dd54..7142a690 100644
--- a/resources/dictionaries/es/building_types.txt
+++ b/resources/dictionaries/es/building_types.txt
@@ -9,6 +9,6 @@ cooperativa|coop
 cortijo|crtjo
 edificio|edifc|edfc|edif
 estancia|estanc|est
-local|loc
+local|loc|lc
 residencial|resid|res
-torre
\ No newline at end of file
+torre|to
\ No newline at end of file
diff --git a/resources/dictionaries/es/cross_streets.txt b/resources/dictionaries/es/cross_streets.txt
new file mode 100644
index 00000000..3ff926ef
--- /dev/null
+++ b/resources/dictionaries/es/cross_streets.txt
@@ -0,0 +1,5 @@
+y
+en
+con
+esquina|esq
+entre|e /
\ No newline at end of file
diff --git a/resources/dictionaries/es/entrance.txt b/resources/dictionaries/es/entrances.txt
similarity index 100%
rename from resources/dictionaries/es/entrance.txt
rename to resources/dictionaries/es/entrances.txt
diff --git a/resources/dictionaries/es/house_number.txt b/resources/dictionaries/es/house_number.txt
index e5ced3f5..056249f6 100644
--- a/resources/dictionaries/es/house_number.txt
+++ b/resources/dictionaries/es/house_number.txt
@@ -1,2 +1,2 @@
-número|numero|#|num|núm|no|nº|n.º|númr|numr|númro|numro|núm.ro|nr|num.ro|nro|n.ro
-número exterior|no ext|# ext|nº ext|n.º ext|núm ext|númr ext|numr ext|númro ext|numro ext|núm.ro ext|nr ext|num.ro ext|nro ext|n.ro ext
\ No newline at end of file
+exterior|ext|ex
+número exterior|no ext|# ext|nº ext|n.º ext|núm ext|númr ext|numr ext|númro ext|numro ext|núm.ro ext|nr ext|num.ro ext|nro ext|n.ro ext|no ex|# ex|nº ex|n.º ex|núm ex|númr ex|numr ex|númro ex|numro ex|núm.ro ex|nr ex|num.ro ex|nro ex|n.ro ex
\ No newline at end of file
diff --git a/resources/dictionaries/es/level_types_numbered.txt b/resources/dictionaries/es/level_types_numbered.txt
index f5f0fad9..fe35f149 100644
--- a/resources/dictionaries/es/level_types_numbered.txt
+++ b/resources/dictionaries/es/level_types_numbered.txt
@@ -1,2 +1,2 @@
 piso|pi|p
-planta|pl
\ No newline at end of file
+planta|pl|p
\ No newline at end of file
diff --git a/resources/dictionaries/es/level_types_standalone.txt b/resources/dictionaries/es/level_types_standalone.txt
index 1b670857..b5fdef03 100644
--- a/resources/dictionaries/es/level_types_standalone.txt
+++ b/resources/dictionaries/es/level_types_standalone.txt
@@ -1,3 +1,4 @@
+bajo|bjo|bo|bº
 bajos|bjos|bjs
 planta baja|pb|pl baja
 planta primera|pl primera
diff --git a/resources/dictionaries/es/number.txt b/resources/dictionaries/es/number.txt
new file mode 100644
index 00000000..5ab463fc
--- /dev/null
+++ b/resources/dictionaries/es/number.txt
@@ -0,0 +1 @@
+número|#|num|núm|no|numero|№|nº|n.º|númr|numr|númro|numro|núm.ro|nr|num.ro|nro|n.ro
\ No newline at end of file
diff --git a/resources/dictionaries/es/qualifiers.txt b/resources/dictionaries/es/qualifiers.txt
index 8620948a..9a988a0f 100644
--- a/resources/dictionaries/es/qualifiers.txt
+++ b/resources/dictionaries/es/qualifiers.txt
@@ -2,21 +2,23 @@ aldea
 ampliación|amplicacion|ampl|amp
 auzoa
 barriada|barda
-barrio|bo|brio|brrio|bº|b.º|b /
+barrio|bo|brio|brrio|bº|b.º|b /|br
 barrios|bos|brios|brrios
-bloque|blque|bloq|blq
+bloque|blque|bloq|blq|bl|bq|blo
 colonia|col
 comuna
 conjunto|cjto|conj|cto
 ciudad|cdad|cd
 cuadra|cuadr
 distrito|dtto
+distrito postal|dp|d p|dtto postal
 estado|edo
 extrarradio|extrr
 extramuros|extrm
 isla|isl|is
 islas|isls|iss
-kilómetro|km|kilometro
+kilómetro|km|kilometro|kilom
+manzana|mz
 núcleo|ncleo|nucleo
 partida|ptda
 poblado|pbdo|pob|pobl
@@ -26,6 +28,6 @@ polígono industrial|poligono industrial|políg ind|polig ind|pol.ind|pol ind|pg
 punto kilométrico|punto kilometrico|pk|p.k.|p k
 sección|seccion|secc|sccn|scn|sec
 sector|sect
-urbanización|urbanizacion|urb
+urbanización|urbanizacion|urb|ur
 vecindario|vecin
-zona|zna
\ No newline at end of file
+zona|zna|zn
\ No newline at end of file
diff --git a/resources/dictionaries/es/street_types.txt b/resources/dictionaries/es/street_types.txt
index a750853b..90b62265 100644
--- a/resources/dictionaries/es/street_types.txt
+++ b/resources/dictionaries/es/street_types.txt
@@ -7,13 +7,13 @@ apeadero|apdro
 autopista|auto|autop
 autovía|autovia|autov
 avenida|av|avd|avda|av /
+avenida calle|ac|av cl
+avenida carrera|ak
 bajada|bjada
 banda|bda
 barranco|branc
 barranquillo|bqllo
 barriada|barda
-barrio|bo
-bloque|blque|bloq|blq
 boulevard|blvd|bvd
 brazal|brzal
 bulevar|bulev|blev|blv|bv
@@ -32,8 +32,8 @@ caminito|cmt
 camping|campg
 cantera|cantr
 cantón|canton|cant
-carrera|cra|carra|carr
-carretera|ctra|cr
+carrera|cra|carra|carr|cr|kra
+carretera|ctra|cr|ct
 carreterín|carreterin|ctrin
 carretil|crtil
 carril|crril
@@ -45,7 +45,7 @@ corredor|crrdo
 costanilla|cstan
 costera
 cuesta|custa
-diagonal|diag
+diagonal|diag|dg
 diseminado|disem
 espalda|eslda
 estrada|estda
@@ -96,7 +96,7 @@ sendera|sedra
 sendero|send|sedro
 subida|sbida
 tránsito|transito|trans
-transversal|trval|trvsal
+transversal|trval|trvsal|tv
 trasera|tras
 travesía|travesia|trva|trvsía|trvsia
 vereda|vreda|ver
diff --git a/resources/dictionaries/es/synonyms.txt b/resources/dictionaries/es/synonyms.txt
index 472b2816..2b3fb8c5 100644
--- a/resources/dictionaries/es/synonyms.txt
+++ b/resources/dictionaries/es/synonyms.txt
@@ -10,15 +10,11 @@ cabo|cbo
 campo|cpo|cmpo
 campos|cpos|cmpos
 canal|cnl
-capital federal|cap fed
 centro|cntro|ctro
 cerro|crro
-codigo postal|cp|c p
 corral|crral
 corralillo|crrlo
 diseminado|disem
-distrito federal|df|d f
-distrito postal|dp|d p
 enero|en|eno|ene|en o
 diciembre|dic|dicbre|dic.bre|dice|dic.e|dbre|d.bre|10bre|10.bre|10 bre|xbre|x.bre|x bre
 febrero|febo|feb.o|febro|feb.ro|febr|feb
diff --git a/resources/dictionaries/es/toponyms.txt b/resources/dictionaries/es/toponyms.txt
index fa1ccb84..558ae5eb 100644
--- a/resources/dictionaries/es/toponyms.txt
+++ b/resources/dictionaries/es/toponyms.txt
@@ -1,5 +1,6 @@
 barcelona|barna|bar.na
 buenos aires|bs as|bs.as
+capital federal|cap fed
 ciudad de méxico|c méx|c mex|ciudad de mexico
 distrito federal|df|d.f|d f
 distrito capital|dc|d.c|d c
diff --git a/resources/dictionaries/es/unit_types_numbered.txt b/resources/dictionaries/es/unit_types_numbered.txt
index 2e49a1f8..7ce2fa56 100644
--- a/resources/dictionaries/es/unit_types_numbered.txt
+++ b/resources/dictionaries/es/unit_types_numbered.txt
@@ -1,10 +1,11 @@
-apartamento|apto|apt|apartamiento
+apartamento|apto|apt|apartamiento|ap
 ático|át|atico|at
+consultorio|cn
 departamento|dpto|dept|dto|depto
-interior|int
-número interior|no int|# int|nº int|№ int|n.º int|núm int|númr int|numr int|númro int|numro int|núm.ro int|nr int|num.ro int|nro int|n.ro int
-número|#|num|núm|no|nº|№|n.º|númr|numr|númro|numro|núm.ro|nr|num.ro|nro|n.ro
+interior|int|in
+número interior|no int|# int|nº int|№ int|n.º int|núm int|númr int|numr int|númro int|numro int|núm.ro int|nr int|num.ro int|nro int|n.ro int|no in|# in|nº in|№ in|n.º in|núm in|númr in|numr in|númro in|numro in|núm.ro in|nr in|num.ro in|nro in|n.ro in
+lote|lt
 oficina|of|ofc
-piso|p
 puerta|pta
-sala
\ No newline at end of file
+sala
+unidad|unid|udad|un
\ No newline at end of file
diff --git a/resources/dictionaries/es/unit_types_standalone.txt b/resources/dictionaries/es/unit_types_standalone.txt
index 45157784..18523e44 100644
--- a/resources/dictionaries/es/unit_types_standalone.txt
+++ b/resources/dictionaries/es/unit_types_standalone.txt
@@ -1,4 +1,5 @@
-ático|át|atico|at
-ático de lujo|át de lujo|atico de lujo|at de lujo|ático lujo|át lujo|atico lujo|at lujo
+ático|át|atico|at|atco
+ático de lujo|át de lujo|atico de lujo|at de lujo|ático lujo|át lujo|atico lujo|at lujo|atco lujo
 cobertizo|cbtizfrente|fren
+sobreático|sobreatico
 trasera|trs|tras
\ No newline at end of file