From 5ab22702a53f000a946217e04f5eed4b61c629e0 Mon Sep 17 00:00:00 2001
From: Al <albarrentine@gmail.com>
Date: Sat, 27 Aug 2016 14:57:47 -0400
Subject: [PATCH] [addresses] adding "x" as an intersection phrase in English
 and Spanish

---
 resources/addresses/en.yaml                 | 7 ++++++-
 resources/addresses/es.yaml                 | 8 ++++++--
 resources/dictionaries/en/cross_streets.txt | 3 ++-
 resources/dictionaries/es/cross_streets.txt | 1 +
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/resources/addresses/en.yaml b/resources/addresses/en.yaml
index 4ef93f23..14e70c78 100644
--- a/resources/addresses/en.yaml
+++ b/resources/addresses/en.yaml
@@ -534,12 +534,17 @@ cross_streets:
     at_the_corner_of: &at_the_corner_of
         canonical: at the corner of
 
+    x: &x
+        canonical: x
+
     intersection:
         default: *and
         probability: 0.7
         alternatives:
             - alternative: *at
-              probability: 0.15
+              probability: 0.125
+            - alternative: *x
+              probability: 0.025
             - alternative: *corner_of
               probability: 0.1
             - alternative: *at_the_corner_of
diff --git a/resources/addresses/es.yaml b/resources/addresses/es.yaml
index db58197d..c2a86f70 100644
--- a/resources/addresses/es.yaml
+++ b/resources/addresses/es.yaml
@@ -346,6 +346,8 @@ cross_streets:
         canonical: con
     en: &en
         canonical: en
+    x: &x
+        canonical: x
     corner_of: &esquina_de
         canonical: esquina de
         abbreviated: esq de
@@ -375,10 +377,12 @@ cross_streets:
               probability: 0.2
             - alternative: *en
               probability: 0.1
+            - alternative: *x
+              probability: 0.075
             - alternative: *esquina_de
-              probability: 0.1
-            - alternative: *en_la_esquina_de
               probability: 0.05
+            - alternative: *en_la_esquina_de
+              probability: 0.025
 
     between:
         canonical: entre
diff --git a/resources/dictionaries/en/cross_streets.txt b/resources/dictionaries/en/cross_streets.txt
index b53016b5..894a7aef 100644
--- a/resources/dictionaries/en/cross_streets.txt
+++ b/resources/dictionaries/en/cross_streets.txt
@@ -5,4 +5,5 @@ at
 at the corner of|at the cnr of
 corner|cnr
 corner of|cnr of
-between|betw|btwn|btw|btween|b / t
\ No newline at end of file
+between|betw|btwn|btw|btween|b / t
+x
\ No newline at end of file
diff --git a/resources/dictionaries/es/cross_streets.txt b/resources/dictionaries/es/cross_streets.txt
index fb237721..6d4d1106 100644
--- a/resources/dictionaries/es/cross_streets.txt
+++ b/resources/dictionaries/es/cross_streets.txt
@@ -2,6 +2,7 @@
 y
 en
 con
+x
 esquina|esq
 en la esquina de|en la esq de
 esquina de|esq de