maplair 4.2.0 → 4.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (179) hide show
  1. package/CHANGELOG.md +106 -8
  2. package/dist/esm/control/AttributionControl.js +10 -10
  3. package/dist/esm/control/AttributionControl.js.map +1 -1
  4. package/dist/esm/control/ButtonControl.js +0 -1
  5. package/dist/esm/control/ButtonControl.js.map +1 -1
  6. package/dist/esm/control/ContextMenu.js +1 -1
  7. package/dist/esm/control/ContextMenu.js.map +1 -1
  8. package/dist/esm/control/Control.js +16 -11
  9. package/dist/esm/control/Control.js.map +1 -1
  10. package/dist/esm/control/FullscreenControl.js +0 -1
  11. package/dist/esm/control/FullscreenControl.js.map +1 -1
  12. package/dist/esm/control/LayersControl.js +13 -9
  13. package/dist/esm/control/LayersControl.js.map +1 -1
  14. package/dist/esm/control/RotateControl.js +0 -1
  15. package/dist/esm/control/RotateControl.js.map +1 -1
  16. package/dist/esm/control/ScaleControl.js +4 -5
  17. package/dist/esm/control/ScaleControl.js.map +1 -1
  18. package/dist/esm/control/SideBySideControl.js +3 -2
  19. package/dist/esm/control/SideBySideControl.js.map +1 -1
  20. package/dist/esm/control/ZoomControl.js +13 -13
  21. package/dist/esm/control/ZoomControl.js.map +1 -1
  22. package/dist/esm/core/Events.js +4 -2
  23. package/dist/esm/core/Events.js.map +1 -1
  24. package/dist/esm/core/Util.js +16 -4
  25. package/dist/esm/core/Util.js.map +1 -1
  26. package/dist/esm/dom/DomEvent.PointerEvents.js +55 -2
  27. package/dist/esm/dom/DomEvent.PointerEvents.js.map +1 -1
  28. package/dist/esm/dom/DomEvent.js +4 -7
  29. package/dist/esm/dom/DomEvent.js.map +1 -1
  30. package/dist/esm/dom/DomUtil.js +5 -5
  31. package/dist/esm/dom/DomUtil.js.map +1 -1
  32. package/dist/esm/dom/Draggable.js +4 -6
  33. package/dist/esm/dom/Draggable.js.map +1 -1
  34. package/dist/esm/geo/LatLng.js +23 -34
  35. package/dist/esm/geo/LatLng.js.map +1 -1
  36. package/dist/esm/geo/LatLngBounds.js +6 -3
  37. package/dist/esm/geo/LatLngBounds.js.map +1 -1
  38. package/dist/esm/geometry/Bounds.js +2 -2
  39. package/dist/esm/geometry/Bounds.js.map +1 -1
  40. package/dist/esm/geometry/Point.js +12 -17
  41. package/dist/esm/geometry/Point.js.map +1 -1
  42. package/dist/esm/geometry/Transformation.js +1 -7
  43. package/dist/esm/geometry/Transformation.js.map +1 -1
  44. package/dist/esm/layer/BlanketOverlay.js +1 -1
  45. package/dist/esm/layer/BlanketOverlay.js.map +1 -1
  46. package/dist/esm/layer/DivOverlay.js +23 -23
  47. package/dist/esm/layer/DivOverlay.js.map +1 -1
  48. package/dist/esm/layer/ImageOverlay.js +7 -4
  49. package/dist/esm/layer/ImageOverlay.js.map +1 -1
  50. package/dist/esm/layer/Layer.js +11 -6
  51. package/dist/esm/layer/Layer.js.map +1 -1
  52. package/dist/esm/layer/Popup.js +30 -11
  53. package/dist/esm/layer/Popup.js.map +1 -1
  54. package/dist/esm/layer/Tooltip.js +18 -35
  55. package/dist/esm/layer/Tooltip.js.map +1 -1
  56. package/dist/esm/layer/VideoOverlay.js +2 -2
  57. package/dist/esm/layer/VideoOverlay.js.map +1 -1
  58. package/dist/esm/layer/marker/DivIcon.js +4 -8
  59. package/dist/esm/layer/marker/DivIcon.js.map +1 -1
  60. package/dist/esm/layer/marker/Icon.js +16 -15
  61. package/dist/esm/layer/marker/Icon.js.map +1 -1
  62. package/dist/esm/layer/marker/Marker.Drag.js +6 -7
  63. package/dist/esm/layer/marker/Marker.Drag.js.map +1 -1
  64. package/dist/esm/layer/marker/Marker.js +49 -48
  65. package/dist/esm/layer/marker/Marker.js.map +1 -1
  66. package/dist/esm/layer/marker/SvgIcon.js +1 -1
  67. package/dist/esm/layer/marker/SvgIcon.js.map +1 -1
  68. package/dist/esm/layer/tile/GridLayer.js +18 -16
  69. package/dist/esm/layer/tile/GridLayer.js.map +1 -1
  70. package/dist/esm/layer/tile/TileLayer.js +9 -9
  71. package/dist/esm/layer/tile/TileLayer.js.map +1 -1
  72. package/dist/esm/layer/vector/Canvas.js +44 -93
  73. package/dist/esm/layer/vector/Canvas.js.map +1 -1
  74. package/dist/esm/layer/vector/Circle.js +8 -7
  75. package/dist/esm/layer/vector/Circle.js.map +1 -1
  76. package/dist/esm/layer/vector/CircleMarker.js +9 -1
  77. package/dist/esm/layer/vector/CircleMarker.js.map +1 -1
  78. package/dist/esm/layer/vector/Path.js +10 -5
  79. package/dist/esm/layer/vector/Path.js.map +1 -1
  80. package/dist/esm/layer/vector/Polygon.js +10 -11
  81. package/dist/esm/layer/vector/Polygon.js.map +1 -1
  82. package/dist/esm/layer/vector/Polyline.js +19 -26
  83. package/dist/esm/layer/vector/Polyline.js.map +1 -1
  84. package/dist/esm/layer/vector/Renderer.getRenderer.js +2 -1
  85. package/dist/esm/layer/vector/Renderer.getRenderer.js.map +1 -1
  86. package/dist/esm/layer/vector/Renderer.js +16 -0
  87. package/dist/esm/layer/vector/Renderer.js.map +1 -1
  88. package/dist/esm/layer/vector/SVG.js +3 -3
  89. package/dist/esm/layer/vector/SVG.js.map +1 -1
  90. package/dist/esm/map/Map.Rotation.js +6 -9
  91. package/dist/esm/map/Map.Rotation.js.map +1 -1
  92. package/dist/esm/map/Map.js +104 -49
  93. package/dist/esm/map/Map.js.map +1 -1
  94. package/dist/esm/map/MapSync.js +1 -4
  95. package/dist/esm/map/MapSync.js.map +1 -1
  96. package/dist/esm/map/handler/BoxZoomHandler.js +2 -0
  97. package/dist/esm/map/handler/BoxZoomHandler.js.map +1 -1
  98. package/dist/esm/map/handler/DisplaceHandler.js +68 -30
  99. package/dist/esm/map/handler/DisplaceHandler.js.map +1 -1
  100. package/dist/esm/map/handler/KeyboardHandler.js +3 -5
  101. package/dist/esm/map/handler/KeyboardHandler.js.map +1 -1
  102. package/dist/esm/map/handler/PinchZoomHandler.js +3 -6
  103. package/dist/esm/map/handler/PinchZoomHandler.js.map +1 -1
  104. package/dist/esm/map/handler/ScrollWheelZoomHandler.js +3 -6
  105. package/dist/esm/map/handler/ScrollWheelZoomHandler.js.map +1 -1
  106. package/dist/esm/map/handler/TapDragZoomHandler.js +1 -4
  107. package/dist/esm/map/handler/TapDragZoomHandler.js.map +1 -1
  108. package/dist/esm/map/handler/TapHoldHandler.js +8 -20
  109. package/dist/esm/map/handler/TapHoldHandler.js.map +1 -1
  110. package/dist/esm/package.js +1 -1
  111. package/dist/maplair-global-src.js +700 -687
  112. package/dist/maplair-global-src.js.map +1 -1
  113. package/dist/maplair-global.js +2 -2
  114. package/dist/maplair-global.js.map +1 -1
  115. package/dist/maplair-src.js +700 -687
  116. package/dist/maplair-src.js.map +1 -1
  117. package/dist/maplair.css +1 -1
  118. package/dist/maplair.js +2 -2
  119. package/dist/maplair.js.map +1 -1
  120. package/i18n/en.json +1 -0
  121. package/package.json +2 -1
  122. package/src/control/AttributionControl.js +9 -9
  123. package/src/control/ButtonControl.js +0 -1
  124. package/src/control/ContextMenu.js +1 -1
  125. package/src/control/Control.js +13 -16
  126. package/src/control/FullscreenControl.js +0 -1
  127. package/src/control/LayersControl.js +14 -10
  128. package/src/control/RotateControl.js +0 -1
  129. package/src/control/ScaleControl.js +4 -5
  130. package/src/control/SideBySideControl.js +4 -2
  131. package/src/control/ZoomControl.js +10 -13
  132. package/src/core/Events.js +8 -2
  133. package/src/core/Util.js +16 -3
  134. package/src/dom/DomEvent.PointerEvents.js +47 -1
  135. package/src/dom/DomEvent.js +5 -17
  136. package/src/dom/DomUtil.js +5 -5
  137. package/src/dom/Draggable.js +5 -6
  138. package/src/geo/LatLng.js +22 -36
  139. package/src/geo/LatLngBounds.js +10 -4
  140. package/src/geometry/Bounds.js +3 -3
  141. package/src/geometry/Point.js +18 -26
  142. package/src/geometry/Transformation.js +1 -8
  143. package/src/layer/BlanketOverlay.js +1 -1
  144. package/src/layer/DivOverlay.js +28 -30
  145. package/src/layer/ImageOverlay.js +9 -7
  146. package/src/layer/Layer.js +18 -6
  147. package/src/layer/Popup.js +38 -17
  148. package/src/layer/Tooltip.js +17 -44
  149. package/src/layer/VideoOverlay.js +2 -2
  150. package/src/layer/marker/DivIcon.js +3 -6
  151. package/src/layer/marker/Icon.js +19 -18
  152. package/src/layer/marker/Marker.Drag.js +16 -18
  153. package/src/layer/marker/Marker.js +66 -59
  154. package/src/layer/marker/SvgIcon.js +1 -1
  155. package/src/layer/tile/GridLayer.js +21 -23
  156. package/src/layer/tile/TileLayer.js +17 -14
  157. package/src/layer/vector/Canvas.js +52 -148
  158. package/src/layer/vector/Circle.js +14 -9
  159. package/src/layer/vector/CircleMarker.js +11 -1
  160. package/src/layer/vector/Path.js +11 -5
  161. package/src/layer/vector/Polygon.js +11 -10
  162. package/src/layer/vector/Polyline.js +20 -21
  163. package/src/layer/vector/Renderer.getRenderer.js +2 -1
  164. package/src/layer/vector/Renderer.js +21 -3
  165. package/src/layer/vector/SVG.js +3 -3
  166. package/src/map/Map.Rotation.js +7 -6
  167. package/src/map/Map.js +135 -54
  168. package/src/map/MapSync.js +1 -1
  169. package/src/map/handler/BoxZoomHandler.js +2 -0
  170. package/src/map/handler/DisplaceHandler.js +53 -7
  171. package/src/map/handler/KeyboardHandler.js +5 -10
  172. package/src/map/handler/PinchZoomHandler.js +3 -3
  173. package/src/map/handler/ScrollWheelZoomHandler.js +3 -3
  174. package/src/map/handler/TapDragZoomHandler.js +1 -1
  175. package/src/map/handler/TapHoldHandler.js +13 -25
  176. package/src/maplair.css +38 -9
  177. package/dist/esm/dom/DomEvent.DoubleTap.js +0 -90
  178. package/dist/esm/dom/DomEvent.DoubleTap.js.map +0 -1
  179. package/src/dom/DomEvent.DoubleTap.js +0 -143
