@loaders.gl/ogc 5.0.0-alpha.14 → 5.0.0-beta.10

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 (262) hide show
  1. package/LICENSE +2 -30
  2. package/README.md +11 -4
  3. package/THIRD-PARTY-NOTICES.md +21 -0
  4. package/dist/{wms/gml-loader.cjs → gml-loader.cjs} +2804 -3809
  5. package/dist/gml-loader.cjs.map +6 -0
  6. package/dist/gml-loader.d.ts +2 -0
  7. package/dist/gml-loader.d.ts.map +1 -0
  8. package/dist/gml-loader.js +2 -0
  9. package/dist/gml-loader.js.map +1 -0
  10. package/dist/index.cjs +346 -4378
  11. package/dist/index.cjs.map +3 -3
  12. package/dist/stac/index.cjs +22 -1044
  13. package/dist/stac/index.cjs.map +3 -3
  14. package/dist/stac/index.d.ts +2 -2
  15. package/dist/stac/index.d.ts.map +1 -1
  16. package/dist/stac/index.js +1 -1
  17. package/dist/stac/index.js.map +1 -1
  18. package/dist/stac/{stac-source-loader-types.d.ts → stac-loader-types.d.ts} +6 -6
  19. package/dist/stac/stac-loader-types.d.ts.map +1 -0
  20. package/dist/stac/{stac-source-loader-types.js → stac-loader-types.js} +8 -8
  21. package/dist/stac/stac-loader-types.js.map +1 -0
  22. package/dist/stac/{stac-source.d.ts → stac-loader.d.ts} +8 -8
  23. package/dist/stac/stac-loader.d.ts.map +1 -0
  24. package/dist/stac/{stac-source.js → stac-loader.js} +7 -7
  25. package/dist/stac/stac-loader.js.map +1 -0
  26. package/dist/{stac/stac-source.cjs → stac-loader.cjs} +288 -791
  27. package/dist/stac-loader.cjs.map +6 -0
  28. package/dist/stac-loader.d.ts +2 -0
  29. package/dist/stac-loader.d.ts.map +1 -0
  30. package/dist/stac-loader.js +2 -0
  31. package/dist/stac-loader.js.map +1 -0
  32. package/dist/wms/bundled.cjs +2638 -3557
  33. package/dist/wms/bundled.cjs.map +3 -3
  34. package/dist/wms/bundled.d.ts +3 -3
  35. package/dist/wms/bundled.d.ts.map +1 -1
  36. package/dist/wms/bundled.js.map +1 -1
  37. package/dist/wms/csw-capabilities-loader-with-parser.d.ts +5 -4
  38. package/dist/wms/csw-capabilities-loader-with-parser.d.ts.map +1 -1
  39. package/dist/wms/csw-capabilities-loader-with-parser.js.map +1 -1
  40. package/dist/wms/csw-capabilities-loader.d.ts +6 -4
  41. package/dist/wms/csw-capabilities-loader.d.ts.map +1 -1
  42. package/dist/wms/csw-capabilities-loader.js +1 -1
  43. package/dist/wms/csw-capabilities-loader.js.map +1 -1
  44. package/dist/wms/csw-domain-loader-with-parser.d.ts +5 -4
  45. package/dist/wms/csw-domain-loader-with-parser.d.ts.map +1 -1
  46. package/dist/wms/csw-domain-loader-with-parser.js.map +1 -1
  47. package/dist/wms/csw-domain-loader.d.ts +6 -4
  48. package/dist/wms/csw-domain-loader.d.ts.map +1 -1
  49. package/dist/wms/csw-domain-loader.js +1 -1
  50. package/dist/wms/csw-domain-loader.js.map +1 -1
  51. package/dist/wms/{csw-source-loader.d.ts → csw-loader.d.ts} +15 -13
  52. package/dist/wms/csw-loader.d.ts.map +1 -0
  53. package/dist/wms/{csw-source-loader.js → csw-loader.js} +5 -5
  54. package/dist/wms/csw-loader.js.map +1 -0
  55. package/dist/wms/csw-records-loader-with-parser.d.ts +5 -4
  56. package/dist/wms/csw-records-loader-with-parser.d.ts.map +1 -1
  57. package/dist/wms/csw-records-loader-with-parser.js.map +1 -1
  58. package/dist/wms/csw-records-loader.d.ts +6 -4
  59. package/dist/wms/csw-records-loader.d.ts.map +1 -1
  60. package/dist/wms/csw-records-loader.js +1 -1
  61. package/dist/wms/csw-records-loader.js.map +1 -1
  62. package/dist/wms/gml-loader-types.d.ts +17 -11
  63. package/dist/wms/gml-loader-types.d.ts.map +1 -1
  64. package/dist/wms/gml-loader-types.js +5 -3
  65. package/dist/wms/gml-loader-types.js.map +1 -1
  66. package/dist/wms/gml-loader.d.ts +11 -9
  67. package/dist/wms/gml-loader.d.ts.map +1 -1
  68. package/dist/wms/gml-loader.js +22 -16
  69. package/dist/wms/gml-loader.js.map +1 -1
  70. package/dist/wms/index.cjs +3444 -4346
  71. package/dist/wms/index.cjs.map +3 -3
  72. package/dist/wms/index.d.ts +21 -21
  73. package/dist/wms/index.d.ts.map +1 -1
  74. package/dist/wms/index.js +10 -12
  75. package/dist/wms/index.js.map +1 -1
  76. package/dist/wms/lib/deprecated/image-source-compatibility.d.ts +1 -1
  77. package/dist/wms/lib/deprecated/image-source-compatibility.js +1 -1
  78. package/dist/wms/lib/parsers/csw/parse-csw-capabilities.d.ts +1 -1
  79. package/dist/wms/lib/parsers/csw/parse-csw-capabilities.d.ts.map +1 -1
  80. package/dist/wms/lib/parsers/csw/parse-csw-domain.d.ts +1 -1
  81. package/dist/wms/lib/parsers/csw/parse-csw-domain.d.ts.map +1 -1
  82. package/dist/wms/lib/parsers/csw/parse-csw-records.d.ts +1 -1
  83. package/dist/wms/lib/parsers/csw/parse-csw-records.d.ts.map +1 -1
  84. package/dist/wms/lib/parsers/csw/parse-csw-records.js +2 -5
  85. package/dist/wms/lib/parsers/csw/parse-csw-records.js.map +1 -1
  86. package/dist/wms/lib/parsers/csw/parse-exception-report.js +2 -2
  87. package/dist/wms/lib/parsers/csw/parse-exception-report.js.map +1 -1
  88. package/dist/wms/lib/parsers/ogc-api/tile-matrix-limits.d.ts +1 -1
  89. package/dist/wms/lib/parsers/ogc-api/tile-matrix-limits.d.ts.map +1 -1
  90. package/dist/wms/lib/parsers/ogc-api/tile-matrix-limits.js +4 -53
  91. package/dist/wms/lib/parsers/ogc-api/tile-matrix-limits.js.map +1 -1
  92. package/dist/wms/lib/parsers/ogc-api/tile-matrix-set.d.ts +2 -2
  93. package/dist/wms/lib/parsers/ogc-api/tile-matrix-set.d.ts.map +1 -1
  94. package/dist/wms/lib/parsers/ogc-api/tile-matrix-set.js +9 -5
  95. package/dist/wms/lib/parsers/ogc-api/tile-matrix-set.js.map +1 -1
  96. package/dist/wms/lib/parsers/wms/parse-wms-error.d.ts.map +1 -1
  97. package/dist/wms/lib/parsers/wms/parse-wms-error.js +3 -1
  98. package/dist/wms/lib/parsers/wms/parse-wms-error.js.map +1 -1
  99. package/dist/wms/lib/parsers/wms/parse-wms-layer-description.d.ts +1 -1
  100. package/dist/wms/lib/parsers/wms/parse-wms-layer-description.d.ts.map +1 -1
  101. package/dist/wms/lib/parsers/wmts/parse-wmts-capabilities.js +1 -1
  102. package/dist/wms/lib/parsers/wmts/parse-wmts-capabilities.js.map +1 -1
  103. package/dist/wms/lib/parsers/xml/parse-xml-text.d.ts +1 -1
  104. package/dist/wms/lib/parsers/xml/parse-xml-text.d.ts.map +1 -1
  105. package/dist/wms/lib/parsers/xml/parse-xml-text.js +2 -1
  106. package/dist/wms/lib/parsers/xml/parse-xml-text.js.map +1 -1
  107. package/dist/wms/managed-vector-source.js +4 -4
  108. package/dist/wms/managed-vector-source.js.map +1 -1
  109. package/dist/wms/{ogc-api-coverages-source-loader.d.ts → ogc-api-coverages-loader.d.ts} +7 -7
  110. package/dist/wms/ogc-api-coverages-loader.d.ts.map +1 -0
  111. package/dist/wms/{ogc-api-coverages-source-loader.js → ogc-api-coverages-loader.js} +4 -4
  112. package/dist/wms/ogc-api-coverages-loader.js.map +1 -0
  113. package/dist/wms/{ogc-api-edr-source-loader.d.ts → ogc-api-edr-loader.d.ts} +7 -7
  114. package/dist/wms/ogc-api-edr-loader.d.ts.map +1 -0
  115. package/dist/wms/{ogc-api-edr-source-loader.js → ogc-api-edr-loader.js} +4 -4
  116. package/dist/wms/ogc-api-edr-loader.js.map +1 -0
  117. package/dist/wms/{ogc-api-source-loader.d.ts → ogc-api-loaders.d.ts} +11 -11
  118. package/dist/wms/ogc-api-loaders.d.ts.map +1 -0
  119. package/dist/wms/{ogc-api-source-loader.js → ogc-api-loaders.js} +15 -13
  120. package/dist/wms/ogc-api-loaders.js.map +1 -0
  121. package/dist/wms/service-runtime.js +18 -18
  122. package/dist/wms/service-runtime.js.map +1 -1
  123. package/dist/wms/unbundled.cjs +319 -3334
  124. package/dist/wms/unbundled.cjs.map +3 -3
  125. package/dist/wms/unbundled.d.ts +3 -3
  126. package/dist/wms/unbundled.d.ts.map +1 -1
  127. package/dist/wms/{wcs-source-loader.d.ts → wcs-coverage-loader.d.ts} +6 -6
  128. package/dist/wms/wcs-coverage-loader.d.ts.map +1 -0
  129. package/dist/wms/{wcs-source-loader.js → wcs-coverage-loader.js} +5 -5
  130. package/dist/wms/wcs-coverage-loader.js.map +1 -0
  131. package/dist/wms/wfs-capabilities-loader-with-parser.d.ts +4 -3
  132. package/dist/wms/wfs-capabilities-loader-with-parser.d.ts.map +1 -1
  133. package/dist/wms/wfs-capabilities-loader-with-parser.js.map +1 -1
  134. package/dist/wms/wfs-capabilities-loader.d.ts +5 -3
  135. package/dist/wms/wfs-capabilities-loader.d.ts.map +1 -1
  136. package/dist/wms/wfs-capabilities-loader.js +1 -1
  137. package/dist/wms/wfs-capabilities-loader.js.map +1 -1
  138. package/dist/wms/{wfs-source-loader.d.ts → wfs-loader.d.ts} +10 -39
  139. package/dist/wms/wfs-loader.d.ts.map +1 -0
  140. package/dist/wms/{wfs-source-loader.js → wfs-loader.js} +9 -40
  141. package/dist/wms/wfs-loader.js.map +1 -0
  142. package/dist/wms/wip/wcs-capabilities-loader.js +1 -1
  143. package/dist/wms/wip/wcs-capabilities-loader.js.map +1 -1
  144. package/dist/wms/wip/wmts-capabilities-loader-with-parser.d.ts +2 -2
  145. package/dist/wms/wip/wmts-capabilities-loader-with-parser.d.ts.map +1 -1
  146. package/dist/wms/wip/wmts-capabilities-loader-with-parser.js.map +1 -1
  147. package/dist/wms/wip/wmts-capabilities-loader.d.ts +2 -2
  148. package/dist/wms/wip/wmts-capabilities-loader.d.ts.map +1 -1
  149. package/dist/wms/wip/wmts-capabilities-loader.js +1 -1
  150. package/dist/wms/wip/wmts-capabilities-loader.js.map +1 -1
  151. package/dist/wms/wms-capabilities-loader-with-parser.d.ts +2 -1
  152. package/dist/wms/wms-capabilities-loader-with-parser.d.ts.map +1 -1
  153. package/dist/wms/wms-capabilities-loader.d.ts +3 -1
  154. package/dist/wms/wms-capabilities-loader.d.ts.map +1 -1
  155. package/dist/wms/wms-capabilities-loader.js +1 -1
  156. package/dist/wms/wms-capabilities-loader.js.map +1 -1
  157. package/dist/wms/wms-error-loader-with-parser.d.ts +5 -4
  158. package/dist/wms/wms-error-loader-with-parser.d.ts.map +1 -1
  159. package/dist/wms/wms-error-loader-with-parser.js.map +1 -1
  160. package/dist/wms/wms-error-loader.d.ts +6 -4
  161. package/dist/wms/wms-error-loader.d.ts.map +1 -1
  162. package/dist/wms/wms-error-loader.js +1 -1
  163. package/dist/wms/wms-error-loader.js.map +1 -1
  164. package/dist/wms/{wms-source-loader.d.ts → wms-loader.d.ts} +8 -10
  165. package/dist/wms/wms-loader.d.ts.map +1 -0
  166. package/dist/wms/{wms-source-loader.js → wms-loader.js} +8 -8
  167. package/dist/wms/wms-loader.js.map +1 -0
  168. package/dist/wms/wmts-capabilities-loader.d.ts +1 -1
  169. package/dist/wms/wmts-capabilities-loader.d.ts.map +1 -1
  170. package/dist/wms/wmts-capabilities-loader.js +1 -1
  171. package/dist/wms/wmts-capabilities-loader.js.map +1 -1
  172. package/dist/wms/{wmts-source-loader.d.ts → wmts-loader.d.ts} +9 -9
  173. package/dist/wms/wmts-loader.d.ts.map +1 -0
  174. package/dist/wms/{wmts-source-loader.js → wmts-loader.js} +7 -5
  175. package/dist/wms/wmts-loader.js.map +1 -0
  176. package/dist/{wms/wmts-capabilities-loader-with-parser.cjs → wmts-capabilities-loader-with-parser.cjs} +227 -179
  177. package/dist/wmts-capabilities-loader-with-parser.cjs.map +6 -0
  178. package/dist/wmts-capabilities-loader-with-parser.d.ts +2 -0
  179. package/dist/wmts-capabilities-loader-with-parser.d.ts.map +1 -0
  180. package/dist/wmts-capabilities-loader-with-parser.js +3 -0
  181. package/dist/wmts-capabilities-loader-with-parser.js.map +1 -0
  182. package/package.json +33 -23
  183. package/src/gml-loader.ts +1 -0
  184. package/src/stac/index.ts +2 -2
  185. package/src/stac/{stac-source-loader-types.ts → stac-loader-types.ts} +9 -9
  186. package/src/stac/{stac-source.ts → stac-loader.ts} +10 -10
  187. package/src/stac-loader.ts +1 -0
  188. package/src/wms/bundled.ts +6 -3
  189. package/src/wms/csw-capabilities-loader-with-parser.ts +6 -5
  190. package/src/wms/csw-capabilities-loader.ts +3 -3
  191. package/src/wms/csw-domain-loader-with-parser.ts +5 -5
  192. package/src/wms/csw-domain-loader.ts +3 -3
  193. package/src/wms/{csw-source-loader.ts → csw-loader.ts} +11 -11
  194. package/src/wms/csw-records-loader-with-parser.ts +5 -5
  195. package/src/wms/csw-records-loader.ts +3 -3
  196. package/src/wms/gml-loader-types.ts +10 -8
  197. package/src/wms/gml-loader.ts +34 -20
  198. package/src/wms/index.ts +35 -31
  199. package/src/wms/lib/deprecated/image-source-compatibility.ts +1 -1
  200. package/src/wms/lib/parsers/csw/parse-csw-capabilities.ts +1 -1
  201. package/src/wms/lib/parsers/csw/parse-csw-domain.ts +1 -1
  202. package/src/wms/lib/parsers/csw/parse-csw-records.ts +3 -6
  203. package/src/wms/lib/parsers/csw/parse-exception-report.ts +2 -2
  204. package/src/wms/lib/parsers/ogc-api/tile-matrix-limits.ts +4 -65
  205. package/src/wms/lib/parsers/ogc-api/tile-matrix-set.ts +10 -9
  206. package/src/wms/lib/parsers/wms/parse-wms-error.ts +3 -1
  207. package/src/wms/lib/parsers/wms/parse-wms-layer-description.ts +1 -1
  208. package/src/wms/lib/parsers/wmts/parse-wmts-capabilities.ts +1 -1
  209. package/src/wms/lib/parsers/xml/parse-xml-text.ts +3 -2
  210. package/src/wms/managed-vector-source.ts +4 -4
  211. package/src/wms/{ogc-api-coverages-source-loader.ts → ogc-api-coverages-loader.ts} +11 -8
  212. package/src/wms/{ogc-api-edr-source-loader.ts → ogc-api-edr-loader.ts} +7 -7
  213. package/src/wms/{ogc-api-source-loader.ts → ogc-api-loaders.ts} +20 -18
  214. package/src/wms/service-runtime.ts +18 -18
  215. package/src/wms/unbundled.ts +3 -3
  216. package/src/wms/{wcs-source-loader.ts → wcs-coverage-loader.ts} +7 -7
  217. package/src/wms/wfs-capabilities-loader-with-parser.ts +5 -4
  218. package/src/wms/wfs-capabilities-loader.ts +2 -2
  219. package/src/wms/{wfs-source-loader.ts → wfs-loader.ts} +17 -47
  220. package/src/wms/wip/wms-feature-info-loader-with-parser.ts +1 -1
  221. package/src/wms/wip/wms-feature-info-loader.ts +1 -1
  222. package/src/wms/wip/wms-layer-description-loader-with-parser.ts +1 -1
  223. package/src/wms/wip/wms-layer-description-loader.ts +1 -1
  224. package/src/wms/wip/wmts-capabilities-loader-with-parser.ts +5 -5
  225. package/src/wms/wip/wmts-capabilities-loader.ts +3 -3
  226. package/src/wms/wms-capabilities-loader-with-parser.ts +1 -1
  227. package/src/wms/wms-capabilities-loader.ts +1 -1
  228. package/src/wms/wms-error-loader-with-parser.ts +8 -7
  229. package/src/wms/wms-error-loader.ts +2 -2
  230. package/src/wms/{wms-source-loader.ts → wms-loader.ts} +15 -28
  231. package/src/wms/wmts-capabilities-loader.ts +3 -3
  232. package/src/wms/{wmts-source-loader.ts → wmts-loader.ts} +13 -11
  233. package/src/wmts-capabilities-loader-with-parser.ts +2 -0
  234. package/third-party-licenses/parse-gml-polygon-LICENSE +5 -0
  235. package/dist/stac/stac-source-loader-types.d.ts.map +0 -1
  236. package/dist/stac/stac-source-loader-types.js.map +0 -1
  237. package/dist/stac/stac-source.cjs.map +0 -6
  238. package/dist/stac/stac-source.d.ts.map +0 -1
  239. package/dist/stac/stac-source.js.map +0 -1
  240. package/dist/wms/csw-source-loader.d.ts.map +0 -1
  241. package/dist/wms/csw-source-loader.js.map +0 -1
  242. package/dist/wms/gml-loader.cjs.map +0 -6
  243. package/dist/wms/lib/deprecated/create-image-source.d.ts +0 -27
  244. package/dist/wms/lib/deprecated/create-image-source.d.ts.map +0 -1
  245. package/dist/wms/lib/deprecated/create-image-source.js +0 -44
  246. package/dist/wms/lib/deprecated/create-image-source.js.map +0 -1
  247. package/dist/wms/ogc-api-coverages-source-loader.d.ts.map +0 -1
  248. package/dist/wms/ogc-api-coverages-source-loader.js.map +0 -1
  249. package/dist/wms/ogc-api-edr-source-loader.d.ts.map +0 -1
  250. package/dist/wms/ogc-api-edr-source-loader.js.map +0 -1
  251. package/dist/wms/ogc-api-source-loader.d.ts.map +0 -1
  252. package/dist/wms/ogc-api-source-loader.js.map +0 -1
  253. package/dist/wms/wcs-source-loader.d.ts.map +0 -1
  254. package/dist/wms/wcs-source-loader.js.map +0 -1
  255. package/dist/wms/wfs-source-loader.d.ts.map +0 -1
  256. package/dist/wms/wfs-source-loader.js.map +0 -1
  257. package/dist/wms/wms-source-loader.d.ts.map +0 -1
  258. package/dist/wms/wms-source-loader.js.map +0 -1
  259. package/dist/wms/wmts-capabilities-loader-with-parser.cjs.map +0 -6
  260. package/dist/wms/wmts-source-loader.d.ts.map +0 -1
  261. package/dist/wms/wmts-source-loader.js.map +0 -1
  262. package/src/wms/lib/deprecated/create-image-source.ts +0 -75
