From b6d0a54f3952f8eed4a29dd8f602549514708276 Mon Sep 17 00:00:00 2001 From: Wolf Date: Mon, 5 Oct 2026 09:20:21 +0200 Subject: [PATCH] =?UTF-8?q?Place=20the=20Danish=20regions=20as=20Akademike?= =?UTF-8?q?rnes=20Jobbank=20writes=20them:=20Stork=C3=B8benhavn=20and=20No?= =?UTF-8?q?rdsj=C3=A6lland=20in=20the=20Capital=20Region,=20the=20Zealand?= =?UTF-8?q?=20and=20Jutland=20labels=20in=20their=20regions,=20and=20Udlan?= =?UTF-8?q?det=20(=C3=B8vrige)=20as=20no=20place?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Fable 5.1 --- app/places.py | 11 +++++++---- tests/test_gazetteer.py | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/app/places.py b/app/places.py index 8d564b7..dda4303 100644 --- a/app/places.py +++ b/app/places.py @@ -283,7 +283,8 @@ _SKANE = Region( _HOVEDSTADEN = Region( "hovedstaden", "Capital Region of Denmark", - _split("Capital Region of Denmark, Capital Region Denmark, Region Hovedstaden, Hovedstaden"), + _split("""Capital Region of Denmark, Capital Region Denmark, Region Hovedstaden, Hovedstaden, + Storkøbenhavn, Nordsjælland"""), _split("""København, Copenhagen, Frederiksberg, Albertslund, Allerød, Ballerup, Bornholm, Brøndby, Dragør, Egedal, Fredensborg, Frederikssund, Furesø, Gentofte, Gladsaxe, Glostrup, Gribskov, Halsnæs, Helsingør, Herlev, Hillerød, Hvidovre, @@ -303,7 +304,8 @@ _HOVEDSTADEN = Region( # The bare word is left out of `names` since "New Zealand" would match it. _ZEALAND = Region( "zealand", "Zealand", - _split("Region Zealand, Region Sjælland, Zealand Denmark, Sjælland, Sjaelland"), + _split("""Region Zealand, Region Sjælland, Zealand Denmark, Sjælland, Sjaelland, + Østsjælland, Vestsjælland, Sydsjælland"""), _split("""Faxe, Greve, Guldborgsund, Holbæk, Kalundborg, Køge, Lejre, Lolland, Næstved, Odsherred, Ringsted, Roskilde, Slagelse, Solrød, Sorø, Stevns, Vordingborg, Nykøbing Falster, Nykøbing F, Nykøbing Sjælland, Nakskov, Maribo, Sakskøbing, @@ -316,7 +318,7 @@ _JUTLAND = Region( "jutland", "Jutland", _split("""Jutland, Jylland, Central Jutland, Midtjylland, Region Midtjylland, North Jutland, Nordjylland, Region Nordjylland, South Jutland, Sønderjylland, - East Jutland, West Jutland, Vestjylland, Østjylland"""), + East Jutland, West Jutland, Vestjylland, Østjylland, Sydøstjylland, Sydvestjylland"""), _split("""Aarhus, Aalborg, Esbjerg, Randers, Kolding, Horsens, Vejle, Silkeborg, Herning, Viborg, Billund, Fredericia, Holstebro, Skive, Ringkøbing, Videbæk, Lem, Risskov, Åbyhøj, Brabrand, Viby J, Aabenraa, Haderslev, Sønderborg, Grenaa, Grenå, @@ -882,7 +884,8 @@ _PLACELESS = frozenset(( "remote", "hybrid", "anywhere", "worldwide", "global", "distributed", "home", "based", "from", "work", "working", "wfh", "office", "offices", "onsite", "on", "site", "in", "multiple", "several", "various", "locations", "location", "flexible", "or", "and", "any", - "first", "field", "travel", "tbd", "n", "a", "other", "job", "jobs", "position")) + "first", "field", "travel", "tbd", "n", "a", "other", "job", "jobs", "position", + "udlandet", "ovrige")) def placeless(text: str) -> bool: diff --git a/tests/test_gazetteer.py b/tests/test_gazetteer.py index 66d916a..0537e6c 100644 --- a/tests/test_gazetteer.py +++ b/tests/test_gazetteer.py @@ -141,6 +141,21 @@ def test_europe_is_every_european_country_and_eu() -> None: assert not {"US", "CN"} & codes +def test_a_danish_region_as_akademikernes_jobbank_writes_it_is_placed() -> None: + # The labels of the site's search form. Unplaced, "Storkøbenhavn; + # Øresundsregionen" was known only as Øresund, which lies in no country. + assert names("Storkøbenhavn") == ["Capital Region of Denmark"] + assert names("Nordsjælland") == ["Capital Region of Denmark"] + for text in ("Østsjælland", "Vestsjælland", "Sydsjælland & Øer"): + assert names(text) == ["Zealand"] + for text in ("Sydøstjylland", "Sydvestjylland"): + assert names(text) == ["Jutland"] + assert names("Storkøbenhavn; Øresundsregionen") == ["Capital Region of Denmark", "Øresund"] + # "Abroad (other)" names no place, so it is not listed as unresolved. + assert names("Udlandet (øvrige)") == [] and places.placeless("Udlandet (øvrige)") + assert names("Udlandet (Sverige)") == ["Sweden"] + + def test_oresund_holds_both_capital_regions() -> None: under = GAZ.under(GAZ.lookup("region:oresund") or ()) assert {GAZ.by_key[("city", "malmo")], GAZ.by_key[("city", "copenhagen")]} <= under