@@ -74,8 +74,8 @@ export class KeyboardHandler extends Handler {
74
74
  const shortcuts = this._map.options.ariaKeyShortcuts;
75
75
  if (shortcuts) {
76
76
  // ARIA names physical keys by their unshifted character, so the default is for a US layout
77
- container.ariaKeyShortcuts = shortcuts === true ?
78
- 'ArrowLeft ArrowRight ArrowUp ArrowDown = Plus -' : shortcuts;
77
+ container.setAttribute('aria-keyshortcuts', shortcuts === true ?
78
+ 'ArrowLeft ArrowRight ArrowUp ArrowDown = Plus -' : shortcuts);
79
79
  }
80
80
 
81
81
  on(container, {
@@ -146,7 +146,8 @@ export class KeyboardHandler extends Handler {
146
146
 
147
147
  // acquire/lose focus #594, #1228, #1540
148
148
  _onPointerDown() {
149
- if (this._focused) { return; }
149
+ // a screen reader's simulated click on a marker has no mousedown to refocus the marker after this
150
+ if (this._focused || this._map._container.contains(document.activeElement)) { return; }
150
151
 
151
152
  // script focus matches :focus-visible by default, which would show a focus ring on every click
152
153
  this._map._container.focus({preventScroll: true, focusVisible: false});
@@ -171,17 +172,11 @@ export class KeyboardHandler extends Handler {
171
172
  const map = this._map,
172
173
  popup = map._popup;
173
174
 
174
- if (e.key !== 'Escape' || e.defaultPrevented || !popup?.options.closeOnEscapeKey ||
175
+ if (e.key !== 'Escape' || e.defaultPrevented || !popup?.isOpen() || !popup.options.closeOnEscapeKey ||
175
176
  map._controlContainer?.contains(e.target)) { return; }
176
177
 
177
- const inPopup = popup._container.contains(e.target),
178
- icon = popup._source?._icon;
179
-
180
178
  map.closePopup();
181
179
  e.preventDefault();
182
-
183
- // closing removes the focused element, which would send focus back to the start of the page
184
- if (inPopup) { (icon?.tabIndex >= 0 ? icon : map._container).focus(); }
185
180
  }
186
181
 
187
182
  _onKeyDown(e) {
@@ -85,8 +85,8 @@ export class PinchZoomHandler extends Handler {
85
85
 
86
86
  map._stop();
87
87
 
88
- DomEvent.on(this._map._container, 'pointermove', this._onPointerMove, this);
89
- DomEvent.on(this._map._container, 'pointerup pointercancel', this._onPointerEnd, this);
88
+ DomEvent.on(map._container, 'pointermove', this._onPointerMove, this);
89
+ DomEvent.on(map._container, 'pointerup pointercancel', this._onPointerEnd, this);
90
90
 
91
91
  e.preventDefault();
92
92
  }
@@ -126,7 +126,7 @@ export class PinchZoomHandler extends Handler {
126
126
 
127
127
  cancelAnimationFrame(this._animRequest);
128
128
 
129
- const moveFn = map._move.bind(map, this._center, this._zoom, {pinch: true, round: false}, undefined);
129
+ const moveFn = map._move.bind(map, this._center, this._zoom, {pinch: true}, undefined);
130
130
  this._animRequest = requestAnimationFrame(moveFn.bind(this));
131
131
 
132
132
  e.preventDefault();
@@ -139,7 +139,7 @@ export class ScrollWheelZoomHandler extends Handler {
139
139
  const pinch = this._pinch,
140
140
  delta = pinch.zoom - pinch.shown;
141
141
  pinch.shown = eased && Math.abs(delta) > 0.01 ? pinch.shown + delta * 0.3 : pinch.zoom;
142
- map._move(this._getPinchCenter(pinch.shown), pinch.shown, {pinch: true, round: false});
142
+ map._move(this._getPinchCenter(pinch.shown), pinch.shown, {pinch: true});
143
143
  if (pinch.shown !== pinch.zoom) {
144
144
  this._pinchFrame = requestAnimationFrame(frame);
145
145
  }
@@ -241,12 +241,12 @@ export class ScrollWheelZoomHandler extends Handler {
241
241
  _performZoom() {
242
242
  const map = this._map,
243
243
  zoom = map.getZoom(),
244
- snap = this._map.options.zoomSnap ?? 0;
244
+ snap = map.options.zoomSnap ?? 0;
245
245
 
246
246
  map._stop(); // stop panning and fly animations if any
247
247
 
248
248
  // map the delta with a sigmoid function to -4..4 range leaning on -1..1
249
- const d2 = this._delta / (this._map.options.wheelPxPerZoomLevel * 4),
249
+ const d2 = this._delta / (map.options.wheelPxPerZoomLevel * 4),
250
250
  d3 = 4 * Math.log(2 / (1 + Math.exp(-Math.abs(d2)))) / Math.LN2,
251
251
  d4 = snap ? Math.ceil(d3 / snap) * snap : d3,
252
252
  // with reduced motion, only zooms by up to one level are animated, so a hard scroll is capped to that
@@ -166,7 +166,7 @@ export class TapDragZoomHandler extends Handler {
166
166
  }
167
167
 
168
168
  cancelAnimationFrame(this._animRequest);
169
- this._animRequest = requestAnimationFrame(() => map._move(this._center, this._zoom, {pinch: true, round: false}));
169
+ this._animRequest = requestAnimationFrame(() => map._move(this._center, this._zoom, {pinch: true}));
170
170
 
171
171
  e.preventDefault();
172
172
  }
@@ -50,60 +50,48 @@ export class TapHoldHandler extends Handler {
50
50
  removeHooks() {
51
51
  DomEvent.off(this._map._container, 'pointerdown', this._onDown, this);
52
52
  this._cancel();
53
- this._cancelClickPrevent();
54
53
  this._stopPreventingNative();
55
54
  }
56
55
 
57
56
  _onDown(e) {
58
57
  clearTimeout(this._holdTimeout);
59
58
  if (PointerEvents.getPointers().length !== 1 || e.pointerType === 'mouse') { return; }
60
- const el = this._map._container;
61
- this._startPos = this._newPos = new Point(e.clientX, e.clientY);
59
+ const el = this._map._container,
60
+ start = new Point(e.clientX, e.clientY);
62
61
 
63
62
  this._holdTimeout = setTimeout((() => {
64
63
  this._cancel();
65
- if (!this._isTapValid()) { return; }
64
+ // the tracker keeps the latest event of each pointer, so this is where the finger is now
65
+ const pointers = PointerEvents.getPointers(),
66
+ p = pointers[0];
67
+ if (pointers.length !== 1 || start.distanceTo([p.clientX, p.clientY]) > this._map.options.tapTolerance) { return; }
66
68
 
67
- // prevent simulated mouse events https://w3c.github.io/touch-events/#mouse-events
68
- DomEvent.on(el, 'pointerup', DomEvent.preventDefault);
69
- DomEvent.on(el, 'pointerup pointercancel', this._cancelClickPrevent, this);
70
69
  this._simulateEvent('contextmenu', e);
71
70
 
72
- // browsers that fire a native contextmenu on touch may do it later than us (e.g. Android with a longer
73
- // touch & hold delay, or Windows on release), so swallow it until the next press
71
+ // releasing the finger still fires a click (iOS skips it only after a longer hold), and browsers that fire a
72
+ // native contextmenu on touch may do it later than us (e.g. Android with a longer touch & hold delay, or
73
+ // Windows on release), so swallow both until the next press or key (which could click a focused control)
74
74
  el.addEventListener('contextmenu', DomEvent.stop, true);
75
+ el.addEventListener('click', DomEvent.stop, true);
75
76
  el.addEventListener('pointerdown', this._stopPreventingNative, true);
77
+ el.addEventListener('keydown', this._stopPreventingNative, true);
76
78
  }), tapHoldDelay);
77
79
 
78
80
  DomEvent.on(el, 'pointerup pointercancel contextmenu', this._cancel, this);
79
- DomEvent.on(el, 'pointermove', this._onMove, this);
80
81
  }
81
82
 
82
- _cancelClickPrevent() {
83
- const el = this._map._container;
84
- DomEvent.off(el, 'pointerup', DomEvent.preventDefault);
85
- DomEvent.off(el, 'pointerup pointercancel', this._cancelClickPrevent, this);
86
- };
87
-
88
83
  _stopPreventingNative = () => {
89
84
  const el = this._map._container;
90
85
  el.removeEventListener('contextmenu', DomEvent.stop, true);
86
+ el.removeEventListener('click', DomEvent.stop, true);
91
87
  el.removeEventListener('pointerdown', this._stopPreventingNative, true);
88
+ el.removeEventListener('keydown', this._stopPreventingNative, true);
92
89
  };
93
90
 
94
91
  _cancel() {
95
92
  clearTimeout(this._holdTimeout);
96
93
  const el = this._map._container;
97
94
  DomEvent.off(el, 'pointerup pointercancel contextmenu', this._cancel, this);
98
- DomEvent.off(el, 'pointermove', this._onMove, this);
99
- }
100
-
101
- _onMove(e) {
102
- this._newPos = new Point(e.clientX, e.clientY);
103
- }
104
-
105
- _isTapValid() {
106
- return this._newPos.distanceTo(this._startPos) <= this._map.options.tapTolerance;
107
95
  }
108
96
 
109
97
  _simulateEvent(type, e) {
package/src/maplair.css CHANGED
@@ -1,9 +1,10 @@
1
1
  :root {
2
2
  /* colors */
3
+ --maplair-color-emphasized: #000000;
3
4
  --maplair-color-base: #333333;
4
5
  --maplair-color-subtle: #757575;
5
6
  --maplair-color-disabled: #aaaaaa;
6
- --maplair-color-progressive: #0078a8;
7
+ --maplair-color-progressive: #006e9d;
7
8
 
8
9
  --maplair-background-color-base: #ffffff;
9
10
  --maplair-background-color-neutral: #dddddd;
@@ -11,7 +12,7 @@
11
12
  --maplair-background-color-interactive-subtle--hover: #f4f4f4;
12
13
  --maplair-background-color-interactive--active: rgba(51, 181, 229, 0.4);
13
14
  --maplair-background-color-disabled-subtle: #f4f4f4;
14
- --maplair-background-color-backdrop-light: rgba(255, 255, 255, 0.8);
15
+ --maplair-background-color-backdrop-light: rgba(255, 255, 255, 0.9);
15
16
 
16
17
  --maplair-border-color-base: #777777;
17
18
  --maplair-border-color-subtle: #cccccc;
@@ -63,7 +64,8 @@
63
64
  .maplair-pane > canvas,
64
65
  .maplair-zoom-box,
65
66
  .maplair-image-layer,
66
- .maplair-layer {
67
+ .maplair-layer,
68
+ .maplair-tooltip {
67
69
  position: absolute;
68
70
  left: 0;
69
71
  top: 0;
@@ -236,6 +238,12 @@
236
238
  pointer-events: none;
237
239
  }
238
240
 
241
+ /* an expanded layers list overlaps the controls of the other corners */
242
+ .maplair-top:has(.maplair-control-layers-expanded),
243
+ .maplair-bottom:has(.maplair-control-layers-expanded) {
244
+ z-index: 1001;
245
+ }
246
+
239
247
  .maplair-top {
240
248
  top: 0;
241
249
  .maplair-control {
@@ -331,7 +339,8 @@
331
339
 
332
340
  /* cursors */
333
341
 
334
- .maplair-interactive {
342
+ .maplair-interactive,
343
+ .maplair-container.maplair-interactive {
335
344
  cursor: pointer;
336
345
  }
337
346
 
@@ -342,6 +351,7 @@
342
351
  .maplair-crosshair {
343
352
  cursor: crosshair;
344
353
 
354
+ &.maplair-interactive,
345
355
  .maplair-interactive {
346
356
  cursor: crosshair;
347
357
  }
@@ -371,6 +381,7 @@
371
381
  .maplair-marker-shadow,
372
382
  .maplair-image-layer,
373
383
  .maplair-pane > svg path,
384
+ .maplair-pane > canvas,
374
385
  .maplair-tile-container {
375
386
  pointer-events: none;
376
387
  }
@@ -461,8 +472,9 @@ path.maplair-interactive:focus:not(:focus-visible) {
461
472
  .maplair-pseudo-fullscreen {
462
473
  position: fixed !important;
463
474
  inset: 0 !important;
464
- width: 100% !important;
465
- height: 100% !important;
475
+ width: auto !important;
476
+ height: auto !important;
477
+ margin: 0 !important;
466
478
  z-index: 99999;
467
479
  }
468
480
 
@@ -471,7 +483,11 @@ path.maplair-interactive:focus:not(:focus-visible) {
471
483
  .maplair-control-zoom-in,
472
484
  .maplair-control-zoom-out {
473
485
  font: bold var(--maplair-font-size-x-large) var(--maplair-font-family-monospace);
474
- text-indent: 1px;
486
+ }
487
+
488
+ .maplair-control-zoom button {
489
+ display: grid;
490
+ place-items: center;
475
491
  }
476
492
 
477
493
 
@@ -828,12 +844,18 @@ path.maplair-interactive:focus:not(:focus-visible) {
828
844
  .maplair-container .maplair-control-attribution {
829
845
  background: var(--maplair-background-color-backdrop-light);
830
846
  margin: 0;
847
+
848
+ @media (prefers-contrast: more) {
849
+ background: var(--maplair-background-color-base);
850
+ }
831
851
  }
832
852
 
853
+ /* attribution links are told apart from text by contrast alone (WCAG 1.4.1 via G183): link vs text >= 3:1 and
854
+ link vs background >= 4.5:1 even over black tiles, which only fits with black text and >= 0.85 background alpha */
833
855
  .maplair-control-attribution,
834
856
  .maplair-control-scale-line {
835
857
  padding: 0 var(--maplair-spacing-25);
836
- color: var(--maplair-color-base);
858
+ color: var(--maplair-color-emphasized);
837
859
  line-height: var(--maplair-line-height-small);
838
860
  }
839
861
 
@@ -844,6 +866,10 @@ path.maplair-interactive:focus:not(:focus-visible) {
844
866
  &:focus {
845
867
  text-decoration: underline;
846
868
  }
869
+
870
+ @media (prefers-contrast: more) {
871
+ text-decoration: underline;
872
+ }
847
873
  }
848
874
 
849
875
  .maplair-attribution-leaf {
@@ -870,6 +896,10 @@ path.maplair-interactive:focus:not(:focus-visible) {
870
896
  background: var(--maplair-background-color-backdrop-light);
871
897
  text-shadow: 1px 1px var(--maplair-background-color-base);
872
898
 
899
+ @media (prefers-contrast: more) {
900
+ background: var(--maplair-background-color-base);
901
+ }
902
+
873
903
  &:not(:first-child) {
874
904
  border-top: var(--maplair-border-width-thick) solid var(--maplair-border-color-base);
875
905
  border-bottom: none;
@@ -1170,7 +1200,6 @@ path.maplair-interactive:focus:not(:focus-visible) {
1170
1200
  /* Tooltip */
1171
1201
  /* Base styles for the element that has a tooltip */
1172
1202
  .maplair-tooltip {
1173
- position: absolute;
1174
1203
  padding: var(--maplair-spacing-50);
1175
1204
  background-color: var(--maplair-background-color-base);
1176
1205
  border: var(--maplair-border-width-base) solid var(--maplair-background-color-base);
@@ -1,90 +0,0 @@
1
- // src/dom/DomEvent.DoubleTap.js
2
- function makeDblclick(ev) {
3
- const init = {
4
- bubbles: ev.bubbles,
5
- cancelable: ev.cancelable,
6
- composed: ev.composed,
7
- detail: 2,
8
- view: ev.view,
9
- screenX: ev.screenX,
10
- screenY: ev.screenY,
11
- clientX: ev.clientX,
12
- clientY: ev.clientY,
13
- ctrlKey: ev.ctrlKey,
14
- shiftKey: ev.shiftKey,
15
- altKey: ev.altKey,
16
- metaKey: ev.metaKey,
17
- button: ev.button,
18
- buttons: ev.buttons,
19
- relatedTarget: ev.relatedTarget,
20
- region: ev.region
21
- };
22
- let newEvent;
23
- if (ev instanceof PointerEvent) newEvent = new PointerEvent("dblclick", {
24
- ...init,
25
- pointerId: ev.pointerId,
26
- width: ev.width,
27
- height: ev.height,
28
- pressure: ev.pressure,
29
- tangentialPressure: ev.tangentialPressure,
30
- tiltX: ev.tiltX,
31
- tiltY: ev.tiltY,
32
- twist: ev.twist,
33
- pointerType: ev.pointerType,
34
- isPrimary: ev.isPrimary
35
- });
36
- else newEvent = new MouseEvent("dblclick", init);
37
- return newEvent;
38
- }
39
- const delay = 200;
40
- /**
41
- * Adds a `dblclick` listener which also handles double taps (simulating `dblclick`
42
- * on platforms which don't fire it for touch events).
43
- * @param {EventTarget} obj
44
- * @param {(ev: MouseEvent) => void} handler
45
- * @returns {{dblclick: (ev: MouseEvent) => void, simDblclick: (ev: PointerEvent) => void}}
46
- * The listeners to pass to `removeDoubleTapListener`.
47
- */
48
- function addDoubleTapListener(obj, handler) {
49
- obj.addEventListener("dblclick", handler);
50
- let last = 0, detail, pointerType;
51
- function onPointerDown(ev) {
52
- pointerType = ev.pointerType;
53
- }
54
- function simDblclick(ev) {
55
- if (ev.detail !== 1) {
56
- detail = ev.detail;
57
- return;
58
- }
59
- if (pointerType === "mouse" || ev.sourceCapabilities && !ev.sourceCapabilities.firesTouchEvents) return;
60
- const path = ev.composedPath();
61
- if (path.some((el) => el instanceof HTMLLabelElement && el.htmlFor) && !path.some((el) => el instanceof HTMLInputElement || el instanceof HTMLSelectElement)) return;
62
- const now = Date.now();
63
- if (now - last <= delay) {
64
- detail++;
65
- if (detail === 2) ev.target.dispatchEvent(makeDblclick(ev));
66
- } else detail = 1;
67
- last = now;
68
- }
69
- obj.addEventListener("pointerdown", onPointerDown, true);
70
- obj.addEventListener("click", simDblclick);
71
- return {
72
- dblclick: handler,
73
- onPointerDown,
74
- simDblclick
75
- };
76
- }
77
- /**
78
- * Removes the listeners added by `addDoubleTapListener`.
79
- * @param {EventTarget} obj
80
- * @param {{dblclick: (ev: MouseEvent) => void, simDblclick: (ev: PointerEvent) => void}} handlers
81
- * @returns {void}
82
- */
83
- function removeDoubleTapListener(obj, handlers) {
84
- obj.removeEventListener("dblclick", handlers.dblclick);
85
- obj.removeEventListener("pointerdown", handlers.onPointerDown, true);
86
- obj.removeEventListener("click", handlers.simDblclick);
87
- }
88
- export { addDoubleTapListener, removeDoubleTapListener };
89
-
90
- //# sourceMappingURL=DomEvent.DoubleTap.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"DomEvent.DoubleTap.js","names":[],"sources":["../../../src/dom/DomEvent.DoubleTap.js"],"sourcesContent":["/*\n * Extends the event handling code with double tap support for mobile browsers.\n *\n * Note: currently most browsers fire native dblclick, with only a few exceptions\n * (see https://github.com/Leaflet/Leaflet/issues/7012#issuecomment-595087386)\n */\n\nfunction makeDblclick(ev) {\n\tconst init = {\n\t\t// EventInit\n\t\tbubbles: ev.bubbles,\n\t\tcancelable: ev.cancelable,\n\t\tcomposed: ev.composed,\n\n\t\t// UIEventInit\n\t\tdetail: 2,\n\t\tview: ev.view,\n\n\t\t// mouseEventInit\n\t\tscreenX: ev.screenX,\n\t\tscreenY: ev.screenY,\n\t\tclientX: ev.clientX,\n\t\tclientY: ev.clientY,\n\t\tctrlKey: ev.ctrlKey,\n\t\tshiftKey: ev.shiftKey,\n\t\taltKey: ev.altKey,\n\t\tmetaKey: ev.metaKey,\n\t\tbutton: ev.button,\n\t\tbuttons: ev.buttons,\n\t\trelatedTarget: ev.relatedTarget,\n\t\tregion: ev.region,\n\t};\n\n\tlet newEvent;\n\t// The `click` event received should be a PointerEvent - but some\n\t// Firefox versions still use MouseEvent.\n\tif (ev instanceof PointerEvent) {\n\t\tnewEvent = new PointerEvent('dblclick', {\n\t\t\t...init,\n\t\t\tpointerId: ev.pointerId,\n\t\t\twidth: ev.width,\n\t\t\theight: ev.height,\n\t\t\tpressure: ev.pressure,\n\t\t\ttangentialPressure: ev.tangentialPressure,\n\t\t\ttiltX: ev.tiltX,\n\t\t\ttiltY: ev.tiltY,\n\t\t\ttwist: ev.twist,\n\t\t\tpointerType: ev.pointerType,\n\t\t\tisPrimary: ev.isPrimary,\n\t\t});\n\t} else {\n\t\tnewEvent = new MouseEvent('dblclick', init);\n\t}\n\treturn newEvent;\n}\n\nconst delay = 200;\n\n/**\n * Adds a `dblclick` listener which also handles double taps (simulating `dblclick`\n * on platforms which don't fire it for touch events).\n * @param {EventTarget} obj\n * @param {(ev: MouseEvent) => void} handler\n * @returns {{dblclick: (ev: MouseEvent) => void, simDblclick: (ev: PointerEvent) => void}}\n * The listeners to pass to `removeDoubleTapListener`.\n */\nexport function addDoubleTapListener(obj, handler) {\n\t// Most browsers handle double tap natively\n\tobj.addEventListener('dblclick', handler);\n\n\t// On some platforms the browser doesn't fire native dblclicks for touch events.\n\t// It seems that in all such cases `detail` property of `click` event is always `1`.\n\t// So here we rely on that fact to avoid excessive 'dblclick' simulation when not needed.\n\tlet last = 0,\n\tdetail,\n\tpointerType;\n\n\t// iOS Safari reports `pointerType: 'mouse'` on clicks from touch (WebKit bug 282988), so we take it from the\n\t// pointerdown instead; capturing so that it's seen even if a child (e.g. a control) stops its propagation.\n\tfunction onPointerDown(ev) {\n\t\tpointerType = ev.pointerType;\n\t}\n\n\tfunction simDblclick(ev) {\n\t\tif (ev.detail !== 1) {\n\t\t\tdetail = ev.detail; // keep in sync to avoid false dblclick in some cases\n\t\t\treturn;\n\t\t}\n\n\t\tif (pointerType === 'mouse' ||\n\t\t\t(ev.sourceCapabilities && !ev.sourceCapabilities.firesTouchEvents)) {\n\n\t\t\treturn;\n\t\t}\n\n\t\t// When clicking on an <input>, the browser generates a click on its\n\t\t// <label> (and vice versa) triggering two clicks in quick succession.\n\t\t// This ignores clicks on elements which are a label with a 'for'\n\t\t// attribute (or children of such a label), but not children of\n\t\t// a <input>.\n\t\tconst path = ev.composedPath();\n\t\tif (path.some(el => el instanceof HTMLLabelElement && el.htmlFor) &&\n\t\t\t!path.some(el => (\n\t\t\t\tel instanceof HTMLInputElement ||\n\t\t\t\t\tel instanceof HTMLSelectElement\n\t\t\t))\n\t\t) {\n\t\t\treturn;\n\t\t}\n\n\t\tconst now = Date.now();\n\t\tif (now - last <= delay) {\n\t\t\tdetail++;\n\t\t\tif (detail === 2) {\n\t\t\t\tev.target.dispatchEvent(makeDblclick(ev));\n\t\t\t}\n\t\t} else {\n\t\t\tdetail = 1;\n\t\t}\n\t\tlast = now;\n\t}\n\n\tobj.addEventListener('pointerdown', onPointerDown, true);\n\tobj.addEventListener('click', simDblclick);\n\n\treturn {\n\t\tdblclick: handler,\n\t\tonPointerDown,\n\t\tsimDblclick\n\t};\n}\n\n/**\n * Removes the listeners added by `addDoubleTapListener`.\n * @param {EventTarget} obj\n * @param {{dblclick: (ev: MouseEvent) => void, simDblclick: (ev: PointerEvent) => void}} handlers\n * @returns {void}\n */\nexport function removeDoubleTapListener(obj, handlers) {\n\tobj.removeEventListener('dblclick', handlers.dblclick);\n\tobj.removeEventListener('pointerdown', handlers.onPointerDown, true);\n\tobj.removeEventListener('click', handlers.simDblclick);\n}\n"],"mappings":";AAOA,SAAS,aAAa,IAAI;CACzB,MAAM,OAAO;EAEZ,SAAS,GAAG;EACZ,YAAY,GAAG;EACf,UAAU,GAAG;EAGb,QAAQ;EACR,MAAM,GAAG;EAGT,SAAS,GAAG;EACZ,SAAS,GAAG;EACZ,SAAS,GAAG;EACZ,SAAS,GAAG;EACZ,SAAS,GAAG;EACZ,UAAU,GAAG;EACb,QAAQ,GAAG;EACX,SAAS,GAAG;EACZ,QAAQ,GAAG;EACX,SAAS,GAAG;EACZ,eAAe,GAAG;EAClB,QAAQ,GAAG;CACZ;CAEA,IAAI;CAGJ,IAAI,cAAc,cACjB,WAAW,IAAI,aAAa,YAAY;EACvC,GAAG;EACH,WAAW,GAAG;EACd,OAAO,GAAG;EACV,QAAQ,GAAG;EACX,UAAU,GAAG;EACb,oBAAoB,GAAG;EACvB,OAAO,GAAG;EACV,OAAO,GAAG;EACV,OAAO,GAAG;EACV,aAAa,GAAG;EAChB,WAAW,GAAG;CACf,CAAC;MAED,WAAW,IAAI,WAAW,YAAY,IAAI;CAE3C,OAAO;AACR;AAEA,MAAM,QAAQ;;;;;;;;;AAUd,SAAgB,qBAAqB,KAAK,SAAS;CAElD,IAAI,iBAAiB,YAAY,OAAO;CAKxC,IAAI,OAAO,GACX,QACA;CAIA,SAAS,cAAc,IAAI;EAC1B,cAAc,GAAG;CAClB;CAEA,SAAS,YAAY,IAAI;EACxB,IAAI,GAAG,WAAW,GAAG;GACpB,SAAS,GAAG;GACZ;EACD;EAEA,IAAI,gBAAgB,WAClB,GAAG,sBAAsB,CAAC,GAAG,mBAAmB,kBAEjD;EAQD,MAAM,OAAO,GAAG,aAAa;EAC7B,IAAI,KAAK,MAAK,OAAM,cAAc,oBAAoB,GAAG,OAAO,KAC/D,CAAC,KAAK,MAAK,OACV,cAAc,oBACb,cAAc,iBACf,GAED;EAGD,MAAM,MAAM,KAAK,IAAI;EACrB,IAAI,MAAM,QAAQ,OAAO;GACxB;GACA,IAAI,WAAW,GACd,GAAG,OAAO,cAAc,aAAa,EAAE,CAAC;EAE1C,OACC,SAAS;EAEV,OAAO;CACR;CAEA,IAAI,iBAAiB,eAAe,eAAe,IAAI;CACvD,IAAI,iBAAiB,SAAS,WAAW;CAEzC,OAAO;EACN,UAAU;EACV;EACA;CACD;AACD;;;;;;;AAQA,SAAgB,wBAAwB,KAAK,UAAU;CACtD,IAAI,oBAAoB,YAAY,SAAS,QAAQ;CACrD,IAAI,oBAAoB,eAAe,SAAS,eAAe,IAAI;CACnE,IAAI,oBAAoB,SAAS,SAAS,WAAW;AACtD"}
@@ -1,143 +0,0 @@
1
- /*
2
- * Extends the event handling code with double tap support for mobile browsers.
3
- *
4
- * Note: currently most browsers fire native dblclick, with only a few exceptions
5
- * (see https://github.com/Leaflet/Leaflet/issues/7012#issuecomment-595087386)
6
- */
7
-
8
- function makeDblclick(ev) {
9
- const init = {
10
- // EventInit
11
- bubbles: ev.bubbles,
12
- cancelable: ev.cancelable,
13
- composed: ev.composed,
14
-
15
- // UIEventInit
16
- detail: 2,
17
- view: ev.view,
18
-
19
- // mouseEventInit
20
- screenX: ev.screenX,
21
- screenY: ev.screenY,
22
- clientX: ev.clientX,
23
- clientY: ev.clientY,
24
- ctrlKey: ev.ctrlKey,
25
- shiftKey: ev.shiftKey,
26
- altKey: ev.altKey,
27
- metaKey: ev.metaKey,
28
- button: ev.button,
29
- buttons: ev.buttons,
30
- relatedTarget: ev.relatedTarget,
31
- region: ev.region,
32
- };
33
-
34
- let newEvent;
35
- // The `click` event received should be a PointerEvent - but some
36
- // Firefox versions still use MouseEvent.
37
- if (ev instanceof PointerEvent) {
38
- newEvent = new PointerEvent('dblclick', {
39
- ...init,
40
- pointerId: ev.pointerId,
41
- width: ev.width,
42
- height: ev.height,
43
- pressure: ev.pressure,
44
- tangentialPressure: ev.tangentialPressure,
45
- tiltX: ev.tiltX,
46
- tiltY: ev.tiltY,
47
- twist: ev.twist,
48
- pointerType: ev.pointerType,
49
- isPrimary: ev.isPrimary,
50
- });
51
- } else {
52
- newEvent = new MouseEvent('dblclick', init);
53
- }
54
- return newEvent;
55
- }
56
-
57
- const delay = 200;
58
-
59
- /**
60
- * Adds a `dblclick` listener which also handles double taps (simulating `dblclick`
61
- * on platforms which don't fire it for touch events).
62
- * @param {EventTarget} obj
63
- * @param {(ev: MouseEvent) => void} handler
64
- * @returns {{dblclick: (ev: MouseEvent) => void, simDblclick: (ev: PointerEvent) => void}}
65
- * The listeners to pass to `removeDoubleTapListener`.
66
- */
67
- export function addDoubleTapListener(obj, handler) {
68
- // Most browsers handle double tap natively
69
- obj.addEventListener('dblclick', handler);
70
-
71
- // On some platforms the browser doesn't fire native dblclicks for touch events.
72
- // It seems that in all such cases `detail` property of `click` event is always `1`.
73
- // So here we rely on that fact to avoid excessive 'dblclick' simulation when not needed.
74
- let last = 0,
75
- detail,
76
- pointerType;
77
-
78
- // iOS Safari reports `pointerType: 'mouse'` on clicks from touch (WebKit bug 282988), so we take it from the
79
- // pointerdown instead; capturing so that it's seen even if a child (e.g. a control) stops its propagation.
80
- function onPointerDown(ev) {
81
- pointerType = ev.pointerType;
82
- }
83
-
84
- function simDblclick(ev) {
85
- if (ev.detail !== 1) {
86
- detail = ev.detail; // keep in sync to avoid false dblclick in some cases
87
- return;
88
- }
89
-
90
- if (pointerType === 'mouse' ||
91
- (ev.sourceCapabilities && !ev.sourceCapabilities.firesTouchEvents)) {
92
-
93
- return;
94
- }
95
-
96
- // When clicking on an <input>, the browser generates a click on its
97
- // <label> (and vice versa) triggering two clicks in quick succession.
98
- // This ignores clicks on elements which are a label with a 'for'
99
- // attribute (or children of such a label), but not children of
100
- // a <input>.
101
- const path = ev.composedPath();
102
- if (path.some(el => el instanceof HTMLLabelElement && el.htmlFor) &&
103
- !path.some(el => (
104
- el instanceof HTMLInputElement ||
105
- el instanceof HTMLSelectElement
106
- ))
107
- ) {
108
- return;
109
- }
110
-
111
- const now = Date.now();
112
- if (now - last <= delay) {
113
- detail++;
114
- if (detail === 2) {
115
- ev.target.dispatchEvent(makeDblclick(ev));
116
- }
117
- } else {
118
- detail = 1;
119
- }
120
- last = now;
121
- }
122
-
123
- obj.addEventListener('pointerdown', onPointerDown, true);
124
- obj.addEventListener('click', simDblclick);
125
-
126
- return {
127
- dblclick: handler,
128
- onPointerDown,
129
- simDblclick
130
- };
131
- }
132
-
133
- /**
134
- * Removes the listeners added by `addDoubleTapListener`.
135
- * @param {EventTarget} obj
136
- * @param {{dblclick: (ev: MouseEvent) => void, simDblclick: (ev: PointerEvent) => void}} handlers
137
- * @returns {void}
138
- */
139
- export function removeDoubleTapListener(obj, handlers) {
140
- obj.removeEventListener('dblclick', handlers.dblclick);
141
- obj.removeEventListener('pointerdown', handlers.onPointerDown, true);
142
- obj.removeEventListener('click', handlers.simDblclick);
143
- }