From 4b80460515020397a6195bd4c297bb9fd46427e7 Mon Sep 17 00:00:00 2001
From: Lilleman auf Larv <lilleman@larvit.se>
Date: Mon, 5 Oct 2026 00:28:18 +0200
Subject: [PATCH] Draw a shipped person from one named first name, and an
 address from one named street

---
 data/en_US/address.json  | 12 ++++++------
 data/en_US/person.json   |  6 +++---
 data/geo/SE/address.json |  6 +++---
 data/geo/US/address.json |  8 ++++----
 data/sv_SE/address.json  | 10 +++++-----
 data/sv_SE/person.json   |  4 ++--
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/data/en_US/address.json b/data/en_US/address.json
index 4bc72a7..b3f4035 100644
--- a/data/en_US/address.json
+++ b/data/en_US/address.json
@@ -1,8 +1,8 @@
 {
-  "format": "{street-number} {street}\n{locality}, {region} {postal-code}",
-  "street": "{/geo.US.address.street}",
-  "street-number": "{/geo.US.address.street-number}",
-  "locality": "{/geo.US.address.locality}",
-  "region": "{/geo.US.address.region}",
-  "postal-code": "{/geo.US.address.postal-code}"
+  "format": "{/geo.US.address as a}{a}",
+  "street": "{a.street}",
+  "street-number": "{a.street-number}",
+  "locality": "{a.locality}",
+  "region": "{a.region}",
+  "postal-code": "{a.postal-code}"
 }
diff --git a/data/en_US/person.json b/data/en_US/person.json
index 79e66cd..28130d8 100644
--- a/data/en_US/person.json
+++ b/data/en_US/person.json
@@ -1,7 +1,7 @@
 {
   "format": "{prefix}{first} {last}",
-  "first": "{.first-name.name}",
+  "first": "{.first-name as n}{n.name}",
   "last": "{.last-name.name}",
-  "prefix": [null, { "format": "{.title.name} ", "weight": 0.1 }],
-  "sex": "{.sex.name}"
+  "prefix": [null, { "format": "{n..sex.title.name} ", "weight": 0.1 }],
+  "sex": "{n..sex.name}"
 }
diff --git a/data/geo/SE/address.json b/data/geo/SE/address.json
index 8c14e63..ff13dd1 100644
--- a/data/geo/SE/address.json
+++ b/data/geo/SE/address.json
@@ -1,6 +1,6 @@
 {
   "format": "{street} {street-number}\n{postal-code} {locality}",
-  "street": "{.street.name}",
+  "street": "{.street as s}{s.name}",
   "street-number": [
     "{int(1,9)}",
     "{int(10,99)}",
@@ -9,6 +9,6 @@
     { "format": "{int(10,99)}{upper(1)}", "weight": 0.1 },
     { "format": "{int(100,999)}{upper(1)}", "weight": 0.05 }
   ],
-  "postal-code": "{.postal-code.code}",
-  "locality": "{.locality.name}"
+  "postal-code": "{s..locality.postal-code.code}",
+  "locality": "{s..locality.name}"
 }
diff --git a/data/geo/US/address.json b/data/geo/US/address.json
index d99c8d8..8ca3cd9 100644
--- a/data/geo/US/address.json
+++ b/data/geo/US/address.json
@@ -1,13 +1,13 @@
 {
   "format": "{street-number} {street}\n{locality}, {region} {postal-code}",
-  "street": "{.street.name}",
+  "street": "{.street as s}{s.name}",
   "street-number": [
     "{int(10,99)}",
     { "format": "{int(100,999)}", "weight": 2 },
     { "format": "{int(1000,9999)}", "weight": 0.5 },
     { "format": "{int(10,99)}{int(100,999)}", "weight": 0.3 }
   ],
-  "locality": "{.locality.name}",
-  "region": "{.region.abbr}",
-  "postal-code": "{.postal-code.code}"
+  "locality": "{s..locality.name}",
+  "region": "{s..locality..municipality..region.abbr}",
+  "postal-code": "{s..locality.postal-code.code}"
 }
diff --git a/data/sv_SE/address.json b/data/sv_SE/address.json
index 67461da..28e31c2 100644
--- a/data/sv_SE/address.json
+++ b/data/sv_SE/address.json
@@ -1,7 +1,7 @@
 {
-  "format": "{street} {street-number}\n{postal-code} {locality}",
-  "street": "{/geo.SE.address.street}",
-  "street-number": "{/geo.SE.address.street-number}",
-  "postal-code": "{/geo.SE.address.postal-code}",
-  "locality": "{/geo.SE.address.locality}"
+  "format": "{/geo.SE.address as a}{a}",
+  "street": "{a.street}",
+  "street-number": "{a.street-number}",
+  "postal-code": "{a.postal-code}",
+  "locality": "{a.locality}"
 }
diff --git a/data/sv_SE/person.json b/data/sv_SE/person.json
index d0fd81f..45f6c26 100644
--- a/data/sv_SE/person.json
+++ b/data/sv_SE/person.json
@@ -1,7 +1,7 @@
 {
   "format": "{prefix}{first} {last}",
-  "first": "{.first-name.name}",
+  "first": "{.first-name as n}{n.name}",
   "last": "{.last-name.name}",
   "prefix": [null, { "format": "{.title.name} ", "weight": 0.05 }],
-  "sex": "{.sex.name}"
+  "sex": "{n..sex.name}"
 }