ol 10.2.2-pr.1 → 10.3.1-dev.1732965160769

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 (454) hide show
  1. package/Collection.d.ts +1 -1
  2. package/Collection.d.ts.map +1 -1
  3. package/Feature.d.ts +2 -2
  4. package/Feature.d.ts.map +1 -1
  5. package/Geolocation.d.ts +1 -1
  6. package/Geolocation.d.ts.map +1 -1
  7. package/Image.d.ts +3 -3
  8. package/Image.d.ts.map +1 -1
  9. package/ImageCanvas.d.ts +1 -1
  10. package/ImageCanvas.d.ts.map +1 -1
  11. package/ImageTile.d.ts +1 -1
  12. package/ImageTile.d.ts.map +1 -1
  13. package/Map.d.ts +7 -7
  14. package/Map.d.ts.map +1 -1
  15. package/Map.js +1 -1
  16. package/MapBrowserEvent.d.ts +1 -1
  17. package/MapBrowserEvent.d.ts.map +1 -1
  18. package/MapBrowserEventHandler.d.ts +1 -1
  19. package/MapBrowserEventHandler.d.ts.map +1 -1
  20. package/MapEvent.d.ts +1 -1
  21. package/MapEvent.d.ts.map +1 -1
  22. package/Object.d.ts +4 -4
  23. package/Object.d.ts.map +1 -1
  24. package/Overlay.d.ts +1 -1
  25. package/Overlay.d.ts.map +1 -1
  26. package/Tile.d.ts +1 -1
  27. package/Tile.d.ts.map +1 -1
  28. package/TileCache.d.ts +1 -1
  29. package/TileRange.d.ts +1 -1
  30. package/TileRange.d.ts.map +1 -1
  31. package/VectorRenderTile.d.ts.map +1 -1
  32. package/VectorTile.d.ts +1 -1
  33. package/VectorTile.d.ts.map +1 -1
  34. package/View.d.ts +24 -24
  35. package/View.d.ts.map +1 -1
  36. package/array.d.ts +2 -2
  37. package/array.d.ts.map +1 -1
  38. package/centerconstraint.d.ts +1 -1
  39. package/centerconstraint.d.ts.map +1 -1
  40. package/control/Attribution.d.ts +1 -1
  41. package/control/Attribution.d.ts.map +1 -1
  42. package/control/Control.d.ts.map +1 -1
  43. package/control/Control.js +3 -1
  44. package/control/FullScreen.d.ts +1 -1
  45. package/control/FullScreen.d.ts.map +1 -1
  46. package/control/MousePosition.d.ts +1 -1
  47. package/control/MousePosition.d.ts.map +1 -1
  48. package/control/OverviewMap.d.ts +1 -1
  49. package/control/OverviewMap.d.ts.map +1 -1
  50. package/control/Rotate.d.ts +1 -1
  51. package/control/Rotate.d.ts.map +1 -1
  52. package/control/ScaleLine.d.ts +1 -1
  53. package/control/ScaleLine.d.ts.map +1 -1
  54. package/control/Zoom.d.ts +1 -1
  55. package/control/Zoom.d.ts.map +1 -1
  56. package/control/ZoomSlider.d.ts +1 -1
  57. package/control/ZoomSlider.d.ts.map +1 -1
  58. package/control/ZoomToExtent.d.ts +1 -1
  59. package/control/ZoomToExtent.d.ts.map +1 -1
  60. package/control/defaults.d.ts +1 -1
  61. package/control/defaults.d.ts.map +1 -1
  62. package/coordinate.d.ts +6 -6
  63. package/coordinate.d.ts.map +1 -1
  64. package/dist/ol.d.ts +6 -0
  65. package/dist/ol.d.ts.map +1 -1
  66. package/dist/ol.js +1 -1
  67. package/dist/ol.js.map +1 -1
  68. package/dom.d.ts +1 -1
  69. package/dom.d.ts.map +1 -1
  70. package/events/Target.d.ts +1 -1
  71. package/events/Target.d.ts.map +1 -1
  72. package/events/condition.d.ts.map +1 -1
  73. package/events.d.ts +1 -1
  74. package/events.d.ts.map +1 -1
  75. package/expr/expression.d.ts.map +1 -1
  76. package/expr/gpu.d.ts +10 -13
  77. package/expr/gpu.d.ts.map +1 -1
  78. package/expr/gpu.js +16 -19
  79. package/extent.d.ts +13 -13
  80. package/extent.d.ts.map +1 -1
  81. package/format/EsriJSON.d.ts +5 -5
  82. package/format/EsriJSON.d.ts.map +1 -1
  83. package/format/Feature.d.ts +11 -11
  84. package/format/Feature.d.ts.map +1 -1
  85. package/format/GML2.d.ts.map +1 -1
  86. package/format/GML3.d.ts +1 -1
  87. package/format/GML3.d.ts.map +1 -1
  88. package/format/GMLBase.d.ts +1 -1
  89. package/format/GMLBase.d.ts.map +1 -1
  90. package/format/GPX.d.ts +1 -1
  91. package/format/GPX.d.ts.map +1 -1
  92. package/format/GeoJSON.d.ts +5 -5
  93. package/format/GeoJSON.d.ts.map +1 -1
  94. package/format/IGC.d.ts +1 -1
  95. package/format/IGC.d.ts.map +1 -1
  96. package/format/IIIFInfo.d.ts +3 -3
  97. package/format/IIIFInfo.d.ts.map +1 -1
  98. package/format/JSONFeature.d.ts +9 -9
  99. package/format/JSONFeature.d.ts.map +1 -1
  100. package/format/KML.d.ts +1 -1
  101. package/format/KML.d.ts.map +1 -1
  102. package/format/MVT.d.ts +2 -2
  103. package/format/MVT.d.ts.map +1 -1
  104. package/format/Polyline.d.ts +8 -8
  105. package/format/Polyline.d.ts.map +1 -1
  106. package/format/TextFeature.d.ts +10 -10
  107. package/format/TextFeature.d.ts.map +1 -1
  108. package/format/TopoJSON.d.ts +1 -1
  109. package/format/TopoJSON.d.ts.map +1 -1
  110. package/format/WFS.d.ts +2 -2
  111. package/format/WFS.d.ts.map +1 -1
  112. package/format/WKB.d.ts +5 -5
  113. package/format/WKB.d.ts.map +1 -1
  114. package/format/WKT.d.ts +1 -1
  115. package/format/WKT.d.ts.map +1 -1
  116. package/format/WMSGetFeatureInfo.d.ts +1 -1
  117. package/format/WMSGetFeatureInfo.d.ts.map +1 -1
  118. package/format/XMLFeature.d.ts +13 -13
  119. package/format/XMLFeature.d.ts.map +1 -1
  120. package/format/filter/Bbox.d.ts +1 -1
  121. package/format/filter/Bbox.d.ts.map +1 -1
  122. package/format/filter/ComparisonBinary.d.ts +1 -1
  123. package/format/filter/ComparisonBinary.d.ts.map +1 -1
  124. package/format/filter/Contains.d.ts +1 -1
  125. package/format/filter/Contains.d.ts.map +1 -1
  126. package/format/filter/DWithin.d.ts +1 -1
  127. package/format/filter/DWithin.d.ts.map +1 -1
  128. package/format/filter/Disjoint.d.ts +1 -1
  129. package/format/filter/Disjoint.d.ts.map +1 -1
  130. package/format/filter/EqualTo.d.ts +1 -1
  131. package/format/filter/EqualTo.d.ts.map +1 -1
  132. package/format/filter/Intersects.d.ts +1 -1
  133. package/format/filter/Intersects.d.ts.map +1 -1
  134. package/format/filter/IsLike.d.ts +1 -1
  135. package/format/filter/IsLike.d.ts.map +1 -1
  136. package/format/filter/NotEqualTo.d.ts +1 -1
  137. package/format/filter/NotEqualTo.d.ts.map +1 -1
  138. package/format/filter/Spatial.d.ts +1 -1
  139. package/format/filter/Spatial.d.ts.map +1 -1
  140. package/format/filter/Within.d.ts +1 -1
  141. package/format/filter/Within.d.ts.map +1 -1
  142. package/format/filter.d.ts +9 -9
  143. package/format/filter.d.ts.map +1 -1
  144. package/geom/Circle.d.ts +2 -2
  145. package/geom/Circle.d.ts.map +1 -1
  146. package/geom/Geometry.d.ts +4 -4
  147. package/geom/Geometry.d.ts.map +1 -1
  148. package/geom/LineString.d.ts +4 -4
  149. package/geom/LineString.d.ts.map +1 -1
  150. package/geom/LinearRing.d.ts +2 -2
  151. package/geom/LinearRing.d.ts.map +1 -1
  152. package/geom/MultiLineString.d.ts +3 -3
  153. package/geom/MultiLineString.d.ts.map +1 -1
  154. package/geom/MultiPoint.d.ts +2 -2
  155. package/geom/MultiPoint.d.ts.map +1 -1
  156. package/geom/MultiPolygon.d.ts +3 -3
  157. package/geom/MultiPolygon.d.ts.map +1 -1
  158. package/geom/Point.d.ts +1 -1
  159. package/geom/Point.d.ts.map +1 -1
  160. package/geom/Polygon.d.ts +6 -6
  161. package/geom/Polygon.d.ts.map +1 -1
  162. package/geom/SimpleGeometry.d.ts +2 -2
  163. package/geom/SimpleGeometry.d.ts.map +1 -1
  164. package/geom/flat/closest.d.ts +3 -3
  165. package/geom/flat/closest.d.ts.map +1 -1
  166. package/geom/flat/deflate.d.ts +2 -2
  167. package/geom/flat/deflate.d.ts.map +1 -1
  168. package/geom/flat/flip.d.ts +1 -1
  169. package/geom/flat/flip.d.ts.map +1 -1
  170. package/geom/flat/inflate.d.ts +3 -3
  171. package/geom/flat/inflate.d.ts.map +1 -1
  172. package/geom/flat/interiorpoint.d.ts +1 -1
  173. package/geom/flat/interiorpoint.d.ts.map +1 -1
  174. package/geom/flat/interpolate.d.ts +1 -1
  175. package/geom/flat/interpolate.d.ts.map +1 -1
  176. package/geom/flat/orient.d.ts +4 -4
  177. package/geom/flat/orient.d.ts.map +1 -1
  178. package/geom/flat/simplify.d.ts +1 -1
  179. package/geom/flat/simplify.d.ts.map +1 -1
  180. package/geom/flat/textpath.d.ts.map +1 -1
  181. package/geom/flat/transform.d.ts +4 -4
  182. package/geom/flat/transform.d.ts.map +1 -1
  183. package/interaction/DblClickDragZoom.d.ts +1 -1
  184. package/interaction/DblClickDragZoom.d.ts.map +1 -1
  185. package/interaction/DoubleClickZoom.d.ts +1 -1
  186. package/interaction/DoubleClickZoom.d.ts.map +1 -1
  187. package/interaction/DragAndDrop.d.ts +2 -2
  188. package/interaction/DragAndDrop.d.ts.map +1 -1
  189. package/interaction/DragBox.d.ts +1 -1
  190. package/interaction/DragBox.d.ts.map +1 -1
  191. package/interaction/DragPan.d.ts +1 -1
  192. package/interaction/DragPan.d.ts.map +1 -1
  193. package/interaction/DragRotate.d.ts +1 -1
  194. package/interaction/DragRotate.d.ts.map +1 -1
  195. package/interaction/DragRotateAndZoom.d.ts +1 -1
  196. package/interaction/DragRotateAndZoom.d.ts.map +1 -1
  197. package/interaction/DragZoom.d.ts +1 -1
  198. package/interaction/DragZoom.d.ts.map +1 -1
  199. package/interaction/Draw.d.ts +1 -1
  200. package/interaction/Draw.d.ts.map +1 -1
  201. package/interaction/Extent.d.ts +1 -1
  202. package/interaction/Extent.d.ts.map +1 -1
  203. package/interaction/Interaction.d.ts +3 -3
  204. package/interaction/Interaction.d.ts.map +1 -1
  205. package/interaction/KeyboardPan.d.ts +1 -1
  206. package/interaction/KeyboardPan.d.ts.map +1 -1
  207. package/interaction/KeyboardZoom.d.ts +1 -1
  208. package/interaction/KeyboardZoom.d.ts.map +1 -1
  209. package/interaction/Link.d.ts +1 -1
  210. package/interaction/Link.d.ts.map +1 -1
  211. package/interaction/Modify.d.ts +2 -2
  212. package/interaction/Modify.d.ts.map +1 -1
  213. package/interaction/Modify.js +3 -0
  214. package/interaction/MouseWheelZoom.d.ts +1 -1
  215. package/interaction/MouseWheelZoom.d.ts.map +1 -1
  216. package/interaction/PinchRotate.d.ts +1 -1
  217. package/interaction/PinchRotate.d.ts.map +1 -1
  218. package/interaction/PinchZoom.d.ts +1 -1
  219. package/interaction/PinchZoom.d.ts.map +1 -1
  220. package/interaction/Pointer.d.ts +1 -1
  221. package/interaction/Pointer.d.ts.map +1 -1
  222. package/interaction/Select.d.ts +1 -1
  223. package/interaction/Select.d.ts.map +1 -1
  224. package/interaction/Snap.d.ts +3 -3
  225. package/interaction/Snap.d.ts.map +1 -1
  226. package/interaction/Translate.d.ts +1 -1
  227. package/interaction/Translate.d.ts.map +1 -1
  228. package/interaction/defaults.d.ts +1 -1
  229. package/interaction/defaults.d.ts.map +1 -1
  230. package/layer/Base.d.ts +4 -4
  231. package/layer/Base.d.ts.map +1 -1
  232. package/layer/BaseImage.d.ts +1 -1
  233. package/layer/BaseImage.d.ts.map +1 -1
  234. package/layer/BaseTile.d.ts +8 -1
  235. package/layer/BaseTile.d.ts.map +1 -1
  236. package/layer/BaseTile.js +2 -0
  237. package/layer/BaseVector.d.ts +7 -2
  238. package/layer/BaseVector.d.ts.map +1 -1
  239. package/layer/BaseVector.js +9 -0
  240. package/layer/Flow.d.ts.map +1 -1
  241. package/layer/Graticule.d.ts +1 -1
  242. package/layer/Graticule.d.ts.map +1 -1
  243. package/layer/Group.d.ts +1 -1
  244. package/layer/Group.d.ts.map +1 -1
  245. package/layer/Heatmap.d.ts +1 -1
  246. package/layer/Heatmap.d.ts.map +1 -1
  247. package/layer/Heatmap.js +3 -3
  248. package/layer/Image.d.ts +1 -1
  249. package/layer/Image.d.ts.map +1 -1
  250. package/layer/Layer.d.ts +6 -2
  251. package/layer/Layer.d.ts.map +1 -1
  252. package/layer/Layer.js +9 -3
  253. package/layer/Tile.d.ts +1 -1
  254. package/layer/Tile.d.ts.map +1 -1
  255. package/layer/Vector.d.ts +1 -1
  256. package/layer/Vector.d.ts.map +1 -1
  257. package/layer/VectorImage.d.ts +1 -1
  258. package/layer/VectorImage.d.ts.map +1 -1
  259. package/layer/VectorTile.d.ts +1 -1
  260. package/layer/VectorTile.d.ts.map +1 -1
  261. package/layer/WebGLPoints.d.ts +17 -4
  262. package/layer/WebGLPoints.d.ts.map +1 -1
  263. package/layer/WebGLPoints.js +8 -4
  264. package/layer/WebGLTile.d.ts.map +1 -1
  265. package/layer/WebGLTile.js +0 -1
  266. package/layer/WebGLVector.d.ts +173 -0
  267. package/layer/WebGLVector.d.ts.map +1 -0
  268. package/layer/WebGLVector.js +120 -0
  269. package/net.d.ts +1 -1
  270. package/net.d.ts.map +1 -1
  271. package/obj.d.ts.map +1 -1
  272. package/package.json +1 -1
  273. package/proj/epsg3857.d.ts +2 -2
  274. package/proj/epsg3857.d.ts.map +1 -1
  275. package/proj/proj4.d.ts.map +1 -1
  276. package/proj.d.ts +5 -5
  277. package/proj.d.ts.map +1 -1
  278. package/render/Event.d.ts +1 -1
  279. package/render/Event.d.ts.map +1 -1
  280. package/render/Feature.d.ts +2 -2
  281. package/render/Feature.d.ts.map +1 -1
  282. package/render/VectorContext.d.ts +13 -17
  283. package/render/VectorContext.d.ts.map +1 -1
  284. package/render/canvas/Executor.d.ts +3 -3
  285. package/render/canvas/Executor.d.ts.map +1 -1
  286. package/render/canvas/ExecutorGroup.d.ts +2 -2
  287. package/render/canvas/ExecutorGroup.d.ts.map +1 -1
  288. package/render/canvas/Immediate.d.ts +1 -1
  289. package/render/canvas/Immediate.d.ts.map +1 -1
  290. package/render/canvas/hitdetect.d.ts +1 -1
  291. package/render/canvas/hitdetect.d.ts.map +1 -1
  292. package/render/canvas.d.ts.map +1 -1
  293. package/render/webgl/MixedGeometryBatch.d.ts +2 -2
  294. package/render/webgl/MixedGeometryBatch.d.ts.map +1 -1
  295. package/render/webgl/VectorStyleRenderer.d.ts +3 -2
  296. package/render/webgl/VectorStyleRenderer.d.ts.map +1 -1
  297. package/render/webgl/VectorStyleRenderer.js +4 -2
  298. package/render/webgl/utils.d.ts +2 -2
  299. package/render/webgl/utils.d.ts.map +1 -1
  300. package/render.d.ts +1 -1
  301. package/render.d.ts.map +1 -1
  302. package/renderer/Map.d.ts.map +1 -1
  303. package/renderer/canvas/ImageLayer.d.ts.map +1 -1
  304. package/renderer/canvas/Layer.d.ts +1 -1
  305. package/renderer/canvas/Layer.d.ts.map +1 -1
  306. package/renderer/canvas/TileLayer.d.ts +1 -1
  307. package/renderer/canvas/TileLayer.d.ts.map +1 -1
  308. package/renderer/canvas/TileLayer.js +25 -16
  309. package/renderer/canvas/VectorLayer.d.ts +2 -2
  310. package/renderer/canvas/VectorLayer.d.ts.map +1 -1
  311. package/renderer/canvas/VectorTileLayer.d.ts +1 -1
  312. package/renderer/canvas/VectorTileLayer.d.ts.map +1 -1
  313. package/renderer/canvas/VectorTileLayer.js +2 -2
  314. package/renderer/vector.d.ts +1 -1
  315. package/renderer/vector.d.ts.map +1 -1
  316. package/renderer/webgl/FlowLayer.d.ts +1 -1
  317. package/renderer/webgl/FlowLayer.d.ts.map +1 -1
  318. package/renderer/webgl/Layer.d.ts +1 -1
  319. package/renderer/webgl/Layer.d.ts.map +1 -1
  320. package/renderer/webgl/PointsLayer.d.ts.map +1 -1
  321. package/renderer/webgl/PointsLayer.js +2 -2
  322. package/renderer/webgl/TileLayerBase.d.ts +1 -1
  323. package/renderer/webgl/TileLayerBase.d.ts.map +1 -1
  324. package/renderer/webgl/VectorLayer.d.ts +12 -0
  325. package/renderer/webgl/VectorLayer.d.ts.map +1 -1
  326. package/renderer/webgl/VectorLayer.js +19 -7
  327. package/renderer/webgl/VectorTileLayer.d.ts +16 -0
  328. package/renderer/webgl/VectorTileLayer.d.ts.map +1 -1
  329. package/renderer/webgl/VectorTileLayer.js +11 -0
  330. package/reproj/Tile.d.ts +1 -1
  331. package/reproj/Tile.d.ts.map +1 -1
  332. package/reproj/Triangulation.d.ts +1 -1
  333. package/reproj/Triangulation.d.ts.map +1 -1
  334. package/reproj/glreproj.d.ts +2 -2
  335. package/reproj/glreproj.d.ts.map +1 -1
  336. package/reproj.d.ts +1 -1
  337. package/reproj.d.ts.map +1 -1
  338. package/resolutionconstraint.d.ts +3 -3
  339. package/resolutionconstraint.d.ts.map +1 -1
  340. package/rotationconstraint.d.ts +1 -1
  341. package/rotationconstraint.d.ts.map +1 -1
  342. package/size.d.ts +3 -3
  343. package/size.d.ts.map +1 -1
  344. package/source/Cluster.d.ts +1 -1
  345. package/source/Cluster.d.ts.map +1 -1
  346. package/source/DataTile.d.ts +1 -1
  347. package/source/DataTile.d.ts.map +1 -1
  348. package/source/IIIF.d.ts +1 -1
  349. package/source/IIIF.d.ts.map +1 -1
  350. package/source/ImageArcGISRest.d.ts +1 -1
  351. package/source/ImageArcGISRest.d.ts.map +1 -1
  352. package/source/ImageCanvas.d.ts +1 -1
  353. package/source/ImageCanvas.d.ts.map +1 -1
  354. package/source/ImageTile.d.ts +1 -1
  355. package/source/ImageTile.d.ts.map +1 -1
  356. package/source/ImageWMS.d.ts +2 -2
  357. package/source/ImageWMS.d.ts.map +1 -1
  358. package/source/OSM.d.ts +1 -1
  359. package/source/OSM.d.ts.map +1 -1
  360. package/source/Raster.d.ts +1 -1
  361. package/source/Raster.d.ts.map +1 -1
  362. package/source/SentinelHub.d.ts +2 -2
  363. package/source/SentinelHub.d.ts.map +1 -1
  364. package/source/SentinelHub.js +6 -14
  365. package/source/Source.d.ts +1 -1
  366. package/source/Source.d.ts.map +1 -1
  367. package/source/Tile.d.ts +1 -1
  368. package/source/Tile.d.ts.map +1 -1
  369. package/source/TileArcGISRest.d.ts +1 -1
  370. package/source/TileArcGISRest.d.ts.map +1 -1
  371. package/source/TileDebug.d.ts +1 -1
  372. package/source/TileDebug.d.ts.map +1 -1
  373. package/source/TileWMS.d.ts +2 -2
  374. package/source/TileWMS.d.ts.map +1 -1
  375. package/source/UTFGrid.d.ts +2 -2
  376. package/source/UTFGrid.d.ts.map +1 -1
  377. package/source/UrlTile.d.ts +1 -1
  378. package/source/UrlTile.d.ts.map +1 -1
  379. package/source/Vector.d.ts +6 -6
  380. package/source/Vector.d.ts.map +1 -1
  381. package/source/VectorTile.d.ts.map +1 -1
  382. package/source/WMTS.js +1 -1
  383. package/source/XYZ.d.ts +1 -1
  384. package/source/XYZ.d.ts.map +1 -1
  385. package/source/Zoomify.d.ts +1 -1
  386. package/source/Zoomify.d.ts.map +1 -1
  387. package/source/ogcTileUtil.d.ts +2 -2
  388. package/source/ogcTileUtil.d.ts.map +1 -1
  389. package/source/wms.d.ts +1 -1
  390. package/source/wms.d.ts.map +1 -1
  391. package/sphere.d.ts +4 -4
  392. package/sphere.d.ts.map +1 -1
  393. package/string.d.ts +1 -1
  394. package/string.d.ts.map +1 -1
  395. package/structs/LRUCache.d.ts +2 -2
  396. package/structs/LRUCache.d.ts.map +1 -1
  397. package/structs/RBush.d.ts +2 -2
  398. package/structs/RBush.d.ts.map +1 -1
  399. package/style/Circle.d.ts +1 -1
  400. package/style/Circle.d.ts.map +1 -1
  401. package/style/Fill.d.ts +1 -1
  402. package/style/Fill.d.ts.map +1 -1
  403. package/style/Icon.d.ts +1 -1
  404. package/style/Icon.d.ts.map +1 -1
  405. package/style/IconImage.d.ts +1 -1
  406. package/style/IconImage.d.ts.map +1 -1
  407. package/style/IconImageCache.d.ts +1 -1
  408. package/style/IconImageCache.d.ts.map +1 -1
  409. package/style/Image.d.ts.map +1 -1
  410. package/style/RegularShape.d.ts.map +1 -1
  411. package/style/RegularShape.js +2 -4
  412. package/style/Stroke.d.ts +1 -1
  413. package/style/Stroke.d.ts.map +1 -1
  414. package/style/Style.d.ts +1 -1
  415. package/style/Style.d.ts.map +1 -1
  416. package/style/Text.d.ts +1 -1
  417. package/style/Text.d.ts.map +1 -1
  418. package/style/flat.d.ts +8 -0
  419. package/style/flat.js +7 -0
  420. package/style/webgl.d.ts +0 -7
  421. package/style/webgl.d.ts.map +1 -1
  422. package/style/webgl.js +0 -2
  423. package/tilecoord.d.ts +1 -1
  424. package/tilecoord.d.ts.map +1 -1
  425. package/tilegrid/TileGrid.d.ts +8 -9
  426. package/tilegrid/TileGrid.d.ts.map +1 -1
  427. package/tilegrid/WMTS.d.ts +1 -1
  428. package/tilegrid/WMTS.d.ts.map +1 -1
  429. package/tilegrid.d.ts +3 -3
  430. package/tilegrid.d.ts.map +1 -1
  431. package/uri.d.ts +1 -1
  432. package/uri.d.ts.map +1 -1
  433. package/util.d.ts.map +1 -1
  434. package/util.js +1 -1
  435. package/vec/mat4.d.ts +4 -4
  436. package/vec/mat4.d.ts.map +1 -1
  437. package/webgl/Buffer.d.ts +1 -1
  438. package/webgl/Buffer.d.ts.map +1 -1
  439. package/webgl/Canvas.d.ts +3 -3
  440. package/webgl/Canvas.d.ts.map +1 -1
  441. package/webgl/Helper.d.ts +7 -7
  442. package/webgl/Helper.d.ts.map +1 -1
  443. package/webgl/PaletteTexture.d.ts +1 -1
  444. package/webgl/PaletteTexture.d.ts.map +1 -1
  445. package/webgl/PostProcessingPass.d.ts +1 -1
  446. package/webgl/PostProcessingPass.d.ts.map +1 -1
  447. package/webgl/RenderTarget.d.ts +1 -1
  448. package/webgl/RenderTarget.d.ts.map +1 -1
  449. package/webgl/ShaderBuilder.js +15 -15
  450. package/webgl/styleparser.d.ts +3 -2
  451. package/webgl/styleparser.d.ts.map +1 -1
  452. package/webgl/styleparser.js +57 -23
  453. package/xml.d.ts +11 -11
  454. package/xml.d.ts.map +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"Canvas.d.ts","sourceRoot":"","sources":["Canvas.js"],"names":[],"mappings":"AAsNA;;;;;GAKG;AACH,kCALW,qBAAqB,kBACrB,MAAM,gBACN,MAAM,GACL,YAAY,CAuBvB;AAvMD,4DAA4D;AAE5D;;GAEG;AACH;IACE;;OAEG;IACH,gBAFW,qBAAqB,EA4C/B;IAzCC;;;OAGG;IACH,YAAa;IAEb;;;OAGG;IACH,iBAAiE;IAEjE,yBAAyE;IACzE,yBAAyE;IAEzE,4CAAsE;IACtE,mDAGC;IACD,6CAAwE;IAExE,mCAAuC;IAGvC,oBAAqD;IAOrD,mCAAuC;IAGvC,oBAAqD;IAQvD;;;;;;;;;;;;;;;;;;OAkBG;IACH,eAdW,YAAY,YACZ,MAAM,aACN,MAAM,QACN,MAAM,QACN,MAAM,qPAgFhB;CACF;qBA/Ia,OAAO,iBAAiB,EAAE,SAAS"}
