@@ -3,7 +3,7 @@ |
||
3 | 3 | namespace GeoFixer\models; |
4 | 4 | |
5 | 5 | use Cake\Database\Connection; |
6 | -use Cake\Database\Driver\Mysql;; |
|
6 | +use Cake\Database\Driver\Mysql; ; |
|
7 | 7 | use Exception; |
8 | 8 | |
9 | 9 | /** |
@@ -37,7 +37,7 @@ |
||
37 | 37 | |
38 | 38 | /* кол-во первых букв в регионе, которые должны совпадать */ |
39 | 39 | $first_letters = 2; |
40 | -$code = $geo->findFiasRegion($region, $first_letters, $strict_search = true); |
|
40 | +$code = $geo->findFiasRegion($region, $first_letters, $strict_search = true); |
|
41 | 41 | |
42 | 42 | /* -------------------------------------------------------------------- */ |
43 | 43 |
@@ -15,26 +15,26 @@ |
||
15 | 15 | * @var array |
16 | 16 | */ |
17 | 17 | public $alphabet = [ |
18 | - "А"=>"A","Б"=>"B","В"=>"V","Г"=>"G", |
|
19 | - "Д"=>"D","Е"=>"E","Ж"=>"J","З"=>"Z","И"=>"I", |
|
20 | - "Й"=>"Y","К"=>"K","Л"=>"L","М"=>"M","Н"=>"N", |
|
21 | - "О"=>"O","П"=>"P","Р"=>"R","С"=>"S","Т"=>"T", |
|
22 | - "У"=>"U","Ф"=>"F","Х"=>"Kh","Ц"=>"Ts","Ч"=>"Ch", |
|
23 | - "Ш"=>"Sh","Щ"=>"Sch","Ъ"=>"","Ы"=>"Yi","Ь"=>"", |
|
24 | - "Э"=>"E","Ю"=>"Yu","Я"=>"Ya","а"=>"a","б"=>"b", |
|
25 | - "в"=>"v","г"=>"g","д"=>"d","е"=>"e","ж"=>"j", |
|
26 | - "з"=>"z","и"=>"i","й"=>"y","к"=>"k","л"=>"l", |
|
27 | - "м"=>"m","н"=>"n","о"=>"o","п"=>"p","р"=>"r", |
|
28 | - "с"=>"s","т"=>"t","у"=>"u","ф"=>"f","х"=>"h", |
|
29 | - "ц"=>"ts","ч"=>"ch","ш"=>"sh","щ"=>"sch","ъ"=>"y", |
|
30 | - "ы"=>"yi","ь"=>"'","э"=>"e","ю"=>"yu","я"=>"ya", |
|
18 | + "А"=>"A", "Б"=>"B", "В"=>"V", "Г"=>"G", |
|
19 | + "Д"=>"D", "Е"=>"E", "Ж"=>"J", "З"=>"Z", "И"=>"I", |
|
20 | + "Й"=>"Y", "К"=>"K", "Л"=>"L", "М"=>"M", "Н"=>"N", |
|
21 | + "О"=>"O", "П"=>"P", "Р"=>"R", "С"=>"S", "Т"=>"T", |
|
22 | + "У"=>"U", "Ф"=>"F", "Х"=>"Kh", "Ц"=>"Ts", "Ч"=>"Ch", |
|
23 | + "Ш"=>"Sh", "Щ"=>"Sch", "Ъ"=>"", "Ы"=>"Yi", "Ь"=>"", |
|
24 | + "Э"=>"E", "Ю"=>"Yu", "Я"=>"Ya", "а"=>"a", "б"=>"b", |
|
25 | + "в"=>"v", "г"=>"g", "д"=>"d", "е"=>"e", "ж"=>"j", |
|
26 | + "з"=>"z", "и"=>"i", "й"=>"y", "к"=>"k", "л"=>"l", |
|
27 | + "м"=>"m", "н"=>"n", "о"=>"o", "п"=>"p", "р"=>"r", |
|
28 | + "с"=>"s", "т"=>"t", "у"=>"u", "ф"=>"f", "х"=>"h", |
|
29 | + "ц"=>"ts", "ч"=>"ch", "ш"=>"sh", "щ"=>"sch", "ъ"=>"y", |
|
30 | + "ы"=>"yi", "ь"=>"'", "э"=>"e", "ю"=>"yu", "я"=>"ya", |
|
31 | 31 | |
32 | - "Ą"=>"A",'Ć'=>'C',"Ę"=>"E", |
|
33 | - "Ł"=>"L","Ń"=>"N","Ó"=>"O", |
|
34 | - "Ś"=>"S","Ź"=>"Z","Ż"=>"Z", |
|
35 | - "ą"=>"a", "ę"=>"e","ł"=>"l", |
|
36 | - "ń"=>"n","ó"=>"o","ć"=>"c", |
|
37 | - "ś"=>"s","ź"=>"z","ż"=>"z", |
|
32 | + "Ą"=>"A", 'Ć'=>'C', "Ę"=>"E", |
|
33 | + "Ł"=>"L", "Ń"=>"N", "Ó"=>"O", |
|
34 | + "Ś"=>"S", "Ź"=>"Z", "Ż"=>"Z", |
|
35 | + "ą"=>"a", "ę"=>"e", "ł"=>"l", |
|
36 | + "ń"=>"n", "ó"=>"o", "ć"=>"c", |
|
37 | + "ś"=>"s", "ź"=>"z", "ż"=>"z", |
|
38 | 38 | ]; |
39 | 39 | |
40 | 40 | /** |
@@ -83,8 +83,7 @@ |
||
83 | 83 | $translited_words = $this->string_helper->arrayTranslit($search_array); |
84 | 84 | |
85 | 85 | $result = $this->strict === true ? |
86 | - $this->fuzzy_helper->findBestMatch($word, $translited_words) : |
|
87 | - key($this->fuzzy_helper->findMostSimilarWords($word, $translited_words)); |
|
86 | + $this->fuzzy_helper->findBestMatch($word, $translited_words) : key($this->fuzzy_helper->findMostSimilarWords($word, $translited_words)); |
|
88 | 87 | |
89 | 88 | return $result; |
90 | 89 | } |