maplair 4.3.0 → 4.5.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 (191) hide show
  1. package/CHANGELOG.md +151 -8
  2. package/dist/esm/control/AttributionControl.js +30 -13
  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 +46 -27
  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 +7 -8
  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 +14 -13
  21. package/dist/esm/control/ZoomControl.js.map +1 -1
  22. package/dist/esm/core/Events.js +3 -2
  23. package/dist/esm/core/Events.js.map +1 -1
  24. package/dist/esm/core/Util.js +17 -5
  25. package/dist/esm/core/Util.js.map +1 -1
  26. package/dist/esm/dom/DomEvent.PointerEvents.js +72 -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 +10 -8
  33. package/dist/esm/dom/Draggable.js.map +1 -1
  34. package/dist/esm/geo/LatLng.js +24 -35
  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 +16 -19
  41. package/dist/esm/geometry/Point.js.map +1 -1
  42. package/dist/esm/geometry/PolyUtil.js +10 -3
  43. package/dist/esm/geometry/PolyUtil.js.map +1 -1
  44. package/dist/esm/geometry/Transformation.js +1 -7
  45. package/dist/esm/geometry/Transformation.js.map +1 -1
  46. package/dist/esm/layer/BlanketOverlay.js +3 -2
  47. package/dist/esm/layer/BlanketOverlay.js.map +1 -1
  48. package/dist/esm/layer/DivOverlay.js +25 -25
  49. package/dist/esm/layer/DivOverlay.js.map +1 -1
  50. package/dist/esm/layer/ImageOverlay.js +8 -5
  51. package/dist/esm/layer/ImageOverlay.js.map +1 -1
  52. package/dist/esm/layer/Layer.js +12 -7
  53. package/dist/esm/layer/Layer.js.map +1 -1
  54. package/dist/esm/layer/Popup.js +33 -15
  55. package/dist/esm/layer/Popup.js.map +1 -1
  56. package/dist/esm/layer/Tooltip.js +48 -56
  57. package/dist/esm/layer/Tooltip.js.map +1 -1
  58. package/dist/esm/layer/VideoOverlay.js +2 -2
  59. package/dist/esm/layer/VideoOverlay.js.map +1 -1
  60. package/dist/esm/layer/marker/DivIcon.js +4 -8
  61. package/dist/esm/layer/marker/DivIcon.js.map +1 -1
  62. package/dist/esm/layer/marker/Icon.js +37 -17
  63. package/dist/esm/layer/marker/Icon.js.map +1 -1
  64. package/dist/esm/layer/marker/Marker.Drag.js +11 -12
  65. package/dist/esm/layer/marker/Marker.Drag.js.map +1 -1
  66. package/dist/esm/layer/marker/Marker.js +54 -53
  67. package/dist/esm/layer/marker/Marker.js.map +1 -1
  68. package/dist/esm/layer/marker/SvgIcon.js +1 -1
  69. package/dist/esm/layer/marker/SvgIcon.js.map +1 -1
  70. package/dist/esm/layer/tile/GridLayer.js +29 -21
  71. package/dist/esm/layer/tile/GridLayer.js.map +1 -1
  72. package/dist/esm/layer/tile/TileLayer.js +19 -15
  73. package/dist/esm/layer/tile/TileLayer.js.map +1 -1
  74. package/dist/esm/layer/tile/WMSTileLayer.js +7 -3
  75. package/dist/esm/layer/tile/WMSTileLayer.js.map +1 -1
  76. package/dist/esm/layer/vector/Canvas.js +45 -94
  77. package/dist/esm/layer/vector/Canvas.js.map +1 -1
  78. package/dist/esm/layer/vector/Circle.js +8 -9
  79. package/dist/esm/layer/vector/Circle.js.map +1 -1
  80. package/dist/esm/layer/vector/CircleMarker.js +15 -4
  81. package/dist/esm/layer/vector/CircleMarker.js.map +1 -1
  82. package/dist/esm/layer/vector/Path.ZoomStyles.js +4 -1
  83. package/dist/esm/layer/vector/Path.ZoomStyles.js.map +1 -1
  84. package/dist/esm/layer/vector/Path.js +10 -5
  85. package/dist/esm/layer/vector/Path.js.map +1 -1
  86. package/dist/esm/layer/vector/Polygon.js +10 -11
  87. package/dist/esm/layer/vector/Polygon.js.map +1 -1
  88. package/dist/esm/layer/vector/Polyline.js +19 -26
  89. package/dist/esm/layer/vector/Polyline.js.map +1 -1
  90. package/dist/esm/layer/vector/Renderer.getRenderer.js +2 -1
  91. package/dist/esm/layer/vector/Renderer.getRenderer.js.map +1 -1
  92. package/dist/esm/layer/vector/Renderer.js +16 -0
  93. package/dist/esm/layer/vector/Renderer.js.map +1 -1
  94. package/dist/esm/layer/vector/SVG.js +3 -3
  95. package/dist/esm/layer/vector/SVG.js.map +1 -1
  96. package/dist/esm/map/Map.Rotation.js +9 -11
  97. package/dist/esm/map/Map.Rotation.js.map +1 -1
  98. package/dist/esm/map/Map.js +158 -71
  99. package/dist/esm/map/Map.js.map +1 -1
  100. package/dist/esm/map/MapSync.js +2 -5
  101. package/dist/esm/map/MapSync.js.map +1 -1
  102. package/dist/esm/map/handler/BoxZoomHandler.js +4 -0
  103. package/dist/esm/map/handler/BoxZoomHandler.js.map +1 -1
  104. package/dist/esm/map/handler/DisplaceHandler.js +68 -30
  105. package/dist/esm/map/handler/DisplaceHandler.js.map +1 -1
  106. package/dist/esm/map/handler/DragHandler.js +7 -2
  107. package/dist/esm/map/handler/DragHandler.js.map +1 -1
  108. package/dist/esm/map/handler/KeyboardHandler.js +3 -5
  109. package/dist/esm/map/handler/KeyboardHandler.js.map +1 -1
  110. package/dist/esm/map/handler/PinchZoomHandler.js +4 -7
  111. package/dist/esm/map/handler/PinchZoomHandler.js.map +1 -1
  112. package/dist/esm/map/handler/ScrollWheelZoomHandler.js +4 -7
  113. package/dist/esm/map/handler/ScrollWheelZoomHandler.js.map +1 -1
  114. package/dist/esm/map/handler/TapDragZoomHandler.js +2 -5
  115. package/dist/esm/map/handler/TapDragZoomHandler.js.map +1 -1
  116. package/dist/esm/map/handler/TapHoldHandler.js +8 -20
  117. package/dist/esm/map/handler/TapHoldHandler.js.map +1 -1
  118. package/dist/esm/package.js +1 -1
  119. package/dist/maplair-global-src.js +970 -810
  120. package/dist/maplair-global-src.js.map +1 -1
  121. package/dist/maplair-global.js +2 -2
  122. package/dist/maplair-global.js.map +1 -1
  123. package/dist/maplair-src.js +970 -810
  124. package/dist/maplair-src.js.map +1 -1
  125. package/dist/maplair.css +1 -1
  126. package/dist/maplair.js +2 -2
  127. package/dist/maplair.js.map +1 -1
  128. package/i18n/en.json +1 -0
  129. package/package.json +1 -1
  130. package/src/control/AttributionControl.js +37 -11
  131. package/src/control/ButtonControl.js +0 -1
  132. package/src/control/ContextMenu.js +1 -1
  133. package/src/control/Control.js +13 -16
  134. package/src/control/FullscreenControl.js +0 -1
  135. package/src/control/LayersControl.js +61 -37
  136. package/src/control/RotateControl.js +0 -1
  137. package/src/control/ScaleControl.js +10 -8
  138. package/src/control/SideBySideControl.js +4 -2
  139. package/src/control/ZoomControl.js +11 -13
  140. package/src/core/Events.js +6 -2
  141. package/src/core/Util.js +17 -4
  142. package/src/dom/DomEvent.PointerEvents.js +68 -2
  143. package/src/dom/DomEvent.js +5 -17
  144. package/src/dom/DomUtil.js +5 -5
  145. package/src/dom/Draggable.js +11 -8
  146. package/src/geo/LatLng.js +24 -37
  147. package/src/geo/LatLngBounds.js +10 -4
  148. package/src/geometry/Bounds.js +3 -3
  149. package/src/geometry/Point.js +22 -28
  150. package/src/geometry/PolyUtil.js +12 -3
  151. package/src/geometry/Transformation.js +1 -8
  152. package/src/layer/BlanketOverlay.js +6 -3
  153. package/src/layer/DivOverlay.js +30 -32
  154. package/src/layer/ImageOverlay.js +12 -9
  155. package/src/layer/Layer.js +19 -7
  156. package/src/layer/Popup.js +41 -21
  157. package/src/layer/Tooltip.js +50 -70
  158. package/src/layer/VideoOverlay.js +2 -2
  159. package/src/layer/marker/DivIcon.js +3 -6
  160. package/src/layer/marker/Icon.js +41 -20
  161. package/src/layer/marker/Marker.Drag.js +22 -24
  162. package/src/layer/marker/Marker.js +71 -64
  163. package/src/layer/marker/SvgIcon.js +1 -1
  164. package/src/layer/tile/GridLayer.js +41 -30
  165. package/src/layer/tile/TileLayer.js +31 -21
  166. package/src/layer/tile/WMSTileLayer.js +4 -2
  167. package/src/layer/vector/Canvas.js +53 -149
  168. package/src/layer/vector/Circle.js +13 -13
  169. package/src/layer/vector/CircleMarker.js +16 -3
  170. package/src/layer/vector/Path.ZoomStyles.js +5 -3
  171. package/src/layer/vector/Path.js +11 -5
  172. package/src/layer/vector/Polygon.js +11 -10
  173. package/src/layer/vector/Polyline.js +20 -21
  174. package/src/layer/vector/Renderer.getRenderer.js +2 -1
  175. package/src/layer/vector/Renderer.js +21 -3
  176. package/src/layer/vector/SVG.js +3 -3
  177. package/src/map/Map.Rotation.js +13 -9
  178. package/src/map/Map.js +195 -83
  179. package/src/map/MapSync.js +2 -2
  180. package/src/map/handler/BoxZoomHandler.js +5 -0
  181. package/src/map/handler/DisplaceHandler.js +53 -7
  182. package/src/map/handler/DragHandler.js +5 -5
  183. package/src/map/handler/KeyboardHandler.js +5 -10
  184. package/src/map/handler/PinchZoomHandler.js +4 -4
  185. package/src/map/handler/ScrollWheelZoomHandler.js +4 -4
  186. package/src/map/handler/TapDragZoomHandler.js +2 -2
  187. package/src/map/handler/TapHoldHandler.js +13 -25
  188. package/src/maplair.css +50 -10
  189. package/dist/esm/dom/DomEvent.DoubleTap.js +0 -90
  190. package/dist/esm/dom/DomEvent.DoubleTap.js.map +0 -1
  191. package/src/dom/DomEvent.DoubleTap.js +0 -143
@@ -131,6 +131,8 @@ export class DisplaceHandler extends Handler {
131
131
  * Called when the handler is enabled, adds the event hooks.
132
132
  */
133
133
  addHooks() {
134
+ // see `CircleMarker#beforeAdd`
135
+ this._map._displaceHandler = this;
134
136
  this._map.on('zoomend', this.schedule, this);
135
137
  this._map.on('layeradd', this._onLayerAdd, this);
136
138
  this._map.on('layerremove', this._onLayerRemove, this);
@@ -143,6 +145,7 @@ export class DisplaceHandler extends Handler {
143
145
  * true positions of the markers.
144
146
  */
145
147
  removeHooks() {
148
+ if (this._map._displaceHandler === this) { delete this._map._displaceHandler; }
146
149
  this._map.off('zoomend', this.schedule, this);
147
150
  this._map.off('layeradd', this._onLayerAdd, this);
148
151
  this._map.off('layerremove', this._onLayerRemove, this);
@@ -235,6 +238,8 @@ export class DisplaceHandler extends Handler {
235
238
  * @param {LatLng} latLng
236
239
  */
237
240
  _moveTo(marker, latLng) {
241
+ // e.g. already placed by `_beforeMarkerAdd`: spares redrawing every marker
242
+ if (marker.getLatLng().equals(latLng)) { return; }
238
243
  this._moving = true;
239
244
  try {
240
245
  marker.setLatLng(latLng);
@@ -255,6 +260,20 @@ export class DisplaceHandler extends Handler {
255
260
  if (this._enabled && this._map.hasLayer(event.target)) { this.schedule(); }
256
261
  }
257
262
 
263
+ /**
264
+ * Called by `CircleMarker#beforeAdd`: puts a marker whose `displaceId` already
265
+ * has a displaced position at the current zoom (e.g. the same station on
266
+ * another layer) there before it is drawn, instead of drawing it twice.
267
+ * @param {CircleMarker} marker
268
+ */
269
+ _beforeMarkerAdd(marker) {
270
+ if (!displaceable(marker)) { return; }
271
+ this._track(marker);
272
+ const {displaceId} = marker.options;
273
+ const latLng = displaceId && this._displacedPositions.get(this._map.getZoom())?.get(displaceId);
274
+ if (latLng) { this._moveTo(marker, latLng); }
275
+ }
276
+
258
277
  /**
259
278
  * @param {LayerEvent} event
260
279
  */
@@ -297,6 +316,11 @@ export class DisplaceHandler extends Handler {
297
316
  }
298
317
  }
299
318
 
319
+ /**
320
+ * Movement in pixels per pass below which `displace` stops early
321
+ */
322
+ const MIN_MOVE = 0.01;
323
+
300
324
  /**
301
325
  * Displaces overlapping points in pixel space until they are at least
302
326
  * `minSeparation` apart. Iterative relaxation: every overlapping pair is pushed
@@ -305,7 +329,8 @@ export class DisplaceHandler extends Handler {
305
329
  *
306
330
  * No point ends up further than `maxDisplacement` away from where it started.
307
331
  * Points which hit that limit stay overlapping – the limit wins over the
308
- * separation.
332
+ * separation. The relaxation stops early once the points are separated or
333
+ * no point moves by more than a hundredth of a pixel per pass.
309
334
  *
310
335
  * @param {Point[]} points Pixel coordinates (modified in place)
311
336
  * @param {number} minSeparation Minimum distance between centers, in pixels
@@ -333,16 +358,24 @@ export function displace(
333
358
  dx.fill(0);
334
359
  dy.fill(0);
335
360
 
336
- // Sort the points into a grid (cell size = separation).
337
- /** @type {Map<string, number[]>} */
361
+ // Sort the points into a grid (cell size = separation), keyed by column and
362
+ // then row. Numeric keys instead of a string "x,y" per lookup: the relaxation
363
+ // runs up to `iterations` times over all points and 9 cells each.
364
+ /** @type {Map<number, Map<number, number[]>>} */
338
365
  const grid = new Map();
339
366
  for (let i = 0; i < n; i++) {
340
- const key = `${Math.floor(points[i].x / cell)},${Math.floor(points[i].y / cell)}`;
341
- const bucket = grid.get(key);
367
+ const cx = Math.floor(points[i].x / cell);
368
+ const cy = Math.floor(points[i].y / cell);
369
+ let column = grid.get(cx);
370
+ if (!column) {
371
+ column = new Map();
372
+ grid.set(cx, column);
373
+ }
374
+ const bucket = column.get(cy);
342
375
  if (bucket) {
343
376
  bucket.push(i);
344
377
  } else {
345
- grid.set(key, [i]);
378
+ column.set(cy, [i]);
346
379
  }
347
380
  }
348
381
 
@@ -352,8 +385,10 @@ export function displace(
352
385
  const cy = Math.floor(points[i].y / cell);
353
386
  // Only the 3×3 neighbouring cells can be closer than `sep`.
354
387
  for (let gx = cx - 1; gx <= cx + 1; gx++) {
388
+ const column = grid.get(gx);
389
+ if (!column) { continue; }
355
390
  for (let gy = cy - 1; gy <= cy + 1; gy++) {
356
- const bucket = grid.get(`${gx},${gy}`);
391
+ const bucket = column.get(gy);
357
392
  if (!bucket) { continue; }
358
393
  for (const j of bucket) {
359
394
  if (j <= i) { continue; } // visit every pair once
@@ -390,7 +425,10 @@ export function displace(
390
425
  if (overlaps === 0) {
391
426
  break; // converged – nothing left to do
392
427
  }
428
+ let maxMoveSq = 0;
393
429
  for (let i = 0; i < n; i++) {
430
+ const x = points[i].x;
431
+ const y = points[i].y;
394
432
  points[i].x += dx[i];
395
433
  points[i].y += dy[i];
396
434
 
@@ -406,6 +444,14 @@ export function displace(
406
444
  points[i].x = ax[i] + ox * scale;
407
445
  points[i].y = ay[i] + oy * scale;
408
446
  }
447
+ const mx = points[i].x - x;
448
+ const my = points[i].y - y;
449
+ maxMoveSq = Math.max(maxMoveSq, mx * mx + my * my);
450
+ }
451
+ // Points held back by `maxDisplacement` keep overlapping, so `overlaps`
452
+ // never drops to 0: stop once no point moves noticeably any more.
453
+ if (maxMoveSq < MIN_MOVE * MIN_MOVE) {
454
+ break;
409
455
  }
410
456
  }
411
457
 
@@ -116,12 +116,12 @@ export class DragHandler extends Handler {
116
116
  map._stop();
117
117
  map._setUserEvent(e.originalEvent);
118
118
  if (this._map.options.maxBounds && this._map.options.maxBoundsViscosity) {
119
- const bounds = LatLngBounds.from(this._map.options.maxBounds);
119
+ const bounds = LatLngBounds.from(this._map.options.maxBounds),
120
+ // any corner can be an extreme when the projection rotates the axes
121
+ corners = [bounds.getNorthWest(), bounds.getNorthEast(), bounds.getSouthEast(), bounds.getSouthWest()],
122
+ {min, max} = new Bounds(corners.map(c => this._map.latLngToContainerPoint(c)));
120
123
 
121
- this._offsetLimit = new Bounds(
122
- this._map.latLngToContainerPoint(bounds.getNorthWest()).multiplyBy(-1),
123
- this._map.latLngToContainerPoint(bounds.getSouthEast()).multiplyBy(-1)
124
- .add(this._map.getSize()));
124
+ this._offsetLimit = new Bounds(max.multiplyBy(-1), min.multiplyBy(-1).add(this._map.getSize()));
125
125
 
126
126
  this._viscosity = Math.min(1.0, Math.max(0.0, this._map.options.maxBoundsViscosity));
127
127
  } else {
@@ -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();
@@ -150,7 +150,7 @@ export class PinchZoomHandler extends Handler {
150
150
 
151
151
  // Pinch updates GridLayers' levels only when zoomSnap is off, so zoomSnap becomes noUpdate.
152
152
  if (this._map._zoomAnimated) {
153
- this._map._animateZoom(this._center, this._map._limitZoom(this._zoom), true, this._map.options.zoomSnap);
153
+ this._map._animateZoom(this._center, this._map._limitZoom(this._zoom), this._map.options.zoomSnap);
154
154
  } else {
155
155
  this._map._resetView(this._center, this._map._limitZoom(this._zoom));
156
156
  }
@@ -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
  }
@@ -165,7 +165,7 @@ export class ScrollWheelZoomHandler extends Handler {
165
165
  this._pinch = null;
166
166
 
167
167
  if (map.options.zoomAnimation && Math.abs(zoom - map.getZoom()) > 1e-9) {
168
- map._animateZoom(center, zoom, true, map.options.zoomSnap);
168
+ map._animateZoom(center, zoom, map.options.zoomSnap);
169
169
  } else {
170
170
  // `_moveStart()` has already been called on the first event
171
171
  map._move(center, zoom)._moveEnd(true);
@@ -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
  }
@@ -187,7 +187,7 @@ export class TapDragZoomHandler extends Handler {
187
187
  const map = this._map,
188
188
  zoom = map._limitZoom(this._zoom);
189
189
  if (map.options.zoomAnimation) {
190
- map._animateZoom(this._center, zoom, true, map.options.zoomSnap);
190
+ map._animateZoom(this._center, zoom, map.options.zoomSnap);
191
191
  } else {
192
192
  // `_moveStart()` has already been called on the first move
193
193
  map._move(this._center, zoom)._moveEnd(true);
@@ -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;
@@ -106,6 +108,8 @@
106
108
  .maplair-marker-icon,
107
109
  .maplair-marker-shadow {
108
110
  display: block;
111
+ /* animated zooms place markers between pixels, and Chrome would otherwise re-raster each one on every frame */
112
+ will-change: transform;
109
113
  }
110
114
 
111
115
  /* !important to survive host-page resets like `img, svg { max-width: 100% }`, which break the map */
@@ -114,7 +118,9 @@
114
118
  overflow: hidden;
115
119
  isolation: isolate;
116
120
 
117
- .maplair-overlay-pane svg {
121
+ .maplair-overlay-pane svg,
122
+ .maplair-pane > svg,
123
+ .maplair-image-layer {
118
124
  max-width: none !important;
119
125
  max-height: none !important;
120
126
  }
@@ -139,6 +145,13 @@
139
145
  }
140
146
  }
141
147
 
148
+ /* A print snapshot taken mid-fade (e.g. right after fitBounds) would catch tiles partly transparent. */
149
+ @media print {
150
+ .maplair-tile-fading {
151
+ opacity: 1 !important;
152
+ }
153
+ }
154
+
142
155
  &.maplair-touch-zoom {
143
156
  touch-action: pan-x pan-y;
144
157
  }
@@ -236,6 +249,12 @@
236
249
  pointer-events: none;
237
250
  }
238
251
 
252
+ /* an expanded layers list overlaps the controls of the other corners */
253
+ .maplair-top:has(.maplair-control-layers-expanded),
254
+ .maplair-bottom:has(.maplair-control-layers-expanded) {
255
+ z-index: 1001;
256
+ }
257
+
239
258
  .maplair-top {
240
259
  top: 0;
241
260
  .maplair-control {
@@ -331,7 +350,8 @@
331
350
 
332
351
  /* cursors */
333
352
 
334
- .maplair-interactive {
353
+ .maplair-interactive,
354
+ .maplair-container.maplair-interactive {
335
355
  cursor: pointer;
336
356
  }
337
357
 
@@ -342,6 +362,7 @@
342
362
  .maplair-crosshair {
343
363
  cursor: crosshair;
344
364
 
365
+ &.maplair-interactive,
345
366
  .maplair-interactive {
346
367
  cursor: crosshair;
347
368
  }
@@ -371,6 +392,7 @@
371
392
  .maplair-marker-shadow,
372
393
  .maplair-image-layer,
373
394
  .maplair-pane > svg path,
395
+ .maplair-pane > canvas,
374
396
  .maplair-tile-container {
375
397
  pointer-events: none;
376
398
  }
@@ -461,8 +483,9 @@ path.maplair-interactive:focus:not(:focus-visible) {
461
483
  .maplair-pseudo-fullscreen {
462
484
  position: fixed !important;
463
485
  inset: 0 !important;
464
- width: 100% !important;
465
- height: 100% !important;
486
+ width: auto !important;
487
+ height: auto !important;
488
+ margin: 0 !important;
466
489
  z-index: 99999;
467
490
  }
468
491
 
@@ -471,7 +494,11 @@ path.maplair-interactive:focus:not(:focus-visible) {
471
494
  .maplair-control-zoom-in,
472
495
  .maplair-control-zoom-out {
473
496
  font: bold var(--maplair-font-size-x-large) var(--maplair-font-family-monospace);
474
- text-indent: 1px;
497
+ }
498
+
499
+ .maplair-control-zoom button {
500
+ display: grid;
501
+ place-items: center;
475
502
  }
476
503
 
477
504
 
@@ -828,12 +855,18 @@ path.maplair-interactive:focus:not(:focus-visible) {
828
855
  .maplair-container .maplair-control-attribution {
829
856
  background: var(--maplair-background-color-backdrop-light);
830
857
  margin: 0;
858
+
859
+ @media (prefers-contrast: more) {
860
+ background: var(--maplair-background-color-base);
861
+ }
831
862
  }
832
863
 
864
+ /* attribution links are told apart from text by contrast alone (WCAG 1.4.1 via G183): link vs text >= 3:1 and
865
+ link vs background >= 4.5:1 even over black tiles, which only fits with black text and >= 0.85 background alpha */
833
866
  .maplair-control-attribution,
834
867
  .maplair-control-scale-line {
835
868
  padding: 0 var(--maplair-spacing-25);
836
- color: var(--maplair-color-base);
869
+ color: var(--maplair-color-emphasized);
837
870
  line-height: var(--maplair-line-height-small);
838
871
  }
839
872
 
@@ -844,6 +877,10 @@ path.maplair-interactive:focus:not(:focus-visible) {
844
877
  &:focus {
845
878
  text-decoration: underline;
846
879
  }
880
+
881
+ @media (prefers-contrast: more) {
882
+ text-decoration: underline;
883
+ }
847
884
  }
848
885
 
849
886
  .maplair-attribution-leaf {
@@ -870,6 +907,10 @@ path.maplair-interactive:focus:not(:focus-visible) {
870
907
  background: var(--maplair-background-color-backdrop-light);
871
908
  text-shadow: 1px 1px var(--maplair-background-color-base);
872
909
 
910
+ @media (prefers-contrast: more) {
911
+ background: var(--maplair-background-color-base);
912
+ }
913
+
873
914
  &:not(:first-child) {
874
915
  border-top: var(--maplair-border-width-thick) solid var(--maplair-border-color-base);
875
916
  border-bottom: none;
@@ -1170,7 +1211,6 @@ path.maplair-interactive:focus:not(:focus-visible) {
1170
1211
  /* Tooltip */
1171
1212
  /* Base styles for the element that has a tooltip */
1172
1213
  .maplair-tooltip {
1173
- position: absolute;
1174
1214
  padding: var(--maplair-spacing-50);
1175
1215
  background-color: var(--maplair-background-color-base);
1176
1216
  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"}