Skip to content

Pick the marker drawn under the tap, label included, and size the info bubble by the icon's real extent #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wf9a5m75 merged 1 commit into from
Oct 23, 2026
Merged

Pick the marker drawn under the tap, label included, and size the info bubble by the icon's real extent #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/AzureMapsView.web.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
type OverlayCollector,
type MapViewControllerInterface,
mapViewStateInternal,
markerIconExtentPx,
} from '@mapconductor/js-sdk-core';
import { AzureMapsProvider, type AzureMapsConfig } from './AzureMapsProvider';
import type { AzureMapsViewStateInterface } from './AzureMapsViewState';
Expand Down Expand Up @@ -294,12 +295,12 @@ export function AzureMapsMapView({
const screenOffset = holder.toScreenOffset(pos);
if (!screenOffset) return null;
const icon = entry.icon;
const iconPixelSize = icon ? icon.iconSize * icon.scale : 0;
const iconPixelSize = markerIconExtentPx(icon);
return (
<InfoBubbleOverlay
key={entry.id}
positionOffset={screenOffset}
iconSize={{ width: iconPixelSize, height: iconPixelSize }}
iconSize={iconPixelSize}
iconOffset={icon ? icon.anchor : { x: 0.5, y: 0.5 }}
infoAnchorOffset={icon ? icon.infoAnchor : { x: 0.5, y: 0.5 }}
tailOffset={entry.tailOffset}
Expand Down
63 changes: 31 additions & 32 deletions src/marker/AzureMapsMarkerController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import {
type MarkerEntity,
type MarkerState,
type RasterLayerState,
pickMarkerHit,
preferMarkerHit,
} from '@mapconductor/js-sdk-core';
import * as atlas from 'azure-maps-control';
import { AzureMapsMarkerOverlayRenderer } from './AzureMapsMarkerOverlayRenderer';
Expand Down Expand Up @@ -136,40 +138,37 @@ export class AzureMapsMarkerController extends AbstractMarkerController<atlas.Sh
*/
override find(position: GeoPoint): MarkerEntity<atlas.Shape> | null {
const [touch] = this.map.positionsToPixels([[position.longitude, position.latitude]]);
const tol = Settings.Default.tapTolerance;
let onIcon: MarkerEntity<atlas.Shape> | null = null;
let onIconY = -Infinity;
let near: MarkerEntity<atlas.Shape> | null = null;
let nearDistSq = Infinity;
for (const entity of this.markerManager.allEntities()) {
if (entity.marker == null) continue; // tiled markers are hit-tested via findTiled
const [mp] = this.map.positionsToPixels([[
entity.state.position.longitude,
entity.state.position.latitude,
]]);
const icon = entity.state.icon?.toBitmapIcon() ?? createDefaultIcon().toBitmapIcon();
const dx = touch[0] - mp[0];
const dy = touch[1] - mp[1];
const left = -icon.anchor.x * icon.size.width;
const right = (1 - icon.anchor.x) * icon.size.width;
const top = -icon.anchor.y * icon.size.height;
const bottom = (1 - icon.anchor.y) * icon.size.height;
if (dx >= left && dx <= right && dy >= top && dy <= bottom) {
if (mp[1] > onIconY) {
onIconY = mp[1];
onIcon = entity;
}
} else if (dx >= left - tol && dx <= right + tol && dy >= top - tol && dy <= bottom + tol) {
const distSq = dx * dx + dy * dy;
if (distSq < nearDistSq) {
nearDistSq = distSq;
near = entity;
}
}
}
return onIcon ?? near;
// 選び方はコアの pickMarkerHit（android / iOS の MarkerHitTest.pickIndex）と同じ。指の下に
// アイコン（ラベル込み）が描かれているマーカーを、アンカーの近い別のマーカーより優先する。
const regular = pickMarkerHit(
{ x: touch[0], y: touch[1] },
this.markerManager.allEntities().filter(entity => entity.marker != null), // tiled markers below
entity => {
const [mp] = this.map.positionsToPixels([[
entity.state.position.longitude,
entity.state.position.latitude,
]]);
const icon = entity.state.icon?.toBitmapIcon() ?? createDefaultIcon().toBitmapIcon();
return {
anchorScreen: { x: mp[0], y: mp[1] },
width: icon.size.width,
height: icon.size.height,
anchor: icon.anchor,
};
},
Settings.Default.tapTolerance,
);
if (regular?.exact) return regular.item;
// タイル化マーカーも同じ規則で比べる（指の下に描かれていれば、通常マーカーの近接より勝つ）。
const tiledHit = this.tileRenderer?.findHit(position, MARKER_HIT_RADIUS_MOUSE_PX, this.map.getCamera().zoom ?? 0) ?? null;
const tiledEntity = tiledHit ? this.markerManager.getEntity(tiledHit.item.id) : null;
return preferMarkerHit<MarkerEntity<atlas.Shape>>(
regular,
tiledHit && tiledEntity ? { ...tiledHit, item: tiledEntity } : null,
)?.item ?? null;
}


/**
* Synthesizes marker drag from map pointer events: SymbolLayer features have no
* DOM node and no native drag, so press a draggable marker to disable map pan
Expand Down