From 9eb444b193daa9b8c9b7a5ba13c3ed2af7b7aff0 Mon Sep 17 00:00:00 2001
From: Al <albarrentine@gmail.com>
Date: Thu, 14 Apr 2016 02:38:02 -0400
Subject: [PATCH] [addresses] PO Box fixes in the address config

---
 resources/addresses/en.yaml | 64 ++++++++++++++++++++++++++-----------
 1 file changed, 45 insertions(+), 19 deletions(-)

diff --git a/resources/addresses/en.yaml b/resources/addresses/en.yaml
index 75a85883..32d286e5 100644
--- a/resources/addresses/en.yaml
+++ b/resources/addresses/en.yaml
@@ -493,19 +493,46 @@ intersections:
 po_boxes:
     po_box: &po_box
         canonical: post office box
-        abbreviated: po box
+        abbreviated: p.o. box
         sample: true
-        prefer_abbreviated: true
+        canonical_probability: 0.01
+        abbreviated_probability: 0.95
+        sample_probability: 0.04
+
+        numeric:
+            direction: left
+            add_number_phrase: true
+            add_number_phrase_probability: 0.4 # PO Box #1234
+
+        numeric_probability: 1.0
 
     box: &box
         canonical: box
         sample: true
+        canonical_probability: 0.8
+        sample_probability: 0.2
+        numeric:
+            direction: left
+            add_number_phrase: true
+            add_number_phrase_probability: 0.4 # Box #1234
+
+        numeric_probability: 1.0
 
     private_mail_box: &private_mail_box
         canonical: private mail box
         abbreviated: pmb
         prefer_abbreviated: true
         sample: true
+        canonical_probability: 0.01
+        abbreviated_probability: 0.95
+        sample_probability: 0.04
+
+        numeric:
+            direction: left
+            add_number_phrase: true
+            add_number_phrase_probability: 0.4 # PMB #1234
+
+        numeric_probability: 1.0
 
     alphanumeric:
         # Don't sample all the forms in post_office.txt as many of the PO box
@@ -517,25 +544,24 @@ po_boxes:
             - alternative: *box
               probability: 0.05
 
-        add_number_phrase: true
-        add_number_phrase_probability: 0.4 # PO Box #1234
-        numeric_probability: 0.9 # 
-        alpha_probability: 0.01 # PO Box A
+        numeric_probability: 0.9 # PO Box 123
+        alpha_probability: 0.05 # PO Box A
         numeric_plus_alpha_probability: 0.04 # PO Box 123G
+        alpha_plus_numeric_probability: 0.01 # PO Box A123
 
-        digits:
-            - length: 1
-              probability: 0.05
-            - length: 2
-              probability: 0.1
-            - length: 3
-              probability: 0.2
-            - length: 4
-              probability: 0.5
-            - length: 5
-              probability: 0.1
-            - length: 6
-              probability: 0.05
+    digits:
+        - length: 1
+          probability: 0.05
+        - length: 2
+          probability: 0.1
+        - length: 3
+          probability: 0.2
+        - length: 4
+          probability: 0.5
+        - length: 5
+          probability: 0.1
+        - length: 6
+          probability: 0.05
 
     zones:
         # Overrides for commercial/office areas (landuse=commercial in OSM)