1
+ {"version":3,"file":"Canvas.d.ts","sourceRoot":"","sources":["Canvas.js"],"names":[],"mappings":"AAsNA;;;;;GAKG;AACH,kCALW,qBAAqB,kBACrB,MAAM,gBACN,MAAM,GACL,YAAY,CAuBvB;AAvMD,4DAA4D;AAE5D;;GAEG;AACH;IACE;;OAEG;IACH,gBAFW,qBAAqB,EA4C/B;IAzCC;;;OAGG;IACH,YAAa;IAEb;;;OAGG;IACH,iBAAiE;IAEjE,yBAAyE;IACzE,yBAAyE;IAEzE,4CAAsE;IACtE,mDAGC;IACD,6CAAwE;IAExE,4BAAuC;IAGvC,oBAAqD;IAOrD,4BAAuC;IAGvC,oBAAqD;IAQvD;;;;;;;;;;;;;;;;;;OAkBG;IACH,eAdW,YAAY,YACZ,MAAM,aACN,MAAM,QACN,MAAM,QACN,MAAM,aACN,MAAM,cACN,MAAM,SACN,MAAM,SACN,MAAM,aACN,MAAM,cACN,MAAM,UACN,MAAM,WACN,MAAM,QAwEhB;CACF;qBA/Ia,OAAO,iBAAiB,EAAE,SAAS"}
package/webgl/Helper.d.ts CHANGED
@@ -273,7 +273,7 @@ declare class WebGLHelper extends Disposable {
273
273
  /**
274
274
  * @param {Options} [options] Options.
275
275
  */
276
- constructor(options?: Options | undefined);
276
+ constructor(options?: Options);
277
277
  /** @private */
278
278
  private boundHandleWebGLContextLost_;
279
279
  /** @private */
@@ -407,12 +407,12 @@ declare class WebGLHelper extends Disposable {
407
407
  * @param {boolean} [disableAlphaBlend] If true, no alpha blending will happen.
408
408
  * @param {boolean} [enableDepth] If true, enables depth testing.
409
409
  */
410
- prepareDraw(frameState: import("../Map.js").FrameState, disableAlphaBlend?: boolean | undefined, enableDepth?: boolean | undefined): void;
410
+ prepareDraw(frameState: import("../Map.js").FrameState, disableAlphaBlend?: boolean, enableDepth?: boolean): void;
411
411
  /**
412
412
  * @param {WebGLFramebuffer|null} frameBuffer The frame buffer.
413
413
  * @param {WebGLTexture} [texture] The texture.
414
414
  */
415
- bindFrameBuffer(frameBuffer: WebGLFramebuffer | null, texture?: WebGLTexture | undefined): void;
415
+ bindFrameBuffer(frameBuffer: WebGLFramebuffer | null, texture?: WebGLTexture): void;
416
416
  /**
417
417
  * Bind the frame buffer from the initial render.
418
418
  */
@@ -440,7 +440,7 @@ declare class WebGLHelper extends Disposable {
440
440
  * @param {boolean} [disableAlphaBlend] If true, no alpha blending will happen.
441
441
  * @param {boolean} [enableDepth] If true, enables depth testing.
442
442
  */
443
- prepareDrawToRenderTarget(frameState: import("../Map.js").FrameState, renderTarget: import("./RenderTarget.js").default, disableAlphaBlend?: boolean | undefined, enableDepth?: boolean | undefined): void;
443
+ prepareDrawToRenderTarget(frameState: import("../Map.js").FrameState, renderTarget: import("./RenderTarget.js").default, disableAlphaBlend?: boolean, enableDepth?: boolean): void;
444
444
  /**
445
445
  * Execute a draw call based on the currently bound program, texture, buffers, attributes.
446
446
  * @param {number} start Start index.
@@ -453,7 +453,7 @@ declare class WebGLHelper extends Disposable {
453
453
  * @param {function(WebGLRenderingContext, import("../Map.js").FrameState):void} [preCompose] Called before composing.
454
454
  * @param {function(WebGLRenderingContext, import("../Map.js").FrameState):void} [postCompose] Called before composing.
455
455
  */
456
- finalizeDraw(frameState: import("../Map.js").FrameState, preCompose?: ((arg0: WebGLRenderingContext, arg1: import("../Map.js").FrameState) => void) | undefined, postCompose?: ((arg0: WebGLRenderingContext, arg1: import("../Map.js").FrameState) => void) | undefined): void;
456
+ finalizeDraw(frameState: import("../Map.js").FrameState, preCompose?: (arg0: WebGLRenderingContext, arg1: import("../Map.js").FrameState) => void, postCompose?: (arg0: WebGLRenderingContext, arg1: import("../Map.js").FrameState) => void): void;
457
457
  /**
458
458
  * @return {HTMLCanvasElement} Canvas.
459
459
  */
@@ -484,7 +484,7 @@ declare class WebGLHelper extends Disposable {
484
484
  * @param {WebGLProgram} program Program.
485
485
  * @param {import("../Map.js").FrameState} [frameState] Frame state.
486
486
  */
487
- useProgram(program: WebGLProgram, frameState?: import("../Map.js").FrameState | undefined): void;
487
+ useProgram(program: WebGLProgram, frameState?: import("../Map.js").FrameState): void;
488
488
  /**
489
489
  * Will attempt to compile a vertex or fragment shader based on source
490
490
  * On error, the shader will be returned but
@@ -591,7 +591,7 @@ declare class WebGLHelper extends Disposable {
591
591
  * @param {boolean} [nearest] Use gl.NEAREST for min/mag filter.
592
592
  * @return {WebGLTexture} The generated texture
593
593
  */
594
- createTexture(size: Array<number>, data: ImageData | HTMLImageElement | HTMLCanvasElement | Uint8Array | null, texture?: WebGLTexture | undefined, nearest?: boolean | undefined): WebGLTexture;
594
+ createTexture(size: Array<number>, data: ImageData | HTMLImageElement | HTMLCanvasElement | Uint8Array | null, texture?: WebGLTexture, nearest?: boolean): WebGLTexture;
595
595
  }
596
596
  import Disposable from '../Disposable.js';
597
597
  //# sourceMappingURL=Helper.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Helper.d.ts","sourceRoot":"","sources":["Helper.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Helper.d.ts","sourceRoot":"","sources":["Helper.js"],"names":[],"mappings":"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"}
@@ -9,7 +9,7 @@ declare class PaletteTexture {
9
9
  */
10
10
  constructor(name: string, data: Uint8Array);
11
11
  name: string;
12
- data: Uint8Array;
12
+ data: Uint8Array<ArrayBufferLike>;
13
13
  /**
14
14
  * @type {WebGLTexture|null}
15
15
  * @private
@@ -1 +1 @@
1
- {"version":3,"file":"PaletteTexture.d.ts","sourceRoot":"","sources":["PaletteTexture.js"],"names":[],"mappings":";AAAA;;GAEG;AAEH;IACE;;;OAGG;IACH,kBAHW,MAAM,QACN,UAAU,EAWpB;IARC,aAAgB;IAChB,iBAAgB;IAEhB;;;OAGG;IACH,iBAAoB;IAGtB;;;OAGG;IACH,eAHW,qBAAqB,GACpB,YAAY,CAwBvB;IAED;;OAEG;IACH,WAFW,qBAAqB,QAO/B;CACF"}
1
+ {"version":3,"file":"PaletteTexture.d.ts","sourceRoot":"","sources":["PaletteTexture.js"],"names":[],"mappings":";AAAA;;GAEG;AAEH;IACE;;;OAGG;IACH,kBAHW,MAAM,QACN,UAAU,EAWpB;IARC,aAAgB;IAChB,kCAAgB;IAEhB;;;OAGG;IACH,iBAAoB;IAGtB;;;OAGG;IACH,eAHW,qBAAqB,GACpB,YAAY,CAwBvB;IAED;;OAEG;IACH,WAFW,qBAAqB,QAO/B;CACF"}
@@ -182,7 +182,7 @@ declare class WebGLPostProcessingPass {
182
182
  * @param {function(WebGLRenderingContext, import("../Map.js").FrameState):void} [preCompose] Called before composing.
183
183
  * @param {function(WebGLRenderingContext, import("../Map.js").FrameState):void} [postCompose] Called before composing.
184
184
  */
185
- apply(frameState: import("../Map.js").FrameState, nextPass?: WebGLPostProcessingPass | undefined, preCompose?: ((arg0: WebGLRenderingContext, arg1: import("../Map.js").FrameState) => void) | undefined, postCompose?: ((arg0: WebGLRenderingContext, arg1: import("../Map.js").FrameState) => void) | undefined): void;
185
+ apply(frameState: import("../Map.js").FrameState, nextPass?: WebGLPostProcessingPass, preCompose?: (arg0: WebGLRenderingContext, arg1: import("../Map.js").FrameState) => void, postCompose?: (arg0: WebGLRenderingContext, arg1: import("../Map.js").FrameState) => void): void;
186
186
  /**
187
187
  * @return {WebGLFramebuffer} Frame buffer
188
188
  */
@@ -1 +1 @@
1
- {"version":3,"file":"PostProcessingPass.d.ts","sourceRoot":"","sources":["PostProcessingPass.js"],"names":[],"mappings":";;;;;kBAqCc,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;WAUrB,OAAO,UAAU,EAAE,YAAY;;;;cAC/B,oBAAoB;;;;;;AAblC;;;;;;;;GAQG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAgHjB;IA7GC;;OAEG;IACH,YAA+B;IAG/B;;OAEG;IACH,oBAA0C;IAE1C;;;OAGG;IACH,6BAA8C;IAE9C;;;OAGG;IACH,iCAAoC;IAEpC;;OAEG;IACH,qBAA0C;IAC1C;;OAEG;IACH,qBAA2C;IAgB3C;;OAEG;IACH,6BAA8C;IAM9C;;OAEG;IACH,oCAAoD;IASpD;;OAEG;IACH,oCAGC;IACD;;OAEG;IACH,qCAGC;IACD;;OAEG;IACH,qCAGC;IACD;;OAEG;IACH,qCAGC;IAED;;;;OAIG;IACH,kBAAmB;IAUrB,uCAEC;IAED;;;OAGG;IACH,SAFY,qBAAqB,CAIhC;IAED;;;;;OAKG;IACH,iBAFW,OAAO,WAAW,EAAE,UAAU,QAoExC;IAED;;;;;;OAMG;IACH,kBALW,OAAO,WAAW,EAAE,UAAU,uEAErB,qBAAqB,QAAE,OAAO,WAAW,EAAE,UAAU,KAAE,IAAI,qCAC3D,qBAAqB,QAAE,OAAO,WAAW,EAAE,UAAU,KAAE,IAAI,qBA6D9E;IAED;;OAEG;IACH,kBAFY,gBAAgB,CAI3B;IAED;;OAEG;IACH,kBAFY,iBAAiB,CAI5B;IAED;;;;OAIG;IACH,sBAwEC;CACF"}
1
+ {"version":3,"file":"PostProcessingPass.d.ts","sourceRoot":"","sources":["PostProcessingPass.js"],"names":[],"mappings":";;;;;kBAqCc,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;WAUrB,OAAO,UAAU,EAAE,YAAY;;;;cAC/B,oBAAoB;;;;;;AAblC;;;;;;;;GAQG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAgHjB;IA7GC;;OAEG;IACH,YAA+B;IAG/B;;OAEG;IACH,oBAA0C;IAE1C;;;OAGG;IACH,6BAA8C;IAE9C;;;OAGG;IACH,iCAAoC;IAEpC;;OAEG;IACH,qBAA0C;IAC1C;;OAEG;IACH,qBAA2C;IAgB3C;;OAEG;IACH,6BAA8C;IAM9C;;OAEG;IACH,oCAAoD;IASpD;;OAEG;IACH,oCAGC;IACD;;OAEG;IACH,qCAGC;IACD;;OAEG;IACH,qCAGC;IACD;;OAEG;IACH,qCAGC;IAED;;;;OAIG;IACH,kBAAmB;IAUrB,uCAEC;IAED;;;OAGG;IACH,SAFY,qBAAqB,CAIhC;IAED;;;;;OAKG;IACH,iBAFW,OAAO,WAAW,EAAE,UAAU,QAoExC;IAED;;;;;;OAMG;IACH,kBALW,OAAO,WAAW,EAAE,UAAU,aAC9B,uBAAuB,eACvB,CAAS,IAAqB,EAArB,qBAAqB,EAAE,IAA8B,EAA9B,OAAO,WAAW,EAAE,UAAU,KAAE,IAAI,gBACpE,CAAS,IAAqB,EAArB,qBAAqB,EAAE,IAA8B,EAA9B,OAAO,WAAW,EAAE,UAAU,KAAE,IAAI,QA6D9E;IAED;;OAEG;IACH,kBAFY,gBAAgB,CAI3B;IAED;;OAEG;IACH,kBAFY,iBAAiB,CAI5B;IAED;;;;OAIG;IACH,sBAwEC;CACF"}
@@ -9,7 +9,7 @@ declare class WebGLRenderTarget {
9
9
  * @param {import("./Helper.js").default} helper WebGL helper; mandatory.
10
10
  * @param {Array<number>} [size] Expected size of the render target texture; note: this can be changed later on.
11
11
  */
12
- constructor(helper: import("./Helper.js").default, size?: number[] | undefined);
12
+ constructor(helper: import("./Helper.js").default, size?: Array<number>);
13
13
  /**
14
14
  * @private
15
15
  * @type {import("./Helper.js").default}
@@ -1 +1 @@
1
- {"version":3,"file":"RenderTarget.d.ts","sourceRoot":"","sources":["RenderTarget.js"],"names":[],"mappings":";AASA;;;;GAIG;AACH;IACE;;;OAGG;IACH,oBAHW,OAAO,aAAa,EAAE,OAAO,+BAgDvC;IA5CC;;;OAGG;IACH,gBAAqB;IAGrB;;;OAGG;IACH,iBAAkC;IAElC;;;OAGG;IACH,qBAA0C;IAE1C;;;OAGG;IACH,qBAA2C;IAE3C;;;OAGG;IACH,cAA2B;IAE3B;;;OAGG;IACH,cAA8B;IAE9B;;;OAGG;IACH,wBAA2B;IAK7B;;;;OAIG;IACH,cAFW,KAAK,CAAC,MAAM,CAAC,QASvB;IAED;;;OAGG;IACH,WAFY,KAAK,CAAC,MAAM,CAAC,CAIxB;IAED;;;;OAIG;IACH,wBAEC;IAED;;;;OAIG;IACH,WAFY,UAAU,CAoBrB;IAED;;;;;;;OAOG;IACH,aAJW,MAAM,KACN,MAAM,GACL,UAAU,CAmBrB;IAED;;OAEG;IACH,cAFY,YAAY,CAIvB;IAED;;OAEG;IACH,kBAFY,gBAAgB,CAI3B;IAED;;OAEG;IACH,kBAFY,iBAAiB,CAI5B;IAED;;OAEG;IACH,oBA+BC;CACF"}
1
+ {"version":3,"file":"RenderTarget.d.ts","sourceRoot":"","sources":["RenderTarget.js"],"names":[],"mappings":";AASA;;;;GAIG;AACH;IACE;;;OAGG;IACH,oBAHW,OAAO,aAAa,EAAE,OAAO,SAC7B,KAAK,CAAC,MAAM,CAAC,EA+CvB;IA5CC;;;OAGG;IACH,gBAAqB;IAGrB;;;OAGG;IACH,iBAAkC;IAElC;;;OAGG;IACH,qBAA0C;IAE1C;;;OAGG;IACH,qBAA2C;IAE3C;;;OAGG;IACH,cAA2B;IAE3B;;;OAGG;IACH,cAA8B;IAE9B;;;OAGG;IACH,wBAA2B;IAK7B;;;;OAIG;IACH,cAFW,KAAK,CAAC,MAAM,CAAC,QASvB;IAED;;;OAGG;IACH,WAFY,KAAK,CAAC,MAAM,CAAC,CAIxB;IAED;;;;OAIG;IACH,wBAEC;IAED;;;;OAIG;IACH,WAFY,UAAU,CAoBrB;IAED;;;;;;;OAOG;IACH,aAJW,MAAM,KACN,MAAM,GACL,UAAU,CAmBrB;IAED;;OAEG;IACH,cAFY,YAAY,CAIvB;IAED;;OAEG;IACH,kBAFY,gBAAgB,CAI3B;IAED;;OAEG;IACH,kBAFY,iBAAiB,CAI5B;IAED;;OAEG;IACH,oBA+BC;CACF"}
@@ -479,7 +479,7 @@ ${this.uniforms_
479
479
  .join('\n')}
480
480
  attribute vec2 a_position;
481
481
  attribute float a_index;
482
- attribute vec4 a_prop_hitColor;
482
+ attribute vec4 a_hitColor;
483
483
  ${this.attributes_
484
484
  .map(function (attribute) {
485
485
  return 'attribute ' + attribute + ';';
@@ -487,7 +487,7 @@ ${this.attributes_
487
487
  .join('\n')}
488
488
  varying vec2 v_texCoord;
489
489
  varying vec2 v_quadCoord;
490
- varying vec4 v_prop_hitColor;
490
+ varying vec4 v_hitColor;
491
491
  varying vec2 v_centerPx;
492
492
  varying float v_angle;
493
493
  varying vec2 v_quadSizePx;
@@ -531,7 +531,7 @@ void main(void) {
531
531
  float u = a_index == 0.0 || a_index == 3.0 ? texCoord.s : texCoord.p;
532
532
  float v = a_index == 2.0 || a_index == 3.0 ? texCoord.t : texCoord.q;
533
533
  v_texCoord = vec2(u, v);
534
- v_prop_hitColor = a_prop_hitColor;
534
+ v_hitColor = a_hitColor;
535
535
  v_angle = angle;
536
536
  c = cos(-v_angle);
537
537
  s = sin(-v_angle);
@@ -561,7 +561,7 @@ ${this.uniforms_
561
561
  })
562
562
  .join('\n')}
563
563
  varying vec2 v_texCoord;
564
- varying vec4 v_prop_hitColor;
564
+ varying vec4 v_hitColor;
565
565
  varying vec2 v_centerPx;
566
566
  varying float v_angle;
567
567
  varying vec2 v_quadSizePx;
@@ -582,7 +582,7 @@ void main(void) {
582
582
  gl_FragColor.rgb *= gl_FragColor.a;
583
583
  if (u_hitDetection > 0) {
584
584
  if (gl_FragColor.a < 0.05) { discard; };
585
- gl_FragColor = v_prop_hitColor;
585
+ gl_FragColor = v_hitColor;
586
586
  }
587
587
  }`;
588
588
  }
@@ -609,7 +609,7 @@ attribute float a_measureEnd;
609
609
  attribute float a_parameters;
610
610
  attribute float a_distance;
611
611
  attribute vec2 a_joinAngles;
612
- attribute vec4 a_prop_hitColor;
612
+ attribute vec4 a_hitColor;
613
613
  ${this.attributes_
614
614
  .map(function (attribute) {
615
615
  return 'attribute ' + attribute + ';';
@@ -620,7 +620,7 @@ varying vec2 v_segmentEnd;
620
620
  varying float v_angleStart;
621
621
  varying float v_angleEnd;
622
622
  varying float v_width;
623
- varying vec4 v_prop_hitColor;
623
+ varying vec4 v_hitColor;
624
624
  varying float v_distanceOffsetPx;
625
625
  varying float v_measureStart;
626
626
  varying float v_measureEnd;
@@ -699,7 +699,7 @@ void main(void) {
699
699
  v_segmentStart = segmentStartPx;
700
700
  v_segmentEnd = segmentEndPx;
701
701
  v_width = lineWidth;
702
- v_prop_hitColor = a_prop_hitColor;
702
+ v_hitColor = a_hitColor;
703
703
  v_distanceOffsetPx = a_distance / u_resolution - (lineOffsetPx * angleTangentSum);
704
704
  v_measureStart = a_measureStart;
705
705
  v_measureEnd = a_measureEnd;
@@ -732,7 +732,7 @@ varying vec2 v_segmentEnd;
732
732
  varying float v_angleStart;
733
733
  varying float v_angleEnd;
734
734
  varying float v_width;
735
- varying vec4 v_prop_hitColor;
735
+ varying vec4 v_hitColor;
736
736
  varying float v_distanceOffsetPx;
737
737
  varying float v_measureStart;
738
738
  varying float v_measureEnd;
@@ -870,7 +870,7 @@ void main(void) {
870
870
  gl_FragColor.rgb *= gl_FragColor.a;
871
871
  if (u_hitDetection > 0) {
872
872
  if (gl_FragColor.a < 0.1) { discard; };
873
- gl_FragColor = v_prop_hitColor;
873
+ gl_FragColor = v_hitColor;
874
874
  }
875
875
  }`;
876
876
  }
@@ -892,13 +892,13 @@ ${this.uniforms_
892
892
  })
893
893
  .join('\n')}
894
894
  attribute vec2 a_position;
895
- attribute vec4 a_prop_hitColor;
895
+ attribute vec4 a_hitColor;
896
896
  ${this.attributes_
897
897
  .map(function (attribute) {
898
898
  return 'attribute ' + attribute + ';';
899
899
  })
900
900
  .join('\n')}
901
- varying vec4 v_prop_hitColor;
901
+ varying vec4 v_hitColor;
902
902
  ${this.varyings_
903
903
  .map(function (varying) {
904
904
  return 'varying ' + varying.type + ' ' + varying.name + ';';
@@ -907,7 +907,7 @@ ${this.varyings_
907
907
  ${this.vertexShaderFunctions_.join('\n')}
908
908
  void main(void) {
909
909
  gl_Position = u_projectionMatrix * vec4(a_position, u_depth, 1.0);
910
- v_prop_hitColor = a_prop_hitColor;
910
+ v_hitColor = a_hitColor;
911
911
  ${this.varyings_
912
912
  .map(function (varying) {
913
913
  return ' ' + varying.name + ' = ' + varying.expression + ';';
@@ -931,7 +931,7 @@ ${this.uniforms_
931
931
  return 'uniform ' + uniform + ';';
932
932
  })
933
933
  .join('\n')}
934
- varying vec4 v_prop_hitColor;
934
+ varying vec4 v_hitColor;
935
935
  ${this.varyings_
936
936
  .map(function (varying) {
937
937
  return 'varying ' + varying.type + ' ' + varying.name + ';';
@@ -970,7 +970,7 @@ void main(void) {
970
970
  gl_FragColor.rgb *= gl_FragColor.a;
971
971
  if (u_hitDetection > 0) {
972
972
  if (gl_FragColor.a < 0.1) { discard; };
973
- gl_FragColor = v_prop_hitColor;
973
+ gl_FragColor = v_hitColor;
974
974
  }
975
975
  }`;
976
976
  }
@@ -6,7 +6,7 @@
6
6
  * @param {number} [expectedType] Expected final type (can be several types combined)
7
7
  * @return {string} GLSL-compatible output
8
8
  */
9
- export function expressionToGlsl(compilationContext: import("../expr/gpu.js").CompilationContext, value: import("../expr/expression.js").EncodedExpression, expectedType?: number | undefined): string;
9
+ export function expressionToGlsl(compilationContext: import("../expr/gpu.js").CompilationContext, value: import("../expr/expression.js").EncodedExpression, expectedType?: number): string;
10
10
  /**
11
11
  * Packs all components of a color into a two-floats array
12
12
  * @param {import("../color.js").Color|string} color Color as array of numbers or string
@@ -34,9 +34,10 @@ export function computeHash(input: any | string): string;
34
34
  * {@link module:ol/renderer/webgl/PointsLayer~WebGLPointsLayerRenderer}.
35
35
  *
36
36
  * @param {import("../style/webgl.js").WebGLStyle} style Literal style.
37
+ * @param {import('../style/flat.js').StyleVariables} variables Style variables.
37
38
  * @return {StyleParseResult} Result containing shader params, attributes and uniforms.
38
39
  */
39
- export function parseLiteralStyle(style: import("../style/webgl.js").WebGLStyle): StyleParseResult;
40
+ export function parseLiteralStyle(style: import("../style/webgl.js").WebGLStyle, variables: import("../style/flat.js").StyleVariables): StyleParseResult;
40
41
  export type StyleParseResult = {
41
42
  /**
42
43
  * Shader builder pre-configured according to a given style
@@ -1 +1 @@
1
- {"version":3,"file":"styleparser.d.ts","sourceRoot":"","sources":["styleparser.js"],"names":[],"mappings":"AAsBA;;;;;;;GAOG;AACH,qDALW,OAAO,gBAAgB,EAAE,kBAAkB,SAC3C,OAAO,uBAAuB,EAAE,iBAAiB,sCAEhD,MAAM,CAUjB;AAED;;;;GAIG;AACH,iCAHW,OAAO,aAAa,EAAE,KAAK,GAAC,MAAM,GACjC,KAAK,CAAC,MAAM,CAAC,CASxB;AAqCD;;;;GAIG;AACH,mCAHW,MAAO,MAAM,GACZ,MAAM,CAOjB;AA4uBD;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH,yCAHW,OAAO,mBAAmB,EAAE,UAAU,GACrC,gBAAgB,CAuI3B;;;;;aArJa,aAAa;;;;cACb,OAAO,wCAAwC,EAAE,kBAAkB;;;;gBACnE,OAAO,wCAAwC,EAAE,oBAAoB;;8BAt0BvD,oBAAoB"}
1
+ {"version":3,"file":"styleparser.d.ts","sourceRoot":"","sources":["styleparser.js"],"names":[],"mappings":"AA0BA;;;;;;;GAOG;AACH,qDALW,OAAO,gBAAgB,EAAE,kBAAkB,SAC3C,OAAO,uBAAuB,EAAE,iBAAiB,iBACjD,MAAM,GACL,MAAM,CAUjB;AAED;;;;GAIG;AACH,iCAHW,OAAO,aAAa,EAAE,KAAK,GAAC,MAAM,GACjC,KAAK,CAAC,MAAM,CAAC,CASxB;AAqCD;;;;GAIG;AACH,mCAHW,MAAO,MAAM,GACZ,MAAM,CAOjB;AA4uBD;;;;;GAKG;AAEH;;;;;;;;;;;GAWG;AACH,yCAJW,OAAO,mBAAmB,EAAE,UAAU,aACtC,OAAO,kBAAkB,EAAE,cAAc,GACxC,gBAAgB,CAoK3B;;;;;aAnLa,aAAa;;;;cACb,OAAO,wCAAwC,EAAE,kBAAkB;;;;gBACnE,OAAO,wCAAwC,EAAE,oBAAoB;;8BAh0BvD,oBAAoB"}
@@ -9,16 +9,20 @@ import {
9
9
  NumberType,
10
10
  SizeType,
11
11
  StringType,
12
+ computeGeometryType,
12
13
  newParsingContext,
13
14
  } from '../expr/expression.js';
14
- import {ShaderBuilder} from './ShaderBuilder.js';
15
- import {asArray} from '../color.js';
16
15
  import {
16
+ FEATURE_ID_PROPERTY_NAME,
17
+ GEOMETRY_TYPE_PROPERTY_NAME,
17
18
  buildExpression,
18
19
  getStringNumberEquivalent,
20
+ newCompilationContext,
19
21
  stringToGlsl,
20
22
  uniformNameForVariable,
21
23
  } from '../expr/gpu.js';
24
+ import {ShaderBuilder} from './ShaderBuilder.js';
25
+ import {asArray} from '../color.js';
22
26
 
23
27
  /**
24
28
  * Recursively parses a style expression and outputs a GLSL-compatible string. Takes in a compilation context that
@@ -861,29 +865,19 @@ function parseFillProperties(
861
865
  * {@link module:ol/renderer/webgl/PointsLayer~WebGLPointsLayerRenderer}.
862
866
  *
863
867
  * @param {import("../style/webgl.js").WebGLStyle} style Literal style.
868
+ * @param {import('../style/flat.js').StyleVariables} variables Style variables.
864
869
  * @return {StyleParseResult} Result containing shader params, attributes and uniforms.
865
870
  */
866
- export function parseLiteralStyle(style) {
867
- /**
868
- * @type {import("../expr/gpu.js").CompilationContext}
869
- */
870
- const vertContext = {
871
- inFragmentShader: false,
872
- properties: {},
873
- variables: {},
874
- functions: {},
875
- style,
876
- };
871
+ export function parseLiteralStyle(style, variables) {
872
+ const vertContext = newCompilationContext();
877
873
 
878
874
  /**
879
875
  * @type {import("../expr/gpu.js").CompilationContext}
880
876
  */
881
877
  const fragContext = {
878
+ ...newCompilationContext(),
882
879
  inFragmentShader: true,
883
880
  variables: vertContext.variables,
884
- properties: {},
885
- functions: {},
886
- style,
887
881
  };
888
882
 
889
883
  const builder = new ShaderBuilder();
@@ -914,10 +908,15 @@ export function parseLiteralStyle(style) {
914
908
  for (const varName in fragContext.variables) {
915
909
  const variable = fragContext.variables[varName];
916
910
  const uniformName = uniformNameForVariable(variable.name);
917
- builder.addUniform(`${getGlslTypeFromType(variable.type)} ${uniformName}`);
911
+ let glslType = getGlslTypeFromType(variable.type);
912
+ if (variable.type === ColorType) {
913
+ // we're not packing colors when they're passed as uniforms
914
+ glslType = 'vec4';
915
+ }
916
+ builder.addUniform(`${glslType} ${uniformName}`);
918
917
 
919
918
  uniforms[uniformName] = () => {
920
- const value = style.variables[variable.name];
919
+ const value = variables[variable.name];
921
920
  if (typeof value === 'number') {
922
921
  return value;
923
922
  }
@@ -925,7 +924,7 @@ export function parseLiteralStyle(style) {
925
924
  return value ? 1 : 0;
926
925
  }
927
926
  if (variable.type === ColorType) {
928
- return packColor([...asArray(value || '#eee')]);
927
+ return asArray(value || '#eee');
929
928
  }
930
929
  if (typeof value === 'string') {
931
930
  return getStringNumberEquivalent(value);
@@ -971,12 +970,12 @@ export function parseLiteralStyle(style) {
971
970
  * @type {import('../render/webgl/VectorStyleRenderer.js').AttributeDefinitions}
972
971
  */
973
972
  const attributes = {};
973
+
974
+ // Define attributes with their callback for each property used in the vertex shader
974
975
  for (const propName in vertContext.properties) {
975
976
  const property = vertContext.properties[propName];
976
977
  const callback = (feature) => {
977
- const value = property.evaluator
978
- ? property.evaluator(feature)
979
- : feature.get(property.name);
978
+ const value = feature.get(property.name);
980
979
  if (property.type === ColorType) {
981
980
  return packColor([...asArray(value || '#eee')]);
982
981
  }
@@ -989,11 +988,46 @@ export function parseLiteralStyle(style) {
989
988
  return value;
990
989
  };
991
990
 
992
- attributes[property.name] = {
991
+ attributes[`prop_${property.name}`] = {
993
992
  size: getGlslSizeFromType(property.type),
994
993
  callback,
995
994
  };
996
995
  }
997
996
 
997
+ // Define attributes for special inputs
998
+ function defineSpecialInput(contextPropName, glslPropName, type, callback) {
999
+ const inVertContext = vertContext[contextPropName];
1000
+ const inFragContext = fragContext[contextPropName];
1001
+ if (!inVertContext && !inFragContext) {
1002
+ return;
1003
+ }
1004
+ const glslType = getGlslTypeFromType(type);
1005
+ const attrSize = getGlslSizeFromType(type);
1006
+ builder.addAttribute(`${glslType} a_${glslPropName}`);
1007
+ if (inFragContext) {
1008
+ builder.addVarying(`v_${glslPropName}`, glslType, `a_${glslPropName}`);
1009
+ }
1010
+ attributes[glslPropName] = {
1011
+ size: attrSize,
1012
+ callback,
1013
+ };
1014
+ }
1015
+ defineSpecialInput(
1016
+ 'geometryType',
1017
+ GEOMETRY_TYPE_PROPERTY_NAME,
1018
+ StringType,
1019
+ (feature) =>
1020
+ getStringNumberEquivalent(computeGeometryType(feature.getGeometry())),
1021
+ );
1022
+ defineSpecialInput(
1023
+ 'featureId',
1024
+ FEATURE_ID_PROPERTY_NAME,
1025
+ StringType | NumberType,
1026
+ (feature) => {
1027
+ const id = feature.getId() ?? null;
1028
+ return typeof id === 'string' ? getStringNumberEquivalent(id) : id;
1029
+ },
1030
+ );
1031
+
998
1032
  return {builder, attributes, uniforms};
999
1033
  }
package/xml.d.ts CHANGED
@@ -50,7 +50,7 @@ export function parse(xml: string): Document;
50
50
  * @return {Parser} Parser.
51
51
  * @template T
52
52
  */
53
- export function makeArrayExtender<T>(valueReader: (this: T, arg1: Node, arg2: Array<any>) => (Array<any> | undefined), thisArg?: T | undefined): Parser;
53
+ export function makeArrayExtender<T>(valueReader: (this: T, arg1: Node, arg2: Array<any>) => (Array<any> | undefined), thisArg?: T): Parser;
54
54
  /**
55
55
  * Make an array pusher function for pushing to the array at the top of the
56
56
  * object stack.
@@ -59,7 +59,7 @@ export function makeArrayExtender<T>(valueReader: (this: T, arg1: Node, arg2: Ar
59
59
  * @return {Parser} Parser.
60
60
  * @template T
61
61
  */
62
- export function makeArrayPusher<T>(valueReader: (this: T, arg1: Element, arg2: Array<any>) => any, thisArg?: T | undefined): Parser;
62
+ export function makeArrayPusher<T>(valueReader: (this: T, arg1: Element, arg2: Array<any>) => any, thisArg?: T): Parser;
63
63
  /**
64
64
  * Make an object stack replacer function for replacing the object at the
65
65
  * top of the stack.
@@ -68,7 +68,7 @@ export function makeArrayPusher<T>(valueReader: (this: T, arg1: Element, arg2: A
68
68
  * @return {Parser} Parser.
69
69
  * @template T
70
70
  */
71
- export function makeReplacer<T>(valueReader: (this: T, arg1: Node, arg2: Array<any>) => any, thisArg?: T | undefined): Parser;
71
+ export function makeReplacer<T>(valueReader: (this: T, arg1: Node, arg2: Array<any>) => any, thisArg?: T): Parser;
72
72
  /**
73
73
  * Make an object property pusher function for adding a property to the
74
74
  * object at the top of the stack.
@@ -78,7 +78,7 @@ export function makeReplacer<T>(valueReader: (this: T, arg1: Node, arg2: Array<a
78
78
  * @return {Parser} Parser.
79
79
  * @template T
80
80
  */
81
- export function makeObjectPropertyPusher<T>(valueReader: (this: T, arg1: Element, arg2: Array<any>) => any, property?: string | undefined, thisArg?: T | undefined): Parser;
81
+ export function makeObjectPropertyPusher<T>(valueReader: (this: T, arg1: Element, arg2: Array<any>) => any, property?: string, thisArg?: T): Parser;
82
82
  /**
83
83
  * Make an object property setter function.
84
84
  * @param {function(this: T, Element, Array<*>): *} valueReader Value reader.
@@ -87,7 +87,7 @@ export function makeObjectPropertyPusher<T>(valueReader: (this: T, arg1: Element
87
87
  * @return {Parser} Parser.
88
88
  * @template T
89
89
  */
90
- export function makeObjectPropertySetter<T>(valueReader: (this: T, arg1: Element, arg2: Array<any>) => any, property?: string | undefined, thisArg?: T | undefined): Parser;
90
+ export function makeObjectPropertySetter<T>(valueReader: (this: T, arg1: Element, arg2: Array<any>) => any, property?: string, thisArg?: T): Parser;
91
91
  /**
92
92
  * Create a serializer that appends nodes written by its `nodeWriter` to its
93
93
  * designated parent. The parent is the `node` of the
@@ -97,7 +97,7 @@ export function makeObjectPropertySetter<T>(valueReader: (this: T, arg1: Element
97
97
  * @return {Serializer} Serializer.
98
98
  * @template T, V
99
99
  */
100
- export function makeChildAppender<T, V>(nodeWriter: (this: T, arg1: Node, arg2: V, arg3: Array<any>) => void, thisArg?: T | undefined): Serializer;
100
+ export function makeChildAppender<T, V>(nodeWriter: (this: T, arg1: Node, arg2: V, arg3: Array<any>) => void, thisArg?: T): Serializer;
101
101
  /**
102
102
  * Create a serializer that calls the provided `nodeWriter` from
103
103
  * {@link module:ol/xml.serialize}. This can be used by the parent writer to have the
@@ -110,7 +110,7 @@ export function makeChildAppender<T, V>(nodeWriter: (this: T, arg1: Node, arg2:
110
110
  * @return {Serializer} Serializer.
111
111
  * @template T, V
112
112
  */
113
- export function makeArraySerializer<T, V>(nodeWriter: (this: T, arg1: Element, arg2: V, arg3: Array<any>) => void, thisArg?: T | undefined): Serializer;
113
+ export function makeArraySerializer<T, V>(nodeWriter: (this: T, arg1: Element, arg2: V, arg3: Array<any>) => void, thisArg?: T): Serializer;
114
114
  /**
115
115
  * Create a node factory which can use the `keys` passed to
116
116
  * {@link module:ol/xml.serialize} or {@link module:ol/xml.pushSerializeAndPop} as node names,
@@ -124,7 +124,7 @@ export function makeArraySerializer<T, V>(nodeWriter: (this: T, arg1: Element, a
124
124
  * be used.
125
125
  * @return {function(*, Array<*>, string=): (Node|undefined)} Node factory.
126
126
  */
127
- export function makeSimpleNodeFactory(fixedNodeName?: string | undefined, fixedNamespaceURI?: string | undefined): (arg0: any, arg1: Array<any>, arg2: string | undefined) => (Node | undefined);
127
+ export function makeSimpleNodeFactory(fixedNodeName?: string, fixedNamespaceURI?: string): (arg0: any, arg1: Array<any>, arg2: string | undefined) => (Node | undefined);
128
128
  /**
129
129
  * Create an array of `values` to be used with {@link module:ol/xml.serialize} or
130
130
  * {@link module:ol/xml.pushSerializeAndPop}, where `orderedKeys` has to be provided as
@@ -151,7 +151,7 @@ export function makeSequence(object: {
151
151
  */
152
152
  export function makeStructureNS<T>(namespaceURIs: Array<string>, structure: T, structureNS?: {
153
153
  [x: string]: T;
154
- } | undefined): {
154
+ }): {
155
155
  [x: string]: T;
156
156
  };
157
157
  /**
@@ -209,7 +209,7 @@ export function serialize<T>(serializersNS: {
209
209
  [x: string]: {
210
210
  [x: string]: Serializer;
211
211
  };
212
- }, nodeFactory: (this: T, arg1: any, arg2: Array<any>, arg3: (string | undefined)) => (Node | undefined), values: Array<any>, objectStack: Array<any>, keys?: string[] | undefined, thisArg?: T | undefined): void;
212
+ }, nodeFactory: (this: T, arg1: any, arg2: Array<any>, arg3: (string | undefined)) => (Node | undefined), values: Array<any>, objectStack: Array<any>, keys?: Array<string>, thisArg?: T): void;
213
213
  /**
214
214
  * @param {O} object Object.
215
215
  * @param {Object<string, Object<string, Serializer>>} serializersNS
@@ -237,7 +237,7 @@ export function pushSerializeAndPop<O, T>(object: O, serializersNS: {
237
237
  [x: string]: {
238
238
  [x: string]: Serializer;
239
239
  };
240
- }, nodeFactory: (this: T, arg1: any, arg2: Array<any>, arg3: (string | undefined)) => (Node | undefined), values: Array<any>, objectStack: Array<any>, keys?: string[] | undefined, thisArg?: T | undefined): O | undefined;
240
+ }, nodeFactory: (this: T, arg1: any, arg2: Array<any>, arg3: (string | undefined)) => (Node | undefined), values: Array<any>, objectStack: Array<any>, keys?: Array<string>, thisArg?: T): O | undefined;
241
241
  /**
242
242
  * Register a XMLSerializer. Can be used to inject a XMLSerializer
243
243
  * where there is no globally available implementation.
package/xml.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"xml.d.ts","sourceRoot":"","sources":["xml.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"xml.d.ts","sourceRoot":"","sources":["xml.js"],"names":[],"mappings":"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"}