diff --git a/resources/addresses/ru.yaml b/resources/addresses/ru.yaml index 369f9970..39b2c36d 100644 --- a/resources/addresses/ru.yaml +++ b/resources/addresses/ru.yaml @@ -427,6 +427,30 @@ levels: numeric_plus_alpha_probability: 0.0001 # e.g. 2A alpha_plus_numeric_probability: 0.0001 # e.g. A2 +blocks: + alphanumeric: + default: &blok + canonical: блок + abbreviated: бл + sample: true + canonical_probability: 0.4 + abbreviated_probability: 0.4 + sample_probability: 0.2 + numeric: + direction: left + probability: 0.95 + alternatives: + - alternative: &blok_latin + canonical: blok + abbreviated: bl + sample: true + canonical_probability: 0.4 + abbreviated_probability: 0.4 + sample_probability: 0.2 + numeric: + direction: left + probability: 0.05 + categories: near: default: @@ -715,8 +739,8 @@ cardinal_directions: numeric_affix_probability: 0.5 yug: &yug - canonical: Юг - abbreviated: Ю + canonical: юг + abbreviated: ю sample: true canonical_probability: 0.75 abbreviated_probability: 0.1 @@ -724,7 +748,7 @@ cardinal_directions: numeric: direction: right numeric_affix: - affix: Ю + affix: ю direction: right numeric_probability: 0.5 numeric_affix_probability: 0.5 @@ -830,14 +854,36 @@ staircases: whitespace_probability: 0.1 directional: - direction: left + direction: right direction_probability: 0.85 modifier: alternatives: + - alternative: *pravo + probability: 0.19 + - alternative: *pravo_latin + probability: 0.01 + - alternative: *levo + probability: 0.19 + - alternative: *levo_latin + probability: 0.01 - alternative: *sever - - alternative: *vostok + probability: 0.14 + - alternative: *sever_latin + probability: 0.01 - alternative: *yug + probability: 0.14 + - alternative: *yug_latin + probability: 0.01 + - alternative: *vostok + probability: 0.14 + - alternative: *vostok_latin + probability: 0.01 - alternative: *zapad + probability: 0.14 + - alternative: *zapad_latin + probability: 0.01 + + po_boxes: abonementnyy_pochtovyy_yashchik: &abonementnyy_pochtovyy_yashchik diff --git a/resources/addresses/uk.yaml b/resources/addresses/uk.yaml index 1168e81b..ba39c050 100644 --- a/resources/addresses/uk.yaml +++ b/resources/addresses/uk.yaml @@ -374,6 +374,29 @@ levels: alpha_plus_numeric_probability: 0.0001 # e.g. A2 +blocks: + alphanumeric: + default: &blok + canonical: блок + abbreviated: бл + sample: true + canonical_probability: 0.4 + abbreviated_probability: 0.4 + sample_probability: 0.2 + numeric: + direction: left + probability: 0.95 + alternatives: + - alternative: &blok_latin + canonical: blok + abbreviated: bl + sample: true + canonical_probability: 0.4 + abbreviated_probability: 0.4 + sample_probability: 0.2 + numeric: + direction: left + probability: 0.05 categories: near: diff --git a/resources/dictionaries/uk/qualifiers.txt b/resources/dictionaries/uk/qualifiers.txt index 45199c19..3d7106b8 100644 --- a/resources/dictionaries/uk/qualifiers.txt +++ b/resources/dictionaries/uk/qualifiers.txt @@ -1,5 +1,5 @@ -блок -blok +блок|бл +blok|bl квартал|кварт|кв|кв-л kvartal|kvart|kv|kv-l област|обл