Map pushpin callout: kind label + preset/name two-line layout

[tordans]

Problem

As a mapper selecting a feature on the map, I need the pushpin callout to answer two questions at a glance: what is it? and what is it called? Today those answers are inconsistent:

1. Preset vs name on one line — The callout sometimes shows name=* and sometimes the preset / feature type, depending on context, so quick scanning is unreliable.
2. Generic wildcard presets — For tags like playground=excavator (preset playground=*), the callout shows the broad generic label (e.g. “Playground Equipment” / “Spielplatzgerät”) instead of the specific localized kind from preset field strings (e.g. “Spielbagger”).

How both cases are solved together

Both changes target the map pushpin callout but address different labeling gaps. They share one primary-label pipeline and compose cleanly.

Pushpin callout (map selection balloon)

MapView.refreshPushpinText() → OsmBaseObject.pushpinCalloutLines() → PushPinView.setCallout(primary:secondary:)

Line	Content	Precedence
1 — type	What the object is	① PresetFeature.localizedKindLabel(for:) (wildcard presets) → ② matched preset friendlyName() → ③ existing friendlyDescription fallbacks (restrictions, key=value, “(node)”, …). Never givenName() on line 1.
2 — name (optional)	What it’s called	givenName() (name, name:xx, ref on highways, …) only if non-empty and not redundant with line 1 (trim + case-insensitive compare). Smaller subheadline font.

New objects (selectedPrimary == nil) keep a single localized “(new object)” line.

Concrete examples (pushpin callout)

Labels below are English UI unless noted. Line 2 is omitted when empty.

Tags	Matched preset	Line 1 (type)	Line 2 (name)
shop=convenience	shop/convenience	Convenience Store	—
shop=convenience + name=Joe's Mart	shop/convenience	Convenience Store	Joe's Mart
playground=excavator	playground (playground=*)	Excavator (kind label from field strings; not “Playground Equipment”)	—
playground=excavator + name=North Playground	playground	Excavator	North Playground
playground=excavator (German UI)	playground	Spielbagger (not “Spielplatzgerät”)	—
playground=excavator + name=Kinderplatz Nord (German UI)	playground	Spielbagger	Kinderplatz Nord
name=Only Name (no preset match)	—	(node) (geometry fallback)	Only Name
shop=convenience + name=Convenience Store	shop/convenience	Convenience Store	— (redundant with line 1)
highway=primary + ref=A 5 (way)	highway/primary	Primary Road	A 5 (ref via givenName())
(no selection, new object)	—	(new object)	—

Same tags elsewhere (not pushpin): friendlyDescription() still returns a single string and prefers name first. Example: shop=convenience + name=Joe's Mart → Joe's Mart (not two lines). Voice announcements and multi-select lists keep this behavior.

POI editor Type row matches pushpin line 1 for the examples above (e.g. “Excavator” / “Spielbagger”, not “Playground Equipment”).

Other UI (unchanged intent)

friendlyDescription() (voice, multi-select, relation lists, etc.) still prefers givenName() first, then uses the same primary pipeline (kind label → preset name → fallbacks). Pushpin is the only surface that splits type and name onto two lines.

Implementation notes (by Cursor)

• PresetFeature.localizedKindLabel(for:) — walks preset fields; for wildcard tags (*), returns localizedOptions[tagValue].title from id-tagging-schema strings.
• OsmBaseObject.pushpinCalloutLines() — (primary, secondary?); pushpinCalloutPrimary(withDetails:) shared with friendlyDescription() after the name-first branch.
• PushPinView — two CATextLayers (headline + subheadline), 300pt max width, wrapping/truncation; balloon height grows for line 2.
• PresetDisplayForFeature — Type row uses kind label when available.
• Tests: PresetKindLabelTestCase, OsmBaseObject_PushpinCalloutTestCase (includes playground=excavator + name precedence).

Supersedes PR #18 (cursor/preset-kind-label-4108), merged into this branch.

Testing notes (by @tordans)

Manual — two-line layout

1. shop=convenience + name=Foo → line 1 “Convenience Store”, line 2 “Foo” (smaller).
2. Only name → line 1 “(node)” (or other fallback); line 2 name when distinct.
3. Long strings → truncation; crosshair opacity in PushPinView still sane.
4. POI tag edits → map callout updates via refreshPushpinText().

Manual — kind label

5. playground=excavator, German UI → line 1 “Spielbagger”, not “Spielplatzgerät”.
6. Same + name=… → line 1 “Spielbagger”, line 2 name.
7. Tag value without strings option → generic preset name on line 1.
8. POI Type row matches pushpin line 1 for wildcard presets.

Automated

• GoMapTests: PresetKindLabelTestCase, OsmBaseObject_PushpinCalloutTestCase.

  

[bryceco]

This looks pretty interesting. I tried testing it and the label is broken, but I think it has potential.

[tordans]

This looks pretty interesting. …, but I think it has potential.

Glad to hear it. Will polish and test this some more soon.

…I tried testing it and the label is broken…

Just to be clear: All the PRs I have on tordans are not tested yet; I expect them all to be broken until the second or third testing round. I am looking for a workflow where I can describe the plan and get to a running prototype rather smoothly… – unfortunately Cursor cannot run iOS apps, so it is basically working blind…