Sync upstream: derive LocationType from the primary Google type for keyword searches

[timwangmusic]

Brings timwangmusic/Vacation-Planner#452 down into this fork. upstream/master was exactly two commits ahead of main — that PR's change and its merge commit — so this closes the whole gap.

What it fixes

Keyword (brand) searches query Google with LocationTypeAny, so parsePlacesSearchResponse stamped every result with an empty LocationType. The write path is a blind upsert into the shared placeDetails:{id} records that category reads hydrate from, so each brand search wiped the type off previously typed records. A McDonald's cached by an Eatery search was then served with no type, and OfferBee's best-card scoring gave it the base rate instead of dining.

The fix derives LocationType from POI.PrimaryLocationType(place.Types) when the searched type is LocationTypeAny, reusing the machinery ReclassifyForCategory already applies on category reads. Typed searches keep their searched-type stamp.

Touches iowrappers/nearby_search.go and iowrappers/nearby_search_test.go only — 83 insertions, no deletions.

Why a merge rather than a cherry-pick

This preserves upstream's SHAs. Cherry-picking would give the same change a new SHA here, and every later origin/main..upstream/master comparison would keep reporting b28a678 as missing.

No conflicts: this fork's commits ahead of upstream are the Apple Maps SDK (#1) and the CI workflow change (#2), which touch applemaps/, .github/workflows/, and docs — no overlap with the merged files.

Verification

go build ./... && go vet ./... && go test ./... clean, including the 72 lines of new tests the upstream commit brings.

🤖 Generated with Claude Code

https://claude.ai/code/session_015WGSuRPA8YK814rwbCpStj

Summary by CodeRabbit

• Bug Fixes
  • Improved place classification for brand and keyword searches by assigning more accurate location types.
  • Preserved saved location types when current search results do not provide one.
  • Prevented cached data from replacing a newer, more specific location type.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: 481bf076-17ae-43d7-9100-90213e5c35e1

📥 Commits

Reviewing files that changed from the base of the PR and between 7c5528e and 7cc6330.

📒 Files selected for processing (2)

• iowrappers/nearby_search.go
• iowrappers/nearby_search_test.go

---

📝 Walkthrough

Walkthrough

Search results now derive meaningful location types for brand searches. Cached location types restore only missing values. Tests cover derivation, typed searches, untyped results, and preservation of fresh types.

Changes

Location type handling

Layer / File(s)	Summary
Search result type derivation iowrappers/nearby_search.go, iowrappers/nearby_search_test.go	Brand searches assign each place’s primary Google location type. Typed searches retain the searched type. Untyped results remain LocationTypeAny.
Cached location type restoration iowrappers/nearby_search.go, iowrappers/nearby_search_test.go	Cached location types fill results with LocationTypeAny and do not overwrite fresh location types.

Estimated code review effort: 2 (Simple) | ~10 minutes

Suggested reviewers: tim-eternos

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly and concisely describes the main change: deriving LocationType from the primary Google type for keyword searches.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches

📝 Generate docstrings

• Create stacked PR
• Commit on current branch

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch sync/upstream-452

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}