Ship every Swedish street, a quarter of the US streets, and every US capital and place of 100,000 beside the drawn tenth

data-import/geo-se.py

@@ -172,7 +172,7 @@ def streets(segments, codes, localities, share, minimum):
 
 
 def main():
-    a = geo.parser(__doc__, "SE", key_file={"help": "file holding the Trafikverket API key; TRAFIKVERKET_API_KEY otherwise"}).parse_args()
+    a = geo.parser(__doc__, "SE", 1.0, key_file={"help": "file holding the Trafikverket API key; TRAFIKVERKET_API_KEY otherwise"}).parse_args()
     key = Path(a.key_file).read_text().strip() if a.key_file else os.environ.get("TRAFIKVERKET_API_KEY")
     if not key:
         sys.exit("set TRAFIKVERKET_API_KEY or pass --key-file")

data-import/geo-us.py

@@ -12,6 +12,7 @@ import random
 import re
 import struct
 import sys
+import urllib.parse
 import zipfile
 
 import geo
@@ -27,10 +28,18 @@ ZCTA_PLACE = "https://www2.census.gov/geo/docs/maps-data/data/rel2020/zcta520/ta
 TIGER = "https://www2.census.gov/geo/tiger/TIGER2025/{0}/tl_2025_{1}_{2}.zip"
 ESTIMATE = "POPESTIMATE2025"
 CDP = "57"
+# Each state's capital from Wikidata (CC0), with the capital's GNIS ids, which the Gazetteer carries as ANSICODE.
+CAPITALS = "https://query.wikidata.org/sparql?" + urllib.parse.urlencode({"query": """
+SELECT ?iso ?capitalLabel ?gnis WHERE {
+  ?state wdt:P31 wd:Q35657; wdt:P300 ?iso; wdt:P36 ?capital.
+  OPTIONAL { ?capital wdt:P590 ?gnis. }
+  SERVICE wikibase:label { bd:serviceParam wikibase:language "en". }
+}"""})
+ALWAYS = 100000
 HIGHWAY = re.compile(r"\b(I- |Hwy |Highway |Loop |Rte |Route |Rd )\d")
 SUFFIX = re.compile(r" (city and borough|city|town|village|borough|municipality|comunidad|zona urbana|metropolitan government|metro government|consolidated government|unified government|urban county|corporation|plantation)( \(balance\))?$")
