Skip to content

Commit 7b7e262

Browse files
committed
Add childcare to taxonomy; bump version to 2026-04-23.
1 parent 2fadf9f commit 7b7e262

7 files changed

Lines changed: 40 additions & 14 deletions

File tree

config.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ versions:
33
osm_data: "20260416"
44
model_output: "20260422_by_shared_label"
55
snapshot_osm: "20260417"
6-
snapshot_overture: "20260417"
6+
snapshot_overture: "20260423"
77
snapshot_foursquare: "20260416"
8-
aws: "20260422"
9-
conflation: "20260422"
8+
aws: "20260423"
9+
conflation: "20260423"
1010

1111
# Settings for downloading data
1212
download:
@@ -95,6 +95,7 @@ download:
9595
- [services_and_business, professional_service]
9696
- [services_and_business, real_estate_service]
9797
- [services_and_business, home_service]
98+
- [services_and_business, family_service]
9899
- [community_and_government, social_or_community_service]
99100
- [community_and_government, government_office]
100101
- [community_and_government, civic_organization]
@@ -262,8 +263,8 @@ upload:
262263
s3_bucket: "openpois-public"
263264
s3_prefix_osm: "snapshots/osm"
264265
s3_prefix_conflation: "snapshots/conflated"
265-
latest_url_osm: "https://openpois-public.s3.us-west-2.amazonaws.com/snapshots/osm/20260417/osm_snapshot_partitioned/"
266-
latest_url_conflation: "https://openpois-public.s3.us-west-2.amazonaws.com/snapshots/conflated/20260422/conflated_partitioned/"
266+
latest_url_osm: "https://openpois-public.s3.us-west-2.amazonaws.com/snapshots/osm/20260423/osm_snapshot_partitioned/"
267+
latest_url_conflation: "https://openpois-public.s3.us-west-2.amazonaws.com/snapshots/conflated/20260423/conflated_partitioned/"
267268
geohash_precision_partition: 4 # ~39 km x 20 km cells; ~1,000–3,000 cells over CONUS
268269
geohash_precision_sort: 6 # ~0.6 km x 1.2 km; fine-grained sort within each partition
269270
# PMTiles generation — single-zoom archive at z14 for both OSM and conflated.

