[addresses] Adding address-level component dropout to AddressComponents (returns an ordering so the client formatter can potentially emit multiple addresses with different components dropped out). Adding PO box and category probabilities to config

scripts/geodata/address_formatting/formatter.py

@@ -52,18 +52,18 @@ class AddressFormatter(object):
 
     CATEGORY = 'category'
     NEAR = 'near'
+    ATTENTION = 'attention'
+    CARE_OF = 'care_of'
     HOUSE = 'house'
     HOUSE_NUMBER = 'house_number'
     PO_BOX = 'po_box'
-    ATTENTION = 'attention'
-    CARE_OF = 'care_of'
+    ROAD = 'road'
     BUILDING = 'building'
     ENTRANCE = 'entrance'
     STAIRCASE = 'staircase'
     LEVEL = 'level'
     UNIT = 'unit'
     INTERSECTION = 'intersection'
-    ROAD = 'road'
     SUBDIVISION = 'subdivision'
     SUBURB = 'suburb'
     CITY_DISTRICT = 'city_district'