-# Places whose Census name is a merged government's; the postal city is what an address carries.
+# Places whose Census name is not the postal city an address carries.
-NAMES = {"1303440": "Athens", "1304204": "Augusta", "1349008": "Macon", "2148006": "Louisville", "3011397": "Butte", "4732742": "Hartsville", "4752006": "Nashville"}
+NAMES = {"1303440": "Athens", "1304204": "Augusta", "1349008": "Macon", "1608830": "Boise", "2148006": "Louisville", "3011397": "Butte", "4732742": "Hartsville", "4752006": "Nashville"}
 TIMEZONES = {
     "AK": "America/Anchorage", "AL": "America/Chicago", "AR": "America/Chicago", "AZ": "America/Phoenix",
     "CA": "America/Los_Angeles", "CO": "America/Denver", "CT": "America/New_York", "DC": "America/New_York",
@@ -117,13 +126,30 @@ def localities(cache, counties):
     out = {}
     for r in gazetteer(cache, "place"):
         geoid, population = r["GEOID"], place_population.get(r["GEOID"], 0)
-        if r["FUNCSTAT"] not in ("A", "F", "N") or r["LSAD"] == CDP or not county_part.get(geoid):
+        if r["FUNCSTAT"] not in ("A", "B", "F", "N") or r["LSAD"] == CDP or not county_part.get(geoid):
             continue
         county = max(county_part[geoid])[1]
         if county not in counties:
             print(f"{geoid} {r['NAME']}: county {county} unknown, dropped", file=sys.stderr)
             continue
-        out[geoid] = {"code": geoid, "name": place_name(geoid, r["NAME"]), "municipality": county, "population": population, "lat": r["INTPTLAT"], "lon": r["INTPTLONG"]}
+        out[geoid] = {"code": geoid, "gnis": int(r["ANSICODE"]), "name": place_name(geoid, r["NAME"]), "municipality": county, "population": population, "lat": r["INTPTLAT"], "lon": r["INTPTLONG"]}
+    return out
+
+
+def capitals(cache, places, counties):
+    """The codes of the places that are a state's capital, matched by any of its GNIS ids, else by name inside the state."""
+    by_gnis = {p["gnis"]: code for code, p in places.items()}
+    by_name = {(counties[p["municipality"]]["region"], p["name"]): code for code, p in places.items()}
+    gnis_of = collections.defaultdict(set)
+    for r in csv.DictReader(io.StringIO(text(source.fetch(CAPITALS, cache, "capitals.csv", magic=b"iso,", headers={"Accept": "text/csv"})))):
+        gnis_of[(r["iso"].removeprefix("US-"), r["capitalLabel"])].add(int(r["gnis"] or 0))
+    out = set()
+    for (state, name), ids in sorted(gnis_of.items()):
+        code = next((by_gnis[i] for i in sorted(ids) if i in by_gnis), None) or by_name.get((state, name))
+        if code:
+            out.add(code)
+        else:
+            print(f"{state} {name}: capital is no incorporated place", file=sys.stderr)
     return out
 
 
@@ -165,7 +191,7 @@ def streets(cache, counties, locality_of_zcta, share, minimum):
 
 
 def main():
-    a = geo.parser(__doc__, "US", place_share={"type": float, "default": 0.1}).parse_args()
+    a = geo.parser(__doc__, "US", 0.25, place_share={"type": float, "default": 0.1}).parse_args()
     cache, out = geo.directories(a)
 
     state_population = {r["STATE"]: r[ESTIMATE] for r in csv_rows(cache, STATES, "nst-est2025.csv") if r["SUMLEV"] == "040"}
@@ -181,7 +207,11 @@ def main():
 
     places = localities(cache, counties)
     owner_of_zcta = zcta_localities(cache, places)
-    places = drawn({p: places[p] for p in set(owner_of_zcta.values())}, a.place_share)
+    capital_codes = capitals(cache, places, counties)
+    owners = {p: places[p] for p in set(owner_of_zcta.values())}
+    for code in sorted(capital_codes - set(owners)):
+        print(f"{code} {places[code]['name']}: capital owns no ZCTA, dropped", file=sys.stderr)
+    places = drawn(owners, a.place_share) | {code: p for code, p in owners.items() if code in capital_codes or p["population"] >= ALWAYS}
     locality_of_zcta = {zcta: p for zcta, p in owner_of_zcta.items() if p in places}
     named, addresses = streets(cache, sorted({l["municipality"] for l in places.values()}), locality_of_zcta, a.street_share, a.min_streets)
     zctas = collections.defaultdict(list)

data-import/geo.py

@@ -9,10 +9,10 @@ DATA = Path(__file__).resolve().parent.parent / "data" / "geo"
 CACHE = Path(__file__).resolve().parent / "cache"
 
 
-def parser(doc, country, **own):
+def parser(doc, country, street_share, **own):
     """A parser for the options every country's import takes, plus the script's own: each keyword names one option, with
     "_" standing for "-"."""
-    options = {"cache": {"default": str(CACHE)}, "out": {"default": str(DATA / country)}, "min_streets": {"type": int, "default": 10}, "street_share": {"type": float, "default": 0.1}, **own}
+    options = {"cache": {"default": str(CACHE)}, "out": {"default": str(DATA / country)}, "min_streets": {"type": int, "default": 10}, "street_share": {"type": float, "default": street_share}, **own}
     p = argparse.ArgumentParser(description=doc.splitlines()[0])
     for name in sorted(options):
         p.add_argument("--" + name.replace("_", "-"), **options[name])

data-import/source.py

@@ -14,7 +14,7 @@ def fetch(source, cache, name, magic=b"", data=None, headers=None):
     if path.exists():
         return path.read_bytes()
     for attempt in range(1, 6):
-        req = urllib.request.Request(source, data=data, headers={"User-Agent": "fejkdata data-import", **(headers or {})})
+        req = urllib.request.Request(source, data=data, headers={"User-Agent": "fejkdata-data-import (https://github.com/larvit/fejkdata)", **(headers or {})})
         try:
             with urllib.request.urlopen(req, timeout=600) as r:
                 body = r.read()

data/geo/US/locality.tsv

@@ -5,6 +5,7 @@ code	name	municipality	population	lat	lon
 0102428	Ariton	01045	653	31.597772	-85.713061
 0103076	Auburn	01081	85113	32.607122	-85.490959
 0104684	Bayou La Batre	01097	2068	30.407586	-88.263271
+0107000	Birmingham	01073	195893	33.527174	-86.797036
 0109736	Brookside	01073	1433	33.637294	-86.892495
 0114104	Chelsea	01117	17716	33.308355	-86.637509
 0115064	Citronelle	01097	3897	31.097269	-88.249843
@@ -42,7 +43,9 @@ code	name	municipality	population	lat	lon
 0178552	Vestavia Hills	01073	38306	33.462742	-86.739569
 0179344	Wadley	01111	869	33.1234	-85.568592
 0203000	Anchorage	02020	287155	61.17425	-149.284329
+0236400	Juneau	02110	31609	58.372904	-134.178438
 0281920	Utqiaġvik	02185	4640	71.264374	-156.753686
+0404720	Avondale	04013	100983	33.313646	-112.331314
 0407940	Buckeye	04013	125445	33.431573	-112.641626
 0408220	Bullhead City	04015	43987	35.127371	-114.55599
 0410530	Casa Grande	04021	69753	32.905527	-111.763948
@@ -151,6 +154,7 @@ code	name	municipality	population	lat	lon
 0621230	Eastvale	06065	70594	33.963274	-117.582369
 0621712	El Cajon	06073	101755	32.801673	-116.960468
 0622020	Elk Grove	06067	185007	38.414621	-121.384961
+0622230	El Monte	06037	105075	34.074633	-118.029136
 0622412	El Segundo	06037	16379	33.910367	-118.425079
 0622678	Encinitas	06073	60736	33.050632	-117.263616
 0622804	Escondido	06073	146030	33.133053	-117.074043
@@ -260,6 +264,7 @@ code	name	municipality	population	lat	lon
 0662546	Rohnert Park	06097	44811	38.347617	-122.700896
 0662938	Roseville	06061	167302	38.770296	-121.319634
 0664000	Sacramento	06067	536449	38.567694	-121.468161
+0664224	Salinas	06053	159134	36.690217	-121.633793
 0665000	San Bernardino	06071	222044	34.14114	-117.294635
 0665042	San Buenaventura (Ventura)	06111	109914	34.26778	-119.254206
 0665070	San Carlos	06081	29261	37.499034	-122.267572
@@ -291,6 +296,7 @@ code	name	municipality	population	lat	lon
 0673108	South Lake Tahoe	06017	21115	38.928218	-119.981
 0673262	South San Francisco	06081	64941	37.655104	-122.376234
 0673962	Stanton	06059	40161	33.800233	-117.993449
+0675000	Stockton	06077	324597	37.976553	-121.308598
 0677000	Sunnyvale	06085	156577	37.385797	-122.026316
 0677364	Susanville	06035	12816	40.433674	-120.628306
 0678120	Temecula	06065	114865	33.492915	-117.134593
@@ -305,6 +311,7 @@ code	name	municipality	population	lat	lon
 0681344	Upland	06071	79446	34.116073	-117.659922
 0681554	Vacaville	06095	103850	38.358621	-121.968601
 0681666	Vallejo	06095	123287	38.106909	-122.262339
+0682590	Victorville	06071	141395	34.527735	-117.353579
 0682954	Visalia	06107	146541	36.32921	-119.326984
 0682996	Vista	06073	98274	33.189532	-117.23858
 0683668	Watsonville	06087	50716	36.923587	-121.772395
@@ -335,6 +342,7 @@ code	name	municipality	population	lat	lon
 0839855	Johnstown	08123	22433	40.307248	-104.911205
 0841560	Kremmling	08049	1451	40.056542	-106.378216
 0842110	La Junta	08089	6864	37.979414	-103.547336
+0843000	Lakewood	08059	156927	39.698939	-105.117573
 0843660	Las Animas	08011	2325	38.069668	-103.223229
 0845255	Littleton	08005	46246	39.590375	-105.020084
 0845970	Longmont	08013	100109	40.168199	-105.100522
@@ -344,8 +352,10 @@ code	name	municipality	population	lat	lon
 0856420	Ouray	08091	929	38.027543	-107.673348
 0857630	Parker	08035	65985	39.509209	-104.771897
 0860160	Platteville	08123	2908	40.222905	-104.830005
+0862000	Pueblo	08101	110404	38.267479	-104.613429
 0864255	Rifle	08045	10844	39.537565	-107.770344
 0873825	Steamboat Springs	08107	13557	40.475578	-106.822919
+0877290	Thornton	08001	147766	39.920433	-104.941413
 0880040	Vail	08037	4407	39.63778	-106.362463
 0883835	Westminster	08001	116182	39.880122	-105.061513
 0884440	Wheat Ridge	08059	32081	39.772675	-105.104801
@@ -363,18 +373,19 @@ code	name	municipality	population	lat	lon
 0956200	Norwich	09180	40001	41.548006	-72.089454
 0968100	Shelton	09140	42880	41.304577	-73.139215
 0973000	Stamford	09190	139535	41.079615	-73.546144
+0980000	Waterbury	09140	115771	41.5585	-73.036685
 1010760	Camden	10001	4176	39.099184	-75.556885
 1021200	Dover	10001	40592	39.160602	-75.521659
 1041830	Lewes	10005	3826	38.778644	-75.143689
 1047030	Middletown	10003	25798	39.441739	-75.717383
 1047940	Millsboro	10005	7890	38.587333	-75.316356
 1050670	Newark	10003	30359	39.677649	-75.757479
-1077580	Wilmington	10003	73512	39.735651	-75.532104
 1150000	Washington	11001	693645	38.904243	-77.016524
 1200950	Altamonte Springs	12117	48000	28.659507	-81.394299
 1201700	Apopka	12095	65552	28.701701	-81.531825
 1202681	Aventura	12086	39880	25.960133	-80.132977
 1205200	Belle Glade	12099	17241	26.692216	-80.666005
+1207300	Boca Raton	12099	101582	26.370809	-80.102558
 1207525	Bonita Springs	12071	57634	26.353754	-81.783392
 1207875	Boynton Beach	12099	82396	26.526785	-80.08064
 1207950	Bradenton	12081	58014	27.489798	-82.576804
@@ -441,6 +452,7 @@ code	name	municipality	population	lat	lon
 1256975	Pinellas Park	12103	52295	27.858883	-82.708213
 1257425	Plantation	12011	99183	26.125573	-80.261818
 1257550	Plant City	12057	44118	28.015675	-82.116768
+1258050	Pompano Beach	12011	117211	26.241622	-80.133851
 1258575	Port Orange	12127	66395	29.113444	-81.013223
 1258600	Port Richey	12101	3655	28.275019	-82.725032
 1258675	Port St. Joe	12045	3995	29.817561	-85.309146
@@ -464,10 +476,10 @@ code	name	municipality	population	lat	lon
 1276500	West Melbourne	12009	31285	28.050398	-80.658327
 1276600	West Palm Beach	12099	127189	26.745114	-80.127038
 1278250	Winter Garden	12095	48063	28.541217	-81.597043
-1278275	Winter Haven	12105	62313	28.045836	-81.732743
 1278325	Winter Springs	12117	39585	28.695481	-81.272086
 1279225	Zephyrhills	12101	22447	28.240721	-82.179024
 1301052	Albany	13095	66907	31.578117	-84.176224
+1303440	Athens	13059	128612	33.949597	-83.370088
 1304000	Atlanta	13121	529110	33.762909	-84.422675
 1304204	Augusta	13245	201999	33.365531	-82.073422
 1304980	Baldwin	13137	4240	34.484007	-83.55984
@@ -504,6 +516,7 @@ code	name	municipality	population	lat	lon
 1369000	Savannah	13051	149440	32.012457	-81.194157
 1371492	Smyrna	13067	57513	33.862942	-84.514729
 1371604	Snellville	13135	22478	33.860224	-84.006295
+1372122	South Fulton	13121	112820	33.635514	-84.582706
 1373256	Statesboro	13031	35366	32.439408	-81.775106
 1373704	Stockbridge	13151	36331	33.529646	-84.233422
 1376476	Tifton	13277	17595	31.462099	-83.520499
@@ -514,7 +527,7 @@ code	name	municipality	population	lat	lon
 1380956	Waycross	13299	13936	31.211006	-82.357658
 1382692	White Plains	13133	271	33.480313	-83.036343
 1601990	Ammon	16019	20119	43.475002	-111.959612
-1608830	Boise City	16001	238429	43.59805	-116.231596
+1608830	Boise	16001	238429	43.59805	-116.231596
 1623410	Eagle	16001	34658	43.695865	-116.411852
 1632140	Gooding	16047	3855	42.937046	-114.713519
 1644290	Kuna	16001	31525	43.52484	-116.403635
@@ -636,6 +649,7 @@ code	name	municipality	population	lat	lon
 1820728	Elkhart	18039	54092	41.695214	-85.955432
 1821070	Elwood	18095	8525	40.27382	-85.837067
 1822000	Evansville	18163	116176	37.987737	-87.534705
+1823278	Fishers	18057	104812	39.96183	-85.968364
 1825000	Fort Wayne	18003	275203	41.088193	-85.142791
 1825324	Frankfort	18023	16837	40.279635	-86.537856
 1827000	Gary	18089	67289	41.59074	-87.347113
@@ -701,6 +715,7 @@ code	name	municipality	population	lat	lon
 2018250	Dodge City	20057	27653	37.760677	-100.018438
 2021275	Emporia	20111	24137	38.402352	-96.194581
 2031400	Herington	20041	2101	38.696855	-96.807268
+2036000	Kansas City	20209	157805	39.122539	-94.741781
 2038900	Lawrence	20045	96367	38.959551	-95.265468
 2039000	Leavenworth	20103	37012	39.322717	-94.925013
 2039350	Lenexa	20091	60506	38.965268	-94.803937
@@ -723,6 +738,7 @@ code	name	municipality	population	lat	lon
 2120350	Dayton	21037	5974	39.112308	-84.46284
 2124274	Elizabethtown	21093	35448	37.698686	-85.876689
 2127982	Florence	21015	34018	38.993405	-84.648186
+2128900	Frankfort	21073	28657	38.194966	-84.865877
 2130700	Georgetown	21209	40883	38.259831	-84.535089
 2131114	Glasgow	21009	15302	37.004842	-85.925876
 2135020	Hartford	21183	2665	37.45338	-86.889849
@@ -744,15 +760,18 @@ code	name	municipality	population	lat	lon
 2170644	Silver Grove	21037	1333	39.040106	-84.400325
 2170752	Simpsonville	21211	3183	38.216376	-85.348781
 2183676	Winchester	21049	19514	38.002364	-84.190586
+2205000	Baton Rouge	22033	222795	30.440443	-91.133166
 2212665	Carencro	22055	13224	30.312561	-92.038706
 2217880	Cottonport	22009	1916	30.989174	-92.050952
 2224215	Eros	22049	141	32.392558	-92.423933
 2227190	Franklinton	22117	3576	30.848234	-90.145869
 2232755	Hammond	22105	24032	30.506006	-90.454857
 2238775	Jonesville	22025	1531	31.622318	-91.83443
+2240735	Lafayette	22055	123311	30.206989	-92.028873
 2241155	Lake Charles	22019	82676	30.19902	-93.210835
 2244690	Livonia	22077	1134	30.562248	-91.550112
 2251410	Monroe	22073	46860	32.518986	-92.07718
+2255000	New Orleans	22071	362154	30.052877	-89.934502
 2258045	Opelousas	22097	15098	30.524897	-92.081654
 2266655	Ruston	22061	22397	32.533817	-92.635243
 2270000	Shreveport	22017	175902	32.466879	-93.792193
@@ -762,6 +781,7 @@ code	name	municipality	population	lat	lon
 2275425	Thibodaux	22057	15573	29.794874	-90.814578
 2283405	Zachary	22033	20621	30.664377	-91.165778
 2302060	Auburn	23001	25441	44.084537	-70.249649
+2302100	Augusta	23011	19155	44.334904	-69.734199
 2302795	Bangor	23019	32518	44.829625	-68.788767
 2365725	Sanford	23031	22663	43.424142	-70.757859
 2401600	Annapolis	24003	40634	38.97216	-76.505334
@@ -927,6 +947,7 @@ code	name	municipality	population	lat	lon
 2925768	Fredericktown	29123	4584	37.562912	-90.303605
 2931708	Herculaneum	29099	5402	38.257558	-90.39313
 2932590	Holland	29155	181	36.057046	-89.870531
+2935000	Independence	29095	121675	39.085469	-94.352082
 2937000	Jefferson City	29051	42489	38.567461	-92.175254
 2937592	Joplin	29097	53930	37.075218	-94.501259
 2938000	Kansas City	29095	521220	39.125155	-94.550313
@@ -951,9 +972,11 @@ code	name	municipality	population	lat	lon
 2970000	Springfield	29077	169847	37.195337	-93.292363
 2977992	Waynesville	29169	5558	37.819832	-92.221403
 2979820	Wildwood	29189	34955	38.576902	-90.667633
+3006550	Billings	30111	121239	45.788538	-108.552475
 3008950	Bozeman	30031	58814	45.683919	-111.057553
 3024475	Ennis	30057	1126	45.346104	-111.732095
 3032800	Great Falls	30013	60208	47.502518	-111.29997
+3035600	Helena	30049	35138	46.595465	-112.018746
 3042700	Laurel	30111	7205	45.674012	-108.778269
 3049525	Miles City	30017	8450	46.405823	-105.838944
 3050200	Missoula	30063	78903	46.874359	-114.026136
@@ -992,6 +1015,7 @@ code	name	municipality	population	lat	lon
 3415820	Cresskill	34003	9257	40.940018	-73.958313
 3418400	Dumont	34003	18501	40.945239	-73.992428
 3419390	East Orange	34013	72159	40.765055	-74.211655
+3421000	Elizabeth	34039	141675	40.666367	-74.193503
 3421510	Englewood Cliffs	34003	5384	40.884634	-73.944654
 3422470	Fair Lawn	34003	37128	40.93583	-74.117505
 3422560	Fairview	34003	15509	40.82111	-74.003032
@@ -1042,6 +1066,7 @@ code	name	municipality	population	lat	lon
 3563460	Rio Rancho	35043	114419	35.28507	-106.698867
 3564930	Roswell	35005	46878	33.373442	-104.529393
 3570500	Santa Fe	35049	89837	35.661981	-105.981815
+3601000	Albany	36001	101698	42.665745	-73.798353
 3603078	Auburn	36011	25947	42.9338	-76.567181
 3603353	Avon	36051	3434	42.912842	-77.74649
 3605771	Bellport	36103	2220	40.75095	-72.941325
@@ -1098,6 +1123,7 @@ code	name	municipality	population	lat	lon
 3712000	Charlotte	37119	964784	35.209045	-80.83099
 3712860	Clayton	37101	32633	35.658139	-78.446007
 3713000	Cleveland	37159	902	35.733056	-80.681522
+3714100	Concord	37025	114598	35.392093	-80.635453
 3719000	Durham	37063	305561	35.977928	-78.898109
 3720600	Elizabethtown	37017	3306	34.621454	-78.6063
 3722920	Fayetteville	37051	209120	35.081647	-78.973159
@@ -1139,6 +1165,7 @@ code	name	municipality	population	lat	lon
 3774540	Wilson	37195	49572	35.731503	-77.930722
 3775000	Winston-Salem	37067	257271	36.102863	-80.260829
 3776220	Zebulon	37183	11933	35.829542	-78.314158
+3807200	Bismarck	38015	77963	46.815857	-100.768569
 3825700	Fargo	38017	136275	46.86469	-96.829073
 3832060	Grand Forks	38035	60365	47.919595	-97.087328
 3853380	Minot	38101	47308	48.236141	-101.277578
@@ -1229,6 +1256,7 @@ code	name	municipality	population	lat	lon
 4017800	Coweta	40145	11472	35.966384	-95.660647
 4019900	Del City	40109	21138	35.448278	-97.440785
 4021750	Drumright	40037	2546	35.989923	-96.597424
+4023200	Edmond	40109	100479	35.673807	-97.413076
 4023700	El Reno	40017	20730	35.535973	-97.945469
 4023950	Enid	40047	50297	36.406702	-97.869861
 4029100	Geronimo	40031	1188	34.4832	-98.388012
@@ -1254,6 +1282,7 @@ code	name	municipality	population	lat	lon
 4123850	Eugene	41039	178618	44.056848	-123.119019
 4130550	Grants Pass	41033	39239	42.43186	-123.333158
 4131250	Gresham	41051	111513	45.502319	-122.441609
+4134100	Hillsboro	41067	111126	45.525315	-122.93638
 4135450	Hubbard	41047	3399	45.181472	-122.808324
 4136500	Irrigon	41049	2042	45.89497	-119.489908
 4139700	Klamath Falls	41035	22111	42.215766	-121.775805
@@ -1280,6 +1309,7 @@ code	name	municipality	population	lat	lon
 4223832	Ephrata	42071	13647	40.180851	-76.180184
 4224000	Erie	42049	91838	42.116594	-80.073503
 4227552	Franklin Park	42003	14978	40.59212	-80.098726
+4232800	Harrisburg	42043	50522	40.275891	-76.88502
 4233200	Hawley	42127	1212	41.475949	-75.175964
 4235520	Honesdale	42127	4417	41.57571	-75.250769
 4236368	Huntingdon	42061	6862	40.497994	-78.008838
@@ -1349,6 +1379,7 @@ code	name	municipality	population	lat	lon
 4577875	Williamston	45007	4338	34.619088	-82.480391
 4618620	Elk Point	46127	2080	42.681224	-96.68048
 4631060	Huron	46005	14607	44.362341	-98.209571
+4649600	Pierre	46065	13848	44.375163	-100.319996
 4652980	Rapid City	46103	80589	44.071071	-103.217924
 4659020	Sioux Falls	46099	213748	43.540696	-96.731962
 4660020	Spearfish	46081	14154	44.491689	-103.815746
@@ -1417,6 +1448,7 @@ code	name	municipality	population	lat	lon
 4814920	Cibolo	48187	39019	29.565803	-98.212822
 4815436	Cleveland	48291	9936	30.338215	-95.090283
 4815652	Clute	48039	10821	29.025851	-95.398229
+4815976	College Station	48041	127472	30.58516	-96.29636
 4815988	Colleyville	48439	25727	32.891478	-97.149747
 4816432	Conroe	48339	119564	30.328717	-95.4846
 4817000	Corpus Christi	48355	317247	27.754252	-97.173385
@@ -1438,6 +1470,7 @@ code	name	municipality	population	lat	lon
 4827000	Fort Worth	48439	1028117	32.781954	-97.348573
 4827348	Fredericksburg	48171	11893	30.26568	-98.875676
 4827420	Freeport	48039	10508	28.943296	-95.35607
+4827684	Frisco	48085	236955	33.155424	-96.822593
 4829000	Garland	48113	249625	32.909826	-96.630334
 4829336	Georgetown	48491	106907	30.668155	-97.698775
 4830116	Gonzales	48177	7239	29.512549	-97.447205
@@ -1459,6 +1492,7 @@ code	name	municipality	population	lat	lon
 4841212	Lancaster	48113	40526	32.596203	-96.773789
 4841440	La Porte	48201	37983	29.667437	-95.049089
 4841464	Laredo	48479	269515	27.560379	-99.489181
+4841980	League City	48167	119905	29.49011	-95.108924
 4842016	Leander	48491	91132	30.573906	-97.862571
 4842508	Lewisville	48121	139006	33.050612	-96.972722
 4843012	Little Elm	48121	62727	33.192555	-96.919909
@@ -1508,6 +1542,7 @@ code	name	municipality	population	lat	lon
 4867268	Shavano Park	48029	3861	29.584448	-98.556179
 4868636	Socorro	48141	38787	31.638491	-106.25744
 4869020	South Houston	48201	16407	29.661024	-95.228361
+4870808	Sugar Land	48157	107726	29.595555	-95.631159
 4872176	Temple	48027	98412	31.104936	-97.388512
 4872284	Terrell	48257	23921	32.73568	-96.28249
 4872530	The Colony	48121	46196	33.089598	-96.903368
@@ -1554,11 +1589,13 @@ code	name	municipality	population	lat	lon
 4983470	West Valley City	49035	137491	40.688493	-112.011759
 5003175	Barre	50023	8214	44.19995	-72.507853
 5010675	Burlington	50007	44019	44.492373	-73.239498
+5046000	Montpelier	50023	7823	44.266448	-72.571524
 5066175	South Burlington	50007	21394	44.436565	-73.181103
 5101000	Alexandria	51510	160662	38.818815	-77.083227
 5107480	Big Stone Gap	51195	5102	36.86274	-82.776089
 5107832	Blackstone	51135	3389	37.081822	-78.002812
 5114968	Charlottesville	51540	44388	38.037658	-78.485381
+5116000	Chesapeake	51550	255332	36.679376	-76.301788
 5126496	Fairfax	51600	26772	38.853183	-77.299025
 5127200	Falls Church	51610	15159	38.884722	-77.175603
 5135000	Hampton	51650	137315	37.047961	-76.297293
@@ -1586,6 +1623,7 @@ code	name	municipality	population	lat	lon
 5311825	Cheney	53063	12650	47.49113	-117.581546
 5317635	Des Moines	53033	33032	47.388708	-122.317581
 5320750	Edmonds	53061	42748	47.813604	-122.35333
+5322640	Everett	53061	113567	47.961199	-122.188933
 5323515	Federal Way	53033	99729	47.311596	-122.337757
 5323620	Ferndale	53073	17559	48.853366	-122.590232
 5327960	Granger	53077	3831	46.345295	-120.192673
@@ -1622,6 +1660,7 @@ code	name	municipality	population	lat	lon
 5376405	Washougal	53011	18028	45.582801	-122.346384
 5379590	Woodinville	53033	14548	47.757695	-122.146791
 5409700	Bradshaw	54047	176	37.349449	-81.79733
+5414600	Charleston	54039	46117	38.348692	-81.632324
 5424580	Elkins	54083	6622	38.924057	-79.854272
 5439460	Huntington	54011	44815	38.40934	-82.433516
 5450932	Man	54045	711	37.739354	-81.880269

data/geo/US/municipality.tsv

@@ -27,6 +27,7 @@ code	name	region	population
 01125	Tuscaloosa County	AL	241368
 01127	Walker County	AL	65140
 02020	Anchorage Municipality	AK	287155
+02110	Juneau City and Borough	AK	31609
 02185	North Slope Borough	AK	10582
 04003	Cochise County	AZ	126332
 04005	Coconino County	AZ	144368
@@ -115,6 +116,7 @@ code	name	region	population
 08069	Larimer County	CO	377292
 08089	Otero County	CO	17683
 08091	Ouray County	CO	5265
+08101	Pueblo County	CO	169277
 08105	Rio Grande County	CO	11087
 08107	Routt County	CO	25329
 08123	Weld County	CO	378426
@@ -168,6 +170,7 @@ code	name	region	population
 13045	Carroll County	GA	131036
 13051	Chatham County	GA	311855
 13057	Cherokee County	GA	299273
+13059	Clarke County	GA	129921
 13063	Clayton County	GA	297471
 13067	Cobb County	GA	793345
 13073	Columbia County	GA	169189
@@ -305,6 +308,7 @@ code	name	region	population
 20173	Sedgwick County	KS	538433
 20175	Seward County	KS	21073
 20177	Shawnee County	KS	178607
+20209	Wyandotte County	KS	170597
 21009	Barren County	KY	45641
 21015	Boone County	KY	145316
 21021	Boyle County	KY	31632
@@ -315,6 +319,7 @@ code	name	region	population
 21049	Clark County	KY	37888
 21059	Daviess County	KY	104898
 21067	Fayette County	KY	329751
+21073	Franklin County	KY	52649
 21085	Grayson County	KY	27406
 21093	Hardin County	KY	113482
 21101	Henderson County	KY	44255
@@ -337,6 +342,7 @@ code	name	region	population
 22055	Lafayette Parish	LA	257949
 22057	Lafourche Parish	LA	95505
 22061	Lincoln Parish	LA	48360
+22071	Orleans Parish	LA	362154
 22073	Ouachita Parish	LA	158542
 22077	Pointe Coupee Parish	LA	19520
 22097	St. Landry Parish	LA	80765
@@ -344,6 +350,7 @@ code	name	region	population
 22105	Tangipahoa Parish	LA	141346
 22117	Washington Parish	LA	44937
 23001	Androscoggin County	ME	116487
+23011	Kennebec County	ME	129067
 23019	Penobscot County	ME	157967
 23031	York County	ME	222434
 24001	Allegany County	MD	66848
@@ -446,6 +453,7 @@ code	name	region	population
 30013	Cascade County	MT	85029
 30017	Custer County	MT	12034
 30031	Gallatin County	MT	128740
+30049	Lewis and Clark County	MT	75331
 30057	Madison County	MT	10026
 30063	Missoula County	MT	123513
 30081	Ravalli County	MT	48582
@@ -564,6 +572,7 @@ code	name	region	population
 37191	Wayne County	NC	122278
 37195	Wilson County	NC	81150
 38009	Bottineau County	ND	6284
+38015	Burleigh County	ND	103251
 38017	Cass County	ND	201794
 38035	Grand Forks County	ND	74501
 38101	Ward County	ND	68233
@@ -644,6 +653,7 @@ code	name	region	population
 42021	Cambria County	PA	128968
 42035	Clinton County	PA	37870
 42037	Columbia County	PA	66193
+42043	Dauphin County	PA	293351
 42045	Delaware County	PA	580937
 42049	Erie County	PA	265832
 42055	Franklin County	PA	160652
@@ -684,6 +694,7 @@ code	name	region	population
 45079	Richland County	SC	434956
 45083	Spartanburg County	SC	380857
 46005	Beadle County	SD	19624
+46065	Hughes County	SD	17570
 46081	Lawrence County	SD	29459
 46099	Minnehaha County	SD	212691
 46103	Pennington County	SD	116792
@@ -735,7 +746,9 @@ code	name	region	population
 48139	Ellis County	TX	240867
 48141	El Paso County	TX	877858
 48149	Fayette County	TX	25459
+48157	Fort Bend County	TX	975191
 48165	Gaines County	TX	23956
+48167	Galveston County	TX	372207
 48171	Gillespie County	TX	28527
 48177	Gonzales County	TX	20159
 48181	Grayson County	TX	153613
@@ -801,6 +814,7 @@ code	name	region	population
 51195	Wise County	VA	34824
 51510	Alexandria city	VA	160662
 51540	Charlottesville city	VA	44388
+51550	Chesapeake city	VA	255332
 51600	Fairfax city	VA	26772
 51610	Falls Church city	VA	15159
 51650	Hampton city	VA	137315
@@ -831,6 +845,7 @@ code	name	region	population
 53073	Whatcom County	WA	236392
 53077	Yakima County	WA	259185
 54011	Cabell County	WV	91183
+54039	Kanawha County	WV	172381
 54045	Logan County	WV	30375
 54047	McDowell County	WV	16878
 54059	Mingo County	WV	21455

data/geo/US/postal-code.tsv

@@ -180,6 +180,7 @@ code	locality	addresses
 04073	2365725	2019
 04083	2365725	628
 04210	2302060	2750
+04330	2302100	3558
 04401	2302795	4278
 04444	2302795	860
 05401	5010675	1401
@@ -187,6 +188,7 @@ code	locality	addresses
 05405	5010675	27
 05408	5010675	616
 05482	5066175	1128
+05602	5046000	1944
 05641	5003175	2272
 06010	0908420	4399
 06032	0950370	1586
@@ -224,6 +226,12 @@ code	locality	addresses
 06608	0908000	738
 06610	0908000	983
 06611	0908000	3709
+06702	0980000	235
+06704	0980000	1567
+06705	0980000	1447
+06706	0980000	956
+06708	0980000	2139
+06710	0980000	508
 06762	0949880	952
 06770	0949880	2203
 06804	0918430	1479
@@ -272,7 +280,11 @@ code	locality	addresses
 07110	3413690	1782
 07112	3451000	858
 07114	3451000	683
+07201	3421000	780
+07202	3421000	941
 07203	3464620	1250
+07206	3421000	630
+07208	3421000	822
 07302	3436000	776
 07304	3436000	874
 07305	3436000	1480
@@ -426,7 +438,18 @@ code	locality	addresses
 12047	3616749	1910
 12051	3618718	415
 12095	3638781	1382
+12159	3601000	812
 12192	3618718	296
+12202	3601000	568
+12203	3601000	1884
+12206	3601000	598
+12207	3601000	272
+12208	3601000	1085
+12209	3601000	514
+12210	3601000	363
+12211	3601000	1050
+12222	3601000	2
+12226	3601000	3
 12303	3665508	2331
 12304	3665508	1517
 12305	3665508	361
@@ -588,6 +611,12 @@ code	locality	addresses
 16652	4236368	2744
 17044	4243000	3186
 17046	4242168	2861
+17101	4232800	373
+17102	4232800	959
+17103	4232800	1579
+17104	4232800	2338
+17110	4232800	2574
+17120	4232800	32
 17236	4248704	1574
 17522	4223832	2870
 17543	4243816	4010
@@ -688,13 +717,6 @@ code	locality	addresses
 19713	1050670	1967
 19716	1050670	61
 19717	1050670	17
-19801	1077580	1548
-19802	1077580	2103
-19803	1077580	2020
-19805	1077580	2806
-19806	1077580	792
-19807	1077580	983
-19809	1077580	1429
 19901	1021200	3105
 19902	1021200	15
 19904	1021200	3143
@@ -851,6 +873,12 @@ code	locality	addresses
 23235	5167000	886
 23284	5167000	23
 23298	5167000	27
+23320	5116000	4157
+23321	5116000	2966
+23322	5116000	5978
+23323	5116000	3428
+23324	5116000	2003
+23325	5116000	1263
 23430	5173200	2850
 23432	5176432	277
 23433	5176432	169
@@ -870,7 +898,7 @@ code	locality	addresses
 23460	5182000	6
 23461	5182000	6
 23462	5182000	3796
-23464	5182000	4906
+23464	5182000	4910
 23502	5157000	1864
 23503	5157000	1970
 23504	5157000	1862
@@ -883,7 +911,7 @@ code	locality	addresses
 23513	5157000	2168
 23517	5157000	602
 23518	5157000	2466
-23523	5157000	863
+23523	5157000	880
 23551	5157000	3
 23601	5156000	1825
 23602	5156000	2741
@@ -904,8 +932,8 @@ code	locality	addresses
 23669	5135000	3280
 23681	5135000	31
 23701	5164000	2085
-23702	5164000	978
+23702	5164000	985
-23703	5164000	2099
+23703	5164000	2100
 23704	5164000	2149
 23707	5164000	1659
 23708	5164000	2
@@ -925,12 +953,21 @@ code	locality	addresses
 24515	5147672	2
 24551	5147672	13
 24817	5409700	15
+25301	5414600	623
+25302	5414600	2309
+25304	5414600	1373
+25305	5414600	12
+25306	5414600	883
+25311	5414600	1306
+25312	5414600	1863
+25314	5414600	1671
+25387	5414600	844
 25617	5450932	168
 25628	5450932	90
 25632	5450932	151
 25635	5450932	226
 25661	5487508	826
-25701	5439460	2525
+25701	5439460	2526
 25702	5439460	1020
 25703	5439460	568
 25704	5439460	747
@@ -1033,6 +1070,8 @@ code	locality	addresses
 27889	3771220	4046
 27893	3774540	4922
 27896	3774540	2103
+28025	3714100	6523
+28027	3714100	6321
 28052	3725580	4759
 28054	3725580	3819
 28056	3725580	4442
@@ -1216,6 +1255,7 @@ code	locality	addresses
 30126	1371492	3670
 30144	1343192	3752
 30152	1343192	3456
+30213	1372122	3541
 30223	1335324	4273
 30224	1335324	2405
 30248	1347140	2773
@@ -1224,9 +1264,11 @@ code	locality	addresses
 30263	1355020	5855
 30265	1355020	3029
 30269	1359724	3249
+30272	1372122	9
 30274	1365464	2089
 30281	1373704	5678
 30291	1378324	1354
+30296	1372122	2053
 30303	1304000	421
 30305	1304000	1239
 30306	1304000	1266
@@ -1249,13 +1291,16 @@ code	locality	addresses
 30327	1304000	2022
 30328	1368516	2167
 30329	1310944	1148
+30331	1372122	3885
 30332	1304000	41
 30334	1304000	16
+30336	1372122	415
 30338	1324768	2528
 30339	1368516	1619
 30342	1368516	1638
 30344	1325720	2947
 30346	1324768	283
+30349	1372122	5458
 30350	1368516	2101
 30354	1304000	1286
 30360	1324768	1010
@@ -1269,9 +1314,17 @@ code	locality	addresses
 30507	1331908	2131
 30511	1304980	163
 30517	1310076	1554
+30601	1303440	1920
+30602	1303440	84
+30605	1303440	2611
+30606	1303440	3359
+30607	1303440	1283
+30609	1303440	8
+30622	1303440	375
 30655	1352192	2772
 30656	1352192	1685
 30678	1382692	273
+30683	1303440	573
 30805	1304204	277
 30812	1304204	2
 30813	1335716	3127
@@ -1505,10 +1558,14 @@ code	locality	addresses
 33040	1236550	2764
 33055	1245060	2569
 33056	1245060	2443
+33060	1258050	2464
+33062	1258050	1355
 33063	1243125	3103
+33064	1258050	4219
 33065	1214400	2692
 33067	1255125	1872
 33068	1249425	2490
+33069	1258050	1298
 33071	1214400	2430
 33076	1255125	2461
 33101	1245000	3
@@ -1586,6 +1643,10 @@ code	locality	addresses
 33418	1254075	3248
 33426	1207875	1560
 33430	1205200	1606
+33431	1207300	1463
+33432	1207300	1496
+33433	1207300	2101
+33434	1207300	1969
 33435	1207875	2806
 33436	1207875	3255
 33449	1275812	629
@@ -1594,6 +1655,9 @@ code	locality	addresses
 33461	1254450	2238
 33477	1235875	850
 33478	1235875	1704
+33486	1207300	1740
+33487	1207300	1047
+33496	1207300	1641
 33540	1279225	1356
 33541	1279225	2758
 33542	1279225	3269
@@ -1666,9 +1730,6 @@ code	locality	addresses
 33853	1238950	1744
 33859	1238950	1464
 33877	1238950	72
-33880	1278275	3587
-33881	1278275	4221
-33884	1278275	3084
 33898	1238950	2940
 33901	1224125	2283
 33903	1210275	2812
@@ -1755,17 +1816,37 @@ code	locality	addresses
 35046	0115136	1606
 35055	0118976	3807
 35058	0118976	2348
+35061	0107000	339
 35096	0143120	2002
 35114	0100820	792
 35116	0151456	796
 35117	0109736	726
 35120	0156400	2308
+35130	0107000	875
 35173	0176944	3790
+35203	0107000	1063
+35204	0107000	2461
+35205	0107000	1884
+35206	0107000	2662
+35207	0107000	2084
+35208	0107000	2233
+35211	0107000	3430
+35212	0107000	1976
+35214	0107000	3364
+35215	0107000	4699
 35216	0178552	2992
+35218	0107000	1782
+35221	0107000	1196
+35222	0107000	1516
+35224	0107000	1904
 35226	0135896	3341
+35233	0107000	687
+35234	0107000	1539
+35235	0107000	1889
 35242	0135896	4989
 35243	0178552	2153
 35244	0135896	2790
+35254	0107000	5
 35401	0177256	4424
 35404	0177256	2705
 35405	0177256	3819
@@ -2125,6 +2206,7 @@ code	locality	addresses
 40517	2146027	1743
 40526	2146027	4
 40536	2146027	2
+40601	2128900	5991
 41042	2127982	3191
 41051	2139142	2326
 41074	2120350	504
@@ -2374,6 +2456,8 @@ code	locality	addresses
 46032	1810342	4762
 46033	1810342	3632
 46036	1821070	2483
+46037	1823278	3796
+46038	1823278	3846
 46041	1825324	4076
 46060	1854180	4859
 46062	1854180	3717
@@ -2928,6 +3012,7 @@ code	locality	addresses
 57110	4659020	2198
 57197	4659020	4
 57350	4631060	4726
+57501	4649600	3290
 57701	4652980	4590
 57702	4652980	4708
 57703	4652980	2095
@@ -2941,17 +3026,28 @@ code	locality	addresses
 58201	3832060	3516
 58202	3832060	40
 58203	3832060	2062
+58501	3807200	4376
+58503	3807200	4389
+58504	3807200	3782
+58505	3807200	3
 58701	3853380	4347
 58703	3853380	2802
 58707	3853380	7
 58793	3885020	350
 58801	3886220	4901
 59044	3042700	2175
+59101	3006550	5896
+59102	3006550	5128
+59105	3006550	3455
+59106	3006550	3348
 59301	3049525	2767
 59401	3032800	1591
 59404	3032800	3570
 59405	3032800	4072
 59414	3032800	227
+59601	3035600	4590
+59602	3035600	6176
+59625	3035600	6
 59715	3008950	5630
 59718	3008950	5333
 59729	3024475	1046
@@ -3229,6 +3325,13 @@ code	locality	addresses
 63703	2911242	1381
 63853	2932590	39
 63857	2938306	2852
+64016	2935000	673
+64050	2935000	2345
+64052	2935000	2244
+64053	2935000	659
+64055	2935000	3442
+64056	2935000	1536
+64057	2935000	1445
 64063	2941348	2145
 64064	2941348	1939
 64075	2953624	1797
@@ -3243,8 +3346,8 @@ code	locality	addresses
 64108	2938000	1676
 64109	2938000	1054
 64110	2938000	1401
-64111	2938000	1369
+64111	2938000	1388
-64112	2938000	687
+64112	2938000	688
 64113	2938000	1225
 64114	2938000	2504
 64116	2938000	13
@@ -3299,7 +3402,7 @@ code	locality	addresses
 65809	2970000	1839
 65810	2970000	2235
 65897	2970000	2
-66007	2004400	1315
+66007	2004400	1336
 66013	2053775	1017
 66027	2039000	294
 66040	2041465	2280
@@ -3307,13 +3410,25 @@ code	locality	addresses
 66045	2038900	87
 66046	2038900	1697
 66047	2038900	1683
-66048	2039000	4861
+66048	2039000	4865
 66049	2038900	2845
 66061	2052575	5920
 66062	2052575	5837
 66064	2053225	1588
 66085	2053775	1371
-66203	2064500	2041
+66101	2036000	1462
+66102	2036000	2945
+66103	2036000	1525
+66104	2036000	3095
+66105	2036000	611
+66106	2036000	2763
+66109	2036000	2772
+66111	2036000	1484
+66112	2036000	1151
+66115	2036000	171
+66118	2036000	97
+66160	2036000	2
+66203	2064500	2070
 66204	2053775	1643
 66207	2053775	1273
 66210	2053775	1432
@@ -3321,8 +3436,8 @@ code	locality	addresses
 66213	2053775	2357
 66214	2053775	973
 66215	2039350	2163
-66216	2064500	2336
+66216	2064500	2340
-66217	2064500	527
+66217	2064500	542
 66218	2064500	825
 66219	2039350	975
 66220	2039350	693
@@ -3459,6 +3574,26 @@ code	locality	addresses
 68901	3121415	5285
 68942	3120365	170
 69101	3135000	7282
+70112	2255000	612
+70113	2255000	851
+70114	2255000	2281
+70115	2255000	3241
+70116	2255000	1124
+70117	2255000	4109
+70118	2255000	3023
+70119	2255000	3166
+70122	2255000	3298
+70124	2255000	1880
+70125	2255000	2004
+70126	2255000	2519
+70127	2255000	1373
+70128	2255000	1084
+70129	2255000	733
+70130	2255000	1607
+70131	2255000	1591
+70139	2255000	1
+70148	2255000	1
+70163	2255000	1
 70301	2275425	3830
 70310	2275425	3
 70401	2232755	2547
@@ -3469,6 +3604,11 @@ code	locality	addresses
 70458	2270805	3451
 70460	2270805	2902
 70461	2270805	2689
+70501	2240735	3887
+70503	2240735	2473
+70506	2240735	3597
+70507	2240735	1562
+70508	2240735	3609
 70520	2212665	1778
 70570	2258045	5624
 70601	2241155	4502
@@ -3482,6 +3622,24 @@ code	locality	addresses
 70755	2244690	260
 70756	2244690	82
 70791	2283405	2565
+70801	2205000	68
+70802	2205000	3764
+70803	2205000	5
+70805	2205000	2764
+70806	2205000	2398
+70807	2205000	1814
+70808	2205000	2530
+70809	2205000	1875
+70810	2205000	2921
+70811	2205000	1128
+70812	2205000	752
+70813	2205000	4
+70814	2205000	1066
+70815	2205000	2193
+70816	2205000	2383
+70819	2205000	353
+70820	2205000	716
+70836	2205000	16
 71047	2270000	1272
 71101	2270000	1639
 71103	2270000	1287
@@ -3557,12 +3715,16 @@ code	locality	addresses
 72846	0538290	1419
 72855	0553480	1727
 72940	0533940	718
+73003	4023200	2064
+73007	4023200	677
 73012	4055000	3170
 73013	4055000	5181
 73014	4023700	502
 73019	4052500	25
 73022	4023700	5
+73025	4023200	1069
 73026	4052500	3672
+73034	4023200	4496
 73036	4023700	3485
 73045	4032750	1633
 73049	4055000	1430
@@ -3682,6 +3844,10 @@ code	locality	addresses
 75023	4858016	2680
 75024	4858016	2099
 75025	4858016	2687
+75033	4827684	2706
+75034	4827684	2652
+75035	4827684	4778
+75036	4827684	2219
 75038	4837000	860
 75039	4837000	502
 75040	4829000	4037
@@ -3937,7 +4103,7 @@ code	locality	addresses
 77028	4835000	1912
 77029	4835000	1811
 77030	4835000	651
-77031	4835000	752
+77031	4835000	756
 77032	4835000	1159
 77033	4835000	1743
 77034	4835000	1835
@@ -3958,7 +4124,7 @@ code	locality	addresses
 77049	4835000	2040
 77050	4835000	369
 77051	4835000	1425
-77053	4835000	598
+77053	4835000	1473
 77054	4835000	611
 77055	4835000	2369
 77056	4835000	1070
@@ -3987,10 +4153,10 @@ code	locality	addresses
 77079	4835000	1833
 77080	4835000	2018
 77081	4835000	820
-77082	4835000	2161
+77082	4835000	2167
-77083	4835000	1679
+77083	4835000	3101
-77084	4835000	4835
+77084	4835000	4836
-77085	4835000	810
+77085	4835000	865
 77086	4835000	1162
 77087	4835000	2159
 77088	4835000	3238
@@ -4003,7 +4169,7 @@ code	locality	addresses
 77095	4835000	3772
 77096	4835000	1964
 77098	4835000	868
-77099	4835000	1775
+77099	4835000	1844
 77204	4835000	41
 77301	4816432	3046
 77302	4816432	2204
@@ -4032,19 +4198,23 @@ code	locality	addresses
 77388	4835000	2918
 77389	4835000	2555
 77396	4835000	2984
+77407	4835000	3712
 77429	4835000	6023
 77433	4835000	6618
 77434	4821844	876
 77447	4835000	1730
-77449	4835000	5741
+77449	4835000	5742
-77450	4835000	2557
+77450	4835000	4024
+77478	4870808	1869
+77479	4870808	6077
+77498	4870808	2747
 77502	4856000	1952
 77503	4856000	1322
 77504	4856000	1006
 77505	4856000	1402
 77506	4856000	1948
 77507	4856000	93
-77511	4802272	5123
+77511	4802272	5504
 77515	4803264	3834
 77520	4806128	3582
 77521	4806128	3329
@@ -4055,8 +4225,9 @@ code	locality	addresses
 77541	4827420	2851
 77562	4806128	1084
 77571	4841440	3270
-77581	4856348	3745
+77573	4841980	5573
-77584	4856348	5202
+77581	4856348	3748
+77584	4856348	5579
 77587	4869020	1743
 77630	4854132	4664
 77632	4854132	2719
@@ -4074,6 +4245,9 @@ code	locality	addresses
 77803	4810912	3773
 77807	4810912	1592
 77808	4810912	2384
+77840	4815976	1859
+77843	4815976	2
+77845	4815976	5862
 77979	4858916	2437
 78023	4865000	2416
 78039	4840108	314
@@ -4369,6 +4543,8 @@ code	locality	addresses
 80210	0820000	2809
 80211	0820000	2701
 80212	0820000	1797
+80214	0843000	2030
+80215	0843000	2020
 80216	0820000	2002
 80218	0820000	838
 80219	0820000	3651
@@ -4377,17 +4553,25 @@ code	locality	addresses
 80222	0820000	1521
 80223	0820000	1831
 80224	0820000	1226
+80226	0843000	2577
+80227	0843000	2213
+80228	0843000	2469
+80229	0877290	3171
 80230	0820000	562
 80231	0820000	1355
+80232	0843000	1830
+80233	0877290	2872
 80234	0883835	1607
 80235	0820000	441
 80236	0820000	974
 80237	0820000	973
 80238	0820000	1597
 80239	0820000	2090
+80241	0877290	2071
 80246	0820000	707
 80247	0820000	776
 80249	0820000	2507
+80260	0877290	1448
 80264	0820000	1
 80266	0820000	4
 80290	0820000	1
@@ -4402,6 +4586,7 @@ code	locality	addresses
 80401	0830835	4851
 80403	0803455	3067
 80459	0841560	631
+80465	0843000	2202
 80487	0873825	3585
 80501	0845970	3526
 80503	0845970	3711
@@ -4414,10 +4599,11 @@ code	locality	addresses
 80534	0839855	1847
 80537	0846465	6166
 80538	0846465	6046
+80602	0877290	3683
 80631	0832155	4591
 80634	0832155	5234
 80651	0860160	1013
-80817	0827865	2451
+80817	0827865	2508
 80831	0816000	3857
 80903	0816000	1730
 80904	0816000	2633
@@ -4448,8 +4634,15 @@ code	locality	addresses
 80938	0816000	47
 80939	0816000	38
 80951	0816000	260
+81001	0862000	3329
+81003	0862000	2842
+81004	0862000	3827
+81005	0862000	2778
+81006	0862000	2058
+81007	0862000	5481
+81008	0862000	1254
 81050	0842110	2967
-81054	0843660	1252
+81054	0843660	1253
 81144	0851635	2041
 81212	0811810	5050
 81230	0833640	2773
@@ -4678,8 +4871,10 @@ code	locality	addresses
 85309	0427820	308
 85310	0455000	2188
 85322	0427050	279
+85323	0404720	2725
 85324	0454050	619
 85326	0407940	8179
+85329	0404720	153
 85335	0422220	1952
 85337	0427050	648
 85338	0428380	5294
@@ -4705,6 +4900,7 @@ code	locality	addresses
 85383	0454050	6008
 85387	0471510	2835
 85388	0471510	2008
+85392	0404720	2271
 85395	0428380	2956
 85396	0407940	3912
 85611	0466820	97
@@ -5097,6 +5293,8 @@ code	locality	addresses
 91701	0659451	3074
 91702	0603386	2943
 91730	0659451	3840
+91731	0622230	1138
+91732	0622230	1624
 91737	0659451	2158
 91739	0659451	2844
 91744	0640340	3163
@@ -5230,12 +5428,16 @@ code	locality	addresses
 92350	0642370	20
 92354	0642370	1594
 92358	0659451	267
+92368	0682590	368
 92371	0600296	7061
 92373	0659962	3040
 92374	0659962	3191
 92376	0660466	4254
 92377	0660466	1592
 92385	0665000	101
+92392	0682590	6049
+92394	0682590	3270
+92395	0682590	3276
 92399	0687042	4217
 92401	0665000	233
 92404	0665000	3365
@@ -5432,6 +5634,10 @@ code	locality	addresses
 93737	0627000	663
 93740	0627000	7
 93741	0627000	5
+93901	0664224	1885
+93905	0664224	1825
+93906	0664224	2322
+93907	0664224	1690
 93908	0645778	1269
 93933	0645778	1379
 93950	0654848	1839
@@ -5610,6 +5816,18 @@ code	locality	addresses
 95138	0668000	1088
 95139	0668000	417
 95148	0668000	2244
+95202	0675000	688
+95203	0675000	1691
+95204	0675000	2610
+95205	0675000	3018
+95206	0675000	4310
+95207	0675000	2401
+95209	0675000	2428
+95210	0675000	1716
+95211	0675000	16
+95212	0675000	1713
+95215	0675000	1625
+95219	0675000	1376
 95221	0602112	51
 95222	0602112	1003
 95231	0640704	393
@@ -5730,7 +5948,10 @@ code	locality	addresses
 97062	4174950	2401
 97068	4180150	3386
 97070	4182800	2011
+97078	4134100	1911
 97080	4131250	4249
+97123	4134100	4128
+97124	4134100	4135
 97128	4145000	4645
 97201	4159000	1427
 97202	4159000	4333
@@ -5861,6 +6082,11 @@ code	locality	addresses
 98195	5363000	30
 98198	5317635	3118
 98199	5363000	1981
+98201	5322640	2970
+98203	5322640	2695
+98204	5322640	1426
+98207	5322640	2
+98208	5322640	3923
 98248	5323620	2747
 98258	5337900	4537
 98264	5340805	2233
@@ -5868,6 +6094,7 @@ code	locality	addresses
 98271	5343955	3149
 98275	5347735	1893
 98290	5365170	4320
+98296	5322640	2807
 98371	5356695	2848
 98373	5356695	2210
 98374	5356695	3672
@@ -5960,3 +6187,5 @@ code	locality	addresses
 99577	0203000	2477
 99587	0203000	391
 99723	0281920	304
+99801	0236400	2467
+99824	0236400	173