[addresses] Using Digits.rewrite for entrance, staircase, floor numbers, and PO boxes

This commit is contained in:
Al
2016-07-02 04:26:21 -04:00
parent 4d0506a295
commit bbeb9a14ca
4 changed files with 13 additions and 8 deletions

View File

@@ -3,7 +3,7 @@ import six
from geodata.addresses.config import address_config
from geodata.addresses.numbering import NumberedComponent, sample_alphabet, latin_alphabet
from geodata.addresses.numbering import NumberedComponent, Digits, sample_alphabet, latin_alphabet
from geodata.encoding import safe_decode
from geodata.math.sampling import weighted_choice, zipfian_distribution, cdf
from geodata.numbers.spellout import numeric_expressions
@@ -57,7 +57,8 @@ class Floor(NumberedComponent):
number += numbering_starts_at
if num_type == cls.NUMERIC:
return safe_decode(number)
number = safe_decode(number)
return Digits.rewrite(number, language, num_type_props)
elif num_type == cls.ROMAN_NUMERAL:
roman_numeral = numeric_expressions.roman_numeral(number)
if roman_numeral is not None: