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
@@ -14,6 +14,10 @@ function isOSMUrl(url) {
14
14
  return osmHosts.some((osmHost) => host === osmHost || host.endsWith(`.${osmHost}`));
15
15
  }
16
16
  const upgradeOSMUrl = (url) => isOSMUrl(url) ? url.replace(httpRe, "https:") : url;
17
+ function retinaLevel() {
18
+ const dpr = window.devicePixelRatio;
19
+ return dpr >= 1.5 ? 2 : dpr > 1 ? 1 : 0;
20
+ }
17
21
  /**
18
22
  * Options of `TileLayer`.
19
23
  * @typedef {object} TileLayerOptions
@@ -32,9 +36,9 @@ const upgradeOSMUrl = (url) => isOSMUrl(url) ? url.replace(httpRe, "https:") : u
32
36
  * this on for [TMS](https://en.wikipedia.org/wiki/Tile_Map_Service) services).
33
37
  * @property {boolean} [zoomReverse=false] If set to true, the zoom number used in tile
34
38
  * URLs will be reversed (`maxZoom - zoom` instead of `zoom`).
35
- * @property {boolean} [detectRetina=false] If `true` and user is on a retina display, it
36
- * will request four tiles of half the specified size and a bigger zoom level in place
37
- * of one to utilize the high resolution.
39
+ * @property {boolean} [detectRetina=false] If `true` and the device pixel ratio is 1.5 or
40
+ * higher, it will request four tiles of half the specified size and a bigger zoom level
41
+ * in place of one to utilize the high resolution.
38
42
  * @property {boolean|string} [crossOrigin=false] Whether the crossOrigin attribute will
39
43
  * be added to the tiles. If a String is provided, all tiles will have their crossOrigin
40
44
  * attribute set to the String provided. This is needed if you want to access tile pixel
@@ -134,20 +138,20 @@ var TileLayer = class TileLayer extends GridLayer {
134
138
  }
135
139
  _applyRetina() {
136
140
  Object.assign(this.options, this._nonRetinaOptions);
137
- this._retina = window.devicePixelRatio > 1;
138
- if (this.options.detectRetina && this._retina && this.options.maxZoom > 0) {
141
+ this._retina = retinaLevel();
142
+ if (this.options.detectRetina && this._retina === 2 && this.options.maxZoom > 0) {
139
143
  const tileSize = this.options.tileSize;
140
144
  this.options.tileSize = tileSize instanceof Point ? tileSize.divideBy(2).floor() : Math.floor(tileSize / 2);
141
145
  if (!this.options.zoomReverse) {
142
146
  this.options.zoomOffset++;
143
147
  this.options.maxZoom = Math.max(this.options.minZoom, this.options.maxZoom - 1);
144
- if (this.options.maxNativeZoom !== void 0) this.options.maxNativeZoom = Math.max(0, this.options.maxNativeZoom - 1);
145
- if (this.options.minNativeZoom !== void 0) this.options.minNativeZoom = Math.max(0, this.options.minNativeZoom - 1);
146
148
  } else {
147
149
  this.options.zoomOffset--;
148
150
  this.options.minZoom = Math.min(this.options.maxZoom, this.options.minZoom + 1);
149
151
  }
150
152
  this.options.minZoom = Math.max(0, this.options.minZoom);
153
+ if (this.options.maxNativeZoom !== void 0) this.options.maxNativeZoom = Math.max(0, this.options.maxNativeZoom - 1);
154
+ if (this.options.minNativeZoom !== void 0) this.options.minNativeZoom = Math.max(0, this.options.minNativeZoom - 1);
151
155
  } else if (!this.options.zoomReverse) this.options.maxZoom = Math.max(this.options.minZoom, this.options.maxZoom);
152
156
  else this.options.minZoom = Math.min(this.options.maxZoom, this.options.minZoom);
153
157
  }
@@ -161,7 +165,7 @@ var TileLayer = class TileLayer extends GridLayer {
161
165
  return events;
162
166
  }
163
167
  _onPixelRatioChange() {
164
- if (window.devicePixelRatio > 1 === this._retina) return;
168
+ if (retinaLevel() === this._retina) return;
165
169
  const map = this._map;
166
170
  this._applyRetina();
167
171
  if (this.options.detectRetina) {
@@ -243,16 +247,17 @@ var TileLayer = class TileLayer extends GridLayer {
243
247
  * @returns {string}
244
248
  */
245
249
  getTileUrl(coords) {
246
- const data = Object.create(this.options);
250
+ const z = coords.z ?? this._tileZoom, data = Object.create(this.options);
247
251
  Object.assign(data, {
248
252
  r: window.devicePixelRatio > 1 ? "@2x" : "",
249
253
  s: this._getSubdomain(coords),
250
254
  x: coords.x,
251
255
  y: coords.y,
252
- z: this._getZoomForUrl()
256
+ z: this._getZoomForUrl(z)
253
257
  });
254
- if (this._map && !this._map.options.crs.infinite) {
255
- const invertedY = this._globalTileRange.max.y - coords.y;
258
+ const worldBounds = this._map?.getPixelWorldBounds(z);
259
+ if (worldBounds) {
260
+ const invertedY = this._pxBoundsToTileRange(worldBounds).max.y - coords.y;
256
261
  if (this.options.tms) data["y"] = invertedY;
257
262
  data["-y"] = invertedY;
258
263
  }
@@ -267,8 +272,7 @@ var TileLayer = class TileLayer extends GridLayer {
267
272
  if (errorUrl && src !== errorUrl && (src || tile.isConnected)) tile.src = errorUrl;
268
273
  done(e, tile);
269
274
  }
270
- _getZoomForUrl() {
271
- let zoom = this._tileZoom;
275
+ _getZoomForUrl(zoom) {
272
276
  const maxZoom = this.options.maxZoom, zoomReverse = this.options.zoomReverse, zoomOffset = this.options.zoomOffset;
273
277
  if (zoomReverse) zoom = maxZoom - zoom;
274
278
  return zoom + zoomOffset;
@@ -301,7 +305,7 @@ var TileLayer = class TileLayer extends GridLayer {
301
305
  return super._removeTile(key);
302
306
  }
303
307
  _tileReady(coords, err, tile) {
304
- if (!this._map || tile && tile.getAttribute("src") === "") return;
308
+ if (!this._map || tile?.getAttribute("src") === "") return;
305
309
  return super._tileReady(coords, err, tile);
306
310
  }
307
311
  _clampZoom(zoom) {
@@ -1 +1 @@
1
- {"version":3,"file":"TileLayer.js","names":["Util.setOptions","Util.template"],"sources":["../../../../src/layer/tile/TileLayer.js"],"sourcesContent":["import {GridLayer} from './GridLayer.js';\nimport * as Util from '../../core/Util.js';\nimport * as DomEvent from '../../dom/DomEvent.js';\nimport {I18n} from '../../core/I18n.js';\nimport {Point} from '../../geometry/Point.js';\n/** @import {GridLayerOptions, TileDoneCallback} from './GridLayer.js' */\n/** @import {TileEvent} from '../../core/Events.js' */\n\nconst osmHosts = ['tile.openstreetmap.org', 'tile.osm.org'];\nconst hostRe = /^(https?:)?\\/\\/([^/?#:]*)/i;\nconst httpRe = /^http:/i;\n\nfunction isOSMUrl(url) {\n\tconst host = hostRe.exec(url)?.[2] ?? '';\n\treturn osmHosts.some(osmHost => host === osmHost || host.endsWith(`.${osmHost}`));\n}\n\n// OSM tiles are upgraded to HTTPS so that the referrer policy works\nconst upgradeOSMUrl = url => (isOSMUrl(url) ? url.replace(httpRe, 'https:') : url);\n\n/**\n * Options of `TileLayer`.\n * @typedef {object} TileLayerOptions\n * @property {number} [minZoom=0] The minimum zoom level down to which this layer will be\n * displayed (inclusive).\n * @property {number} [maxZoom=18] The maximum zoom level up to which this layer will be\n * displayed (inclusive).\n * @property {string|string[]} [subdomains='abc'] Subdomains of the tile service. Can be\n * passed in the form of one string (where each letter is a subdomain name) or an array\n * of strings.\n * @property {string} [errorTileUrl=''] URL to the tile image to show in place of the\n * tile that failed to load.\n * @property {number} [zoomOffset=0] The zoom number used in tile URLs will be offset\n * with this value.\n * @property {boolean} [tms=false] If `true`, inverses Y axis numbering for tiles (turn\n * this on for [TMS](https://en.wikipedia.org/wiki/Tile_Map_Service) services).\n * @property {boolean} [zoomReverse=false] If set to true, the zoom number used in tile\n * URLs will be reversed (`maxZoom - zoom` instead of `zoom`).\n * @property {boolean} [detectRetina=false] If `true` and user is on a retina display, it\n * will request four tiles of half the specified size and a bigger zoom level in place\n * of one to utilize the high resolution.\n * @property {boolean|string} [crossOrigin=false] Whether the crossOrigin attribute will\n * be added to the tiles. If a String is provided, all tiles will have their crossOrigin\n * attribute set to the String provided. This is needed if you want to access tile pixel\n * data. Refer to\n * [CORS Settings](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes)\n * for valid String values.\n * @property {ReferrerPolicy} [referrerPolicy='strict-origin-when-cross-origin'] Sets the\n * tiles' `referrerPolicy` attribute set to the String provided. See\n * [`HTMLImageElement.referrerPolicy`](https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/referrerPolicy)\n * for possible values.\n *\n * Tile providers might require you to use a specific referrer policy (e.g. to verify\n * API tokens or prevent abuse). Specifically, if you are using tiles from\n * `tile.openstreetmap.org` or `tile.osm.org`, you\n * [should not change this value](https://operations.osmfoundation.org/policies/tiles/).\n * @property {RequestInit|null} [fetchOptions=null] If set, the tiles are loaded with\n * [`fetch()`](https://developer.mozilla.org/docs/Web/API/Window/fetch) using these\n * options (see [`RequestInit`](https://developer.mozilla.org/docs/Web/API/RequestInit)),\n * e.g. `{headers: {Authorization: 'Bearer …'}}` for tile servers requiring custom HTTP\n * headers. Requests of tiles that are no longer needed (e.g. after panning or zooming\n * away) are aborted. Cross-origin tile servers have to allow such requests with\n * [CORS](https://developer.mozilla.org/docs/Web/HTTP/CORS) headers.\n * @extends GridLayerOptions\n */\n\n/**\n * Used to load and display tile layers on the map. Note that most tile servers require\n * attribution, which you can set under `Layer`. Extends `GridLayer`.\n *\n * ### URL template\n *\n * A string of the following form:\n *\n * ```\n * 'https://{s}.somedomain.com/blabla/{z}/{x}/{y}{r}.png'\n * ```\n *\n * `{s}` means one of the available subdomains (used sequentially to help with browser\n * parallel requests per domain limitation; subdomain values are specified in options;\n * `a`, `b` or `c` by default, can be omitted), `{z}` — zoom level, `{x}` and `{y}` —\n * tile coordinates. `{r}` can be used to add \"@2x\" to the URL to load retina tiles.\n *\n * You can use custom keys in the template, which will be [evaluated](#util-template)\n * from TileLayer options, like this:\n *\n * ```\n * new TileLayer('https://{s}.somedomain.com/{foo}/{z}/{x}/{y}.png', {foo: 'bar'});\n * ```\n *\n * Layers extending `TileLayer` might reimplement the [`getTileUrl()`](#tilelayer-gettileurl)\n * method.\n *\n * @example\n * ```js\n * new TileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png?{foo}', {foo: 'bar', attribution: '© <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap contributors</a>'}).addTo(map);\n * ```\n *\n * @fires tileabort {TileEvent} Fired when a tile was loading but is now not wanted.\n */\nexport class TileLayer extends GridLayer {\n\n\tstatic defaultOptions = {\n\t\tminZoom: 0,\n\t\tmaxZoom: 18,\n\t\tsubdomains: 'abc',\n\t\terrorTileUrl: '',\n\t\tzoomOffset: 0,\n\t\ttms: false,\n\t\tzoomReverse: false,\n\t\tdetectRetina: false,\n\t\tcrossOrigin: false,\n\t\treferrerPolicy: 'strict-origin-when-cross-origin',\n\t\tfetchOptions: null\n\n\t};\n\n\t/**\n\t * Instantiates a tile layer object given a [URL template](#tilelayer) and optionally an\n\t * options object.\n\t * @param {string} url The URL template.\n\t * @param {TileLayerOptions & Record<string, unknown>} [options] The options, and the values\n\t * of custom keys of the URL template.\n\t */\n\tconstructor(url, options) {\n\t\tsuper(options);\n\n\t\toptions = Util.setOptions(this, options);\n\n\t\t// Set required OpenStreetMap attribution if it hasn't been specified\n\t\tif (isOSMUrl(url) && options.attribution === null) {\n\t\t\toptions.attribution = `&copy; <a href=\"https://www.openstreetmap.org/copyright\">${I18n.translate('OpenStreetMap contributors')}</a>`;\n\t\t}\n\t\tthis._url = upgradeOSMUrl(url);\n\n\t\tconst {tileSize, zoomOffset, minZoom, maxZoom, minNativeZoom, maxNativeZoom} = this.options;\n\t\tthis._nonRetinaOptions = {tileSize, zoomOffset, minZoom, maxZoom, minNativeZoom, maxNativeZoom};\n\t\tthis._applyRetina();\n\n\t\tif (typeof this.options.subdomains === 'string') {\n\t\t\tthis.options.subdomains = this.options.subdomains.split('');\n\t\t}\n\n\t\tthis.callInitHooks(TileLayer);\n\t}\n\n\t// Detects retina displays (if `detectRetina` is set), adjusting tileSize and zoom levels.\n\t_applyRetina() {\n\t\tObject.assign(this.options, this._nonRetinaOptions);\n\t\tthis._retina = window.devicePixelRatio > 1;\n\n\t\tif (this.options.detectRetina && this._retina && this.options.maxZoom > 0) {\n\n\t\t\tconst tileSize = this.options.tileSize;\n\t\t\tthis.options.tileSize = tileSize instanceof Point ? tileSize.divideBy(2).floor() : Math.floor(tileSize / 2);\n\n\t\t\tif (!this.options.zoomReverse) {\n\t\t\t\tthis.options.zoomOffset++;\n\t\t\t\tthis.options.maxZoom = Math.max(this.options.minZoom, this.options.maxZoom - 1);\n\t\t\t\t// do not request tiles beyond the native zoom levels\n\t\t\t\tif (this.options.maxNativeZoom !== undefined) {\n\t\t\t\t\tthis.options.maxNativeZoom = Math.max(0, this.options.maxNativeZoom - 1);\n\t\t\t\t}\n\t\t\t\tif (this.options.minNativeZoom !== undefined) {\n\t\t\t\t\tthis.options.minNativeZoom = Math.max(0, this.options.minNativeZoom - 1);\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tthis.options.zoomOffset--;\n\t\t\t\tthis.options.minZoom = Math.min(this.options.maxZoom, this.options.minZoom + 1);\n\t\t\t}\n\n\t\t\tthis.options.minZoom = Math.max(0, this.options.minZoom);\n\t\t} else if (!this.options.zoomReverse) {\n\t\t\t// make sure maxZoom is gte minZoom\n\t\t\tthis.options.maxZoom = Math.max(this.options.minZoom, this.options.maxZoom);\n\t\t} else {\n\t\t\t// make sure minZoom is lte maxZoom\n\t\t\tthis.options.minZoom = Math.min(this.options.maxZoom, this.options.minZoom);\n\t\t}\n\t}\n\n\t/**\n\t * Returns the map events the layer listens to, see `Layer`.\n\t * @returns {Record<string, Function>}\n\t */\n\tgetEvents() {\n\t\tconst events = super.getEvents();\n\t\tevents.pixelratiochange = this._onPixelRatioChange;\n\t\treturn events;\n\t}\n\n\t// Loads the tiles for the new resolution, see the map's `pixelratiochange` event.\n\t_onPixelRatioChange() {\n\t\tif ((window.devicePixelRatio > 1) === this._retina) { return; }\n\t\tconst map = this._map;\n\t\tthis._applyRetina();\n\t\tif (this.options.detectRetina) {\n\t\t\tmap._removeZoomLimit(this);\n\t\t\tmap._addZoomLimit(this);\n\t\t\tthis._invalidateAll();\n\t\t\tthis._resetView();\n\t\t} else if (this._url.includes('{r}')) {\n\t\t\tthis.redraw();\n\t\t}\n\t}\n\n\t/**\n\t * Updates the layer's URL template and redraws it (unless `noRedraw` is set to `true`).\n\t * If the URL does not change, the layer will not be redrawn unless\n\t * the noRedraw parameter is set to false.\n\t * The current tiles stay visible until the new tiles have loaded, to avoid flickering.\n\t * @param {string} url\n\t * @param {boolean} [noRedraw]\n\t * @returns {this}\n\t */\n\tsetUrl(url, noRedraw) {\n\t\turl = upgradeOSMUrl(url);\n\n\t\tif (this._url === url && noRedraw === undefined) {\n\t\t\tnoRedraw = true;\n\t\t}\n\n\t\tthis._url = url;\n\n\t\tif (!noRedraw) {\n\t\t\tthis._keepCurrentTiles();\n\t\t\tthis.redraw();\n\t\t}\n\t\treturn this;\n\t}\n\n\t/**\n\t * Called only internally, overrides GridLayer's [`createTile()`](#gridlayer-createtile)\n\t * to return an `<img>` HTML element with the appropriate image URL given `coords`. The\n\t * `done` callback is called when the tile has been loaded.\n\t * @param {Point} coords\n\t * @param {TileDoneCallback} [done]\n\t * @returns {HTMLImageElement}\n\t */\n\tcreateTile(coords, done) {\n\t\tconst tile = document.createElement('img');\n\n\t\tDomEvent.on(tile, 'load', this._tileOnLoad.bind(this, done, tile));\n\t\tDomEvent.on(tile, 'error', this._tileOnError.bind(this, done, tile));\n\n\t\tif (this.options.crossOrigin || this.options.crossOrigin === '') {\n\t\t\ttile.crossOrigin = this.options.crossOrigin === true ? '' : this.options.crossOrigin;\n\t\t}\n\n\t\t// for this new option we follow the documented behavior\n\t\t// more closely by only setting the property when string\n\t\tif (typeof this.options.referrerPolicy === 'string') {\n\t\t\ttile.referrerPolicy = this.options.referrerPolicy;\n\t\t}\n\n\t\t// The alt attribute is set to the empty string,\n\t\t// allowing screen readers to ignore the decorative image tiles.\n\t\t// https://www.w3.org/WAI/tutorials/images/decorative/\n\t\t// https://www.w3.org/TR/html-aria/#el-img-empty-alt\n\t\ttile.alt = '';\n\n\t\tconst url = this.getTileUrl(coords);\n\t\tif (this.options.fetchOptions) {\n\t\t\tthis._fetchTile(tile, url, done);\n\t\t} else {\n\t\t\ttile.src = url;\n\t\t}\n\n\t\treturn tile;\n\t}\n\n\t// Loads the tile image with `fetch()`, see the `fetchOptions` option.\n\t_fetchTile(tile, url, done) {\n\t\tconst controller = new AbortController(),\n\t\toptions = {signal: controller.signal, ...this.options.fetchOptions};\n\t\tif (typeof this.options.referrerPolicy === 'string') {\n\t\t\toptions.referrerPolicy ??= this.options.referrerPolicy;\n\t\t}\n\n\t\tthis._tileFetches ??= new Map();\n\t\tthis._tileFetches.set(tile, controller);\n\n\t\tfetch(url, options)\n\t\t\t.then((response) => {\n\t\t\t\tif (!response.ok) {\n\t\t\t\t\tthrow new Error(`Failed to load the tile ${url}: HTTP ${response.status}`);\n\t\t\t\t}\n\t\t\t\treturn response.blob();\n\t\t\t})\n\t\t\t.then((blob) => {\n\t\t\t\t// revoked in `_tileOnLoad()`\n\t\t\t\ttile.src = URL.createObjectURL(blob);\n\t\t\t})\n\t\t\t.catch((error) => {\n\t\t\t\tif (!controller.signal.aborted) {\n\t\t\t\t\tthis._tileOnError(done, tile, error);\n\t\t\t\t}\n\t\t\t})\n\t\t\t.finally(() => this._tileFetches.delete(tile));\n\t}\n\n\t// Aborts the request of a tile loaded with `fetch()`, returns whether there was one.\n\t_abortTileFetch(tile) {\n\t\tconst controller = this._tileFetches?.get(tile);\n\t\tif (!controller) { return false; }\n\t\tcontroller.abort();\n\t\tthis._tileFetches.delete(tile);\n\t\treturn true;\n\t}\n\n\t/**\n\t * Called only internally, returns the URL for a tile given its coordinates.\n\t * Classes extending `TileLayer` can override this function to provide custom tile URL\n\t * naming schemes.\n\t * @group Extension methods\n\t * @param {Point} coords\n\t * @returns {string}\n\t */\n\tgetTileUrl(coords) {\n\t\tconst data = Object.create(this.options);\n\t\tObject.assign(data, {\n\t\t\tr: window.devicePixelRatio > 1 ? '@2x' : '',\n\t\t\ts: this._getSubdomain(coords),\n\t\t\tx: coords.x,\n\t\t\ty: coords.y,\n\t\t\tz: this._getZoomForUrl()\n\t\t});\n\t\tif (this._map && !this._map.options.crs.infinite) {\n\t\t\tconst invertedY = this._globalTileRange.max.y - coords.y;\n\t\t\tif (this.options.tms) {\n\t\t\t\tdata['y'] = invertedY;\n\t\t\t}\n\t\t\tdata['-y'] = invertedY;\n\t\t}\n\n\t\treturn Util.template(this._url, data);\n\t}\n\n\t_tileOnLoad(done, tile) {\n\t\tif (tile.src.startsWith('blob:')) {\n\t\t\t// the image keeps its data, see `_fetchTile()`\n\t\t\tURL.revokeObjectURL(tile.src);\n\t\t}\n\t\tdone(null, tile);\n\t}\n\n\t_tileOnError(done, tile, e) {\n\t\tconst errorUrl = this.options.errorTileUrl,\n\t\tsrc = tile.getAttribute('src');\n\t\t// removed tiles get an empty src to cancel their request, which fires error too\n\t\tif (errorUrl && src !== errorUrl && (src || tile.isConnected)) {\n\t\t\ttile.src = errorUrl;\n\t\t}\n\t\tdone(e, tile);\n\t}\n\n\t_getZoomForUrl() {\n\t\tlet zoom = this._tileZoom;\n\t\tconst maxZoom = this.options.maxZoom,\n\t\tzoomReverse = this.options.zoomReverse,\n\t\tzoomOffset = this.options.zoomOffset;\n\n\t\tif (zoomReverse) {\n\t\t\tzoom = maxZoom - zoom;\n\t\t}\n\n\t\treturn zoom + zoomOffset;\n\t}\n\n\t_getSubdomain(tilePoint) {\n\t\tconst {subdomains} = this.options;\n\t\treturn subdomains?.[Math.abs(tilePoint.x + tilePoint.y) % subdomains.length];\n\t}\n\n\t// stops loading all tiles in the background layer\n\t_abortLoading() {\n\t\tlet i, tile;\n\t\tfor (i of Object.keys(this._tiles)) {\n\t\t\tif (this._tiles[i].coords.z !== this._tileZoom) {\n\t\t\t\ttile = this._tiles[i].el;\n\n\t\t\t\tif (this._abortTileFetch(tile) || !tile.complete) {\n\t\t\t\t\ttile.setAttribute('src', '');\n\t\t\t\t\tconst coords = this._tiles[i].coords;\n\t\t\t\t\ttile.remove();\n\t\t\t\t\tdelete this._tiles[i];\n\t\t\t\t\tthis.fire('tileabort', {\n\t\t\t\t\t\ttile,\n\t\t\t\t\t\tcoords\n\t\t\t\t\t});\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\t_removeTile(key) {\n\t\tconst tile = this._tiles[key];\n\t\tif (!tile) { return; }\n\n\t\t// Cancels any pending http requests associated with the tile\n\t\tthis._abortTileFetch(tile.el);\n\t\ttile.el.setAttribute('src', '');\n\n\t\treturn super._removeTile(key);\n\t}\n\n\t_tileReady(coords, err, tile) {\n\t\tif (!this._map || (tile && tile.getAttribute('src') === '')) {\n\t\t\treturn;\n\t\t}\n\n\t\treturn super._tileReady(coords, err, tile);\n\t}\n\n\t_clampZoom(zoom) {\n\t\treturn Math.round(super._clampZoom(zoom));\n\t}\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"TileLayer.js","names":["Util.setOptions","Util.template"],"sources":["../../../../src/layer/tile/TileLayer.js"],"sourcesContent":["import {GridLayer} from './GridLayer.js';\nimport * as Util from '../../core/Util.js';\nimport * as DomEvent from '../../dom/DomEvent.js';\nimport {I18n} from '../../core/I18n.js';\nimport {Point} from '../../geometry/Point.js';\n/** @import {GridLayerOptions, TileDoneCallback} from './GridLayer.js' */\n/** @import {TileEvent} from '../../core/Events.js' */\n\nconst osmHosts = ['tile.openstreetmap.org', 'tile.osm.org'];\nconst hostRe = /^(https?:)?\\/\\/([^/?#:]*)/i;\nconst httpRe = /^http:/i;\n\nfunction isOSMUrl(url) {\n\tconst host = hostRe.exec(url)?.[2] ?? '';\n\treturn osmHosts.some(osmHost => host === osmHost || host.endsWith(`.${osmHost}`));\n}\n\n// OSM tiles are upgraded to HTTPS so that the referrer policy works\nconst upgradeOSMUrl = url => (isOSMUrl(url) ? url.replace(httpRe, 'https:') : url);\n\n// 0 at a pixel ratio of 1, 1 above it (the `{r}` of tile URLs), 2 from 1.5 on (`detectRetina`)\nfunction retinaLevel() {\n\tconst dpr = window.devicePixelRatio;\n\treturn dpr >= 1.5 ? 2 : dpr > 1 ? 1 : 0;\n}\n\n/**\n * Options of `TileLayer`.\n * @typedef {object} TileLayerOptions\n * @property {number} [minZoom=0] The minimum zoom level down to which this layer will be\n * displayed (inclusive).\n * @property {number} [maxZoom=18] The maximum zoom level up to which this layer will be\n * displayed (inclusive).\n * @property {string|string[]} [subdomains='abc'] Subdomains of the tile service. Can be\n * passed in the form of one string (where each letter is a subdomain name) or an array\n * of strings.\n * @property {string} [errorTileUrl=''] URL to the tile image to show in place of the\n * tile that failed to load.\n * @property {number} [zoomOffset=0] The zoom number used in tile URLs will be offset\n * with this value.\n * @property {boolean} [tms=false] If `true`, inverses Y axis numbering for tiles (turn\n * this on for [TMS](https://en.wikipedia.org/wiki/Tile_Map_Service) services).\n * @property {boolean} [zoomReverse=false] If set to true, the zoom number used in tile\n * URLs will be reversed (`maxZoom - zoom` instead of `zoom`).\n * @property {boolean} [detectRetina=false] If `true` and the device pixel ratio is 1.5 or\n * higher, it will request four tiles of half the specified size and a bigger zoom level\n * in place of one to utilize the high resolution.\n * @property {boolean|string} [crossOrigin=false] Whether the crossOrigin attribute will\n * be added to the tiles. If a String is provided, all tiles will have their crossOrigin\n * attribute set to the String provided. This is needed if you want to access tile pixel\n * data. Refer to\n * [CORS Settings](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes)\n * for valid String values.\n * @property {ReferrerPolicy} [referrerPolicy='strict-origin-when-cross-origin'] Sets the\n * tiles' `referrerPolicy` attribute set to the String provided. See\n * [`HTMLImageElement.referrerPolicy`](https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/referrerPolicy)\n * for possible values.\n *\n * Tile providers might require you to use a specific referrer policy (e.g. to verify\n * API tokens or prevent abuse). Specifically, if you are using tiles from\n * `tile.openstreetmap.org` or `tile.osm.org`, you\n * [should not change this value](https://operations.osmfoundation.org/policies/tiles/).\n * @property {RequestInit|null} [fetchOptions=null] If set, the tiles are loaded with\n * [`fetch()`](https://developer.mozilla.org/docs/Web/API/Window/fetch) using these\n * options (see [`RequestInit`](https://developer.mozilla.org/docs/Web/API/RequestInit)),\n * e.g. `{headers: {Authorization: 'Bearer …'}}` for tile servers requiring custom HTTP\n * headers. Requests of tiles that are no longer needed (e.g. after panning or zooming\n * away) are aborted. Cross-origin tile servers have to allow such requests with\n * [CORS](https://developer.mozilla.org/docs/Web/HTTP/CORS) headers.\n * @extends GridLayerOptions\n */\n\n/**\n * Used to load and display tile layers on the map. Note that most tile servers require\n * attribution, which you can set under `Layer`. Extends `GridLayer`.\n *\n * ### URL template\n *\n * A string of the following form:\n *\n * ```\n * 'https://{s}.somedomain.com/blabla/{z}/{x}/{y}{r}.png'\n * ```\n *\n * `{s}` means one of the available subdomains (used sequentially to help with browser\n * parallel requests per domain limitation; subdomain values are specified in options;\n * `a`, `b` or `c` by default, can be omitted), `{z}` — zoom level, `{x}` and `{y}` —\n * tile coordinates. `{r}` can be used to add \"@2x\" to the URL to load retina tiles.\n *\n * You can use custom keys in the template, which will be [evaluated](#util-template)\n * from TileLayer options, like this:\n *\n * ```\n * new TileLayer('https://{s}.somedomain.com/{foo}/{z}/{x}/{y}.png', {foo: 'bar'});\n * ```\n *\n * Layers extending `TileLayer` might reimplement the [`getTileUrl()`](#tilelayer-gettileurl)\n * method.\n *\n * @example\n * ```js\n * new TileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png?{foo}', {foo: 'bar', attribution: '© <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap contributors</a>'}).addTo(map);\n * ```\n *\n * @fires tileabort {TileEvent} Fired when a tile was loading but is now not wanted.\n */\nexport class TileLayer extends GridLayer {\n\n\tstatic defaultOptions = {\n\t\tminZoom: 0,\n\t\tmaxZoom: 18,\n\t\tsubdomains: 'abc',\n\t\terrorTileUrl: '',\n\t\tzoomOffset: 0,\n\t\ttms: false,\n\t\tzoomReverse: false,\n\t\tdetectRetina: false,\n\t\tcrossOrigin: false,\n\t\treferrerPolicy: 'strict-origin-when-cross-origin',\n\t\tfetchOptions: null\n\n\t};\n\n\t/**\n\t * Instantiates a tile layer object given a [URL template](#tilelayer) and optionally an\n\t * options object.\n\t * @param {string} url The URL template.\n\t * @param {TileLayerOptions & Record<string, unknown>} [options] The options, and the values\n\t * of custom keys of the URL template.\n\t */\n\tconstructor(url, options) {\n\t\tsuper(options);\n\n\t\toptions = Util.setOptions(this, options);\n\n\t\t// Set required OpenStreetMap attribution if it hasn't been specified\n\t\tif (isOSMUrl(url) && options.attribution === null) {\n\t\t\toptions.attribution = `&copy; <a href=\"https://www.openstreetmap.org/copyright\">${I18n.translate('OpenStreetMap contributors')}</a>`;\n\t\t}\n\t\tthis._url = upgradeOSMUrl(url);\n\n\t\tconst {tileSize, zoomOffset, minZoom, maxZoom, minNativeZoom, maxNativeZoom} = this.options;\n\t\tthis._nonRetinaOptions = {tileSize, zoomOffset, minZoom, maxZoom, minNativeZoom, maxNativeZoom};\n\t\tthis._applyRetina();\n\n\t\tif (typeof this.options.subdomains === 'string') {\n\t\t\tthis.options.subdomains = this.options.subdomains.split('');\n\t\t}\n\n\t\tthis.callInitHooks(TileLayer);\n\t}\n\n\t// Detects retina displays (if `detectRetina` is set), adjusting tileSize and zoom levels. Below a\n\t// pixel ratio of 1.5 (e.g. 125% scaling), half-size tiles of the next zoom make labels too small to read.\n\t_applyRetina() {\n\t\tObject.assign(this.options, this._nonRetinaOptions);\n\t\tthis._retina = retinaLevel();\n\n\t\tif (this.options.detectRetina && this._retina === 2 && this.options.maxZoom > 0) {\n\n\t\t\tconst tileSize = this.options.tileSize;\n\t\t\tthis.options.tileSize = tileSize instanceof Point ? tileSize.divideBy(2).floor() : Math.floor(tileSize / 2);\n\n\t\t\tif (!this.options.zoomReverse) {\n\t\t\t\tthis.options.zoomOffset++;\n\t\t\t\tthis.options.maxZoom = Math.max(this.options.minZoom, this.options.maxZoom - 1);\n\t\t\t} else {\n\t\t\t\tthis.options.zoomOffset--;\n\t\t\t\tthis.options.minZoom = Math.min(this.options.maxZoom, this.options.minZoom + 1);\n\t\t\t}\n\n\t\t\tthis.options.minZoom = Math.max(0, this.options.minZoom);\n\n\t\t\t// either way, the tile at zoom z is now the server's z + 1 tile, so native zooms shift down by one, so\n\t\t\t// that no tiles beyond the native zoom levels are requested\n\t\t\tif (this.options.maxNativeZoom !== undefined) {\n\t\t\t\tthis.options.maxNativeZoom = Math.max(0, this.options.maxNativeZoom - 1);\n\t\t\t}\n\t\t\tif (this.options.minNativeZoom !== undefined) {\n\t\t\t\tthis.options.minNativeZoom = Math.max(0, this.options.minNativeZoom - 1);\n\t\t\t}\n\t\t} else if (!this.options.zoomReverse) {\n\t\t\t// make sure maxZoom is gte minZoom\n\t\t\tthis.options.maxZoom = Math.max(this.options.minZoom, this.options.maxZoom);\n\t\t} else {\n\t\t\t// make sure minZoom is lte maxZoom\n\t\t\tthis.options.minZoom = Math.min(this.options.maxZoom, this.options.minZoom);\n\t\t}\n\t}\n\n\t/**\n\t * Returns the map events the layer listens to, see `Layer`.\n\t * @returns {Record<string, Function>}\n\t */\n\tgetEvents() {\n\t\tconst events = super.getEvents();\n\t\tevents.pixelratiochange = this._onPixelRatioChange;\n\t\treturn events;\n\t}\n\n\t// Loads the tiles for the new resolution, see the map's `pixelratiochange` event.\n\t_onPixelRatioChange() {\n\t\tif (retinaLevel() === this._retina) { return; }\n\t\tconst map = this._map;\n\t\tthis._applyRetina();\n\t\tif (this.options.detectRetina) {\n\t\t\tmap._removeZoomLimit(this);\n\t\t\tmap._addZoomLimit(this);\n\t\t\tthis._invalidateAll();\n\t\t\tthis._resetView();\n\t\t} else if (this._url.includes('{r}')) {\n\t\t\tthis.redraw();\n\t\t}\n\t}\n\n\t/**\n\t * Updates the layer's URL template and redraws it (unless `noRedraw` is set to `true`).\n\t * If the URL does not change, the layer will not be redrawn unless\n\t * the noRedraw parameter is set to false.\n\t * The current tiles stay visible until the new tiles have loaded, to avoid flickering.\n\t * @param {string} url\n\t * @param {boolean} [noRedraw]\n\t * @returns {this}\n\t */\n\tsetUrl(url, noRedraw) {\n\t\turl = upgradeOSMUrl(url);\n\n\t\tif (this._url === url && noRedraw === undefined) {\n\t\t\tnoRedraw = true;\n\t\t}\n\n\t\tthis._url = url;\n\n\t\tif (!noRedraw) {\n\t\t\tthis._keepCurrentTiles();\n\t\t\tthis.redraw();\n\t\t}\n\t\treturn this;\n\t}\n\n\t/**\n\t * Called only internally, overrides GridLayer's [`createTile()`](#gridlayer-createtile)\n\t * to return an `<img>` HTML element with the appropriate image URL given `coords`. The\n\t * `done` callback is called when the tile has been loaded.\n\t * @param {Point} coords\n\t * @param {TileDoneCallback} [done]\n\t * @returns {HTMLImageElement}\n\t */\n\tcreateTile(coords, done) {\n\t\tconst tile = document.createElement('img');\n\n\t\tDomEvent.on(tile, 'load', this._tileOnLoad.bind(this, done, tile));\n\t\tDomEvent.on(tile, 'error', this._tileOnError.bind(this, done, tile));\n\n\t\tif (this.options.crossOrigin || this.options.crossOrigin === '') {\n\t\t\ttile.crossOrigin = this.options.crossOrigin === true ? '' : this.options.crossOrigin;\n\t\t}\n\n\t\t// for this new option we follow the documented behavior\n\t\t// more closely by only setting the property when string\n\t\tif (typeof this.options.referrerPolicy === 'string') {\n\t\t\ttile.referrerPolicy = this.options.referrerPolicy;\n\t\t}\n\n\t\t// The alt attribute is set to the empty string,\n\t\t// allowing screen readers to ignore the decorative image tiles.\n\t\t// https://www.w3.org/WAI/tutorials/images/decorative/\n\t\t// https://www.w3.org/TR/html-aria/#el-img-empty-alt\n\t\ttile.alt = '';\n\n\t\tconst url = this.getTileUrl(coords);\n\t\tif (this.options.fetchOptions) {\n\t\t\tthis._fetchTile(tile, url, done);\n\t\t} else {\n\t\t\ttile.src = url;\n\t\t}\n\n\t\treturn tile;\n\t}\n\n\t// Loads the tile image with `fetch()`, see the `fetchOptions` option.\n\t_fetchTile(tile, url, done) {\n\t\tconst controller = new AbortController(),\n\t\toptions = {signal: controller.signal, ...this.options.fetchOptions};\n\t\tif (typeof this.options.referrerPolicy === 'string') {\n\t\t\toptions.referrerPolicy ??= this.options.referrerPolicy;\n\t\t}\n\n\t\tthis._tileFetches ??= new Map();\n\t\tthis._tileFetches.set(tile, controller);\n\n\t\tfetch(url, options)\n\t\t\t.then((response) => {\n\t\t\t\tif (!response.ok) {\n\t\t\t\t\tthrow new Error(`Failed to load the tile ${url}: HTTP ${response.status}`);\n\t\t\t\t}\n\t\t\t\treturn response.blob();\n\t\t\t})\n\t\t\t.then((blob) => {\n\t\t\t\t// revoked in `_tileOnLoad()`\n\t\t\t\ttile.src = URL.createObjectURL(blob);\n\t\t\t})\n\t\t\t.catch((error) => {\n\t\t\t\tif (!controller.signal.aborted) {\n\t\t\t\t\tthis._tileOnError(done, tile, error);\n\t\t\t\t}\n\t\t\t})\n\t\t\t.finally(() => this._tileFetches.delete(tile));\n\t}\n\n\t// Aborts the request of a tile loaded with `fetch()`, returns whether there was one.\n\t_abortTileFetch(tile) {\n\t\tconst controller = this._tileFetches?.get(tile);\n\t\tif (!controller) { return false; }\n\t\tcontroller.abort();\n\t\tthis._tileFetches.delete(tile);\n\t\treturn true;\n\t}\n\n\t/**\n\t * Called only internally, returns the URL for a tile given its coordinates.\n\t * Classes extending `TileLayer` can override this function to provide custom tile URL\n\t * naming schemes.\n\t * @group Extension methods\n\t * @param {Point} coords\n\t * @returns {string}\n\t */\n\tgetTileUrl(coords) {\n\t\tconst z = coords.z ?? this._tileZoom,\n\t\tdata = Object.create(this.options);\n\t\tObject.assign(data, {\n\t\t\tr: window.devicePixelRatio > 1 ? '@2x' : '',\n\t\t\ts: this._getSubdomain(coords),\n\t\t\tx: coords.x,\n\t\t\ty: coords.y,\n\t\t\tz: this._getZoomForUrl(z)\n\t\t});\n\t\tconst worldBounds = this._map?.getPixelWorldBounds(z);\n\t\tif (worldBounds) {\n\t\t\tconst invertedY = this._pxBoundsToTileRange(worldBounds).max.y - coords.y;\n\t\t\tif (this.options.tms) {\n\t\t\t\tdata['y'] = invertedY;\n\t\t\t}\n\t\t\tdata['-y'] = invertedY;\n\t\t}\n\n\t\treturn Util.template(this._url, data);\n\t}\n\n\t_tileOnLoad(done, tile) {\n\t\tif (tile.src.startsWith('blob:')) {\n\t\t\t// the image keeps its data, see `_fetchTile()`\n\t\t\tURL.revokeObjectURL(tile.src);\n\t\t}\n\t\tdone(null, tile);\n\t}\n\n\t_tileOnError(done, tile, e) {\n\t\tconst errorUrl = this.options.errorTileUrl,\n\t\tsrc = tile.getAttribute('src');\n\t\t// removed tiles get an empty src to cancel their request, which fires error too\n\t\tif (errorUrl && src !== errorUrl && (src || tile.isConnected)) {\n\t\t\ttile.src = errorUrl;\n\t\t}\n\t\tdone(e, tile);\n\t}\n\n\t_getZoomForUrl(zoom) {\n\t\tconst maxZoom = this.options.maxZoom,\n\t\tzoomReverse = this.options.zoomReverse,\n\t\tzoomOffset = this.options.zoomOffset;\n\n\t\tif (zoomReverse) {\n\t\t\tzoom = maxZoom - zoom;\n\t\t}\n\n\t\treturn zoom + zoomOffset;\n\t}\n\n\t_getSubdomain(tilePoint) {\n\t\tconst {subdomains} = this.options;\n\t\treturn subdomains?.[Math.abs(tilePoint.x + tilePoint.y) % subdomains.length];\n\t}\n\n\t// stops loading all tiles in the background layer\n\t_abortLoading() {\n\t\tlet i, tile;\n\t\tfor (i of Object.keys(this._tiles)) {\n\t\t\tif (this._tiles[i].coords.z !== this._tileZoom) {\n\t\t\t\ttile = this._tiles[i].el;\n\n\t\t\t\tif (this._abortTileFetch(tile) || !tile.complete) {\n\t\t\t\t\ttile.setAttribute('src', '');\n\t\t\t\t\tconst coords = this._tiles[i].coords;\n\t\t\t\t\ttile.remove();\n\t\t\t\t\tdelete this._tiles[i];\n\t\t\t\t\tthis.fire('tileabort', {\n\t\t\t\t\t\ttile,\n\t\t\t\t\t\tcoords\n\t\t\t\t\t});\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\t_removeTile(key) {\n\t\tconst tile = this._tiles[key];\n\t\tif (!tile) { return; }\n\n\t\t// Cancels any pending http requests associated with the tile\n\t\tthis._abortTileFetch(tile.el);\n\t\ttile.el.setAttribute('src', '');\n\n\t\treturn super._removeTile(key);\n\t}\n\n\t_tileReady(coords, err, tile) {\n\t\tif (!this._map || tile?.getAttribute('src') === '') {\n\t\t\treturn;\n\t\t}\n\n\t\treturn super._tileReady(coords, err, tile);\n\t}\n\n\t_clampZoom(zoom) {\n\t\treturn Math.round(super._clampZoom(zoom));\n\t}\n}\n"],"mappings":"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"}
@@ -78,7 +78,7 @@ var WMSTileLayer = class WMSTileLayer extends TileLayer {
78
78
  this.callInitHooks(WMSTileLayer);
79
79
  }
80
80
  _updateWmsSize() {
81
- const realRetina = this.options.detectRetina && window.devicePixelRatio > 1 ? 2 : 1;
81
+ const realRetina = this.options.detectRetina && window.devicePixelRatio >= 1.5 ? 2 : 1;
82
82
  const tileSize = this.getTileSize();
83
83
  this.wmsParams.width = tileSize.x * realRetina;
84
84
  this.wmsParams.height = tileSize.y * realRetina;
@@ -134,7 +134,10 @@ var WMSTileLayer = class WMSTileLayer extends TileLayer {
134
134
  for (const [k, v] of Object.entries({
135
135
  ...this.wmsParams,
136
136
  bbox
137
- })) url.searchParams.append(this.options.uppercase ? k.toUpperCase() : k, `${v}`);
137
+ })) {
138
+ if (v == null) continue;
139
+ url.searchParams.append(this.options.uppercase ? k.toUpperCase() : k, `${v}`);
140
+ }
138
141
  return url.toString();
139
142
  }
140
143
  /**
@@ -162,7 +165,8 @@ var WMSTileLayer = class WMSTileLayer extends TileLayer {
162
165
  /**
163
166
  * Merges an object with the new parameters and re-requests tiles on the current screen
164
167
  * (unless `noRedraw` was set to true). The current tiles stay visible until the new
165
- * tiles have loaded, to avoid flickering.
168
+ * tiles have loaded, to avoid flickering. Set a parameter to `undefined` or `null` to
169
+ * leave it out of the requests.
166
170
  * @param {Record<string, any>} params
167
171
  * @param {boolean} [noRedraw]
168
172
  * @returns {this}
@@ -1 +1 @@
1
- {"version":3,"file":"WMSTileLayer.js","names":[],"sources":["../../../../src/layer/tile/WMSTileLayer.js"],"sourcesContent":["import {TileLayer} from './TileLayer.js';\nimport {EPSG4326} from '../../geo/crs/EPSG4326.js';\nimport {Bounds} from '../../geometry/Bounds.js';\n/** @import {CRS} from '../../geo/crs/CRS.js' */\n/** @import {Point} from '../../geometry/Point.js' */\n/** @import {MaplairMap} from '../../map/Map.js' */\n/** @import {TileLayerOptions} from './TileLayer.js' */\n\n/**\n * Options of `WMSTileLayer`. If any custom options not documented here are used, they\n * will be sent to the WMS server as extra parameters in each request URL. This can be\n * useful for\n * [non-standard vendor WMS parameters](https://docs.geoserver.org/stable/en/user/services/wms/vendor.html).\n * @typedef {object} WMSTileLayerOptions\n * @property {string} [layers=''] **(required)** Comma-separated list of WMS layers to\n * show.\n * @property {string} [styles=''] Comma-separated list of WMS styles.\n * @property {string} [format='image/jpeg'] WMS image format (use `'image/png'` for\n * layers with transparency).\n * @property {boolean} [transparent=false] If `true`, the WMS service will return images\n * with transparency.\n * @property {string} [version='1.1.1'] Version of the WMS service to use.\n * @property {CRS|null} [crs=null] Coordinate Reference System to use for the WMS\n * requests, defaults to map CRS. Don't change this if you're not sure what it means.\n * @property {boolean} [uppercase=false] If `true`, WMS request parameter keys will be\n * uppercase.\n * @extends TileLayerOptions\n */\n\n/**\n * Used to display [WMS](https://en.wikipedia.org/wiki/Web_Map_Service) services as tile\n * layers on the map. Extends `TileLayer`.\n *\n * @example\n * ```js\n * const nexrad = new WMSTileLayer(\"http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi\", {\n * \tlayers: 'nexrad-n0r-900913',\n * \tformat: 'image/png',\n * \ttransparent: true,\n * \tattribution: \"Weather data © 2012 IEM Nexrad\"\n * });\n * ```\n */\nexport class WMSTileLayer extends TileLayer {\n\n\t/**\n\t * The default WMS parameters, which the options override, see `WMSTileLayerOptions`.\n\t * @type {Record<string, any>}\n\t */\n\tstatic defaultWmsParams = {\n\t\tservice: 'WMS',\n\t\trequest: 'GetMap',\n\t\tlayers: '',\n\t\tstyles: '',\n\t\tformat: 'image/jpeg',\n\t\ttransparent: false,\n\t\tversion: '1.1.1'\n\t};\n\n\tstatic defaultOptions = {\n\t\tcrs: null,\n\t\tuppercase: false\n\t};\n\n\t/**\n\t * Instantiates a WMS tile layer object given a base URL of the WMS service and a WMS\n\t * parameters/options object.\n\t * @param {string} url The base URL of the WMS service.\n\t * @param {WMSTileLayerOptions & Record<string, unknown>} options The options and WMS\n\t * parameters.\n\t */\n\tconstructor(url, options) {\n\t\tsuper(url, options);\n\n\t\tconst wmsParams = {...WMSTileLayer.defaultWmsParams};\n\n\t\t// Options that are unknown in the prototype chain are considered WMS params.\n\t\tfor (const [key, value] of Object.entries(options)) {\n\t\t\tif (!(key in WMSTileLayer.defaultOptions)) {\n\t\t\t\twmsParams[key] = value;\n\t\t\t}\n\t\t}\n\n\t\t/**\n\t\t * The parameters of the WMS requests, see `setParams()`.\n\t\t * @type {Record<string, any>}\n\t\t */\n\t\tthis.wmsParams = wmsParams;\n\t\tthis._updateWmsSize();\n\n\t\tthis.callInitHooks(WMSTileLayer);\n\t}\n\n\t// The size of the requested images: the tile size, doubled on retina displays with `detectRetina`.\n\t_updateWmsSize() {\n\t\tconst realRetina = this.options.detectRetina && window.devicePixelRatio > 1 ? 2 : 1;\n\t\tconst tileSize = this.getTileSize();\n\n\t\tthis.wmsParams.width = tileSize.x * realRetina;\n\t\tthis.wmsParams.height = tileSize.y * realRetina;\n\t}\n\n\t_applyRetina() {\n\t\tsuper._applyRetina();\n\t\tif (this.wmsParams) {\n\t\t\tthis._updateWmsSize();\n\t\t}\n\t}\n\n\t/**\n\t * Uses the CRS of the map (unless the `crs` option is set) and loads the tiles.\n\t * @param {MaplairMap} map\n\t */\n\tonAdd(map) {\n\t\tthis._updateCrs();\n\t\tsuper.onAdd(map);\n\t}\n\n\t_updateCrs() {\n\t\tthis._crs = this.options.crs ?? this._map.options.crs;\n\t\tthis._wmsVersion = parseFloat(this.wmsParams.version);\n\n\t\tdelete this.wmsParams.srs;\n\t\tdelete this.wmsParams.crs;\n\t\tthis.wmsParams[this._wmsVersion >= 1.3 ? 'crs' : 'srs'] = this._crs.code;\n\t}\n\n\t/**\n\t * Returns the map events the layer listens to, see `Layer`.\n\t * @returns {Record<string, Function>}\n\t */\n\tgetEvents() {\n\t\tconst events = super.getEvents();\n\t\tevents.crschange = this._updateCrs;\n\t\treturn events;\n\t}\n\n\t/**\n\t * Called only internally, returns the URL of the `GetMap` request for a tile given its\n\t * coordinates.\n\t * @group Extension methods\n\t * @param {Point} coords\n\t * @returns {string}\n\t */\n\tgetTileUrl(coords) {\n\n\t\tconst tileBounds = this._tileCoordsToNwSe(coords),\n\t\tcrs = this._crs,\n\t\tbounds = new Bounds(crs.project(tileBounds[0]), crs.project(tileBounds[1])),\n\t\tmin = bounds.min,\n\t\tmax = bounds.max,\n\t\tbbox = (this._wmsVersion >= 1.3 && this._crs === EPSG4326 ?\n\t\t\t[min.y, min.x, max.y, max.x] :\n\t\t\t[min.x, min.y, max.x, max.y]).join(',');\n\t\tconst url = new URL(super.getTileUrl(coords), document.baseURI);\n\t\tfor (const [k, v] of Object.entries({...this.wmsParams, bbox})) {\n\t\t\turl.searchParams.append(this.options.uppercase ? k.toUpperCase() : k, `${v}`);\n\t\t}\n\t\treturn url.toString();\n\t}\n\n\t/**\n\t * Returns the URL of the legend image (a `GetLegendGraphic` request) of the first\n\t * of the `layers` (with its style, if any), with the version, format and `uppercase`\n\t * option of the layer. `params` change or add parameters, e.g. `{layer: 'roads',\n\t * width: 20, height: 20}` or vendor parameters like `legend_options`.\n\t * @param {Record<string, any>} [params]\n\t * @returns {string}\n\t */\n\tgetLegendUrl(params) {\n\t\tconst {version, format, layers, styles} = this.wmsParams,\n\t\turl = new URL(this._url, document.baseURI);\n\t\tfor (const [k, v] of Object.entries({\n\t\t\tservice: 'WMS',\n\t\t\trequest: 'GetLegendGraphic',\n\t\t\tversion,\n\t\t\tformat,\n\t\t\tlayer: layers.split(',')[0],\n\t\t\tstyle: styles?.split(',')[0] || undefined,\n\t\t\t// required by the WMS 1.3 profile of SLD\n\t\t\tsld_version: parseFloat(version) >= 1.3 ? '1.1.0' : undefined,\n\t\t\t...params\n\t\t})) {\n\t\t\tif (v !== undefined) {\n\t\t\t\turl.searchParams.set(this.options.uppercase ? k.toUpperCase() : k, v);\n\t\t\t}\n\t\t}\n\t\treturn url.toString();\n\t}\n\n\t/**\n\t * Merges an object with the new parameters and re-requests tiles on the current screen\n\t * (unless `noRedraw` was set to true). The current tiles stay visible until the new\n\t * tiles have loaded, to avoid flickering.\n\t * @param {Record<string, any>} params\n\t * @param {boolean} [noRedraw]\n\t * @returns {this}\n\t */\n\tsetParams(params, noRedraw) {\n\n\t\tObject.assign(this.wmsParams, params);\n\n\t\tif (this._map) { this._updateCrs(); }\n\n\t\tif (!noRedraw) {\n\t\t\tthis._keepCurrentTiles();\n\t\t\tthis.redraw();\n\t\t}\n\n\t\treturn this;\n\t}\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"WMSTileLayer.js","names":[],"sources":["../../../../src/layer/tile/WMSTileLayer.js"],"sourcesContent":["import {TileLayer} from './TileLayer.js';\nimport {EPSG4326} from '../../geo/crs/EPSG4326.js';\nimport {Bounds} from '../../geometry/Bounds.js';\n/** @import {CRS} from '../../geo/crs/CRS.js' */\n/** @import {Point} from '../../geometry/Point.js' */\n/** @import {MaplairMap} from '../../map/Map.js' */\n/** @import {TileLayerOptions} from './TileLayer.js' */\n\n/**\n * Options of `WMSTileLayer`. If any custom options not documented here are used, they\n * will be sent to the WMS server as extra parameters in each request URL. This can be\n * useful for\n * [non-standard vendor WMS parameters](https://docs.geoserver.org/stable/en/user/services/wms/vendor.html).\n * @typedef {object} WMSTileLayerOptions\n * @property {string} [layers=''] **(required)** Comma-separated list of WMS layers to\n * show.\n * @property {string} [styles=''] Comma-separated list of WMS styles.\n * @property {string} [format='image/jpeg'] WMS image format (use `'image/png'` for\n * layers with transparency).\n * @property {boolean} [transparent=false] If `true`, the WMS service will return images\n * with transparency.\n * @property {string} [version='1.1.1'] Version of the WMS service to use.\n * @property {CRS|null} [crs=null] Coordinate Reference System to use for the WMS\n * requests, defaults to map CRS. Don't change this if you're not sure what it means.\n * @property {boolean} [uppercase=false] If `true`, WMS request parameter keys will be\n * uppercase.\n * @extends TileLayerOptions\n */\n\n/**\n * Used to display [WMS](https://en.wikipedia.org/wiki/Web_Map_Service) services as tile\n * layers on the map. Extends `TileLayer`.\n *\n * @example\n * ```js\n * const nexrad = new WMSTileLayer(\"http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi\", {\n * \tlayers: 'nexrad-n0r-900913',\n * \tformat: 'image/png',\n * \ttransparent: true,\n * \tattribution: \"Weather data © 2012 IEM Nexrad\"\n * });\n * ```\n */\nexport class WMSTileLayer extends TileLayer {\n\n\t/**\n\t * The default WMS parameters, which the options override, see `WMSTileLayerOptions`.\n\t * @type {Record<string, any>}\n\t */\n\tstatic defaultWmsParams = {\n\t\tservice: 'WMS',\n\t\trequest: 'GetMap',\n\t\tlayers: '',\n\t\tstyles: '',\n\t\tformat: 'image/jpeg',\n\t\ttransparent: false,\n\t\tversion: '1.1.1'\n\t};\n\n\tstatic defaultOptions = {\n\t\tcrs: null,\n\t\tuppercase: false\n\t};\n\n\t/**\n\t * Instantiates a WMS tile layer object given a base URL of the WMS service and a WMS\n\t * parameters/options object.\n\t * @param {string} url The base URL of the WMS service.\n\t * @param {WMSTileLayerOptions & Record<string, unknown>} options The options and WMS\n\t * parameters.\n\t */\n\tconstructor(url, options) {\n\t\tsuper(url, options);\n\n\t\tconst wmsParams = {...WMSTileLayer.defaultWmsParams};\n\n\t\t// Options that are unknown in the prototype chain are considered WMS params.\n\t\tfor (const [key, value] of Object.entries(options)) {\n\t\t\tif (!(key in WMSTileLayer.defaultOptions)) {\n\t\t\t\twmsParams[key] = value;\n\t\t\t}\n\t\t}\n\n\t\t/**\n\t\t * The parameters of the WMS requests, see `setParams()`.\n\t\t * @type {Record<string, any>}\n\t\t */\n\t\tthis.wmsParams = wmsParams;\n\t\tthis._updateWmsSize();\n\n\t\tthis.callInitHooks(WMSTileLayer);\n\t}\n\n\t// The size of the requested images: the tile size, doubled on retina displays with `detectRetina`.\n\t_updateWmsSize() {\n\t\tconst realRetina = this.options.detectRetina && window.devicePixelRatio >= 1.5 ? 2 : 1;\n\t\tconst tileSize = this.getTileSize();\n\n\t\tthis.wmsParams.width = tileSize.x * realRetina;\n\t\tthis.wmsParams.height = tileSize.y * realRetina;\n\t}\n\n\t_applyRetina() {\n\t\tsuper._applyRetina();\n\t\tif (this.wmsParams) {\n\t\t\tthis._updateWmsSize();\n\t\t}\n\t}\n\n\t/**\n\t * Uses the CRS of the map (unless the `crs` option is set) and loads the tiles.\n\t * @param {MaplairMap} map\n\t */\n\tonAdd(map) {\n\t\tthis._updateCrs();\n\t\tsuper.onAdd(map);\n\t}\n\n\t_updateCrs() {\n\t\tthis._crs = this.options.crs ?? this._map.options.crs;\n\t\tthis._wmsVersion = parseFloat(this.wmsParams.version);\n\n\t\tdelete this.wmsParams.srs;\n\t\tdelete this.wmsParams.crs;\n\t\tthis.wmsParams[this._wmsVersion >= 1.3 ? 'crs' : 'srs'] = this._crs.code;\n\t}\n\n\t/**\n\t * Returns the map events the layer listens to, see `Layer`.\n\t * @returns {Record<string, Function>}\n\t */\n\tgetEvents() {\n\t\tconst events = super.getEvents();\n\t\tevents.crschange = this._updateCrs;\n\t\treturn events;\n\t}\n\n\t/**\n\t * Called only internally, returns the URL of the `GetMap` request for a tile given its\n\t * coordinates.\n\t * @group Extension methods\n\t * @param {Point} coords\n\t * @returns {string}\n\t */\n\tgetTileUrl(coords) {\n\n\t\tconst tileBounds = this._tileCoordsToNwSe(coords),\n\t\tcrs = this._crs,\n\t\tbounds = new Bounds(crs.project(tileBounds[0]), crs.project(tileBounds[1])),\n\t\tmin = bounds.min,\n\t\tmax = bounds.max,\n\t\tbbox = (this._wmsVersion >= 1.3 && this._crs === EPSG4326 ?\n\t\t\t[min.y, min.x, max.y, max.x] :\n\t\t\t[min.x, min.y, max.x, max.y]).join(',');\n\t\tconst url = new URL(super.getTileUrl(coords), document.baseURI);\n\t\tfor (const [k, v] of Object.entries({...this.wmsParams, bbox})) {\n\t\t\tif (v == null) { continue; } // unset, e.g. cleared with `setParams`\n\t\t\turl.searchParams.append(this.options.uppercase ? k.toUpperCase() : k, `${v}`);\n\t\t}\n\t\treturn url.toString();\n\t}\n\n\t/**\n\t * Returns the URL of the legend image (a `GetLegendGraphic` request) of the first\n\t * of the `layers` (with its style, if any), with the version, format and `uppercase`\n\t * option of the layer. `params` change or add parameters, e.g. `{layer: 'roads',\n\t * width: 20, height: 20}` or vendor parameters like `legend_options`.\n\t * @param {Record<string, any>} [params]\n\t * @returns {string}\n\t */\n\tgetLegendUrl(params) {\n\t\tconst {version, format, layers, styles} = this.wmsParams,\n\t\turl = new URL(this._url, document.baseURI);\n\t\tfor (const [k, v] of Object.entries({\n\t\t\tservice: 'WMS',\n\t\t\trequest: 'GetLegendGraphic',\n\t\t\tversion,\n\t\t\tformat,\n\t\t\tlayer: layers.split(',')[0],\n\t\t\tstyle: styles?.split(',')[0] || undefined,\n\t\t\t// required by the WMS 1.3 profile of SLD\n\t\t\tsld_version: parseFloat(version) >= 1.3 ? '1.1.0' : undefined,\n\t\t\t...params\n\t\t})) {\n\t\t\tif (v !== undefined) {\n\t\t\t\turl.searchParams.set(this.options.uppercase ? k.toUpperCase() : k, v);\n\t\t\t}\n\t\t}\n\t\treturn url.toString();\n\t}\n\n\t/**\n\t * Merges an object with the new parameters and re-requests tiles on the current screen\n\t * (unless `noRedraw` was set to true). The current tiles stay visible until the new\n\t * tiles have loaded, to avoid flickering. Set a parameter to `undefined` or `null` to\n\t * leave it out of the requests.\n\t * @param {Record<string, any>} params\n\t * @param {boolean} [noRedraw]\n\t * @returns {this}\n\t */\n\tsetParams(params, noRedraw) {\n\n\t\tObject.assign(this.wmsParams, params);\n\n\t\tif (this._map) { this._updateCrs(); }\n\n\t\tif (!noRedraw) {\n\t\t\tthis._keepCurrentTiles();\n\t\t\tthis.redraw();\n\t\t}\n\n\t\treturn this;\n\t}\n}\n"],"mappings":"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"}
@@ -1,5 +1,4 @@
1
1
  import { stamp } from "../../core/Util.js";
2
- import { on } from "../../dom/DomEvent.js";
3
2
  import { Bounds } from "../../geometry/Bounds.js";
4
3
  import { Renderer } from "./Renderer.js";
5
4
  // src/layer/vector/Canvas.js
@@ -73,22 +72,21 @@ var Canvas = class Canvas extends Renderer {
73
72
  */
74
73
  onAdd(map) {
75
74
  super.onAdd(map);
75
+ const z = (r) => +getComputedStyle(r._container.parentNode).zIndex || 0;
76
+ map._canvases.push(this);
77
+ map._canvases.sort((a, b) => z(b) - z(a) || 1 - (a._container.compareDocumentPosition(b._container) & 2));
76
78
  this._draw();
77
79
  }
80
+ _initContainer() {
81
+ const container = this._container = document.createElement("canvas");
82
+ this._ctx = container.getContext("2d");
83
+ }
78
84
  /**
79
85
  * Removes the canvas from the map.
80
86
  */
81
87
  onRemove() {
88
+ this._map._canvases = this._map._canvases.filter((r) => r !== this);
82
89
  super.onRemove();
83
- clearTimeout(this._pointerHoverThrottleTimeout);
84
- }
85
- _initContainer() {
86
- const container = this._container = document.createElement("canvas");
87
- on(container, "pointermove", this._onPointerMove, this);
88
- on(container, "click dblclick pointerdown pointerup contextmenu", this._onClick, this);
89
- on(container, "pointerout", this._handlePointerOut, this);
90
- container["_maplair_disable_events"] = true;
91
- this._ctx = container.getContext("2d");
92
90
  }
93
91
  _destroyContainer() {
94
92
  cancelAnimationFrame(this._redrawRequest);
@@ -124,26 +122,13 @@ var Canvas = class Canvas extends Renderer {
124
122
  _initPath(layer) {
125
123
  this._updateDashArray(layer);
126
124
  this._layers[stamp(layer)] = layer;
127
- const order = layer._order = {
128
- layer,
129
- prev: this._drawLast,
130
- next: null
131
- };
132
- if (this._drawLast) this._drawLast.next = order;
133
- this._drawLast = order;
134
- this._drawFirst ??= this._drawLast;
125
+ this._append(layer._order = { layer });
135
126
  }
136
127
  _addPath(layer) {
137
128
  this._requestRedraw(layer);
138
129
  }
139
130
  _removePath(layer) {
140
- const order = layer._order;
141
- const next = order.next;
142
- const prev = order.prev;
143
- if (next) next.prev = prev;
144
- else this._drawLast = prev;
145
- if (prev) prev.next = next;
146
- else this._drawFirst = next;
131
+ this._unlink(layer._order);
147
132
  delete layer._order;
148
133
  delete this._layers[stamp(layer)];
149
134
  this._requestRedraw(layer);
@@ -169,7 +154,7 @@ var Canvas = class Canvas extends Renderer {
169
154
  }
170
155
  _extendRedrawBounds(layer) {
171
156
  if (layer._pxBounds) {
172
- const padding = (layer.options.weight ?? 0) + 1;
157
+ const padding = (+layer.options.weight || 0) + 1;
173
158
  this._redrawBounds ??= new Bounds();
174
159
  this._redrawBounds.extend(layer._pxBounds.min.subtract([padding, padding]));
175
160
  this._redrawBounds.extend(layer._pxBounds.max.add([padding, padding]));
@@ -211,7 +196,7 @@ var Canvas = class Canvas extends Renderer {
211
196
  this._drawing = true;
212
197
  for (let order = this._drawFirst; order; order = order.next) {
213
198
  layer = order.layer;
214
- if (!bounds || layer._pxBounds && layer._pxBounds.intersects(bounds)) layer._updatePath();
199
+ if (!bounds || layer._pxBounds?.intersects(bounds)) layer._updatePath();
215
200
  }
216
201
  this._drawing = false;
217
202
  this._ctx.restore();
@@ -244,7 +229,7 @@ var Canvas = class Canvas extends Renderer {
244
229
  ctx.fillStyle = options.fillColor ?? options.color;
245
230
  ctx.fill(options.fillRule || "evenodd");
246
231
  }
247
- if (options.stroke && options.weight !== 0) {
232
+ if (options.stroke && +options.weight !== 0) {
248
233
  ctx.lineDashOffset = Number(options.dashOffset ?? 0);
249
234
  ctx.setLineDash(layer._dashArray ?? []);
250
235
  ctx.globalAlpha = options.opacity;
@@ -256,84 +241,50 @@ var Canvas = class Canvas extends Renderer {
256
241
  }
257
242
  }
258
243
  _updateInteractive() {}
259
- _onClick(e) {
244
+ /**
245
+ * Returns the topmost interactive layer under the pointer.
246
+ * @param {MouseEvent} e
247
+ * @param {boolean} [click] Skip layers that were just dragged, so the drag doesn't end with a click.
248
+ * @returns {Path|undefined}
249
+ */
250
+ _layerAt(e, click) {
260
251
  const point = this._map.pointerEventToLayerPoint(e);
261
- let layer, clickedLayer;
262
- for (let order = this._drawFirst; order; order = order.next) {
263
- layer = order.layer;
264
- if (layer.options.interactive && layer._containsPoint(point)) {
265
- if (!(e.type === "click" || e.type === "preclick") || !this._map._draggableMoved(layer)) clickedLayer = layer;
266
- }
252
+ for (let order = this._drawLast; order; order = order.prev) {
253
+ const layer = order.layer;
254
+ if (layer.options.interactive && layer._containsPoint(point) && !(click && this._map._draggableMoved(layer))) return layer;
267
255
  }
268
- this._fireEvent(clickedLayer ? [clickedLayer] : false, e);
269
- }
270
- _onPointerMove(e) {
271
- if (!this._map || this._map.dragging.moving() || this._map._animatingZoom) return;
272
- const point = this._map.pointerEventToLayerPoint(e);
273
- this._handlePointerHover(e, point);
274
256
  }
275
- _handlePointerOut(e) {
276
- const layer = this._hoveredLayer;
277
- if (layer) {
278
- this._container.classList.remove("maplair-interactive");
279
- this._fireEvent([layer], e, "pointerout");
280
- this._hoveredLayer = null;
281
- this._pointerHoverThrottled = false;
257
+ _bringToFront(layer) {
258
+ const order = layer._order;
259
+ if (order?.next) {
260
+ this._unlink(order);
261
+ this._append(order);
262
+ this._requestRedraw(layer);
282
263
  }
283
264
  }
284
- _handlePointerHover(e, point) {
285
- if (this._pointerHoverThrottled) return;
286
- let layer, candidateHoveredLayer;
287
- for (let order = this._drawFirst; order; order = order.next) {
288
- layer = order.layer;
289
- if (layer.options.interactive && layer._containsPoint(point)) candidateHoveredLayer = layer;
290
- }
291
- if (candidateHoveredLayer !== this._hoveredLayer) {
292
- this._handlePointerOut(e);
293
- if (candidateHoveredLayer) {
294
- this._container.classList.add("maplair-interactive");
295
- this._fireEvent([candidateHoveredLayer], e, "pointerover");
296
- this._hoveredLayer = candidateHoveredLayer;
297
- }
265
+ _bringToBack(layer) {
266
+ const order = layer._order;
267
+ if (order?.prev) {
268
+ this._unlink(order);
269
+ order.prev = null;
270
+ order.next = this._drawFirst;
271
+ this._drawFirst.prev = order;
272
+ this._drawFirst = order;
273
+ this._requestRedraw(layer);
298
274
  }
299
- this._fireEvent(this._hoveredLayer ? [this._hoveredLayer] : false, e);
300
- this._pointerHoverThrottled = true;
301
- this._pointerHoverThrottleTimeout = setTimeout((() => {
302
- this._pointerHoverThrottled = false;
303
- }), 32);
304
- }
305
- _fireEvent(layers, e, type) {
306
- this._map._fireDOMEvent(e, type || e.type, layers);
307
275
  }
308
- _bringToFront(layer) {
309
- const order = layer._order;
310
- if (!order) return;
311
- const next = order.next;
312
- const prev = order.prev;
313
- if (next) next.prev = prev;
314
- else return;
315
- if (prev) prev.next = next;
316
- else if (next) this._drawFirst = next;
276
+ _append(order) {
317
277
  order.prev = this._drawLast;
318
- this._drawLast.next = order;
319
278
  order.next = null;
279
+ if (this._drawLast) this._drawLast.next = order;
320
280
  this._drawLast = order;
321
- this._requestRedraw(layer);
281
+ this._drawFirst ??= order;
322
282
  }
323
- _bringToBack(layer) {
324
- const order = layer._order;
325
- if (!order) return;
326
- const next = order.next;
327
- const prev = order.prev;
328
- if (prev) prev.next = next;
329
- else return;
283
+ _unlink({ prev, next }) {
330
284
  if (next) next.prev = prev;
331
- else if (prev) this._drawLast = prev;
332
- order.prev = null;
333
- order.next = this._drawFirst;
334
- this._drawFirst.prev = order;
335
- this._drawFirst = order;
336
- this._requestRedraw(layer);
285
+ else this._drawLast = prev;
286
+ if (prev) prev.next = next;
287
+ else this._drawFirst = next;
337
288
  }
338
289
  };
339
290
  export { Canvas };
@@ -1 +1 @@
1
- {"version":3,"file":"Canvas.js","names":["Util.stamp"],"sources":["../../../../src/layer/vector/Canvas.js"],"sourcesContent":["import {Renderer} from './Renderer.js';\nimport * as DomEvent from '../../dom/DomEvent.js';\nimport * as Util from '../../core/Util.js';\nimport {Bounds} from '../../geometry/Bounds.js';\n/** @import {MaplairMap} from '../../map/Map.js' */\n/** @import {EventListener} from '../../core/Events.js' */\n/** @import {RendererOptions} from './Renderer.js' */\n\nconst DASH_SEPARATOR_RE = /[, ]+/;\n\n/**\n * Options of `Canvas`.\n * @typedef {object} CanvasOptions\n * @property {number} [tolerance=0] How much to extend the click tolerance around a\n * path/object on the map.\n * @extends RendererOptions\n */\n\n/**\n * Allows vector layers to be displayed with [`<canvas>`](https://developer.mozilla.org/docs/Web/API/Canvas_API).\n * Inherits `Renderer`.\n *\n * @example\n * Use Canvas by default for all paths in the map:\n *\n * ```js\n * const map = new MaplairMap('map', {\n * \trenderer: new Canvas()\n * });\n * ```\n *\n * Use a Canvas renderer with extra padding for specific vector geometries:\n *\n * ```js\n * const map = new MaplairMap('map');\n * const myRenderer = new Canvas({ padding: 0.5 });\n * const line = new Polyline( coordinates, { renderer: myRenderer } );\n * const circle = new Circle( center, { renderer: myRenderer, radius: 100 } );\n * ```\n */\nexport class Canvas extends Renderer {\n\n\tstatic defaultOptions = {\n\t\ttolerance: 0\n\t};\n\n\t/**\n\t * Creates a Canvas renderer with the given options.\n\t * @overload\n\t * @param {CanvasOptions} [options]\n\t */\n\t/**\n\t * @param {...any} args\n\t */\n\tconstructor(...args) {\n\t\tsuper(...args);\n\t\tthis.callInitHooks(Canvas);\n\t}\n\n\t/**\n\t * Returns the map events the renderer listens to.\n\t * @returns {Record<string, EventListener>}\n\t */\n\tgetEvents() {\n\t\tconst events = super.getEvents();\n\t\tevents.viewprereset = this._onViewPreReset;\n\t\tevents.pixelratiochange = this._onPixelRatioChange;\n\t\treturn events;\n\t}\n\n\t// Redraws with the resolution of the new `devicePixelRatio`.\n\t_onPixelRatioChange() {\n\t\tthis._resizeContainer();\n\t\tthis._update();\n\t}\n\n\t_onViewPreReset() {\n\t\t// Set a flag so that a viewprereset+moveend+viewreset only updates&redraws once\n\t\tthis._postponeUpdatePaths = true;\n\t}\n\n\t/**\n\t * Adds the canvas to the map and draws the paths.\n\t * @param {MaplairMap} map\n\t */\n\tonAdd(map) {\n\t\tsuper.onAdd(map);\n\n\t\t// Redraw vectors since canvas is cleared upon removal,\n\t\t// in case of removing the renderer itself from the map.\n\t\tthis._draw();\n\t}\n\n\t/**\n\t * Removes the canvas from the map.\n\t */\n\tonRemove() {\n\t\tsuper.onRemove();\n\n\t\tclearTimeout(this._pointerHoverThrottleTimeout);\n\t}\n\n\t_initContainer() {\n\t\tconst container = this._container = document.createElement('canvas');\n\n\t\tDomEvent.on(container, 'pointermove', this._onPointerMove, this);\n\t\tDomEvent.on(container, 'click dblclick pointerdown pointerup contextmenu', this._onClick, this);\n\t\tDomEvent.on(container, 'pointerout', this._handlePointerOut, this);\n\t\tcontainer['_maplair_disable_events'] = true;\n\n\t\tthis._ctx = container.getContext('2d');\n\t}\n\n\t_destroyContainer() {\n\t\tcancelAnimationFrame(this._redrawRequest);\n\t\tthis._redrawRequest = null;\n\t\tdelete this._ctx;\n\t\tsuper._destroyContainer();\n\t}\n\n\t_resizeContainer() {\n\t\tconst size = super._resizeContainer();\n\t\tconst m = this._ctxScale = window.devicePixelRatio;\n\n\t\t// set canvas size (also clearing it); use double size on retina\n\t\tthis._container.width = m * size.x;\n\t\tthis._container.height = m * size.y;\n\t}\n\n\t_updatePaths() {\n\t\tif (this._postponeUpdatePaths) { return; }\n\n\t\tthis._redrawBounds = null;\n\t\tfor (const layer of Object.values(this._layers)) {\n\t\t\tlayer._update();\n\t\t}\n\t\tthis._redraw();\n\t}\n\n\t_update() {\n\t\tif (this._map._animatingZoom && this._bounds) { return; }\n\n\t\tconst b = this._bounds,\n\t\ts = this._ctxScale;\n\n\t\t// translate so we use the same path coordinates after canvas element moves\n\t\tthis._ctx.setTransform(\n\t\t\ts, 0, 0, s,\n\t\t\t-b.min.x * s,\n\t\t\t-b.min.y * s);\n\n\t\t// Tell paths to redraw themselves\n\t\tthis.fire('update');\n\t}\n\n\t_reset() {\n\t\tsuper._reset();\n\n\t\tif (this._postponeUpdatePaths) {\n\t\t\tthis._postponeUpdatePaths = false;\n\t\t\tthis._updatePaths();\n\t\t}\n\t}\n\n\t_initPath(layer) {\n\t\tthis._updateDashArray(layer);\n\t\tthis._layers[Util.stamp(layer)] = layer;\n\n\t\tconst order = layer._order = {\n\t\t\tlayer,\n\t\t\tprev: this._drawLast,\n\t\t\tnext: null\n\t\t};\n\t\tif (this._drawLast) { this._drawLast.next = order; }\n\t\tthis._drawLast = order;\n\t\tthis._drawFirst ??= this._drawLast;\n\t}\n\n\t_addPath(layer) {\n\t\tthis._requestRedraw(layer);\n\t}\n\n\t_removePath(layer) {\n\t\tconst order = layer._order;\n\t\tconst next = order.next;\n\t\tconst prev = order.prev;\n\n\t\tif (next) {\n\t\t\tnext.prev = prev;\n\t\t} else {\n\t\t\tthis._drawLast = prev;\n\t\t}\n\t\tif (prev) {\n\t\t\tprev.next = next;\n\t\t} else {\n\t\t\tthis._drawFirst = next;\n\t\t}\n\n\t\tdelete layer._order;\n\n\t\tdelete this._layers[Util.stamp(layer)];\n\n\t\tthis._requestRedraw(layer);\n\t}\n\n\t_updatePath(layer) {\n\t\t// Redraw the union of the layer's old pixel\n\t\t// bounds and the new pixel bounds.\n\t\tthis._extendRedrawBounds(layer);\n\t\tlayer._project();\n\t\tlayer._update();\n\t\t// The redraw will extend the redraw bounds\n\t\t// with the new pixel bounds.\n\t\tthis._requestRedraw(layer);\n\t}\n\n\t_updateStyle(layer) {\n\t\tthis._updateDashArray(layer);\n\t\tthis._requestRedraw(layer);\n\t}\n\n\t_updateDashArray(layer) {\n\t\tif (typeof layer.options.dashArray === 'string') {\n\t\t\tconst parts = layer.options.dashArray.split(DASH_SEPARATOR_RE);\n\t\t\t// Ignore dash array containing invalid lengths\n\t\t\tlayer._dashArray = parts.map(n => Number(n)).filter(n => !isNaN(n));\n\t\t} else {\n\t\t\tlayer._dashArray = layer.options.dashArray;\n\t\t}\n\t}\n\n\t_requestRedraw(layer) {\n\t\tif (!this._map) { return; }\n\n\t\tthis._extendRedrawBounds(layer);\n\t\tthis._redrawRequest ??= requestAnimationFrame(this._redraw.bind(this));\n\t}\n\n\t_extendRedrawBounds(layer) {\n\t\tif (layer._pxBounds) {\n\t\t\tconst padding = (layer.options.weight ?? 0) + 1;\n\t\t\tthis._redrawBounds ??= new Bounds();\n\t\t\tthis._redrawBounds.extend(layer._pxBounds.min.subtract([padding, padding]));\n\t\t\tthis._redrawBounds.extend(layer._pxBounds.max.add([padding, padding]));\n\t\t}\n\t}\n\n\t_redraw() {\n\t\t// also when redrawing directly, see `_updatePaths()`\n\t\tcancelAnimationFrame(this._redrawRequest);\n\t\tthis._redrawRequest = null;\n\n\t\tif (this._redrawBounds) {\n\t\t\tthis._redrawBounds.min._floor();\n\t\t\tthis._redrawBounds.max._ceil();\n\t\t}\n\n\t\tthis._clear(); // clear layers in redraw bounds\n\t\tthis._draw(); // draw layers\n\n\t\tthis._redrawBounds = null;\n\t}\n\n\t_clear() {\n\t\tconst bounds = this._redrawBounds;\n\t\tif (bounds) {\n\t\t\tconst size = bounds.getSize();\n\t\t\tthis._ctx.clearRect(bounds.min.x, bounds.min.y, size.x, size.y);\n\t\t} else {\n\t\t\tthis._ctx.save();\n\t\t\tthis._ctx.setTransform(1, 0, 0, 1, 0, 0);\n\t\t\tthis._ctx.clearRect(0, 0, this._container.width, this._container.height);\n\t\t\tthis._ctx.restore();\n\t\t}\n\t}\n\n\t_draw() {\n\t\tlet layer;\n\t\tconst bounds = this._redrawBounds;\n\t\tthis._ctx.save();\n\t\tif (bounds) {\n\t\t\tconst size = bounds.getSize();\n\t\t\tthis._ctx.beginPath();\n\t\t\tthis._ctx.rect(bounds.min.x, bounds.min.y, size.x, size.y);\n\t\t\tthis._ctx.clip();\n\t\t}\n\n\t\tthis._drawing = true;\n\n\t\tfor (let order = this._drawFirst; order; order = order.next) {\n\t\t\tlayer = order.layer;\n\t\t\tif (!bounds || (layer._pxBounds && layer._pxBounds.intersects(bounds))) {\n\t\t\t\tlayer._updatePath();\n\t\t\t}\n\t\t}\n\n\t\tthis._drawing = false;\n\n\t\tthis._ctx.restore(); // Restore state before clipping.\n\t}\n\n\t_updatePoly(layer, closed) {\n\t\tif (!this._drawing) { return; }\n\n\t\tconst parts = layer._parts,\n\t\tctx = this._ctx;\n\n\t\tif (!parts.length) { return; }\n\n\t\tctx.beginPath();\n\n\t\tparts.forEach((p0) => {\n\t\t\tp0.forEach((p, j) => {\n\t\t\t\tctx[j ? 'lineTo' : 'moveTo'](p.x, p.y);\n\t\t\t});\n\t\t\tif (closed) {\n\t\t\t\tctx.closePath();\n\t\t\t}\n\t\t});\n\n\t\tthis._fillStroke(ctx, layer);\n\n\t\t// TODO optimization: 1 fill/stroke for all features with equal style instead of 1 for each feature\n\t}\n\n\t_updateCircle(layer) {\n\n\t\tif (!this._drawing || layer._empty()) { return; }\n\n\t\tconst {x, y} = layer._point,\n\t\tctx = this._ctx,\n\t\tr = Math.max(Math.round(layer._pxRadius), 1),\n\t\try = Math.max(Math.round(layer._pxRadiusY), 1) || r;\n\n\t\tctx.beginPath();\n\t\t// arc is faster for circles in Chrome and Firefox, ellipse for everything else\n\t\tif (ry === r) {\n\t\t\tctx.arc(x, y, r, 0, Math.PI * 2);\n\t\t} else {\n\t\t\tctx.ellipse(x, y, r, ry, 0, 0, Math.PI * 2);\n\t\t}\n\n\t\tthis._fillStroke(ctx, layer);\n\t}\n\n\t_fillStroke(ctx, layer) {\n\t\tconst options = layer.options;\n\n\t\tif (options.fill) {\n\t\t\tctx.globalAlpha = options.fillOpacity;\n\t\t\tctx.fillStyle = options.fillColor ?? options.color;\n\t\t\tctx.fill(options.fillRule || 'evenodd');\n\t\t}\n\n\t\tif (options.stroke && options.weight !== 0) {\n\t\t\tctx.lineDashOffset = Number(options.dashOffset ?? 0);\n\t\t\tctx.setLineDash(layer._dashArray ?? []);\n\t\t\tctx.globalAlpha = options.opacity;\n\t\t\tctx.lineWidth = options.weight;\n\t\t\tctx.strokeStyle = options.color;\n\t\t\tctx.lineCap = options.lineCap;\n\t\t\tctx.lineJoin = options.lineJoin;\n\t\t\tctx.stroke();\n\t\t}\n\t}\n\n\t// The hit detection checks the `interactive` option of the layers,\n\t// the hovered layer is left on the next pointer move.\n\t_updateInteractive() {}\n\n\t// Canvas obviously doesn't have pointer events for individual drawn objects,\n\t// so we emulate that by calculating what's under the pointer on pointermove/click manually\n\n\t_onClick(e) {\n\t\tconst point = this._map.pointerEventToLayerPoint(e);\n\t\tlet layer, clickedLayer;\n\n\t\tfor (let order = this._drawFirst; order; order = order.next) {\n\t\t\tlayer = order.layer;\n\t\t\tif (layer.options.interactive && layer._containsPoint(point)) {\n\t\t\t\tif (!(e.type === 'click' || e.type === 'preclick') || !this._map._draggableMoved(layer)) {\n\t\t\t\t\tclickedLayer = layer;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tthis._fireEvent(clickedLayer ? [clickedLayer] : false, e);\n\t}\n\n\t_onPointerMove(e) {\n\t\tif (!this._map || this._map.dragging.moving() || this._map._animatingZoom) { return; }\n\n\t\tconst point = this._map.pointerEventToLayerPoint(e);\n\t\tthis._handlePointerHover(e, point);\n\t}\n\n\n\t_handlePointerOut(e) {\n\t\tconst layer = this._hoveredLayer;\n\t\tif (layer) {\n\t\t\t// if we're leaving the layer, fire pointerout\n\t\t\tthis._container.classList.remove('maplair-interactive');\n\t\t\tthis._fireEvent([layer], e, 'pointerout');\n\t\t\tthis._hoveredLayer = null;\n\t\t\tthis._pointerHoverThrottled = false;\n\t\t}\n\t}\n\n\t_handlePointerHover(e, point) {\n\t\tif (this._pointerHoverThrottled) {\n\t\t\treturn;\n\t\t}\n\n\t\tlet layer, candidateHoveredLayer;\n\n\t\tfor (let order = this._drawFirst; order; order = order.next) {\n\t\t\tlayer = order.layer;\n\t\t\tif (layer.options.interactive && layer._containsPoint(point)) {\n\t\t\t\tcandidateHoveredLayer = layer;\n\t\t\t}\n\t\t}\n\n\t\tif (candidateHoveredLayer !== this._hoveredLayer) {\n\t\t\tthis._handlePointerOut(e);\n\n\t\t\tif (candidateHoveredLayer) {\n\t\t\t\tthis._container.classList.add('maplair-interactive'); // change cursor\n\t\t\t\tthis._fireEvent([candidateHoveredLayer], e, 'pointerover');\n\t\t\t\tthis._hoveredLayer = candidateHoveredLayer;\n\t\t\t}\n\t\t}\n\n\t\tthis._fireEvent(this._hoveredLayer ? [this._hoveredLayer] : false, e);\n\n\t\tthis._pointerHoverThrottled = true;\n\t\tthis._pointerHoverThrottleTimeout = setTimeout((() => {\n\t\t\tthis._pointerHoverThrottled = false;\n\t\t}), 32);\n\t}\n\n\t_fireEvent(layers, e, type) {\n\t\tthis._map._fireDOMEvent(e, type || e.type, layers);\n\t}\n\n\t_bringToFront(layer) {\n\t\tconst order = layer._order;\n\n\t\tif (!order) { return; }\n\n\t\tconst next = order.next;\n\t\tconst prev = order.prev;\n\n\t\tif (next) {\n\t\t\tnext.prev = prev;\n\t\t} else {\n\t\t\t// Already last\n\t\t\treturn;\n\t\t}\n\t\tif (prev) {\n\t\t\tprev.next = next;\n\t\t} else if (next) {\n\t\t\t// Update first entry unless this is the\n\t\t\t// single entry\n\t\t\tthis._drawFirst = next;\n\t\t}\n\n\t\torder.prev = this._drawLast;\n\t\tthis._drawLast.next = order;\n\n\t\torder.next = null;\n\t\tthis._drawLast = order;\n\n\t\tthis._requestRedraw(layer);\n\t}\n\n\t_bringToBack(layer) {\n\t\tconst order = layer._order;\n\n\t\tif (!order) { return; }\n\n\t\tconst next = order.next;\n\t\tconst prev = order.prev;\n\n\t\tif (prev) {\n\t\t\tprev.next = next;\n\t\t} else {\n\t\t\t// Already first\n\t\t\treturn;\n\t\t}\n\t\tif (next) {\n\t\t\tnext.prev = prev;\n\t\t} else if (prev) {\n\t\t\t// Update last entry unless this is the\n\t\t\t// single entry\n\t\t\tthis._drawLast = prev;\n\t\t}\n\n\t\torder.prev = null;\n\n\t\torder.next = this._drawFirst;\n\t\tthis._drawFirst.prev = order;\n\t\tthis._drawFirst = order;\n\n\t\tthis._requestRedraw(layer);\n\t}\n}\n"],"mappings":";;;;;;;;AAQA,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgC1B,IAAa,SAAb,MAAa,eAAe,SAAS;CAEpC,OAAO,iBAAiB,EACvB,WAAW,EACZ;;;;;;;;;CAUA,YAAY,GAAG,MAAM;EACpB,MAAM,GAAG,IAAI;EACb,KAAK,cAAc,MAAM;CAC1B;;;;;CAMA,YAAY;EACX,MAAM,SAAS,MAAM,UAAU;EAC/B,OAAO,eAAe,KAAK;EAC3B,OAAO,mBAAmB,KAAK;EAC/B,OAAO;CACR;CAGA,sBAAsB;EACrB,KAAK,iBAAiB;EACtB,KAAK,QAAQ;CACd;CAEA,kBAAkB;EAEjB,KAAK,uBAAuB;CAC7B;;;;;CAMA,MAAM,KAAK;EACV,MAAM,MAAM,GAAG;EAIf,KAAK,MAAM;CACZ;;;;CAKA,WAAW;EACV,MAAM,SAAS;EAEf,aAAa,KAAK,4BAA4B;CAC/C;CAEA,iBAAiB;EAChB,MAAM,YAAY,KAAK,aAAa,SAAS,cAAc,QAAQ;EAEnE,GAAY,WAAW,eAAe,KAAK,gBAAgB,IAAI;EAC/D,GAAY,WAAW,oDAAoD,KAAK,UAAU,IAAI;EAC9F,GAAY,WAAW,cAAc,KAAK,mBAAmB,IAAI;EACjE,UAAU,6BAA6B;EAEvC,KAAK,OAAO,UAAU,WAAW,IAAI;CACtC;CAEA,oBAAoB;EACnB,qBAAqB,KAAK,cAAc;EACxC,KAAK,iBAAiB;EACtB,OAAO,KAAK;EACZ,MAAM,kBAAkB;CACzB;CAEA,mBAAmB;EAClB,MAAM,OAAO,MAAM,iBAAiB;EACpC,MAAM,IAAI,KAAK,YAAY,OAAO;EAGlC,KAAK,WAAW,QAAQ,IAAI,KAAK;EACjC,KAAK,WAAW,SAAS,IAAI,KAAK;CACnC;CAEA,eAAe;EACd,IAAI,KAAK,sBAAwB;EAEjC,KAAK,gBAAgB;EACrB,KAAK,MAAM,SAAS,OAAO,OAAO,KAAK,OAAO,GAC7C,MAAM,QAAQ;EAEf,KAAK,QAAQ;CACd;CAEA,UAAU;EACT,IAAI,KAAK,KAAK,kBAAkB,KAAK,SAAW;EAEhD,MAAM,IAAI,KAAK,SACf,IAAI,KAAK;EAGT,KAAK,KAAK,aACT,GAAG,GAAG,GAAG,GACT,CAAC,EAAE,IAAI,IAAI,GACX,CAAC,EAAE,IAAI,IAAI,CAAC;EAGb,KAAK,KAAK,QAAQ;CACnB;CAEA,SAAS;EACR,MAAM,OAAO;EAEb,IAAI,KAAK,sBAAsB;GAC9B,KAAK,uBAAuB;GAC5B,KAAK,aAAa;EACnB;CACD;CAEA,UAAU,OAAO;EAChB,KAAK,iBAAiB,KAAK;EAC3B,KAAK,QAAQA,MAAW,KAAK,KAAK;EAElC,MAAM,QAAQ,MAAM,SAAS;GAC5B;GACA,MAAM,KAAK;GACX,MAAM;EACP;EACA,IAAI,KAAK,WAAa,KAAK,UAAU,OAAO;EAC5C,KAAK,YAAY;EACjB,KAAK,eAAe,KAAK;CAC1B;CAEA,SAAS,OAAO;EACf,KAAK,eAAe,KAAK;CAC1B;CAEA,YAAY,OAAO;EAClB,MAAM,QAAQ,MAAM;EACpB,MAAM,OAAO,MAAM;EACnB,MAAM,OAAO,MAAM;EAEnB,IAAI,MACH,KAAK,OAAO;OAEZ,KAAK,YAAY;EAElB,IAAI,MACH,KAAK,OAAO;OAEZ,KAAK,aAAa;EAGnB,OAAO,MAAM;EAEb,OAAO,KAAK,QAAQA,MAAW,KAAK;EAEpC,KAAK,eAAe,KAAK;CAC1B;CAEA,YAAY,OAAO;EAGlB,KAAK,oBAAoB,KAAK;EAC9B,MAAM,SAAS;EACf,MAAM,QAAQ;EAGd,KAAK,eAAe,KAAK;CAC1B;CAEA,aAAa,OAAO;EACnB,KAAK,iBAAiB,KAAK;EAC3B,KAAK,eAAe,KAAK;CAC1B;CAEA,iBAAiB,OAAO;EACvB,IAAI,OAAO,MAAM,QAAQ,cAAc,UAGtC,MAAM,aAFQ,MAAM,QAAQ,UAAU,MAAM,iBAErB,CAAC,CAAC,KAAI,MAAK,OAAO,CAAC,CAAC,CAAC,CAAC,QAAO,MAAK,CAAC,MAAM,CAAC,CAAC;OAElE,MAAM,aAAa,MAAM,QAAQ;CAEnC;CAEA,eAAe,OAAO;EACrB,IAAI,CAAC,KAAK,MAAQ;EAElB,KAAK,oBAAoB,KAAK;EAC9B,KAAK,mBAAmB,sBAAsB,KAAK,QAAQ,KAAK,IAAI,CAAC;CACtE;CAEA,oBAAoB,OAAO;EAC1B,IAAI,MAAM,WAAW;GACpB,MAAM,WAAW,MAAM,QAAQ,UAAU,KAAK;GAC9C,KAAK,kBAAkB,IAAI,OAAO;GAClC,KAAK,cAAc,OAAO,MAAM,UAAU,IAAI,SAAS,CAAC,SAAS,OAAO,CAAC,CAAC;GAC1E,KAAK,cAAc,OAAO,MAAM,UAAU,IAAI,IAAI,CAAC,SAAS,OAAO,CAAC,CAAC;EACtE;CACD;CAEA,UAAU;EAET,qBAAqB,KAAK,cAAc;EACxC,KAAK,iBAAiB;EAEtB,IAAI,KAAK,eAAe;GACvB,KAAK,cAAc,IAAI,OAAO;GAC9B,KAAK,cAAc,IAAI,MAAM;EAC9B;EAEA,KAAK,OAAO;EACZ,KAAK,MAAM;EAEX,KAAK,gBAAgB;CACtB;CAEA,SAAS;EACR,MAAM,SAAS,KAAK;EACpB,IAAI,QAAQ;GACX,MAAM,OAAO,OAAO,QAAQ;GAC5B,KAAK,KAAK,UAAU,OAAO,IAAI,GAAG,OAAO,IAAI,GAAG,KAAK,GAAG,KAAK,CAAC;EAC/D,OAAO;GACN,KAAK,KAAK,KAAK;GACf,KAAK,KAAK,aAAa,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;GACvC,KAAK,KAAK,UAAU,GAAG,GAAG,KAAK,WAAW,OAAO,KAAK,WAAW,MAAM;GACvE,KAAK,KAAK,QAAQ;EACnB;CACD;CAEA,QAAQ;EACP,IAAI;EACJ,MAAM,SAAS,KAAK;EACpB,KAAK,KAAK,KAAK;EACf,IAAI,QAAQ;GACX,MAAM,OAAO,OAAO,QAAQ;GAC5B,KAAK,KAAK,UAAU;GACpB,KAAK,KAAK,KAAK,OAAO,IAAI,GAAG,OAAO,IAAI,GAAG,KAAK,GAAG,KAAK,CAAC;GACzD,KAAK,KAAK,KAAK;EAChB;EAEA,KAAK,WAAW;EAEhB,KAAK,IAAI,QAAQ,KAAK,YAAY,OAAO,QAAQ,MAAM,MAAM;GAC5D,QAAQ,MAAM;GACd,IAAI,CAAC,UAAW,MAAM,aAAa,MAAM,UAAU,WAAW,MAAM,GACnE,MAAM,YAAY;EAEpB;EAEA,KAAK,WAAW;EAEhB,KAAK,KAAK,QAAQ;CACnB;CAEA,YAAY,OAAO,QAAQ;EAC1B,IAAI,CAAC,KAAK,UAAY;EAEtB,MAAM,QAAQ,MAAM,QACpB,MAAM,KAAK;EAEX,IAAI,CAAC,MAAM,QAAU;EAErB,IAAI,UAAU;EAEd,MAAM,SAAS,OAAO;GACrB,GAAG,SAAS,GAAG,MAAM;IACpB,IAAI,IAAI,WAAW,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;GACtC,CAAC;GACD,IAAI,QACH,IAAI,UAAU;EAEhB,CAAC;EAED,KAAK,YAAY,KAAK,KAAK;CAG5B;CAEA,cAAc,OAAO;EAEpB,IAAI,CAAC,KAAK,YAAY,MAAM,OAAO,GAAK;EAExC,MAAM,EAAC,GAAG,MAAK,MAAM,QACrB,MAAM,KAAK,MACX,IAAI,KAAK,IAAI,KAAK,MAAM,MAAM,SAAS,GAAG,CAAC,GAC3C,KAAK,KAAK,IAAI,KAAK,MAAM,MAAM,UAAU,GAAG,CAAC,KAAK;EAElD,IAAI,UAAU;EAEd,IAAI,OAAO,GACV,IAAI,IAAI,GAAG,GAAG,GAAG,GAAG,KAAK,KAAK,CAAC;OAE/B,IAAI,QAAQ,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,KAAK,KAAK,CAAC;EAG3C,KAAK,YAAY,KAAK,KAAK;CAC5B;CAEA,YAAY,KAAK,OAAO;EACvB,MAAM,UAAU,MAAM;EAEtB,IAAI,QAAQ,MAAM;GACjB,IAAI,cAAc,QAAQ;GAC1B,IAAI,YAAY,QAAQ,aAAa,QAAQ;GAC7C,IAAI,KAAK,QAAQ,YAAY,SAAS;EACvC;EAEA,IAAI,QAAQ,UAAU,QAAQ,WAAW,GAAG;GAC3C,IAAI,iBAAiB,OAAO,QAAQ,cAAc,CAAC;GACnD,IAAI,YAAY,MAAM,cAAc,CAAC,CAAC;GACtC,IAAI,cAAc,QAAQ;GAC1B,IAAI,YAAY,QAAQ;GACxB,IAAI,cAAc,QAAQ;GAC1B,IAAI,UAAU,QAAQ;GACtB,IAAI,WAAW,QAAQ;GACvB,IAAI,OAAO;EACZ;CACD;CAIA,qBAAqB,CAAC;CAKtB,SAAS,GAAG;EACX,MAAM,QAAQ,KAAK,KAAK,yBAAyB,CAAC;EAClD,IAAI,OAAO;EAEX,KAAK,IAAI,QAAQ,KAAK,YAAY,OAAO,QAAQ,MAAM,MAAM;GAC5D,QAAQ,MAAM;GACd,IAAI,MAAM,QAAQ,eAAe,MAAM,eAAe,KAAK,GACtD;QAAA,EAAE,EAAE,SAAS,WAAW,EAAE,SAAS,eAAe,CAAC,KAAK,KAAK,gBAAgB,KAAK,GACrF,eAAe;GAAA;EAGlB;EACA,KAAK,WAAW,eAAe,CAAC,YAAY,IAAI,OAAO,CAAC;CACzD;CAEA,eAAe,GAAG;EACjB,IAAI,CAAC,KAAK,QAAQ,KAAK,KAAK,SAAS,OAAO,KAAK,KAAK,KAAK,gBAAkB;EAE7E,MAAM,QAAQ,KAAK,KAAK,yBAAyB,CAAC;EAClD,KAAK,oBAAoB,GAAG,KAAK;CAClC;CAGA,kBAAkB,GAAG;EACpB,MAAM,QAAQ,KAAK;EACnB,IAAI,OAAO;GAEV,KAAK,WAAW,UAAU,OAAO,qBAAqB;GACtD,KAAK,WAAW,CAAC,KAAK,GAAG,GAAG,YAAY;GACxC,KAAK,gBAAgB;GACrB,KAAK,yBAAyB;EAC/B;CACD;CAEA,oBAAoB,GAAG,OAAO;EAC7B,IAAI,KAAK,wBACR;EAGD,IAAI,OAAO;EAEX,KAAK,IAAI,QAAQ,KAAK,YAAY,OAAO,QAAQ,MAAM,MAAM;GAC5D,QAAQ,MAAM;GACd,IAAI,MAAM,QAAQ,eAAe,MAAM,eAAe,KAAK,GAC1D,wBAAwB;EAE1B;EAEA,IAAI,0BAA0B,KAAK,eAAe;GACjD,KAAK,kBAAkB,CAAC;GAExB,IAAI,uBAAuB;IAC1B,KAAK,WAAW,UAAU,IAAI,qBAAqB;IACnD,KAAK,WAAW,CAAC,qBAAqB,GAAG,GAAG,aAAa;IACzD,KAAK,gBAAgB;GACtB;EACD;EAEA,KAAK,WAAW,KAAK,gBAAgB,CAAC,KAAK,aAAa,IAAI,OAAO,CAAC;EAEpE,KAAK,yBAAyB;EAC9B,KAAK,+BAA+B,kBAAkB;GACrD,KAAK,yBAAyB;EAC/B,IAAI,EAAE;CACP;CAEA,WAAW,QAAQ,GAAG,MAAM;EAC3B,KAAK,KAAK,cAAc,GAAG,QAAQ,EAAE,MAAM,MAAM;CAClD;CAEA,cAAc,OAAO;EACpB,MAAM,QAAQ,MAAM;EAEpB,IAAI,CAAC,OAAS;EAEd,MAAM,OAAO,MAAM;EACnB,MAAM,OAAO,MAAM;EAEnB,IAAI,MACH,KAAK,OAAO;OAGZ;EAED,IAAI,MACH,KAAK,OAAO;OACN,IAAI,MAGV,KAAK,aAAa;EAGnB,MAAM,OAAO,KAAK;EAClB,KAAK,UAAU,OAAO;EAEtB,MAAM,OAAO;EACb,KAAK,YAAY;EAEjB,KAAK,eAAe,KAAK;CAC1B;CAEA,aAAa,OAAO;EACnB,MAAM,QAAQ,MAAM;EAEpB,IAAI,CAAC,OAAS;EAEd,MAAM,OAAO,MAAM;EACnB,MAAM,OAAO,MAAM;EAEnB,IAAI,MACH,KAAK,OAAO;OAGZ;EAED,IAAI,MACH,KAAK,OAAO;OACN,IAAI,MAGV,KAAK,YAAY;EAGlB,MAAM,OAAO;EAEb,MAAM,OAAO,KAAK;EAClB,KAAK,WAAW,OAAO;EACvB,KAAK,aAAa;EAElB,KAAK,eAAe,KAAK;CAC1B;AACD"}
1
+ {"version":3,"file":"Canvas.js","names":["Util.stamp"],"sources":["../../../../src/layer/vector/Canvas.js"],"sourcesContent":["import {Renderer} from './Renderer.js';\nimport * as Util from '../../core/Util.js';\nimport {Bounds} from '../../geometry/Bounds.js';\n/** @import {MaplairMap} from '../../map/Map.js' */\n/** @import {EventListener} from '../../core/Events.js' */\n/** @import {RendererOptions} from './Renderer.js' */\n\nconst DASH_SEPARATOR_RE = /[, ]+/;\n\n/**\n * Options of `Canvas`.\n * @typedef {object} CanvasOptions\n * @property {number} [tolerance=0] How much to extend the click tolerance around a\n * path/object on the map.\n * @extends RendererOptions\n */\n\n/**\n * Allows vector layers to be displayed with [`<canvas>`](https://developer.mozilla.org/docs/Web/API/Canvas_API).\n * Inherits `Renderer`.\n *\n * @example\n * Use Canvas by default for all paths in the map:\n *\n * ```js\n * const map = new MaplairMap('map', {\n * \trenderer: new Canvas()\n * });\n * ```\n *\n * Use a Canvas renderer with extra padding for specific vector geometries:\n *\n * ```js\n * const map = new MaplairMap('map');\n * const myRenderer = new Canvas({ padding: 0.5 });\n * const line = new Polyline( coordinates, { renderer: myRenderer } );\n * const circle = new Circle( center, { renderer: myRenderer, radius: 100 } );\n * ```\n */\nexport class Canvas extends Renderer {\n\n\tstatic defaultOptions = {\n\t\ttolerance: 0\n\t};\n\n\t/**\n\t * Creates a Canvas renderer with the given options.\n\t * @overload\n\t * @param {CanvasOptions} [options]\n\t */\n\t/**\n\t * @param {...any} args\n\t */\n\tconstructor(...args) {\n\t\tsuper(...args);\n\t\tthis.callInitHooks(Canvas);\n\t}\n\n\t/**\n\t * Returns the map events the renderer listens to.\n\t * @returns {Record<string, EventListener>}\n\t */\n\tgetEvents() {\n\t\tconst events = super.getEvents();\n\t\tevents.viewprereset = this._onViewPreReset;\n\t\tevents.pixelratiochange = this._onPixelRatioChange;\n\t\treturn events;\n\t}\n\n\t// Redraws with the resolution of the new `devicePixelRatio`.\n\t_onPixelRatioChange() {\n\t\tthis._resizeContainer();\n\t\tthis._update();\n\t}\n\n\t_onViewPreReset() {\n\t\t// Set a flag so that a viewprereset+moveend+viewreset only updates&redraws once\n\t\tthis._postponeUpdatePaths = true;\n\t}\n\n\t/**\n\t * Adds the canvas to the map and draws the paths.\n\t * @param {MaplairMap} map\n\t */\n\tonAdd(map) {\n\t\tsuper.onAdd(map);\n\n\t\t// the map hit-tests canvas renderers topmost first: by pane z-index, then DOM order\n\t\tconst z = r => +getComputedStyle(r._container.parentNode).zIndex || 0;\n\t\tmap._canvases.push(this);\n\t\tmap._canvases.sort((a, b) => z(b) - z(a) || 1 - (a._container.compareDocumentPosition(b._container) & 2));\n\n\t\t// Redraw vectors since canvas is cleared upon removal,\n\t\t// in case of removing the renderer itself from the map.\n\t\tthis._draw();\n\t}\n\n\t_initContainer() {\n\t\tconst container = this._container = document.createElement('canvas');\n\n\t\tthis._ctx = container.getContext('2d');\n\t}\n\n\t/**\n\t * Removes the canvas from the map.\n\t */\n\tonRemove() {\n\t\tthis._map._canvases = this._map._canvases.filter(r => r !== this);\n\t\tsuper.onRemove();\n\t}\n\n\t_destroyContainer() {\n\t\tcancelAnimationFrame(this._redrawRequest);\n\t\tthis._redrawRequest = null;\n\t\tdelete this._ctx;\n\t\tsuper._destroyContainer();\n\t}\n\n\t_resizeContainer() {\n\t\tconst size = super._resizeContainer();\n\t\tconst m = this._ctxScale = window.devicePixelRatio;\n\n\t\t// set canvas size (also clearing it); use double size on retina\n\t\tthis._container.width = m * size.x;\n\t\tthis._container.height = m * size.y;\n\t}\n\n\t_updatePaths() {\n\t\tif (this._postponeUpdatePaths) { return; }\n\n\t\tthis._redrawBounds = null;\n\t\tfor (const layer of Object.values(this._layers)) {\n\t\t\tlayer._update();\n\t\t}\n\t\tthis._redraw();\n\t}\n\n\t_update() {\n\t\tif (this._map._animatingZoom && this._bounds) { return; }\n\n\t\tconst b = this._bounds,\n\t\ts = this._ctxScale;\n\n\t\t// translate so we use the same path coordinates after canvas element moves\n\t\tthis._ctx.setTransform(\n\t\t\ts, 0, 0, s,\n\t\t\t-b.min.x * s,\n\t\t\t-b.min.y * s);\n\n\t\t// Tell paths to redraw themselves\n\t\tthis.fire('update');\n\t}\n\n\t_reset() {\n\t\tsuper._reset();\n\n\t\tif (this._postponeUpdatePaths) {\n\t\t\tthis._postponeUpdatePaths = false;\n\t\t\tthis._updatePaths();\n\t\t}\n\t}\n\n\t_initPath(layer) {\n\t\tthis._updateDashArray(layer);\n\t\tthis._layers[Util.stamp(layer)] = layer;\n\n\t\tthis._append(layer._order = {layer});\n\t}\n\n\t_addPath(layer) {\n\t\tthis._requestRedraw(layer);\n\t}\n\n\t_removePath(layer) {\n\t\tthis._unlink(layer._order);\n\t\tdelete layer._order;\n\n\t\tdelete this._layers[Util.stamp(layer)];\n\n\t\tthis._requestRedraw(layer);\n\t}\n\n\t_updatePath(layer) {\n\t\t// Redraw the union of the layer's old pixel\n\t\t// bounds and the new pixel bounds.\n\t\tthis._extendRedrawBounds(layer);\n\t\tlayer._project();\n\t\tlayer._update();\n\t\t// The redraw will extend the redraw bounds\n\t\t// with the new pixel bounds.\n\t\tthis._requestRedraw(layer);\n\t}\n\n\t_updateStyle(layer) {\n\t\tthis._updateDashArray(layer);\n\t\tthis._requestRedraw(layer);\n\t}\n\n\t_updateDashArray(layer) {\n\t\tif (typeof layer.options.dashArray === 'string') {\n\t\t\tconst parts = layer.options.dashArray.split(DASH_SEPARATOR_RE);\n\t\t\t// Ignore dash array containing invalid lengths\n\t\t\tlayer._dashArray = parts.map(n => Number(n)).filter(n => !isNaN(n));\n\t\t} else {\n\t\t\tlayer._dashArray = layer.options.dashArray;\n\t\t}\n\t}\n\n\t_requestRedraw(layer) {\n\t\tif (!this._map) { return; }\n\n\t\tthis._extendRedrawBounds(layer);\n\t\tthis._redrawRequest ??= requestAnimationFrame(this._redraw.bind(this));\n\t}\n\n\t_extendRedrawBounds(layer) {\n\t\tif (layer._pxBounds) {\n\t\t\tconst padding = (+layer.options.weight || 0) + 1;\n\t\t\tthis._redrawBounds ??= new Bounds();\n\t\t\tthis._redrawBounds.extend(layer._pxBounds.min.subtract([padding, padding]));\n\t\t\tthis._redrawBounds.extend(layer._pxBounds.max.add([padding, padding]));\n\t\t}\n\t}\n\n\t_redraw() {\n\t\t// also when redrawing directly, see `_updatePaths()`\n\t\tcancelAnimationFrame(this._redrawRequest);\n\t\tthis._redrawRequest = null;\n\n\t\tif (this._redrawBounds) {\n\t\t\tthis._redrawBounds.min._floor();\n\t\t\tthis._redrawBounds.max._ceil();\n\t\t}\n\n\t\tthis._clear(); // clear layers in redraw bounds\n\t\tthis._draw(); // draw layers\n\n\t\tthis._redrawBounds = null;\n\t}\n\n\t_clear() {\n\t\tconst bounds = this._redrawBounds;\n\t\tif (bounds) {\n\t\t\tconst size = bounds.getSize();\n\t\t\tthis._ctx.clearRect(bounds.min.x, bounds.min.y, size.x, size.y);\n\t\t} else {\n\t\t\tthis._ctx.save();\n\t\t\tthis._ctx.setTransform(1, 0, 0, 1, 0, 0);\n\t\t\tthis._ctx.clearRect(0, 0, this._container.width, this._container.height);\n\t\t\tthis._ctx.restore();\n\t\t}\n\t}\n\n\t_draw() {\n\t\tlet layer;\n\t\tconst bounds = this._redrawBounds;\n\t\tthis._ctx.save();\n\t\tif (bounds) {\n\t\t\tconst size = bounds.getSize();\n\t\t\tthis._ctx.beginPath();\n\t\t\tthis._ctx.rect(bounds.min.x, bounds.min.y, size.x, size.y);\n\t\t\tthis._ctx.clip();\n\t\t}\n\n\t\tthis._drawing = true;\n\n\t\tfor (let order = this._drawFirst; order; order = order.next) {\n\t\t\tlayer = order.layer;\n\t\t\tif (!bounds || layer._pxBounds?.intersects(bounds)) {\n\t\t\t\tlayer._updatePath();\n\t\t\t}\n\t\t}\n\n\t\tthis._drawing = false;\n\n\t\tthis._ctx.restore(); // Restore state before clipping.\n\t}\n\n\t_updatePoly(layer, closed) {\n\t\tif (!this._drawing) { return; }\n\n\t\tconst parts = layer._parts,\n\t\tctx = this._ctx;\n\n\t\tif (!parts.length) { return; }\n\n\t\tctx.beginPath();\n\n\t\tparts.forEach((p0) => {\n\t\t\tp0.forEach((p, j) => {\n\t\t\t\tctx[j ? 'lineTo' : 'moveTo'](p.x, p.y);\n\t\t\t});\n\t\t\tif (closed) {\n\t\t\t\tctx.closePath();\n\t\t\t}\n\t\t});\n\n\t\tthis._fillStroke(ctx, layer);\n\n\t\t// TODO optimization: 1 fill/stroke for all features with equal style instead of 1 for each feature\n\t}\n\n\t_updateCircle(layer) {\n\n\t\tif (!this._drawing || layer._empty()) { return; }\n\n\t\tconst {x, y} = layer._point,\n\t\tctx = this._ctx,\n\t\tr = Math.max(Math.round(layer._pxRadius), 1),\n\t\try = Math.max(Math.round(layer._pxRadiusY), 1) || r;\n\n\t\tctx.beginPath();\n\t\t// arc is faster for circles in Chrome and Firefox, ellipse for everything else\n\t\tif (ry === r) {\n\t\t\tctx.arc(x, y, r, 0, Math.PI * 2);\n\t\t} else {\n\t\t\tctx.ellipse(x, y, r, ry, 0, 0, Math.PI * 2);\n\t\t}\n\n\t\tthis._fillStroke(ctx, layer);\n\t}\n\n\t_fillStroke(ctx, layer) {\n\t\tconst options = layer.options;\n\n\t\tif (options.fill) {\n\t\t\tctx.globalAlpha = options.fillOpacity;\n\t\t\tctx.fillStyle = options.fillColor ?? options.color;\n\t\t\tctx.fill(options.fillRule || 'evenodd');\n\t\t}\n\n\t\tif (options.stroke && +options.weight !== 0) {\n\t\t\tctx.lineDashOffset = Number(options.dashOffset ?? 0);\n\t\t\tctx.setLineDash(layer._dashArray ?? []);\n\t\t\tctx.globalAlpha = options.opacity;\n\t\t\tctx.lineWidth = options.weight;\n\t\t\tctx.strokeStyle = options.color;\n\t\t\tctx.lineCap = options.lineCap;\n\t\t\tctx.lineJoin = options.lineJoin;\n\t\t\tctx.stroke();\n\t\t}\n\t}\n\n\t// The hit detection checks the `interactive` option of the layers,\n\t// the hovered layer is left on the next pointer move.\n\t_updateInteractive() {}\n\n\t// Canvas obviously doesn't have pointer events for individual drawn objects,\n\t// so the map calls this on its own pointer events to find what's under the pointer\n\n\t/**\n\t * Returns the topmost interactive layer under the pointer.\n\t * @param {MouseEvent} e\n\t * @param {boolean} [click] Skip layers that were just dragged, so the drag doesn't end with a click.\n\t * @returns {Path|undefined}\n\t */\n\t_layerAt(e, click) {\n\t\tconst point = this._map.pointerEventToLayerPoint(e);\n\n\t\tfor (let order = this._drawLast; order; order = order.prev) {\n\t\t\tconst layer = order.layer;\n\t\t\tif (layer.options.interactive && layer._containsPoint(point) && !(click && this._map._draggableMoved(layer))) {\n\t\t\t\treturn layer;\n\t\t\t}\n\t\t}\n\t}\n\n\t_bringToFront(layer) {\n\t\tconst order = layer._order;\n\t\tif (order?.next) { // unless already last\n\t\t\tthis._unlink(order);\n\t\t\tthis._append(order);\n\t\t\tthis._requestRedraw(layer);\n\t\t}\n\t}\n\n\t_bringToBack(layer) {\n\t\tconst order = layer._order;\n\t\tif (order?.prev) { // unless already first\n\t\t\tthis._unlink(order);\n\t\t\torder.prev = null;\n\t\t\torder.next = this._drawFirst;\n\t\t\tthis._drawFirst.prev = order;\n\t\t\tthis._drawFirst = order;\n\t\t\tthis._requestRedraw(layer);\n\t\t}\n\t}\n\n\t_append(order) {\n\t\torder.prev = this._drawLast;\n\t\torder.next = null;\n\t\tif (this._drawLast) { this._drawLast.next = order; }\n\t\tthis._drawLast = order;\n\t\tthis._drawFirst ??= order;\n\t}\n\n\t_unlink({prev, next}) {\n\t\tif (next) {\n\t\t\tnext.prev = prev;\n\t\t} else {\n\t\t\tthis._drawLast = prev;\n\t\t}\n\t\tif (prev) {\n\t\t\tprev.next = next;\n\t\t} else {\n\t\t\tthis._drawFirst = next;\n\t\t}\n\t}\n}\n"],"mappings":"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"}
@@ -32,7 +32,6 @@ var Circle = class Circle extends CircleMarker {
32
32
  constructor(latlng, options) {
33
33
  if (typeof options === "number") throw new Error("Circle: the radius is an option in Maplair. Use new Circle(latlng, {radius}).");
34
34
  super(latlng, options);
35
- if (isNaN(this.options.radius)) throw new Error("Circle radius cannot be NaN");
36
35
  this.callInitHooks(Circle);
37
36
  }
38
37
  /**
@@ -46,18 +45,18 @@ var Circle = class Circle extends CircleMarker {
46
45
  return new LatLngBounds(this._map.layerPointToLatLng(this._point.subtract(half)), this._map.layerPointToLatLng(this._point.add(half)));
47
46
  }
48
47
  _project() {
49
- const lng = this._latlng.lng, lat = this._latlng.lat, map = this._map, crs = map.options.crs;
48
+ const lng = this._latlng.lng, lat = this._latlng.lat, map = this._map, crs = map.options.crs, renderer = this._renderer, zoom = renderer._pathZoom;
50
49
  if (crs.distance === EarthCRS.distance) {
51
- const d = Math.PI / 180, latR = this._radius / EarthCRS.R / d, top = map.project([lat + latR, lng]), bottom = map.project([lat - latR, lng]), p = top.add(bottom).divideBy(2), lat2 = map.unproject(p).lat;
50
+ const d = Math.PI / 180, latR = this._radius / EarthCRS.R / d, top = map.project([lat + latR, lng], zoom), bottom = map.project([lat - latR, lng], zoom), p = top.add(bottom).divideBy(2), lat2 = map.unproject(p, zoom).lat;
52
51
  let lngR = 2 * Math.asin(Math.sqrt((Math.sin(latR * d / 2) ** 2 - Math.sin((lat2 - lat) * d / 2) ** 2) / (Math.cos(lat * d) * Math.cos(lat2 * d)))) / d;
53
- if (isNaN(lngR) || lngR === 0) lngR = latR / Math.cos(Math.PI / 180 * lat);
54
- this._point = p.subtract(map.getPixelOrigin());
55
- this._pxRadius = isNaN(lngR) ? 0 : p.x - map.project([lat2, lng - lngR]).x;
56
- this._pxRadiusY = p.y - top.y;
52
+ if (isNaN(lngR) || lngR === 0) lngR = latR / Math.cos(lat * d);
53
+ this._point = p.subtract(renderer._pathOrigin);
54
+ this._pxRadius = isNaN(lngR) ? 0 : p.distanceTo(map.project([lat2, lng - lngR], zoom));
55
+ this._pxRadiusY = p.distanceTo(top);
57
56
  } else {
58
57
  const latlng2 = crs.unproject(crs.project(this._latlng).subtract([this._radius, 0]));
59
- this._point = map.latLngToLayerPoint(this._latlng);
60
- this._pxRadius = Math.abs(this._point.x - map.latLngToLayerPoint(latlng2).x);
58
+ this._point = renderer._latLngToLayerPoint(this._latlng);
59
+ this._pxRadius = Math.abs(this._point.x - renderer._latLngToLayerPoint(latlng2).x);
61
60
  }
62
61
  this._updateBounds();
63
62
  }