@@ -4,10 +4,10 @@
4
4
 
5
5
  import type {CoreAPI, DataSourceOptions, SourceLoader} from '@loaders.gl/core/loader-utils';
6
6
  import {DataSource} from '@loaders.gl/core/loader-utils';
7
- import type {OGCAPILandingPage, OGCAPICollection} from './ogc-api-source-loader';
7
+ import type {OGCAPILandingPage, OGCAPICollection} from './ogc-api-loaders';
8
8
 
9
9
  /** Options for an OGC API EDR source. */
10
- export type OGCAPIEDRSourceOptions = DataSourceOptions & {
10
+ export type OGCAPIEDRLoaderOptions = DataSourceOptions & {
11
11
  /** EDR request defaults. */
12
12
  'ogc-api-edr'?: {collectionId?: string; parameters?: Record<string, string>};
13
13
  };
@@ -39,10 +39,10 @@ export type OGCAPIEDRQueryParameters = {
39
39
  };
40
40
 
41
41
  /** Minimal OGC API EDR source for discovery and spatiotemporal queries. */
42
- export class OGCAPIEDRSource extends DataSource<string, OGCAPIEDRSourceOptions> {
42
+ export class OGCAPIEDRSource extends DataSource<string, OGCAPIEDRLoaderOptions> {
43
43
  /** Creates an EDR source. */
44
- constructor(url: string, options: OGCAPIEDRSourceOptions = {}, coreApi?: CoreAPI) {
45
- super(url.replace(/\/$/, ''), options, OGCAPIEDRSourceLoader.defaultOptions, coreApi);
44
+ constructor(url: string, options: OGCAPIEDRLoaderOptions = {}, coreApi?: CoreAPI) {
45
+ super(url.replace(/\/$/, ''), options, OGCAPIEDRLoader.defaultOptions, coreApi);
46
46
  }
47
47
 
48
48
  /** Returns the EDR landing page. */
@@ -98,7 +98,7 @@ export class OGCAPIEDRSource extends DataSource<string, OGCAPIEDRSourceOptions>
98
98
  }
99
99
 
100
100
  /** Source loader for OGC API EDR services. */
101
- export const OGCAPIEDRSourceLoader = {
101
+ export const OGCAPIEDRLoader = {
102
102
  dataType: null as unknown as OGCAPIEDRSource,
103
103
  batchType: null as never,
104
104
  name: 'OGC API EDR',
@@ -116,7 +116,7 @@ export const OGCAPIEDRSourceLoader = {
116
116
  /(?:\/edr(?:\/|$)|ogc[/-]?api[/-]?edr|\/collections\/[^/]+\/(?:position|radius|area|cube|trajectory|corridor|locations)(?:\/|$))/i.test(
117
117
  url
118
118
  ),
119
- createDataSource: (url: string, options: OGCAPIEDRSourceOptions = {}, coreApi?: CoreAPI) =>
119
+ createDataSourceSync: (url: string, options: OGCAPIEDRLoaderOptions = {}, coreApi?: CoreAPI) =>
120
120
  new OGCAPIEDRSource(url, options, coreApi)
121
121
  } as const satisfies SourceLoader<OGCAPIEDRSource>;
122
122
 
@@ -18,8 +18,8 @@ import type {
18
18
  } from '@loaders.gl/core/loader-utils';
19
19
  import {DataSource} from '@loaders.gl/core/loader-utils';
20
20
  import type {GeoJSONTable, Schema} from '@loaders.gl/core/schema';
21
- import {convertFeaturesToWKBArrowTable} from '@loaders.gl/arrow-geometry/feature-collection-to-arrow';
22
- import {convertGeojsonToBinaryFeatureCollection} from '@loaders.gl/arrow-geometry/legacy-binary';
21
+ import {convertFeaturesToWKBArrowTable} from '@loaders.gl/core/arrow-geometry/feature-collection-to-arrow';
22
+ import {convertGeojsonToBinaryFeatureCollection} from '@loaders.gl/core/arrow-geometry/legacy-binary';
23
23
  import {getServiceCRSAxisOrder} from './crs-utils';
24
24
  import type {OGCTileMatrixSet} from './lib/parsers/ogc-api/tile-matrix-set';
25
25
  import {convertOGCTileMatrixSetToTileGrid} from './lib/parsers/ogc-api/tile-matrix-set';
@@ -28,6 +28,7 @@ import {
28
28
  convertOGCTileMatrixLimits,
29
29
  isOGCTileAvailable
30
30
  } from './lib/parsers/ogc-api/tile-matrix-limits';
31
+ import {resolveTileGridTile} from '@loaders.gl/core/loader-utils/tile-grid';
31
32
  import {getTileGridMatrixId, validateMetersPerUnit} from './lib/tile-grid';
32
33
  import type {FeaturePaginationOptions, FeaturePage} from './feature-pagination';
33
34
  import {
@@ -38,7 +39,7 @@ import {
38
39
  } from './feature-pagination';
39
40
 
40
41
  /** Options shared by the minimal OGC API source adapters. */
41
- export type OGCAPISourceOptions = DataSourceOptions & {
42
+ export type OGCAPILoaderOptions = DataSourceOptions & {
42
43
  /** Optional collection identifier for an OGC API Features source. */
43
44
  'ogc-api'?: {
44
45
  /** Collection to query. */
@@ -113,12 +114,12 @@ export type OGCAPILandingPage = {
113
114
 
114
115
  /** Minimal OGC API Features source. */
115
116
  export class OGCAPIFeaturesSource
116
- extends DataSource<string, OGCAPISourceOptions>
117
+ extends DataSource<string, OGCAPILoaderOptions>
117
118
  implements VectorSource
118
119
  {
119
120
  /** Creates an OGC API Features source. */
120
- constructor(url: string, options: OGCAPISourceOptions = {}, coreApi?: CoreAPI) {
121
- super(url.replace(/\/$/, ''), options, OGCAPIFeaturesSourceLoader.defaultOptions, coreApi);
121
+ constructor(url: string, options: OGCAPILoaderOptions = {}, coreApi?: CoreAPI) {
122
+ super(url.replace(/\/$/, ''), options, OGCAPIFeaturesLoader.defaultOptions, coreApi);
122
123
  }
123
124
 
124
125
  /** Returns the landing page metadata. */
@@ -163,7 +164,7 @@ export class OGCAPIFeaturesSource
163
164
  case 'arrow':
164
165
  return convertFeaturesToWKBArrowTable(geoJSONTable.features, {
165
166
  encodingPreference: parameters.geoarrow?.encodingPreference
166
- });
167
+ }).data;
167
168
  case 'geojson':
168
169
  default:
169
170
  return geoJSONTable;
@@ -264,7 +265,7 @@ export class OGCAPIFeaturesSource
264
265
  }
265
266
 
266
267
  /** Source loader for minimal OGC API Features support. */
267
- export const OGCAPIFeaturesSourceLoader = {
268
+ export const OGCAPIFeaturesLoader = {
268
269
  dataType: null as unknown as OGCAPIFeaturesSource,
269
270
  batchType: null as never,
270
271
  name: 'OGC API Features',
@@ -279,13 +280,13 @@ export const OGCAPIFeaturesSourceLoader = {
279
280
  options: {'ogc-api': {}},
280
281
  defaultOptions: {'ogc-api': {}},
281
282
  testURL: (url: string): boolean => /\/collections(?:\/|$)|ogc[/-]?api[/-]features/i.test(url),
282
- createDataSource: (url: string, options: OGCAPISourceOptions = {}, coreApi?: CoreAPI) =>
283
+ createDataSourceSync: (url: string, options: OGCAPILoaderOptions = {}, coreApi?: CoreAPI) =>
283
284
  new OGCAPIFeaturesSource(url, options, coreApi)
284
285
  } as const satisfies SourceLoader<OGCAPIFeaturesSource>;
285
286
 
286
287
  /** Minimal OGC API Tiles source that follows a discovered tile template. */
287
288
  export class OGCAPITilesSource
288
- extends DataSource<string, OGCAPISourceOptions>
289
+ extends DataSource<string, OGCAPILoaderOptions>
289
290
  implements TileSource
290
291
  {
291
292
  /** Converted tile matrix set and the options it was loaded or discovered with. */
@@ -305,13 +306,13 @@ export class OGCAPITilesSource
305
306
  } | null = null;
306
307
 
307
308
  /** Creates an OGC API Tiles source. */
308
- constructor(url: string, options: OGCAPISourceOptions = {}, coreApi?: CoreAPI) {
309
- super(url.replace(/\/$/, ''), options, OGCAPITilesSourceLoader.defaultOptions, coreApi);
309
+ constructor(url: string, options: OGCAPILoaderOptions = {}, coreApi?: CoreAPI) {
310
+ super(url.replace(/\/$/, ''), options, OGCAPITilesLoader.defaultOptions, coreApi);
310
311
  validateMetersPerUnit(options['ogc-api']?.metersPerUnit, 'OGC API Tiles');
311
312
  }
312
313
 
313
314
  /** Updates options. A new `tileMatrixSet` document replaces the old one instead of merging. */
314
- override setProps(options: OGCAPISourceOptions): void {
315
+ override setProps(options: OGCAPILoaderOptions): void {
315
316
  super.setProps(options);
316
317
  const ogcAPIOptions = options['ogc-api'];
317
318
  if (ogcAPIOptions && 'tileMatrixSet' in ogcAPIOptions) {
@@ -543,7 +544,8 @@ export class OGCAPITilesSource
543
544
  const template = this.options['ogc-api']?.tileTemplate;
544
545
  if (!template) throw new Error('OGC API Tiles requires ogc-api.tileTemplate');
545
546
  const loadedGrid = this.getLoadedTileGrid();
546
- if (!isOGCTileAvailable(parameters, loadedGrid)) {
547
+ const resolvedParameters = resolveTileGridTile(loadedGrid, parameters);
548
+ if (!resolvedParameters) {
547
549
  throw new RangeError('OGC tile is outside advertised coverage');
548
550
  }
549
551
  // XYZ placeholders keep numeric z; only OGC placeholders substitute a matrix identifier.
@@ -560,10 +562,10 @@ export class OGCAPITilesSource
560
562
  const tileUrl = template
561
563
  .replaceAll('{tileMatrix}', encodeURIComponent(tileMatrixId))
562
564
  .replaceAll('{tileRow}', String(parameters.y))
563
- .replaceAll('{tileCol}', String(parameters.x))
565
+ .replaceAll('{tileCol}', String(resolvedParameters.x))
564
566
  .replaceAll('{z}', String(parameters.z))
565
567
  .replaceAll('{y}', String(parameters.y))
566
- .replaceAll('{x}', String(parameters.x));
568
+ .replaceAll('{x}', String(resolvedParameters.x));
567
569
  return resolveLink(tileUrl, this.url);
568
570
  }
569
571
 
@@ -575,7 +577,7 @@ export class OGCAPITilesSource
575
577
  }
576
578
 
577
579
  /** Source loader for minimal OGC API Tiles support. */
578
- export const OGCAPITilesSourceLoader = {
580
+ export const OGCAPITilesLoader = {
579
581
  dataType: null as unknown as OGCAPITilesSource,
580
582
  batchType: null as never,
581
583
  name: 'OGC API Tiles',
@@ -590,7 +592,7 @@ export const OGCAPITilesSourceLoader = {
590
592
  options: {},
591
593
  defaultOptions: {},
592
594
  testURL: (url: string): boolean => /\/tiles(?:\/|$)|ogc[/-]?api[/-]tiles/i.test(url),
593
- createDataSource: (url: string, options: OGCAPISourceOptions = {}, coreApi?: CoreAPI) =>
595
+ createDataSourceSync: (url: string, options: OGCAPILoaderOptions = {}, coreApi?: CoreAPI) =>
594
596
  new OGCAPITilesSource(url, options, coreApi)
595
597
  } as const satisfies SourceLoader<OGCAPITilesSource>;
596
598
 
@@ -11,14 +11,14 @@ import type {
11
11
  SourceLoader
12
12
  } from '@loaders.gl/core/loader-utils';
13
13
  import {createAuthenticatedFetch, redactCredentialURL} from '@loaders.gl/core/loader-utils';
14
- import {CSWSourceLoader} from './csw-source-loader';
15
- import {WMSSourceLoader} from './wms-source-loader';
16
- import {WMTSSourceLoader} from './wmts-source-loader';
17
- import {WFSSourceLoader} from './wfs-source-loader';
18
- import {OGCAPIEDRSourceLoader} from './ogc-api-edr-source-loader';
19
- import {OGCAPICoveragesSourceLoader} from './ogc-api-coverages-source-loader';
20
- import {OGCAPIFeaturesSourceLoader, OGCAPITilesSourceLoader} from './ogc-api-source-loader';
21
- import {WCSCoverageSourceLoader} from './wcs-source-loader';
14
+ import {CSWLoader} from './csw-loader';
15
+ import {WMSLoader} from './wms-loader';
16
+ import {WMTSLoader} from './wmts-loader';
17
+ import {WFSLoader} from './wfs-loader';
18
+ import {OGCAPIEDRLoader} from './ogc-api-edr-loader';
19
+ import {OGCAPICoveragesLoader} from './ogc-api-coverages-loader';
20
+ import {OGCAPIFeaturesLoader, OGCAPITilesLoader} from './ogc-api-loaders';
21
+ import {WCSCoverageLoader} from './wcs-coverage-loader';
22
22
 
23
23
  /** A source loader that can be selected by the universal service runtime. */
24
24
  export type ServiceSourceLoader = SourceLoader;
@@ -81,15 +81,15 @@ export class ServiceRequestError extends Error {
81
81
 
82
82
  /** Default source set spanning the OGC service families implemented by WMS. */
83
83
  export const DEFAULT_SERVICE_LOADERS: readonly ServiceSourceLoader[] = [
84
- WMTSSourceLoader,
85
- WMSSourceLoader,
86
- WFSSourceLoader,
87
- WCSCoverageSourceLoader,
88
- OGCAPITilesSourceLoader,
89
- OGCAPICoveragesSourceLoader,
90
- OGCAPIEDRSourceLoader,
91
- OGCAPIFeaturesSourceLoader,
92
- CSWSourceLoader
84
+ WMTSLoader,
85
+ WMSLoader,
86
+ WFSLoader,
87
+ WCSCoverageLoader,
88
+ OGCAPITilesLoader,
89
+ OGCAPICoveragesLoader,
90
+ OGCAPIEDRLoader,
91
+ OGCAPIFeaturesLoader,
92
+ CSWLoader
93
93
  ];
94
94
 
95
95
  type CachedSource = {source: DataSource<unknown, DataSourceOptions>; expires: number};
@@ -121,7 +121,7 @@ export class ServiceRuntime {
121
121
  const loader = this.options.loaders.find(candidate => candidate.testURL(url));
122
122
  if (!loader) throw new Error(`No geospatial service loader recognized URL: ${url}`);
123
123
  const sourceOptions = this._getSourceOptions(options);
124
- const source = loader.createDataSource(url, sourceOptions, this.options.coreApi);
124
+ const source = loader.createDataSourceSync(url, sourceOptions, this.options.coreApi);
125
125
  this._sources.set(url, {source, expires: Date.now() + this.options.cacheTTL});
126
126
  return source;
127
127
  }
@@ -2,7 +2,7 @@
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
- export type {CSWLoaderOptions, CSWCapabilities} from './csw-capabilities-loader';
5
+ export type {CSWCapabilitiesLoaderOptions, CSWCapabilities} from './csw-capabilities-loader';
6
6
  export {CSWCapabilitiesLoader} from './csw-capabilities-loader';
7
7
  export type {CSWDomain} from './csw-domain-loader';
8
8
  export {CSWDomainLoader} from './csw-domain-loader';
@@ -10,13 +10,13 @@ export type {CSWRecords} from './csw-records-loader';
10
10
  export {CSWRecordsLoader} from './csw-records-loader';
11
11
 
12
12
  export {WMSErrorLoader} from './wms-error-loader';
13
- export type {WMTSLoaderOptions} from './wmts-capabilities-loader';
13
+ export type {WMTSCapabilitiesLoaderOptions} from './wmts-capabilities-loader';
14
14
  export type {WMTSCapabilities} from './lib/parsers/wmts/parse-wmts-capabilities';
15
15
  export {WMTSCapabilitiesLoader} from './wmts-capabilities-loader';
16
16
  export type {WMSCapabilitiesLoaderOptions} from './wms-capabilities-loader';
17
17
  export {WMSCapabilitiesLoader} from './wms-capabilities-loader';
18
18
 
19
- export type {WFSLoaderOptions as _WFSLoaderOptions} from './wfs-capabilities-loader';
19
+ export type {WFSCapabilitiesLoaderOptions as _WFSLoaderOptions} from './wfs-capabilities-loader';
20
20
  export type {WFSCapabilities as _WFSCapabilities} from './wfs-capabilities-loader';
21
21
  export {WFSCapabilitiesLoader as _WFSCapabilitiesLoader} from './wfs-capabilities-loader';
22
22
 
@@ -3,14 +3,14 @@
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
5
  import type {LERCData} from '@loaders.gl/raster';
6
- import {LERCLoader} from '@loaders.gl/raster';
6
+ import {LERCLoader} from '@loaders.gl/raster/lerc-loader-types';
7
7
  import type {CoreAPI, DataSourceOptions, SourceLoader} from '@loaders.gl/core/loader-utils';
8
8
  import {DataSource} from '@loaders.gl/core/loader-utils';
9
9
  import type {WCSCapabilities} from './wip/lib/wcs/parse-wcs-capabilities';
10
10
  import {parseWCSCapabilities} from './wip/lib/wcs/parse-wcs-capabilities';
11
11
 
12
12
  /** Options for WCS coverage requests. */
13
- export type WCSSourceOptions = DataSourceOptions & {
13
+ export type WCSCoverageLoaderOptions = DataSourceOptions & {
14
14
  /** WCS request defaults. */
15
15
  wcs?: {
16
16
  /** WCS protocol version. */
@@ -67,10 +67,10 @@ export type WCSCoverageMetadata = {
67
67
  };
68
68
 
69
69
  /** WCS source with capabilities and GetCoverage support. */
70
- export class WCSCoverageSource extends DataSource<string, WCSSourceOptions> {
70
+ export class WCSCoverageSource extends DataSource<string, WCSCoverageLoaderOptions> {
71
71
  /** Creates a WCS source. */
72
- constructor(url: string, options: WCSSourceOptions = {}, coreApi?: CoreAPI) {
73
- super(url.replace(/\/$/, ''), options, WCSCoverageSourceLoader.defaultOptions, coreApi);
72
+ constructor(url: string, options: WCSCoverageLoaderOptions = {}, coreApi?: CoreAPI) {
73
+ super(url.replace(/\/$/, ''), options, WCSCoverageLoader.defaultOptions, coreApi);
74
74
  }
75
75
 
76
76
  /** Fetches and parses the WCS GetCapabilities document. */
@@ -164,7 +164,7 @@ export class WCSCoverageSource extends DataSource<string, WCSSourceOptions> {
164
164
  }
165
165
 
166
166
  /** Source loader for WCS coverage services. */
167
- export const WCSCoverageSourceLoader = {
167
+ export const WCSCoverageLoader = {
168
168
  dataType: null as unknown as WCSCoverageSource,
169
169
  batchType: null as never,
170
170
  name: 'WCS Coverage',
@@ -179,7 +179,7 @@ export const WCSCoverageSourceLoader = {
179
179
  options: {wcs: {}},
180
180
  defaultOptions: {wcs: {}},
181
181
  testURL: (url: string): boolean => url.toLowerCase().includes('wcs'),
182
- createDataSource: (url: string, options: WCSSourceOptions = {}, coreApi?: CoreAPI) =>
182
+ createDataSourceSync: (url: string, options: WCSCoverageLoaderOptions = {}, coreApi?: CoreAPI) =>
183
183
  new WCSCoverageSource(url, options, coreApi)
184
184
  } as const satisfies SourceLoader<WCSCoverageSource>;
185
185
 
@@ -12,7 +12,7 @@ const {preload: _WFSCapabilitiesLoaderPreload, ...WFSCapabilitiesLoaderMetadataW
12
12
 
13
13
  export type {WFSCapabilities};
14
14
 
15
- export type WFSLoaderOptions = LoaderOptions & {
15
+ export type WFSCapabilitiesLoaderOptions = LoaderOptions & {
16
16
  wfs?: {};
17
17
  };
18
18
 
@@ -22,9 +22,10 @@ export type WFSLoaderOptions = LoaderOptions & {
22
22
  */
23
23
  export const WFSCapabilitiesLoaderWithParser = {
24
24
  ...WFSCapabilitiesLoaderMetadataWithoutPreload,
25
- parse: async (arrayBuffer: ArrayBuffer, options?: WFSLoaderOptions) =>
25
+ parse: async (arrayBuffer: ArrayBuffer, options?: WFSCapabilitiesLoaderOptions) =>
26
26
  parseWFSCapabilities(new TextDecoder().decode(arrayBuffer), options),
27
- parseTextSync: (text: string, options?: WFSLoaderOptions) => parseWFSCapabilities(text, options)
28
- } as const satisfies LoaderWithParser<WFSCapabilities, never, WFSLoaderOptions>;
27
+ parseTextSync: (text: string, options?: WFSCapabilitiesLoaderOptions) =>
28
+ parseWFSCapabilities(text, options)
29
+ } as const satisfies LoaderWithParser<WFSCapabilities, never, WFSCapabilitiesLoaderOptions>;
29
30
 
30
31
  export const _typecheckWFSCapabilitiesLoader: LoaderWithParser = WFSCapabilitiesLoaderWithParser;
@@ -12,7 +12,7 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
12
12
 
13
13
  export type {WFSCapabilities};
14
14
 
15
- export type WFSLoaderOptions = LoaderOptions & {
15
+ export type WFSCapabilitiesLoaderOptions = LoaderOptions & {
16
16
  wfs?: {};
17
17
  };
18
18
 
@@ -47,7 +47,7 @@ export const WFSCapabilitiesLoader = {
47
47
  wfs: {}
48
48
  },
49
49
  preload
50
- } as const satisfies Loader<WFSCapabilities, never, WFSLoaderOptions>;
50
+ } as const satisfies Loader<WFSCapabilities, never, WFSCapabilitiesLoaderOptions>;
51
51
 
52
52
  function testXMLFile(text: string): boolean {
53
53
  // TODO - There could be space first.
@@ -3,8 +3,8 @@
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
5
  import type {Schema, GeoJSONTable, Geometry} from '@loaders.gl/core/schema';
6
- import {convertFeaturesToWKBArrowTable} from '@loaders.gl/arrow-geometry/feature-collection-to-arrow';
7
- import {convertGeojsonToBinaryFeatureCollection} from '@loaders.gl/arrow-geometry/legacy-binary';
6
+ import {convertFeaturesToWKBArrowTable} from '@loaders.gl/core/arrow-geometry/feature-collection-to-arrow';
7
+ import {convertGeojsonToBinaryFeatureCollection} from '@loaders.gl/core/arrow-geometry/legacy-binary';
8
8
  import type {
9
9
  CoreAPI,
10
10
  DataSourceOptions,
@@ -19,7 +19,7 @@ import {DataSource, mergeOptions} from '@loaders.gl/core/loader-utils';
19
19
  import type {WFSCapabilities} from './wfs-capabilities-loader';
20
20
  import {WFSCapabilitiesLoaderWithParser} from './wfs-capabilities-loader-with-parser';
21
21
 
22
- import type {WMSLoaderOptions} from './wms-error-loader';
22
+ import type {WMSErrorLoaderOptions} from './wms-error-loader';
23
23
  import type {GMLLoaderOptions} from './gml-loader-types';
24
24
  import {WMSErrorLoaderWithParser} from './wms-error-loader-with-parser';
25
25
  import {parseGML} from './lib/parsers/gml/parse-gml';
@@ -37,8 +37,8 @@ import {
37
37
  /* eslint-disable camelcase */ // WFS XML parameters use snake_case
38
38
 
39
39
  /** Properties for creating a enw WFS service */
40
- export type WFSourceOptions = DataSourceOptions &
41
- WMSLoaderOptions &
40
+ export type WFSLoaderOptions = DataSourceOptions &
41
+ WMSErrorLoaderOptions &
42
42
  GMLLoaderOptions & {
43
43
  wfs?: {
44
44
  /** Opt-in bounded pagination for getFeatures(); omitted keeps the single-page behavior. */
@@ -60,7 +60,7 @@ export type WFSVersion = '1.1.0' | '2.0.0';
60
60
  /**
61
61
  * Read-only WFS source supporting extent queries and GeoJSON/GML responses.
62
62
  */
63
- export const WFSSourceLoader = {
63
+ export const WFSLoader = {
64
64
  dataType: null as unknown as WFSVectorSource,
65
65
  batchType: null as never,
66
66
  name: 'WFS',
@@ -82,8 +82,11 @@ export const WFSSourceLoader = {
82
82
  },
83
83
 
84
84
  testURL: (url: string): boolean => url.toLowerCase().includes('wfs'),
85
- createDataSource: (url: string, options: WFSourceOptions, coreApi?: CoreAPI): WFSVectorSource =>
86
- new WFSVectorSource(url, options, coreApi)
85
+ createDataSourceSync: (
86
+ url: string,
87
+ options: WFSLoaderOptions,
88
+ coreApi?: CoreAPI
89
+ ): WFSVectorSource => new WFSVectorSource(url, options, coreApi)
87
90
  } as const satisfies SourceLoader<WFSVectorSource>;
88
91
 
89
92
  // PARAMETER TYPES FOR WFS SOURCE
@@ -282,15 +285,15 @@ export type WFSGetLegendGraphicParameters = {
282
285
  * - implements the VectorSource interface
283
286
  * @note Only the URL parameter conversion is supported. XML posts are not supported.
284
287
  */
285
- export class WFSVectorSource extends DataSource<string, WFSourceOptions> implements VectorSource {
288
+ export class WFSVectorSource extends DataSource<string, WFSLoaderOptions> implements VectorSource {
286
289
  /** Default static vendor parameters */
287
290
  vendorParameters?: Record<string, unknown>;
288
291
 
289
292
  capabilities: WFSCapabilities | null = null;
290
293
 
291
294
  /** Create a WFSVectorSource */
292
- constructor(data: string, options: WFSourceOptions, coreApi?: CoreAPI) {
293
- super(data, options, WFSSourceLoader.defaultOptions, coreApi);
295
+ constructor(data: string, options: WFSLoaderOptions, coreApi?: CoreAPI) {
296
+ super(data, options, WFSLoader.defaultOptions, coreApi);
294
297
  this.vendorParameters = options.wfs?.vendorParameters;
295
298
 
296
299
  // TODO - defaults such as version, layers etc could be extracted from a base URL with parameters
@@ -324,7 +327,7 @@ export class WFSVectorSource extends DataSource<string, WFSourceOptions> impleme
324
327
  default:
325
328
  return convertFeaturesToWKBArrowTable(geoJsonTable.features, {
326
329
  encodingPreference: parameters.geoarrow?.encodingPreference
327
- });
330
+ }).data;
328
331
  }
329
332
  }
330
333
 
@@ -489,22 +492,6 @@ export class WFSVectorSource extends DataSource<string, WFSourceOptions> impleme
489
492
  return capabilities;
490
493
  }
491
494
 
492
- /** Get a map image *
493
- async getMap(
494
- wfsParameters: WFSGetMapParameters,
495
- vendorParameters?: Record<string, unknown>
496
- ): Promise<ImageType> {
497
- const url = this.getMapURL(wfsParameters, vendorParameters);
498
- const response = await this.fetch(url);
499
- const arrayBuffer = await response.arrayBuffer();
500
- this._checkResponse(response, arrayBuffer);
501
- try {
502
- return await ImageLoader.parse(arrayBuffer, this.loadOptions);
503
- } catch {
504
- throw this._parseError(arrayBuffer);
505
- }
506
- }
507
-
508
495
  /** Get Feature Info for a coordinate *
509
496
  async getFeatureInfo(
510
497
  wfsParameters: WFSGetFeatureInfoParameters,
@@ -541,23 +528,6 @@ export class WFSVectorSource extends DataSource<string, WFSourceOptions> impleme
541
528
  return await WFSLayerDescriptionLoader.parse(arrayBuffer, this.loadOptions);
542
529
  }
543
530
 
544
- /** Get an image with a semantic legend *
545
- async getLegendGraphic(
546
- wfsParameters: WFSGetLegendGraphicParameters,
547
- vendorParameters?: Record<string, unknown>
548
- ): Promise<ImageType> {
549
- const url = this.getLegendGraphicURL(wfsParameters, vendorParameters);
550
- const response = await this.fetch(url);
551
- const arrayBuffer = await response.arrayBuffer();
552
- this._checkResponse(response, arrayBuffer);
553
- try {
554
- return await ImageLoader.parse(arrayBuffer, this.loadOptions);
555
- } catch {
556
- throw this._parseError(arrayBuffer);
557
- }
558
- }
559
- */
560
-
561
531
  // Typed URL creators
562
532
  // For applications that want full control of fetching and parsing
563
533
 
@@ -867,7 +837,7 @@ export class WFSVectorSource extends DataSource<string, WFSourceOptions> impleme
867
837
  const responseText = new TextDecoder().decode(arrayBuffer);
868
838
  if (!response.ok || isWFSExceptionDocument(responseText, contentType)) {
869
839
  // We want error responses to throw exceptions, the WMSErrorLoaderWithParser can do this
870
- const loadOptions = mergeOptions<WMSLoaderOptions>(this.loadOptions, {
840
+ const loadOptions = mergeOptions<WMSErrorLoaderOptions>(this.loadOptions, {
871
841
  wms: {throwOnError: true}
872
842
  });
873
843
  const error = WMSErrorLoaderWithParser.parseSync?.(arrayBuffer, loadOptions);
@@ -964,7 +934,7 @@ function convertWFSFeatures(
964
934
  }
965
935
  return convertFeaturesToWKBArrowTable(parsed.features as any, {
966
936
  encodingPreference
967
- });
937
+ }).data;
968
938
  }
969
939
 
970
940
  /** Adapts a browser response stream to the chunk iterator expected by GML. */
@@ -3,7 +3,7 @@
3
3
  // Copyright vis.gl contributors
4
4
 
5
5
  import type {LoaderWithParser} from '@loaders.gl/core/loader-utils';
6
- import type {XMLLoaderOptions} from '@loaders.gl/xml';
6
+ import type {XMLLoaderOptions} from '@loaders.gl/documents';
7
7
 
8
8
  import type {WMSFeatureInfo} from '../lib/parsers/wms/parse-wms-features';
9
9
  import {parseWMSFeatureInfo} from '../lib/parsers/wms/parse-wms-features';
@@ -3,7 +3,7 @@
3
3
  // Copyright vis.gl contributors
4
4
 
5
5
  import type {Loader} from '@loaders.gl/core/loader-utils';
6
- import type {XMLLoaderOptions} from '@loaders.gl/xml';
6
+ import type {XMLLoaderOptions} from '@loaders.gl/documents';
7
7
  import {WMSCapabilitiesLoader} from '../wms-capabilities-loader';
8
8
 
9
9
  import type {WMSFeatureInfo} from '../lib/parsers/wms/parse-wms-features';
@@ -3,7 +3,7 @@
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
5
  import type {LoaderWithParser} from '@loaders.gl/core/loader-utils';
6
- import type {XMLLoaderOptions} from '@loaders.gl/xml';
6
+ import type {XMLLoaderOptions} from '@loaders.gl/documents';
7
7
 
8
8
  import type {WMSLayerDescription} from '../lib/parsers/wms/parse-wms-layer-description';
9
9
  import {parseWMSLayerDescription} from '../lib/parsers/wms/parse-wms-layer-description';
@@ -3,7 +3,7 @@
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
5
  import type {Loader} from '@loaders.gl/core/loader-utils';
6
- import type {XMLLoaderOptions} from '@loaders.gl/xml';
6
+ import type {XMLLoaderOptions} from '@loaders.gl/documents';
7
7
  import {WMSCapabilitiesLoader} from '../wms-capabilities-loader';
8
8
 
9
9
  import type {WMSLayerDescription} from '../lib/parsers/wms/parse-wms-layer-description';
@@ -3,7 +3,7 @@
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
5
  import type {LoaderWithParser} from '@loaders.gl/core/loader-utils';
6
- import type {XMLLoaderOptions} from '@loaders.gl/xml';
6
+ import type {XMLLoaderOptions} from '@loaders.gl/documents';
7
7
  // import type {WMTSCapabilities} from './lib/wmts/parse-wmts-capabilities';
8
8
  import {parseWMTSCapabilities, WMTSCapabilities} from './lib/wmts/parse-wmts-capabilities';
9
9
  import {WMTSCapabilitiesLoader as WMTSCapabilitiesLoaderMetadata} from './wmts-capabilities-loader';
@@ -13,7 +13,7 @@ const {preload: _WMTSCapabilitiesLoaderPreload, ...WMTSCapabilitiesLoaderMetadat
13
13
 
14
14
  // export type {WMTSCapabilities};
15
15
 
16
- export type WMTSLoaderOptions = XMLLoaderOptions & {
16
+ export type WMTSCapabilitiesLoaderOptions = XMLLoaderOptions & {
17
17
  wmts?: {};
18
18
  };
19
19
 
@@ -22,9 +22,9 @@ export type WMTSLoaderOptions = XMLLoaderOptions & {
22
22
  */
23
23
  export const WMTSCapabilitiesLoaderWithParser = {
24
24
  ...WMTSCapabilitiesLoaderMetadataWithoutPreload,
25
- parse: async (arrayBuffer: ArrayBuffer, options?: WMTSLoaderOptions) =>
25
+ parse: async (arrayBuffer: ArrayBuffer, options?: WMTSCapabilitiesLoaderOptions) =>
26
26
  parseWMTSCapabilities(new TextDecoder().decode(arrayBuffer), options),
27
- parseTextSync: (text: string, options?: WMTSLoaderOptions) => parseWMTSCapabilities(text, options)
28
- } as const satisfies LoaderWithParser<WMTSCapabilities, never, WMTSLoaderOptions>;
27
+ parseTextSync: (text: string, options?: WMTSCapabilitiesLoaderOptions) => parseWMTSCapabilities(text, options)
28
+ } as const satisfies LoaderWithParser<WMTSCapabilities, never, WMTSCapabilitiesLoaderOptions>;
29
29
 
30
30
  export const _typecheckWMTSCapabilitiesLoader: LoaderWithParser = WMTSCapabilitiesLoaderWithParser;
@@ -3,7 +3,7 @@
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
5
  import type {Loader} from '@loaders.gl/core/loader-utils';
6
- import type {XMLLoaderOptions} from '@loaders.gl/xml';
6
+ import type {XMLLoaderOptions} from '@loaders.gl/documents';
7
7
  // import type {WMTSCapabilities} from './lib/wmts/parse-wmts-capabilities';
8
8
  import type {WMTSCapabilities} from './lib/wmts/parse-wmts-capabilities';
9
9
 
@@ -14,7 +14,7 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
14
14
 
15
15
  // export type {WMTSCapabilities};
16
16
 
17
- export type WMTSLoaderOptions = XMLLoaderOptions & {
17
+ export type WMTSCapabilitiesLoaderOptions = XMLLoaderOptions & {
18
18
  wmts?: {};
19
19
  };
20
20
 
@@ -42,7 +42,7 @@ export const WMTSCapabilitiesLoader = {
42
42
  },
43
43
  /** Loads the parser-bearing WMTS capabilities loader implementation. */
44
44
  preload: async () => (await import('./wmts-capabilities-loader-with-parser')).WMTSCapabilitiesLoaderWithParser
45
- } as const satisfies Loader<WMTSCapabilities, never, WMTSLoaderOptions>;
45
+ } as const satisfies Loader<WMTSCapabilities, never, WMTSCapabilitiesLoaderOptions>;
46
46
 
47
47
  function testXMLFile(text: string): boolean {
48
48
  // TODO - There could be space first.
@@ -3,7 +3,7 @@
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
5
  import type {LoaderWithParser} from '@loaders.gl/core/loader-utils';
6
- import type {XMLLoaderOptions} from '@loaders.gl/xml';
6
+ import type {XMLLoaderOptions} from '@loaders.gl/documents';
7
7
  import {WMSCapabilities, parseWMSCapabilities} from './lib/parsers/wms/parse-wms-capabilities';
8
8
  import {WMSCapabilitiesLoader as WMSCapabilitiesLoaderMetadata} from './wms-capabilities-loader';
9
9
 
@@ -3,7 +3,7 @@
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
5
  import type {Loader} from '@loaders.gl/core/loader-utils';
6
- import type {XMLLoaderOptions} from '@loaders.gl/xml';
6
+ import type {XMLLoaderOptions} from '@loaders.gl/documents';
7
7
  import type {WMSCapabilities} from './lib/parsers/wms/parse-wms-capabilities';
8
8
 
9
9
  import {WMSCapabilitiesFormat} from './wms-format';
@@ -9,7 +9,7 @@ import {WMSErrorLoader as WMSErrorLoaderMetadata} from './wms-error-loader';
9
9
  const {preload: _WMSErrorLoaderPreload, ...WMSErrorLoaderMetadataWithoutPreload} =
10
10
  WMSErrorLoaderMetadata;
11
11
 
12
- export type WMSLoaderOptions = LoaderOptions & {
12
+ export type WMSErrorLoaderOptions = LoaderOptions & {
13
13
  wms?: {
14
14
  /** By default the error loader will throw an error with the parsed error message */
15
15
  throwOnError?: boolean;
@@ -23,15 +23,16 @@ export type WMSLoaderOptions = LoaderOptions & {
23
23
  */
24
24
  export const WMSErrorLoaderWithParser = {
25
25
  ...WMSErrorLoaderMetadataWithoutPreload,
26
- parse: async (arrayBuffer: ArrayBuffer, options?: WMSLoaderOptions): Promise<string> =>
26
+ parse: async (arrayBuffer: ArrayBuffer, options?: WMSErrorLoaderOptions): Promise<string> =>
27
27
  parseTextSync(new TextDecoder().decode(arrayBuffer), options),
28
- parseSync: (arrayBuffer: ArrayBuffer, options?: WMSLoaderOptions): string =>
28
+ parseSync: (arrayBuffer: ArrayBuffer, options?: WMSErrorLoaderOptions): string =>
29
29
  parseTextSync(new TextDecoder().decode(arrayBuffer), options),
30
- parseTextSync: (text: string, options?: WMSLoaderOptions): string => parseTextSync(text, options)
31
- } as const satisfies LoaderWithParser<string, never, WMSLoaderOptions>;
30
+ parseTextSync: (text: string, options?: WMSErrorLoaderOptions): string =>
31
+ parseTextSync(text, options)
32
+ } as const satisfies LoaderWithParser<string, never, WMSErrorLoaderOptions>;
32
33
 
33
- function parseTextSync(text: string, options?: WMSLoaderOptions): string {
34
- const wmsOptions: WMSLoaderOptions['wms'] = {
34
+ function parseTextSync(text: string, options?: WMSErrorLoaderOptions): string {
35
+ const wmsOptions: WMSErrorLoaderOptions['wms'] = {
35
36
  ...WMSErrorLoaderWithParser.options.wms,
36
37
  ...options?.wms
37
38
  };