]> git.openstreetmap.org Git - nominatim.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 6 Oct 2020 15:04:50 +0000 (17:04 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 6 Oct 2020 15:04:50 +0000 (17:04 +0200)
data/country_name.sql
docs/admin/Migration.md
lib/SearchDescription.php
osm2pgsql
sql/indices.src.sql
sql/tables.sql
test/bdd/api/search/queries.feature
utils/check_import_finished.php

index 8dc02382a6f0e09d564832cc34b322170839f5a5..7245241c14b24e3a100692bd5512d4e110891a20 100644 (file)
@@ -134,7 +134,7 @@ pg  "name"=>"Papua New Guinea", "name:af"=>"Papoea-Nieu-Guinee", "name:ar"=>"با
 sd     "name"=>"السودان ‎al-Sūdān", "name:af"=>"Soedan", "name:ar"=>"السودان", "name:be"=>"Судан", "name:br"=>"Soudan", "name:ca"=>"Sudan ", "name:cy"=>"Sudan", "name:da"=>"Sudan", "name:de"=>"Sudan", "name:el"=>"Σουδάν", "name:en"=>"Sudan", "name:eo"=>"Sudano", "name:es"=>"Sudán", "name:et"=>"Sudaan", "name:fa"=>"سودان", "name:fi"=>"Sudan", "name:fr"=>"Soudan", "name:fy"=>"Sûdan", "name:ga"=>"An tSúdáin", "name:gd"=>"Sudan", "name:he"=>"סודן", "name:hr"=>"Sudan", "name:hu"=>"Szudán", "name:id"=>"Sudan", "name:is"=>"Súdan", "name:it"=>"Sudan", "name:ja"=>"スーダン", "name:la"=>"Sudania", "name:lb"=>"Sudan", "name:li"=>"Soedaan", "name:lt"=>"Sudanas", "name:lv"=>"Sudāna", "name:mn"=>"Судан", "name:nl"=>"Soedan", "name:pl"=>"Sudan", "name:pt"=>"Sudão", "name:ru"=>"Судан", "name:sl"=>"Sudan", "name:sv"=>"Sudan", "name:th"=>"ประเทศซูดาน", "name:tr"=>"Sudan", "name:uk"=>"Судан", "name:vi"=>"Sudan", "name:zh"=>"苏丹", "name:haw"=>"Sudana", "name:zh_py"=>"Sudan", "name:zh_pyt"=>"Sūdān", "official_name"=>"جمهورية السودان", "official_name:br"=>"Republik Soudan", "official_name:el"=>"Δημοκρατία του Σουδάν", "official_name:en"=>"Republic of Sudan", "official_name:et"=>"Sudaani Vabariik", "official_name:fr"=>"République du Soudan", "official_name:id"=>"Republik Sudan", "official_name:ja"=>"スーダン共和国", "official_name:lb"=>"Republik Sudan", "official_name:pt"=>"República do Sudão", "official_name:sv"=>"Republiken Sudan", "official_name:vi"=>"Cộng hòa Sudan"      \N      72
 za     "name"=>"South Africa", "name:af"=>"Suid-Afrika", "name:ar"=>"جنوب أفريقيا", "name:be"=>"Паўднёва-Афрыканская Рэспубліка", "name:br"=>"Suafrika", "name:ca"=>"Sud-àfrica", "name:cy"=>"De Affrica", "name:da"=>"Sydafrika", "name:de"=>"Südafrika", "name:el"=>"Νότια Αφρική", "name:en"=>"South Africa", "name:eo"=>"Sudafriko", "name:es"=>"Sudáfrica", "name:et"=>"Lõuna-Aafrika Vabariik", "name:fa"=>"آفریقای جنوبی", "name:fi"=>"Etelä-Afrikka", "name:fr"=>"Afrique du Sud", "name:fy"=>"Súd-Afrika", "name:ga"=>"An Afraic Theas", "name:gd"=>"Afraga a Deas", "name:he"=>"דרום אפריקה", "name:hr"=>"Južnoafrička Republika", "name:hu"=>"Dél-Afrikai Köztársaság", "name:id"=>"Afrika Selatan", "name:is"=>"Suður-Afríka", "name:it"=>"Sudafrica", "name:ja"=>"南アフリカ", "name:la"=>"Africa Australis", "name:lb"=>"Südafrika", "name:li"=>"Zuud-Afrika", "name:lt"=>"Pietų Afrikos Respublika", "name:mn"=>"Өмнөд Африк", "name:nl"=>"Zuid-Afrika", "name:pl"=>"Republika Południowej Afryki", "name:pt"=>"África do Sul", "name:ru"=>"Южная Африка", "name:sl"=>"Južna Afrika", "name:ss"=>"INingizimu Afrika", "name:st"=>"Afrika Borwa", "name:sv"=>"Sydafrika", "name:th"=>"ประเทศแอฟริกาใต้", "name:tn"=>"Aferika Borwa", "name:tr"=>"Güney Afrika", "name:ts"=>"Afrika-Dzonga", "name:uk"=>"Південно-Африканська Республіка", "name:ve"=>"Afurika Tshipembe", "name:vi"=>"Nam Phi", "name:xh"=>"uMzantsi Afrika", "name:zh"=>"南非", "name:zu"=>"Ningizimu Afrika", "name:haw"=>"ʻApelika Hema", "name:zh_py"=>"Nan Fei", "name:zh_pyt"=>"Nán Fēi", "official_name"=>"Republic of South Africa", "official_name:br"=>"Republik Suafrika", "official_name:en"=>"Republic of South Africa", "official_name:fr"=>"République d'Afrique du Sud", "official_name:gd"=>"Poblachd Afraga a Deas", "official_name:id"=>"Republik Afrika Selatan", "official_name:ja"=>"南アフリカ共和国", "official_name:lb"=>"Republik Südafrika", "official_name:pt"=>"República da África do Sul", "official_name:ru"=>"Южно-Африканская Республика", "official_name:sl"=>"Republika Južna Afrika", "official_name:sv"=>"Republiken Sydafrika", "official_name:ts"=>"Riphabliki ra Afrika Dzonga", "official_name:ve"=>"Riphabuḽiki ya Afurika Tshipembe", "official_name:vi"=>"Cộng hòa Nam Phi"     \N      76
 sc     "name"=>"Seychelles", "name:af"=>"Seychelle", "name:ar"=>"سيشيل", "name:be"=>"Сейшэлы", "name:br"=>"Sechelez", "name:da"=>"Seychellerne", "name:de"=>"Seychellen", "name:el"=>"Σεϋχέλλες", "name:en"=>"Seychelles", "name:eo"=>"Sejŝeloj", "name:es"=>"Seychelles", "name:et"=>"Seišellid", "name:fa"=>"سیشل", "name:fi"=>"Seychellit", "name:fr"=>"Seychelles", "name:fy"=>"de Seysjellen", "name:ga"=>"Na Séiséil", "name:gd"=>"Na h-Eileanan Sheiseall", "name:he"=>"סיישל", "name:hr"=>"Sejšeli", "name:hu"=>"Seychelle-szigetek", "name:is"=>"Seychelles-eyjar", "name:la"=>"Insulae Seisellenses", "name:lb"=>"Seychellen", "name:li"=>"Seisjelle", "name:lt"=>"Seišeliai", "name:mn"=>"Сейшелийн арлууд", "name:nl"=>"Seychellen", "name:pl"=>"Seszele", "name:ru"=>"Сейшелы", "name:sl"=>"Sejšeli", "name:sv"=>"Seychellerna", "name:th"=>"ประเทศเซเชลส์", "name:tr"=>"Seyşeller", "name:uk"=>"Сейшельські Острови", "name:zh"=>"塞舌尔群岛", "name:haw"=>"Sekele", "name:zh_py"=>"Saisheerqundao", "name:zh_pyt"=>"Sàishéěr Qúndǎo", "official_name"=>"Repiblik Sesel", "official_name:el"=>"Δημοκρατία των Σεϋχελλών", "official_name:en"=>"Republic of Seychelles", "official_name:es"=>"República de las Seychelles", "official_name:et"=>"Seišelli Vabariik", "official_name:fr"=>"République des Seychelles", "official_name:gd"=>"Poblachd na h-Eileanan Sheiseall", "official_name:id"=>"Republik Seychelles", "official_name:lt"=>"Seišelių Respublika", "official_name:pl"=>"Republika Seszeli", "official_name:sv"=>"Republiken Seychellerna", "official_name:vi"=>"Cộng hòa Seychelles"     \N      79
-sz     "name"=>"Swaziland", "name:ar"=>"سوازيلند", "name:be"=>"Свазіленд", "name:br"=>"Swaziland", "name:ca"=>"Swazilàndia", "name:cy"=>"Gwlad Swazi", "name:de"=>"Swasiland", "name:el"=>"Σουαζιλάνδη", "name:eo"=>"Svazilando", "name:es"=>"Suazilandia", "name:et"=>"Svaasimaa", "name:fa"=>"سوازیلند", "name:fi"=>"Swazimaa", "name:fr"=>"Swaziland", "name:fy"=>"Swazilân", "name:ga"=>"An tSuasalainn", "name:gd"=>"Suasalainn", "name:he"=>"סווזילנד", "name:hr"=>"Svazi", "name:hu"=>"Szváziföld", "name:is"=>"Svasíland", "name:it"=>"Swaziland", "name:ja"=>"スワジランド", "name:la"=>"Suazia", "name:lb"=>"Swasiland", "name:lt"=>"Svazilendas", "name:mn"=>"Свазиланд", "name:pl"=>"Suazi", "name:pt"=>"Suazilândia", "name:ru"=>"Свазиленд", "name:sl"=>"Svazi", "name:sv"=>"Swaziland", "name:th"=>"ประเทศสวาซิแลนด์", "name:tr"=>"Svaziland", "name:uk"=>"Свазіленд", "name:zh"=>"斯威士兰", "name:haw"=>"Suazilana", "name:zh_py"=>"Siweishilan", "name:zh_pyt"=>"Sīwēishìlán", "official_name"=>"Kingdom of Swaziland;Umbuso weSwatini", "official_name:ca"=>"Regne de Swazilàndia", "official_name:el"=>"Βασίλειο της Σουαζιλάνδης", "official_name:et"=>"Svaasimaa Kuningriik", "official_name:gd"=>"Dùthaich nan Suasaidh", "official_name:id"=>"Kerajaan Swaziland", "official_name:ja"=>"スワジランド王国", "official_name:lb"=>"Kinneksräich Swasiland", "official_name:pt"=>"Reino da Suazilândia", "official_name:sl"=>"Kraljevina Svazi", "official_name:sv"=>"Konungariket Swaziland", "official_name:vi"=>"Vương quốc Swaziland"        \N      82
+sz     "name"=>"eSwatini", "name:af"=>"Swaziland", "name:am"=>"ስዋዚላንድ", "name:an"=>"Swazilandia", "name:ar"=>"سوازيلاند", "name:ay"=>"Suasïsuiu", "name:az"=>"Svazilend", "name:ba"=>"Свазиленд", "name:be"=>"Эсваціні", "name:bg"=>"Есватини", "name:bm"=>"Swazilandi", "name:bn"=>"সোয়াজিল্যান্ড", "name:bo"=>"སུ་ཝ་ཛི་ལནཌ།", "name:br"=>"Swaziland", "name:bs"=>"Svazilend", "name:ca"=>"Swazilàndia", "name:cs"=>"Svazijsko", "name:cy"=>"Gwlad Swazi", "name:da"=>"Swaziland", "name:de"=>"Eswatini", "name:dv"=>"ސުވާޒިލޭންޑު", "name:dz"=>"སུ་ཝ་ཛི་ལེནཌ", "name:ee"=>"Swaziland", "name:el"=>"Σουαζιλάνδη", "name:en"=>"Eswatini", "name:eo"=>"Svazilando", "name:es"=>"Suazilandia", "name:et"=>"Svaasimaa", "name:eu"=>"Swazilandia", "name:fa"=>"سوازیلند", "name:ff"=>"Swaasilannda", "name:fi"=>"Swazimaa", "name:fo"=>"Svasiland", "name:fr"=>"Swaziland", "name:fy"=>"Swazilân", "name:ga"=>"An tSuasalainn", "name:gd"=>"Dùthaich nan Suasaidh", "name:gl"=>"Suacilandia - Swaziland", "name:gu"=>"સ્વાઝીલેન્ડ", "name:gv"=>"Yn Çheer Swassee", "name:ha"=>"Suwazilan", "name:he"=>"סווזילנד", "name:hi"=>"स्वाज़ीलैण्ड", "name:hr"=>"Svazi", "name:ht"=>"Swazilann", "name:hu"=>"Szváziföld", "name:hy"=>"Սվազիլենդ", "name:ia"=>"Swazilandia", "name:id"=>"Swaziland", "name:ie"=>"Swaziland", "name:io"=>"Swazilando", "name:is"=>"Svasíland", "name:it"=>"Swaziland", "name:ja"=>"スワジランド", "name:jv"=>"Swaziland", "name:ka"=>"სვაზილენდი", "name:kg"=>"Swati", "name:ki"=>"Uswazi", "name:kk"=>"Суазиланд", "name:kl"=>"Swazilandi", "name:km"=>"សូហ្ស៉ីឡង់", "name:kn"=>"ಸ್ವಾಜಿಲ್ಯಾಂಡ್", "name:ko"=>"스와질란드", "name:ks"=>"سُوزِلینٛڑ", "name:ku"=>"Swaziland", "name:kw"=>"Pow Swati", "name:la"=>"Swazia", "name:lb"=>"Swasiland", "name:lg"=>"Swazirandi", "name:li"=>"Swaziland", "name:ln"=>"Swaziland", "name:lo"=>"ສະວາຊິແລນ", "name:lt"=>"Svazilandas", "name:lv"=>"Svazilenda", "name:mg"=>"Soazilandy", "name:mi"=>"Warerangi", "name:mk"=>"Свазиленд", "name:ml"=>"സ്വാസിലാന്റ്", "name:mn"=>"Свазиланд", "name:mr"=>"स्वाझीलँड", "name:ms"=>"Swaziland", "name:mt"=>"Sważiland", "name:my"=>"ဆွာဇီလန်နိုင်ငံ", "name:ne"=>"स्वाजिल्याण्ड", "name:nl"=>"Swaziland", "name:nn"=>"Eswatini", "name:no"=>"Eswatini", "name:nv"=>"Swáazi Dineʼé Bikéyah", "name:oc"=>"Swaziland", "name:or"=>"ସ୍ଵାଜିଲ୍ୟାଣ୍ଡ", "name:os"=>"Свазиленд", "name:pa"=>"ਸਵਾਜ਼ੀਲੈਂਡ", "name:pl"=>"Eswatini", "name:ps"=>"سوازيلانډ", "name:pt"=>"eSwatini", "name:qu"=>"Swasisuyu", "name:rn"=>"Suwazilandi", "name:ro"=>"eSwatini", "name:ru"=>"Эсватини", "name:rw"=>"Swazilande", "name:sa"=>"स्वाजीलैंड", "name:sc"=>"Swaziland", "name:se"=>"Swazieana", "name:sg"=>"Swäzïlânde", "name:sh"=>"Svazilend", "name:si"=>"ස්වාසිලන්තය", "name:sk"=>"Svazijsko", "name:sl"=>"Esvatini", "name:sn"=>"Swaziland", "name:so"=>"Swasiland", "name:sq"=>"Suazilendi", "name:sr"=>"Есватини", "name:ss"=>"eSwatini", "name:su"=>"Swaziland", "name:sv"=>"Swaziland", "name:sw"=>"Uswazi", "name:ta"=>"சுவாசிலாந்து", "name:te"=>"స్వాజీలేండ్", "name:tg"=>"Свазиленд", "name:th"=>"ประเทศสวาซิแลนด์", "name:ti"=>"ስዋዚላንድ", "name:tk"=>"Swazilend", "name:tl"=>"Suwasilandya", "name:to"=>"Suasileni", "name:tr"=>"Esvatini", "name:ts"=>"Swaziland", "name:tt"=>"Свазиленд", "name:ug"=>"سۋازىلېند", "name:uk"=>"Есватіні", "name:ur"=>"سوازی لینڈ", "name:uz"=>"Svazilend", "name:ve"=>"Swazini", "name:vi"=>"Eswatini", "name:vo"=>"Svasiyän", "name:wo"=>"Suwaasilaand", "name:yi"=>"סוואזילאנד", "name:yo"=>"Swásílándì", "name:zh"=>"斯威士兰/斯威士蘭/史瓦濟蘭", "name:zu"=>"ISwazilandi", "name:ace"=>"Swaziland", "name:als"=>"Swasiland", "name:ang"=>"Sƿasiland", "name:arz"=>"سوازيلاندا", "name:ast"=>"Suazilandia", "name:bcl"=>"Swasilandya", "name:bjn"=>"Swaziland", "name:bpy"=>"সোয়াজিল্যান্ড", "name:bxr"=>"Свазиланд", "name:ceb"=>"Suwasilandiya", "name:ckb"=>"سوازیلاند", "name:crh"=>"Svaziland", "name:diq"=>"Swazilanda", "name:ext"=>"Suazilandia", "name:frp"=>"Souazilande", "name:gag"=>"Svazilend", "name:hak"=>"Sṳ̂-vî-sṳ-làn", "name:haw"=>"Suazilana", "name:hif"=>"Swaziland", "name:ilo"=>"Swaziland", "name:jbo"=>"suazilynd", "name:kaa"=>"Svazilend", "name:kab"=>"Swazilund", "name:ksh"=>"ẞwaasiland", "name:lfn"=>"Suaziland", "name:lij"=>"Swaziland", "name:lmo"=>"Swaziland", "name:mhr"=>"Свазиленд", "name:nah"=>"Suazitlālpan", "name:nan"=>"Swazi-tē", "name:nds"=>"Swasiland", "name:nov"=>"Swazilande", "name:nso"=>"Swaziland", "name:pam"=>"Swaziland", "name:pdc"=>"Swasiland", "name:pih"=>"Swoseland", "name:pms"=>"Swaziland", "name:pnb"=>"سوازی لینڈ", "name:sah"=>"Суазилэнд", "name:scn"=>"Swaziland", "name:sco"=>"Swaziland", "name:smn"=>"Swazieennâm", "name:sms"=>"Swazijânnam", "name:stq"=>"Swasilound", "name:tok"=>"ma Sawasi", "name:tzl"=>"Swaziphäts", "name:vec"=>"Swaziland", "name:war"=>"Swazilandya", "name:xal"=>"Свазилендин Нутг", "name:yue"=>"斯威士蘭", "alt_name:be"=>"Свазіленд", "alt_name:bg"=>"Свазиленд;Суазиленд", "alt_name:de"=>"Swasiland", "alt_name:en"=>"eSwatini;Swaziland", "alt_name:eo"=>"Svaziujo", "alt_name:it"=>"Suazilandia", "alt_name:pl"=>"Suazi", "alt_name:pt"=>"Suazilândia;Essuatíni", "alt_name:ro"=>"Swaziland", "alt_name:ru"=>"Свазиленд", "alt_name:tr"=>"Svaziland", "alt_name:uk"=>"Нгване;Е-Сватіні", "alt_name:vi"=>"E-xoa-ti-ni;Swaziland;Xoa-di-len", "old_name:be"=>"Свазіленд", "old_name:de"=>"Swasiland", "old_name:en"=>"Swaziland", "old_name:nn"=>"Swaziland", "old_name:no"=>"Swaziland", "old_name:ru"=>"Свазиленд", "old_name:sl"=>"Svazi", "old_name:sr"=>"Свазиленд", "old_name:uk"=>"Свазіленд", "alt_name:lfn"=>"Suaziland", "name:bat-smg"=>"Svazėlands", "name:fiu-vro"=>"Svaasimaa", "name:sr-Latn"=>"Esvatini", "official_name"=>"Kingdom of Swaziland;Umbuso weSwatini", "name:be-tarask"=>"Эсўаціні", "name:zh_pinyin"=>"Sīwēishìlán", "name:zh-Hans-CN"=>"斯威士兰", "name:zh-Hant-HK"=>"斯威士蘭", "name:zh-Hant-TW"=>"史瓦濟蘭", "official_name:bg"=>"Кралство Есватини", "official_name:ca"=>"Regne de Swazilàndia", "official_name:cs"=>"Svazijské království", "official_name:de"=>"Königreich von Eswatini", "official_name:el"=>"Βασίλειο της Σουαζιλάνδης", "official_name:en"=>"Kingdom of Eswatini", "official_name:et"=>"Svaasimaa Kuningriik", "official_name:eu"=>"Swazilandiako Erresuma", "official_name:gd"=>"Dùthaich nan Suasaidh", "official_name:id"=>"Kerajaan Swaziland", "official_name:ku"=>"Keyîtiya Swazîland", "official_name:lb"=>"Kinneksräich Swasiland", "official_name:lt"=>"Svazilando Karalystė", "official_name:nn"=>"Kongeriket Eswatini", "official_name:no"=>"Kongeriket Eswatini", "official_name:pl"=>"Królestwo Eswatini", "official_name:pt"=>"Reino de eSwatini", "official_name:ro"=>"Regatul eSwatini", "official_name:ru"=>"Королевство Эсватини", "official_name:sl"=>"Kraljevina Esvatini", "official_name:sr"=>"Краљевина Есватини", "official_name:sv"=>"Konungariket Swaziland", "official_name:tr"=>"Esvatini Krallığı", "official_name:uk"=>"Королівство Е-Сватіні", "official_name:vi"=>"Vương quốc Eswatini", "old_name:sr-Latn"=>"Svazilend", "alt_name:be-tarask"=>"Сўазілэнд", "old_name:be-tarask"=>"Сўазілэнд", "official_name:sr-Latn"=>"Kraljevina Esvatini" \N      82
 ae     "name"=>"United Arab Emirates", "name:af"=>"Verenigde Arabiese Emirate", "name:ar"=>"الإمارات العربية المتحدة", "name:br"=>"Emirelezhioù Arab Unanet", "name:ca"=>"Emirats Àrabs Units", "name:cy"=>"Yr Emiradau Arabaidd Unedig", "name:da"=>"Forenede Arabiske Emirater", "name:de"=>"Vereinigte Arabische Emirate", "name:el"=>"Ηνωμένα Αραβικά Εμιράτα", "name:en"=>"United Arab Emirates", "name:eo"=>"Unuiĝintaj Arabaj Emirlandoj", "name:es"=>"Emiratos Árabes Unidos", "name:et"=>"Araabia Ühendemiraadid", "name:fa"=>"امارات متحده عربی", "name:fi"=>"Yhdistyneet arabiemiirikunnat", "name:fr"=>"Emirats Arabes Unis", "name:fy"=>"de Feriene Arabyske Emiraten", "name:ga"=>"Aontas na nÉimíríochtaí Arabacha", "name:gd"=>"Na h-Iomaratan Arabach Aonaichte", "name:he"=>"איחוד האמירויות הערביות", "name:hr"=>"Ujedinjeni Arapski Emirati", "name:hu"=>"Egyesült Arab Emírségek", "name:id"=>"Uni Emirat Arab", "name:is"=>"Sameinuðu arabísku furstadæmin", "name:it"=>"Emirati Arabi Uniti", "name:ja"=>"アラブ首長国連邦", "name:la"=>"Phylarchiarum Arabicarum Confoederatio", "name:lb"=>"Vereenegt Arabesch Emirater", "name:li"=>"Vereinegde Arabische Emirate", "name:lt"=>"Jungtiniai Arabų Emyratai", "name:mn"=>"Арабын Нэгдсэн Эмирт Улс", "name:nl"=>"Verenigde Arabische Emiraten", "name:pl"=>"Zjednoczone Emiraty Arabskie", "name:pt"=>"Emirados Árabes Unidos", "name:ru"=>"Объединённые Арабские Эмираты", "name:sl"=>"Združeni arabski emirati", "name:sv"=>"Förenade Arabemiraten", "name:th"=>"สหรัฐอาหรับเอมิเรตส์", "name:tr"=>"Birleşik Arap Emirlikleri", "name:uk"=>"Об'єднані Арабські Емірати", "name:vi"=>"Các Tiểu vương quốc Ả Rập Thống nhất", "name:zh"=>"阿拉伯联合酋长国", "name:zh_py"=>"Alabo Lianhe Qiuchangguo", "name:zh_pyt"=>"Ālābó Liánhé Qiúchángguó"      ar      83
 tr     "name"=>"Türkiye", "name:af"=>"Turkye", "name:ar"=>"تركيا", "name:az"=>"Türkiyə", "name:be"=>"Турцыя", "name:br"=>"Turkia", "name:ca"=>"Turquia", "name:cy"=>"Twrci", "name:da"=>"Tyrkiet", "name:de"=>"Türkei", "name:el"=>"Τουρκία", "name:en"=>"Turkey", "name:eo"=>"Turkio", "name:es"=>"Turquía", "name:et"=>"Türgi", "name:fa"=>"ترکیه", "name:fi"=>"Turkki", "name:fr"=>"Turquie", "name:fy"=>"Turkije", "name:ga"=>"An Tuirc", "name:gd"=>"An Tuirc", "name:he"=>"טורקיה", "name:hr"=>"Turska", "name:hu"=>"Törökország", "name:hy"=>"Թուրքիա", "name:id"=>"Turki", "name:is"=>"Tyrkland", "name:it"=>"Turchia", "name:ja"=>"トルコ", "name:la"=>"Turcia", "name:lb"=>"Tierkei", "name:li"=>"Törkieë", "name:lt"=>"Turkija", "name:lv"=>"Turcija", "name:nl"=>"Turkije", "name:no"=>"Tyrkia", "name:pl"=>"Turcja", "name:pt"=>"Turquia", "name:ru"=>"Турция", "name:sk"=>"Turecko", "name:sl"=>"Turčija", "name:sv"=>"Turkiet", "name:th"=>"ประเทศตุรกี", "name:tr"=>"Türkiye", "name:uk"=>"Турція", "name:vi"=>"Thổ Nhĩ Kỳ", "name:zh"=>"土耳其", "name:haw"=>"Tureke", "name:zh_py"=>"Tuerqi", "name:zh_pyt"=>"Tǔěrqí", "official_name"=>"Türkiye Cumhuriyeti", "official_name:br"=>"Republik Turkia", "official_name:es"=>"República de Turquía", "official_name:et"=>"Türgi Vabariik", "official_name:id"=>"Republik Turki", "official_name:it"=>"Repubblica di Turchia", "official_name:lb"=>"Republik Tierkei", "official_name:lv"=>"Turcijas Republika", "official_name:pl"=>"Republika Turcji", "official_name:pt"=>"República da Turquia", "official_name:sk"=>"Turecká republika", "official_name:sv"=>"Republiken Turkiet", "official_name:vi"=>"Cộng hoà Thổ Nhĩ Kỳ" tr      81
 et     "name"=>"Ethiopia", "name:af"=>"Ethiopië", "name:am"=>"ኢትዮጵያ", "name:ar"=>"إثيوبيا", "name:be"=>"Эфіопія", "name:br"=>"Etiopia", "name:ca"=>"Etiòpia", "name:da"=>"Etiopien", "name:de"=>"Äthiopien", "name:el"=>"Αιθιοπία", "name:en"=>"Ethiopia", "name:eo"=>"Etiopio", "name:es"=>"Etiopía", "name:et"=>"Etioopia", "name:eu"=>"Etiopia", "name:fa"=>"اتیوپی", "name:fi"=>"Etiopia", "name:fr"=>"Éthiopie", "name:fy"=>"Etioopje", "name:ga"=>"An Aetóip", "name:gd"=>"An Aetiòp", "name:he"=>"אתיופיה", "name:hr"=>"Etiopija", "name:hu"=>"Etiópia", "name:is"=>"Eþíópía", "name:it"=>"Etiopia", "name:ja"=>"エチオピア", "name:la"=>"Aethiopia", "name:lb"=>"Ethiopien", "name:li"=>"Ethiopië", "name:lt"=>"Etiopija", "name:lv"=>"Etiopija", "name:mn"=>"Этиоп", "name:nl"=>"Ethiopië", "name:pl"=>"Etiopia", "name:pt"=>"Etiópia", "name:ru"=>"Эфиопия", "name:sl"=>"Etiopija", "name:sv"=>"Etiopien", "name:th"=>"ประเทศเอธิโอเปีย", "name:tr"=>"Etiyopya", "name:uk"=>"Ефіопія", "name:zh"=>"埃塞俄比亚", "old_name"=>"Abyssinia", "name:zh_py"=>"Aisaiebiya", "name:zh_pyt"=>"Āisàiébǐyà", "official_name"=>"Federal Democratic Republic of Ethiopia", "official_name:af"=>"Federale Demokratiese Republiek Ethiopië", "official_name:be"=>"Федэратыўная Дэмакратычная Рэспубліка Эфіопія", "official_name:el"=>"Ομοσπονδιακή Δημοκρατία της Αιθιοπίας", "official_name:en"=>"Federal Democratic Republic of Ethiopia", "official_name:id"=>"Republik Demokratik Federal Ethiopia", "official_name:lb"=>"Bundesrepublik Ethiopien", "official_name:lt"=>"Etiopijos Federacinė Demokratinė Respublika", "official_name:lv"=>"Etiopijas Federatīvā Demokrātiskā Republika", "official_name:pt"=>"República Democrática Federal da Etiópia", "official_name:sv"=>"Demokratiska förbundsrepubliken Etiopien", "official_name:vi"=>"Cộng hòa Dân chủ Liên bang Ethiopia"       \N      90
index 917d37859d1a7e7bdb0a7ee142343df988536b92..b731c37c51075600788462e233645c0a48cdc8d2 100644 (file)
@@ -24,6 +24,13 @@ You can then drop the old index with:
 DROP INDEX idx_placex_pendingsector
 ```
 
+### Unused index
+
+This index has been unused ever since the query using it was changed two years ago. Saves about 12GB on a planet installation.
+
+```sql
+DROP INDEX idx_placex_geometry_reverse_lookupPoint
+```
 
 ### Switching to dotenv
 
index 33b766a5f5fcacbe09f596d6221370ca49456ef9..ad404528968ad94075bc414af0bc0f5a185873cc 100644 (file)
@@ -199,15 +199,10 @@ class SearchDescription
         } elseif (($sPhraseType == '' || $sPhraseType == 'postalcode')
                   && is_a($oSearchTerm, '\Nominatim\Token\Postcode')
         ) {
-            // We need to try the case where the postal code is the primary element
-            // (i.e. no way to tell if it is (postalcode, city) OR (city, postalcode)
-            // so try both.
             if (!$this->sPostcode) {
                 // If we have structured search or this is the first term,
                 // make the postcode the primary search element.
-                if ($this->iOperator == Operator::NONE
-                    && ($sPhraseType == 'postalcode' || $bFirstToken)
-                ) {
+                if ($this->iOperator == Operator::NONE && $bFirstToken) {
                     $oSearch = clone $this;
                     $oSearch->iSearchRank++;
                     $oSearch->iOperator = Operator::POSTCODE;
index b8af2b242f55b4f31abac9ba428d4ccf6aa51cd0..acbec68bbf94dafae103663801d55291cf8f227e 160000 (submodule)
--- a/osm2pgsql
+++ b/osm2pgsql
@@ -1 +1 @@
-Subproject commit b8af2b242f55b4f31abac9ba428d4ccf6aa51cd0
+Subproject commit acbec68bbf94dafae103663801d55291cf8f227e
index fa009783f1f7f4e94b432888ec2ed96fbe6fad7b..7fcd965f4eb14d61a4bd5ed1366804a697f8504e 100644 (file)
@@ -10,11 +10,6 @@ CREATE INDEX idx_placex_rank_search ON placex USING BTREE (rank_search) {ts:sear
 CREATE INDEX idx_placex_rank_address ON placex USING BTREE (rank_address) {ts:search-index};
 CREATE INDEX idx_placex_parent_place_id ON placex USING BTREE (parent_place_id) {ts:search-index} where parent_place_id IS NOT NULL;
 
-CREATE INDEX idx_placex_geometry_reverse_lookupPoint
-  ON placex USING gist (geometry) {ts:search-index}
-  WHERE (name is not null or housenumber is not null or rank_address between 26 and 27)
-    AND class not in ('railway','tunnel','bridge','man_made')
-    AND rank_address >= 26 AND indexed_status = 0 AND linked_place_id is null;
 CREATE INDEX idx_placex_geometry_reverse_lookupPolygon
   ON placex USING gist (geometry) {ts:search-index}
   WHERE St_GeometryType(geometry) in ('ST_Polygon', 'ST_MultiPolygon')
index cf51cbe68b058ca6b066d2da226bc42271d9a486..5686bcd22c002fea652599cbe1417aaaa2d93073 100644 (file)
@@ -260,3 +260,6 @@ CREATE TABLE wikipedia_redirect (
 );
 ALTER TABLE ONLY wikipedia_redirect ADD CONSTRAINT wikipedia_redirect_pkey PRIMARY KEY (language, from_title);
 
+-- osm2pgsql does not create indexes on the middle tables for Nominatim
+-- Add one for lookup of associated street relations.
+CREATE INDEX planet_osm_rels_parts_associated_idx ON planet_osm_rels USING gin(parts) WHERE tags @> ARRAY['associatedStreet'];
index a9719fb2d68d861a6541f8d7f0632fc274191008..e5040f1e247b79ab8bb2808df568ce9dea8436b7 100644 (file)
@@ -24,7 +24,6 @@ Feature: Search queries
           | house_number  | 86 |
           | road          | Schellingstraße |
           | suburb        | Eilbek |
-          | neighbourhood | Auenviertel |
           | postcode      | 22089 |
           | city          | Hamburg |
           | country       | Deutschland |
@@ -38,7 +37,6 @@ Feature: Search queries
           | type          | value |
           | house_number  | 73 |
           | road          | Schellingstraße |
-          | neighbourhood | Auenviertel |
           | suburb        | Eilbek |
           | postcode      | 22089 |
           | city          | Hamburg |
index 42d834c870b2439cf3aff4a9b8c571fcff9fa535..5ec99b81eb2a8164251a12b1888cdc4b0e50ceb5 100755 (executable)
@@ -106,7 +106,6 @@ $aExpectedIndices = array(
     'idx_placex_rank_address',
     'idx_placex_pendingsector',
     'idx_placex_parent_place_id',
-    'idx_placex_geometry_reverse_lookuppoint',
     'idx_placex_geometry_reverse_lookuppolygon',
     'idx_placex_geometry_reverse_placenode',
     'idx_location_area_country_place_id',