From 1f9b2016338ff232394d180c274358ca20a5593b Mon Sep 17 00:00:00 2001 From: Lilleman auf Larv Date: Sun, 11 Oct 2026 19:06:28 +0200 Subject: [PATCH] Answer product-owner round 2: a street joining names with a bare comma is dropped, and the US places read as a drawn tenth plus the capitals and big places --- CHANGELOG.md | 4 ++-- README.md | 6 +++--- data-import/geo-se.py | 2 +- data/geo/SE/street.tsv | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a56a6d..769fbbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -96,8 +96,8 @@ replacement, and each removed path, column or flag. reads its country's `geo` module. Every Swedish postort the import can place and give a street ships with all its streets. Of the US incorporated places that hold most of some postal code's land, a tenth drawn by population down to villages of a hundred - people ships, and every state capital but Honolulu and every place of 100,000 or more - beside, so a smaller city may be missing; each carries a quarter of its streets, at + people ships, plus every state capital but Honolulu and every place of 100,000 or more, + so a smaller city may be missing; each carries a quarter of its streets, at least ten. - `{date(from,to,'layout')}` and `{time('layout')}`: a second between two days, or within one, in a single-quoted Go layout, drawn in UTC; `from` may equal `to`. diff --git a/README.md b/README.md index fb6382a..8cf21d0 100644 --- a/README.md +++ b/README.md @@ -318,9 +318,9 @@ neighbouring one. `geo.SE.region[Skåne län].municipality` draws a kommun in Skåne, `geo.SE.locality[Lund].street` a street in Lund, and `geo.US.region[IL].locality[Springfield]` settles which Springfield. The US places are -the incorporated places that hold most of some postal code's land: a tenth of them drawn -with odds by population, and every state capital but Honolulu and every place of 100,000 -or more beside, so a smaller city may be missing: look one up in +the incorporated places that hold most of some postal code's land: a tenth of them, drawn +with odds by population, plus every state capital but Honolulu and every place of 100,000 +or more, so a smaller city may be missing: look one up in [`locality.tsv`](data/geo/US/locality.tsv) before selecting it. A region row carries its `timezone`, the state's predominant zone, and a locality its `lat` and `lon`. What ports across countries is the five table names, the `name` column, diff --git a/data-import/geo-se.py b/data-import/geo-se.py index 537ce96..679722a 100644 --- a/data-import/geo-se.py +++ b/data-import/geo-se.py @@ -40,7 +40,7 @@ ONE_POSITION = {"Stockholm", "Göteborg", "Malmö"} UNMATCHED_POPULATION = 200 # Not a street: a road number, a ferry route, a cycle path or road association's label, a placeholder, or two names # or a description in one. -NOT_A_STREET = re.compile(r"^(Europaväg|Länsväg|Riksväg) \d|^Färjeled |\b(GC|SMF|VSF)\b|^NN$|, ") +NOT_A_STREET = re.compile(r"^(Europaväg|Länsväg|Riksväg) \d|^Färjeled |\b(GC|SMF|VSF)\b|^NN$|,") PARTICLES = {"af", "de", "von"} diff --git a/data/geo/SE/street.tsv b/data/geo/SE/street.tsv index 1520c5d..01e64da 100644 --- a/data/geo/SE/street.tsv +++ b/data/geo/SE/street.tsv @@ -25376,7 +25376,6 @@ Parkgatan Falun 4 Parkvägen Falun 4 Polhemsvägen Falun 4 Rissgårdsvägen Falun 4 -Risövägen,Dejstolvägen,Runvägen Falun 4 Samuelsdalsvägen Falun 4 Selma Ströms väg Falun 4 Sjögavägen Falun 4