scripts/conflation/conflate.py

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def log_rss(label: str) -> None:
171171
# memory after the chunked matcher returns so the matching phase can
172172
# run without the full source GeoDataFrames resident.
173173
OSM_MERGE_COLS = [
174-
"osm_id", "name", "brand",
174+
"osm_id", "osm_type", "name", "brand",
175175
"conf_mean", "conf_lower", "conf_upper", "geometry",
176176
]
177177
OVERTURE_MERGE_COLS = [
@@ -327,7 +327,29 @@ def _load_gdf(
327327
# indices match the match-phase output.
328328
overture_merge_source_path = OVERTURE_PATH
329329
overture_merge_needs_test_bbox = True
330-
if DEDUP_ENABLED:
330+
post_dedup_resume_path = conflation_dir / DEDUP_POST_FILTER_FILE
331+
if DEDUP_ENABLED and post_dedup_resume_path.exists():
332+
print(
333+
f"\nReusing post-dedup Overture from "
334+
f"{post_dedup_resume_path} (skipping dedup pass)."
335+
)
336+
overture_gdf = (
337+
gpd.read_parquet(post_dedup_resume_path)
338+
.reset_index(drop = True)
339+
)
340+
overture_shared_labels, overture_radii = (
341+
assign_overture_shared_label(
342+
overture_gdf, load_overture_crosswalk(), match_radii,
343+
default_radius_m = DEFAULT_RADIUS_M,
344+
)
345+
)
346+
overture_l0_bits = compute_overture_l0_bits(
347+
overture_gdf["taxonomy_l0"].fillna("").to_numpy(),
348+
)
349+
overture_merge_source_path = post_dedup_resume_path
350+
overture_merge_needs_test_bbox = False
351+
log_rss("after Overture post-dedup reload")
352+
elif DEDUP_ENABLED:
331353
dedup_checkpoint_dir = (
332354
conflation_dir / DEDUP_CHECKPOINT_SUBDIR
333355
)

site/public/about.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -450,19 +450,19 @@ <h2>Data Access &amp; Licensing</h2>
450450
<div class="s3-block-header">
451451
<span class="s3-block-title">OSM snapshot</span>
452452
<a class="s3-browse-link"
453-
href="https://openpois-public.s3.us-west-2.amazonaws.com/?list-type=2&prefix=snapshots/osm/20260417/osm_snapshot_partitioned/"
453+
href="https://openpois-public.s3.us-west-2.amazonaws.com/?list-type=2&prefix=snapshots/osm/20260423/osm_snapshot_partitioned/"
454454
target="_blank" rel="noopener noreferrer">Browse files &rarr;</a>
455455
</div>
456-
<code class="s3-path">s3://openpois-public/snapshots/osm/20260417/osm_snapshot_partitioned/</code>
456+
<code class="s3-path">s3://openpois-public/snapshots/osm/20260423/osm_snapshot_partitioned/</code>
457457
</div>
458458
<div class="s3-block">
459459
<div class="s3-block-header">
460460
<span class="s3-block-title">Conflated dataset</span>
461461
<a class="s3-browse-link"
462-
href="https://openpois-public.s3.us-west-2.amazonaws.com/?list-type=2&prefix=snapshots/conflated/20260422/conflated_partitioned/"
462+
href="https://openpois-public.s3.us-west-2.amazonaws.com/?list-type=2&prefix=snapshots/conflated/20260423/conflated_partitioned/"
463463
target="_blank" rel="noopener noreferrer">Browse files &rarr;</a>
464464
</div>
465-
<code class="s3-path">s3://openpois-public/snapshots/conflated/20260422/conflated_partitioned/</code>
465+
<code class="s3-path">s3://openpois-public/snapshots/conflated/20260423/conflated_partitioned/</code>
466466
</div>
467467

468468
<h2>Python API Documentation</h2>

site/src/constants.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import {
99

1010
// S3 URLs — PMTiles archives read via ol-pmtiles.
1111
export const OSM_PMTILES_URL =
12-
'https://openpois-public.s3.us-west-2.amazonaws.com/snapshots/osm/20260417/osm_snapshot.pmtiles'
12+
'https://openpois-public.s3.us-west-2.amazonaws.com/snapshots/osm/20260423/osm_snapshot.pmtiles'
1313

1414
export const CONFLATED_PMTILES_URL =
15-
'https://openpois-public.s3.us-west-2.amazonaws.com/snapshots/conflated/20260422/conflated.pmtiles'
15+
'https://openpois-public.s3.us-west-2.amazonaws.com/snapshots/conflated/20260423/conflated.pmtiles'
1616

1717
// Overture PMTiles (latest release — update URL on each Overture monthly release)
1818
export const OVERTURE_PMTILES_URL =

src/openpois/conflation/data/match_radii.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Car Wash,50
1616
Casino,100
1717
Cell Phone Store,50
1818
Charging Station,50
19+
Childcare,100
1920
Clinic,100
2021
Clothing Store,50
2122
Community Center,100

src/openpois/conflation/data/taxonomy_crosswalk_openstreetmap.csv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ shop,shoes,Shoe Store
3232
shop,sports,Sports Outlet
3333
shop,storage_rental,Specialty Store
3434
shop,supermarket,Supermarket
35+
shop,wholesale,Supermarket
3536
shop,tobacco,Specialty Store
3637
shop,tires,Tire Store
3738
shop,tyres,Tire Store
3839
shop,variety_store,Discount Store
39-
shop,wholesale,Wholesale Store
4040
healthcare,alternative,Alternative Medicine
4141
healthcare,blood_donation,Other Healthcare
4242
healthcare,chiropractor,Other Healthcare
@@ -66,6 +66,7 @@ amenity,car_rental,Car Rental
6666
amenity,car_wash,Car Wash
6767
amenity,casino,Casino
6868
amenity,charging_station,Charging Station
69+
amenity,childcare,Childcare
6970
amenity,cinema,Movie Theater
7071
amenity,clinic,Clinic
7172
amenity,college,University

src/openpois/conflation/data/taxonomy_crosswalk_overture_maps.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ services_and_business,home_service,,Home Service
295295
services_and_business,legal_service,,Legal Service
296296
services_and_business,professional_service,,Other Professional
297297
services_and_business,real_estate_service,,Real Estate
298+
services_and_business,family_service,child_care_and_day_care,Childcare
298299
travel_and_transportation,fueling_station,ev_charging_station,Charging Station
299300
travel_and_transportation,fueling_station,gas_station,Gas Station
300301
travel_and_transportation,fueling_station,,Gas Station

0 commit comments

Comments
 (0)