@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
@@ -3,7 +3,7 @@
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
5
  import type {Loader, LoaderOptions} from '@loaders.gl/core/loader-utils';
6
- import type {ArrowTable, ArrowTableBatch} from '@loaders.gl/core/schema';
6
+ import type {Table, RecordBatch} from 'apache-arrow';
7
7
  import type {GMLFeatureCollection, Geometry, ParseGMLOptions} from './lib/parsers/gml/parse-gml';
8
8
 
9
9
  import {GMLFormat} from './wms-format';
@@ -16,7 +16,7 @@ export type GMLLoaderOptions = LoaderOptions & {
16
16
  /** GML parser and output options. */
17
17
  gml?: ParseGMLOptions & {
18
18
  /** Arrow feature table by default; geojson preserves the legacy geometry/collection. */
19
- shape?: 'arrow-table' | 'geojson';
19
+ shape?: 'arrow' | 'geojson';
20
20
  /** Number of feature members emitted in each streaming batch. */
21
21
  batchSize?: number;
22
22
  };
@@ -24,15 +24,17 @@ export type GMLLoaderOptions = LoaderOptions & {
24
24
 
25
25
  /** Preloads the parser-bearing GML loader implementation. */
26
26
  async function preload() {
27
- const {GMLLoaderWithParser} = await import('@loaders.gl/ogc/wms/gml-loader');
27
+ const {GMLLoaderWithParser} = await import('@loaders.gl/ogc/gml-loader');
28
28
  return GMLLoaderWithParser;
29
29
  }
30
30
 
31
31
  /** Metadata-only loader for GML geometry responses. */
32
32
  export const GMLLoader = {
33
33
  ...GMLFormat,
34
- dataType: null as unknown as ArrowTable | Geometry | GMLFeatureCollection | null,
35
- batchType: null as unknown as ArrowTableBatch | GMLFeatureCollection,
34
+ defaultShape: 'arrow',
35
+ supportsNativeArrow: true,
36
+ dataType: null as unknown as Table | Geometry | GMLFeatureCollection | null,
37
+ batchType: null as unknown as RecordBatch | GMLFeatureCollection,
36
38
 
37
39
  name: 'GML',
38
40
  id: 'gml',
@@ -47,12 +49,12 @@ export const GMLLoader = {
47
49
  mimeTypes: ['application/vnd.ogc.gml', 'application/xml', 'text/xml'],
48
50
  testText: testXMLFile,
49
51
  options: {
50
- gml: {shape: 'arrow-table'}
52
+ gml: {shape: 'arrow'}
51
53
  },
52
54
  preload
53
55
  } as const satisfies Loader<
54
- ArrowTable | Geometry | GMLFeatureCollection | null,
55
- ArrowTableBatch | GMLFeatureCollection,
56
+ Table | Geometry | GMLFeatureCollection | null,
57
+ RecordBatch | GMLFeatureCollection,
56
58
  GMLLoaderOptions
57
59
  >;
58
60
 
@@ -2,9 +2,14 @@
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
- import {makeTableScanBatch, type LoaderWithParser} from '@loaders.gl/core/loader-utils';
6
- import type {ArrowTable, ArrowTableBatch, Feature} from '@loaders.gl/core/schema';
7
- import {convertFeaturesToWKBArrowTable} from '@loaders.gl/arrow-geometry/feature-collection-to-arrow';
5
+ import {
6
+ paceBatchIterator,
7
+ type LoaderContext,
8
+ type LoaderWithParser
9
+ } from '@loaders.gl/core/loader-utils';
10
+ import type {Table, RecordBatch} from 'apache-arrow';
11
+ import type {Feature} from '@loaders.gl/core/schema';
12
+ import {convertFeaturesToWKBArrowTable} from '@loaders.gl/core/arrow-geometry/feature-collection-to-arrow';
8
13
  import {getGeoMetadata, setGeoMetadata} from '@loaders.gl/core/schema';
9
14
  import type {GMLFeatureCollection, Geometry} from './lib/parsers/gml/parse-gml';
10
15
  import {parseGML} from './lib/parsers/gml/parse-gml';
@@ -20,10 +25,15 @@ export const GMLLoaderWithParser = {
20
25
  parse: async (arrayBuffer: ArrayBuffer, options?: GMLLoaderOptions) =>
21
26
  parseGMLText(new TextDecoder().decode(arrayBuffer), options),
22
27
  parseTextSync: parseGMLText,
23
- parseInBatches: parseGMLInRequestedShape
28
+ parseInBatches: (iterator, options?: GMLLoaderOptions, context?: LoaderContext) =>
29
+ paceBatchIterator(parseGMLInRequestedShape(iterator, options), {
30
+ batchMaxRowsPerSecond: options?.core?.batchMaxRowsPerSecond,
31
+ getRowCount: batch => ('numRows' in batch ? batch.numRows : batch.features.length),
32
+ signal: options?.signal ?? context?.signal
33
+ })
24
34
  } as const satisfies LoaderWithParser<
25
- ArrowTable | Geometry | GMLFeatureCollection | null,
26
- ArrowTableBatch | GMLFeatureCollection,
35
+ Table | Geometry | GMLFeatureCollection | null,
36
+ RecordBatch | GMLFeatureCollection,
27
37
  GMLLoaderOptions
28
38
  >;
29
39
 
@@ -41,7 +51,7 @@ function parseGMLText(text: string, options?: GMLLoaderOptions) {
41
51
  }
42
52
 
43
53
  /** Keeps GML coordinates unchanged without incorrectly declaring the GeoParquet CRS84 default. */
44
- function makeGMLArrowTable(features: GMLFeatureCollection['features']): ArrowTable {
54
+ function makeGMLArrowTable(features: GMLFeatureCollection['features']): Table {
45
55
  const hasFeatureIds = features.some(feature => feature.id !== undefined);
46
56
  for (const feature of features) {
47
57
  if (
@@ -54,17 +64,12 @@ function makeGMLArrowTable(features: GMLFeatureCollection['features']): ArrowTab
54
64
  }
55
65
  }
56
66
  // The shared encoder supports null geometry although the GeoJSON Feature type excludes it.
57
- const table = convertFeaturesToWKBArrowTable(features as Feature[]);
58
- const geoMetadata = getGeoMetadata(table.data.schema.metadata)!;
67
+ const table = convertFeaturesToWKBArrowTable(features as Feature[]).data;
68
+ const geoMetadata = getGeoMetadata(table.schema.metadata)!;
59
69
  geoMetadata.columns.geometry.crs = null;
60
- setGeoMetadata(table.data.schema.metadata, geoMetadata);
61
- const geometryField = table.data.schema.fields.find(field => field.name === 'geometry');
70
+ setGeoMetadata(table.schema.metadata, geoMetadata);
71
+ const geometryField = table.schema.fields.find(field => field.name === 'geometry');
62
72
  geometryField?.metadata.set('ARROW:extension:metadata', JSON.stringify({crs: null}));
63
- if (table.schema) {
64
- table.schema.metadata = Object.fromEntries(table.data.schema.metadata);
65
- const field = table.schema.fields.find(field => field.name === 'geometry');
66
- if (field) field.metadata = Object.fromEntries(geometryField!.metadata);
67
- }
68
73
  return table;
69
74
  }
70
75
 
@@ -74,13 +79,13 @@ async function* parseGMLInRequestedShape(
74
79
  | AsyncIterable<ArrayBufferLike | ArrayBufferView>
75
80
  | Iterable<ArrayBufferLike | ArrayBufferView>,
76
81
  options?: GMLLoaderOptions
77
- ): AsyncIterable<ArrowTableBatch | GMLFeatureCollection> {
82
+ ): AsyncIterable<RecordBatch | GMLFeatureCollection> {
78
83
  for await (const collection of parseGMLInBatches(iterator, options)) {
79
84
  if (options?.gml?.shape === 'geojson') {
80
85
  yield collection;
81
86
  } else {
82
87
  const table = makeGMLArrowTable(collection.features);
83
- yield makeTableScanBatch(table);
88
+ yield* table.batches;
84
89
  }
85
90
  }
86
91
  }
@@ -95,7 +100,13 @@ async function* parseGMLInBatches(
95
100
  const decoder = new TextDecoder();
96
101
  const parser = new GMLFeatureStreamParser();
97
102
  let features: GMLFeatureCollection['features'] = [];
98
- const batchSize = options?.gml?.batchSize || 1000;
103
+ const batchSize =
104
+ (typeof options?.core?.batchSize === 'number'
105
+ ? options.core.batchSize
106
+ : options?.gml?.batchSize) ?? 1000;
107
+ if (!Number.isSafeInteger(batchSize) || batchSize < 1) {
108
+ throw new RangeError('GMLLoader batch size must be a positive integer');
109
+ }
99
110
 
100
111
  for await (const chunk of iterator) {
101
112
  const fragments = parser.push(
@@ -106,7 +117,7 @@ async function* parseGMLInBatches(
106
117
  for (const fragment of fragments) {
107
118
  const parsed = parseGMLFeatureFragment(fragment, {...options, ...options?.gml});
108
119
  if (parsed && parsed.type === 'FeatureCollection') features.push(...parsed.features);
109
- if (features.length >= batchSize) {
120
+ while (features.length >= batchSize) {
110
121
  yield {type: 'FeatureCollection', features: features.splice(0, batchSize)};
111
122
  }
112
123
  }
@@ -115,6 +126,9 @@ async function* parseGMLInBatches(
115
126
  const parsed = parseGMLFeatureFragment(fragment, {...options, ...options?.gml});
116
127
  if (parsed && parsed.type === 'FeatureCollection') features.push(...parsed.features);
117
128
  }
129
+ while (features.length >= batchSize) {
130
+ yield {type: 'FeatureCollection', features: features.splice(0, batchSize)};
131
+ }
118
132
  if (features.length) yield {type: 'FeatureCollection', features};
119
133
  }
120
134
 
package/src/wms/index.ts CHANGED
@@ -18,7 +18,7 @@ export {
18
18
  WMTSCapabilitiesFormat
19
19
  } from './wms-format';
20
20
 
21
- export type {CSWLoaderOptions} from './csw-capabilities-loader';
21
+ export type {CSWCapabilitiesLoaderOptions} from './csw-capabilities-loader';
22
22
 
23
23
  export type {CSWCapabilities} from './csw-capabilities-loader';
24
24
  export {CSWCapabilitiesLoader} from './csw-capabilities-loader';
@@ -50,7 +50,7 @@ export {WMSLayerDescriptionLoader as _WMSLayerDescriptionLoader} from './wip/wms
50
50
 
51
51
  // WMTS - Web Map Tile Service
52
52
 
53
- export type {WMTSLoaderOptions} from './wmts-capabilities-loader';
53
+ export type {WMTSCapabilitiesLoaderOptions} from './wmts-capabilities-loader';
54
54
  export type {
55
55
  WMTSCapabilities,
56
56
  WMTSLayer,
@@ -64,7 +64,7 @@ export {WMTSCapabilitiesLoader} from './wmts-capabilities-loader';
64
64
 
65
65
  // WFS - Web Feature Service
66
66
 
67
- export type {WFSLoaderOptions as _WFSLoaderOptions} from './wfs-capabilities-loader';
67
+ export type {WFSCapabilitiesLoaderOptions as _WFSLoaderOptions} from './wfs-capabilities-loader';
68
68
  export type {WFSCapabilities as _WFSCapabilities} from './wfs-capabilities-loader';
69
69
  export {WFSCapabilitiesLoader as _WFSCapabilitiesLoader} from './wfs-capabilities-loader';
70
70
 
@@ -81,12 +81,16 @@ export {GMLLoader, GMLLoader as _GMLLoader} from './gml-loader-types';
81
81
  export type {
82
82
  CSWCatalogQuery,
83
83
  CSWRecord,
84
- CSWSourceLoaderOptions
85
- } from './csw-source-loader';
86
- export {CSWCatalogSource, CSWSourceLoader} from './csw-source-loader';
87
- export {WMSSourceLoader, WMSImageSource} from './wms-source-loader';
88
- export type {WMTSSourceLoaderOptions, WMTSGetFeatureInfoParameters} from './wmts-source-loader';
89
- export {WMTSSourceLoader, WMTSImageTileSource} from './wmts-source-loader';
84
+ CSWLoaderOptions
85
+ } from './csw-loader';
86
+ export {CSWCatalogSource, CSWLoader} from './csw-loader';
87
+ export type {WMSLoaderOptions} from './wms-loader';
88
+ export {WMSLoader, WMSImageSource} from './wms-loader';
89
+ export type {WMTSLoaderOptions, WMTSGetFeatureInfoParameters} from './wmts-loader';
90
+ export {
91
+ WMTSLoader,
92
+ WMTSImageTileSource
93
+ } from './wmts-loader';
90
94
  export type {
91
95
  OGCTileMatrixSet,
92
96
  OGCTileMatrix,
@@ -103,43 +107,46 @@ export {
103
107
  getServiceCRSAxisOrder
104
108
  } from './crs-utils';
105
109
  export type {FeaturePaginationOptions} from './feature-pagination';
106
- export {WFSSourceLoader, WFSVectorSource} from './wfs-source-loader';
107
- export type {WFSVersion, WFSGetFeatureParameters, WFSourceOptions} from './wfs-source-loader';
110
+ export {WFSLoader, WFSVectorSource} from './wfs-loader';
111
+ export type {WFSVersion, WFSGetFeatureParameters, WFSLoaderOptions} from './wfs-loader';
108
112
  export type {WFSFeatureType} from './lib/parsers/wfs/parse-wfs-capabilities';
109
113
  export type {
110
114
  OGCAPICollection,
111
115
  OGCAPILandingPage,
112
116
  OGCAPILink,
113
- OGCAPISourceOptions,
117
+ OGCAPILoaderOptions,
114
118
  OGCAPITileMatrixSetSummary,
115
119
  OGCAPITileset
116
- } from './ogc-api-source-loader';
120
+ } from './ogc-api-loaders';
117
121
  export {
118
122
  OGCAPIFeaturesSource,
119
- OGCAPIFeaturesSourceLoader,
123
+ OGCAPIFeaturesLoader,
120
124
  OGCAPITilesSource,
121
- OGCAPITilesSourceLoader
122
- } from './ogc-api-source-loader';
123
- export type {OGCAPIEDRQueryParameters, OGCAPIEDRSourceOptions} from './ogc-api-edr-source-loader';
125
+ OGCAPITilesLoader
126
+ } from './ogc-api-loaders';
127
+ export type {OGCAPIEDRQueryParameters, OGCAPIEDRLoaderOptions} from './ogc-api-edr-loader';
124
128
  export {
125
129
  OGCAPIEDRSource,
126
- OGCAPIEDRSourceLoader
127
- } from './ogc-api-edr-source-loader';
130
+ OGCAPIEDRLoader
131
+ } from './ogc-api-edr-loader';
128
132
  export type {
129
133
  OGCAPICoveragesQueryParameters,
130
- OGCAPICoveragesSourceOptions
131
- } from './ogc-api-coverages-source-loader';
134
+ OGCAPICoveragesLoaderOptions
135
+ } from './ogc-api-coverages-loader';
132
136
  export {
133
137
  OGCAPICoveragesSource,
134
- OGCAPICoveragesSourceLoader
135
- } from './ogc-api-coverages-source-loader';
138
+ OGCAPICoveragesLoader
139
+ } from './ogc-api-coverages-loader';
136
140
  export type {
137
141
  WCSCoverage,
138
142
  WCSCoverageMetadata,
139
143
  WCSGetCoverageParameters,
140
- WCSSourceOptions
141
- } from './wcs-source-loader';
142
- export {WCSCoverageSource, WCSCoverageSourceLoader} from './wcs-source-loader';
144
+ WCSCoverageLoaderOptions
145
+ } from './wcs-coverage-loader';
146
+ export {
147
+ WCSCoverageSource,
148
+ WCSCoverageLoader
149
+ } from './wcs-coverage-loader';
143
150
 
144
151
  export type {GeoServiceType, ServiceCapabilities} from './service-capabilities';
145
152
  export {
@@ -160,12 +167,9 @@ export type {ServiceEndpoint, ServiceEndpointPreferences} from './capability-gra
160
167
  export {CapabilityGraph, discoverServiceGraph} from './capability-graph';
161
168
 
162
169
  export {ImageSource} from './lib/deprecated/image-source-compatibility';
170
+ /** @deprecated Compatibility alias for deck.gl 10.0.0-alpha.1. Use WMSLoader. */
171
+ export {WMSLoader as WMSSource} from './wms-loader';
163
172
  export type {ImageType} from '@loaders.gl/images';
164
- export {createImageSource} from './lib/deprecated/create-image-source';
165
-
166
- // DEPRECATED EXPORTS
167
- /** @deprecated Use `WMSSourceLoader`. Kept for deck.gl compatibility. */
168
- export {WMSSourceLoader as WMSSource} from './wms-source-loader';
169
173
 
170
174
  export {ManagedVectorSource} from './managed-vector-source';
171
175
  export type {ManagedVectorSourceOptions} from './managed-vector-source';
@@ -8,7 +8,7 @@ import type {ImageSource as ImageSourceContract} from '@loaders.gl/core/loader-u
8
8
  export type ImageSource = ImageSourceContract;
9
9
 
10
10
  /**
11
- * Structural compatibility guard for deck.gl 9.x `instanceof ImageSource` checks.
11
+ * Structural compatibility guard for deck.gl 10.0.0-alpha.1 `instanceof ImageSource` checks.
12
12
  *
13
13
  * @deprecated `ImageSource` is a type-only capability contract. Do not construct or extend this
14
14
  * value; use it only for compatibility with deck.gl versions that still perform the legacy check.
@@ -2,7 +2,7 @@
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
- import type {XMLLoaderOptions} from '@loaders.gl/xml';
5
+ import type {XMLLoaderOptions} from '@loaders.gl/documents';
6
6
  import {parseExceptionReport} from './parse-exception-report';
7
7
  import {parseXMLTextSync} from '../xml/parse-xml-text';
8
8
 
@@ -2,7 +2,7 @@
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
- import type {XMLLoaderOptions} from '@loaders.gl/xml';
5
+ import type {XMLLoaderOptions} from '@loaders.gl/documents';
6
6
  import {parseExceptionReport} from './parse-exception-report';
7
7
  import {parseXMLTextSync} from '../xml/parse-xml-text';
8
8
 
@@ -2,9 +2,9 @@
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
- import type {XMLLoaderOptions} from '@loaders.gl/xml';
5
+ import type {XMLLoaderOptions} from '@loaders.gl/documents';
6
6
  import type {CRSIdentifier} from '@math.gl/geospatial/crs';
7
- import {convertXMLFieldToArrayInPlace} from '@loaders.gl/xml';
7
+ import {convertXMLFieldToArrayInPlace} from '@loaders.gl/documents/xml-utils';
8
8
  import {parseExceptionReport} from './parse-exception-report';
9
9
  import {parseXMLTextSync} from '../xml/parse-xml-text';
10
10
 
@@ -46,10 +46,7 @@ export function parseCSWRecords(text: string, options?: XMLLoaderOptions): CSWRe
46
46
  removeNSPrefix: true,
47
47
  uncapitalizeKeys: true,
48
48
  arrayPaths: [],
49
- _fastXML: {
50
- ...options?.xml?._fastXML,
51
- parseAttributeValue: true
52
- }
49
+ parseAttributeValue: true
53
50
  }
54
51
  });
55
52
 
@@ -2,8 +2,8 @@
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
- // import type {XMLLoaderOptions} from '@loaders.gl/xml';
6
- // import {XMLLoader} from '@loaders.gl/xml';
5
+ // import type {XMLLoaderOptions} from '@loaders.gl/documents';
6
+ // import {XMLLoader} from '@loaders.gl/documents';
7
7
 
8
8
  /**
9
9
  * Parses a typed data structure from raw XML for `GetDomain` response
@@ -3,7 +3,7 @@
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
5
  import type {GetTileParameters, TileGrid, TileGridLimits} from '@loaders.gl/core/loader-utils';
6
- import {getRequestedTileMatrix} from '../../tile-grid';
6
+ import {validateTileGridLimits, resolveTileGridTile} from '@loaders.gl/core/loader-utils/tile-grid';
7
7
 
8
8
  /** Inclusive tile availability bounds in an OGC API Tiles tileset document. */
9
9
  export type OGCTileMatrixLimits = {
@@ -33,75 +33,14 @@ export function convertOGCTileMatrixLimits(
33
33
  minTileColumn: limit?.minTileCol,
34
34
  maxTileColumn: limit?.maxTileCol
35
35
  }));
36
- validateTileGridLimits(normalized, grid);
36
+ validateTileGridLimits({...grid, limits: normalized});
37
37
  return normalized;
38
38
  }
39
39
 
40
- /** Validates source coverage independently of complete geometric metadata. */
41
- function validateTileGridLimits(
42
- limits: readonly TileGridLimits[] | undefined,
43
- grid: TileGrid
44
- ): void {
45
- if (limits === undefined) return;
46
- const identifiers = new Set<string>();
47
- for (const limit of limits) {
48
- if (
49
- !limit ||
50
- typeof limit.tileMatrix !== 'string' ||
51
- !limit.tileMatrix ||
52
- identifiers.has(limit.tileMatrix) ||
53
- ![limit.minTileRow, limit.maxTileRow, limit.minTileColumn, limit.maxTileColumn].every(
54
- value => Number.isSafeInteger(value) && value >= 0
55
- ) ||
56
- limit.minTileRow > limit.maxTileRow ||
57
- limit.minTileColumn > limit.maxTileColumn
58
- ) {
59
- throw new Error('Invalid OGC tile matrix limits');
60
- }
61
- identifiers.add(limit.tileMatrix);
62
- const matrix = grid.matrices?.find(candidate => candidate.id === limit.tileMatrix);
63
- if (grid.matrices && !matrix)
64
- throw new Error('OGC tile matrix limits reference an unknown matrix');
65
- if (
66
- matrix?.matrixSize &&
67
- (limit.maxTileColumn >= matrix.matrixSize[0] || limit.maxTileRow >= matrix.matrixSize[1])
68
- ) {
69
- throw new Error('OGC tile matrix limits exceed matrix dimensions');
70
- }
71
- }
72
- }
73
-
74
- /** Checks integer tile indices against advertised dimensions and optional inclusive limits. */
40
+ /** Checks source coverage using shared canonical-column semantics. */
75
41
  export function isOGCTileAvailable(
76
42
  parameters: GetTileParameters,
77
43
  grid: TileGrid | undefined
78
44
  ): boolean {
79
- if (
80
- ![parameters.x, parameters.y, parameters.z].every(
81
- value => Number.isSafeInteger(value) && value >= 0
82
- )
83
- ) {
84
- throw new RangeError('OGC tile indices require nonnegative safe integers');
85
- }
86
- if (!grid) return true;
87
- validateTileGridLimits(grid.limits, grid);
88
- const matrix =
89
- grid.matrices && getRequestedTileMatrix(grid.matrices, level => level.id, parameters);
90
- if (grid.matrices && !matrix) return false;
91
- if (matrix?.matrixSize) {
92
- if (!matrix.matrixSize.every(size => Number.isSafeInteger(size) && size > 0)) {
93
- throw new Error('OGC matrix dimensions require positive safe integers');
94
- }
95
- if (parameters.x >= matrix.matrixSize[0] || parameters.y >= matrix.matrixSize[1]) return false;
96
- }
97
- if (grid.limits === undefined) return true;
98
- const identifier = matrix?.id ?? parameters.tileMatrix ?? String(parameters.z);
99
- const limit = grid.limits.find(candidate => candidate.tileMatrix === identifier);
100
- return Boolean(
101
- limit &&
102
- parameters.x >= limit.minTileColumn &&
103
- parameters.x <= limit.maxTileColumn &&
104
- parameters.y >= limit.minTileRow &&
105
- parameters.y <= limit.maxTileRow
106
- );
45
+ return resolveTileGridTile(grid, parameters) !== null;
107
46
  }
@@ -3,6 +3,7 @@
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
5
  import type {TileGrid, TileGridMatrix} from '@loaders.gl/core/loader-utils';
6
+ import {validateTileGrid} from '@loaders.gl/core/loader-utils/tile-grid';
6
7
  import {getServiceCRSAxisOrder} from '../../../crs-utils';
7
8
  import {
8
9
  createTileGrid,
@@ -38,8 +39,8 @@ export type OGCTileMatrix = {
38
39
  matrixWidth?: number;
39
40
  /** Matrix height in tiles. */
40
41
  matrixHeight?: number;
41
- /** Coalesced rows; nonempty declarations are rejected until variable-width geometry is supported. */
42
- variableMatrixWidths?: unknown[];
42
+ /** Coalesced row bands in native row numbering; complete geometry validates their bounds. */
43
+ variableMatrixWidths?: readonly import('@math.gl/geospatial').VariableMatrixWidth[];
43
44
  };
44
45
 
45
46
  /** An OGC TileMatrixSet 2.0 JSON document (OGC 17-083r4). */
@@ -89,7 +90,9 @@ export function convertOGCTileMatrixSetToTileGrid(
89
90
  if (new Set(matrices.map(matrix => matrix.id)).size !== matrices.length) {
90
91
  throw new Error('OGC TileMatrixSet requires unique tile matrix identifiers');
91
92
  }
92
- return createTileGrid(crs, matrices);
93
+ const grid = createTileGrid(crs, matrices);
94
+ if (matrices.some(matrix => matrix.variableMatrixWidths?.length)) validateTileGrid(grid);
95
+ return grid;
93
96
  }
94
97
 
95
98
  /** Converts one tile matrix, keeping only the fields the document provides. */
@@ -101,11 +104,8 @@ function toTileGridMatrix(
101
104
  if (typeof matrix?.id !== 'string' || !matrix.id) {
102
105
  throw new Error('OGC TileMatrixSet tile matrices require a string id');
103
106
  }
104
- if (
105
- matrix.variableMatrixWidths !== undefined &&
106
- (!Array.isArray(matrix.variableMatrixWidths) || matrix.variableMatrixWidths.length > 0)
107
- ) {
108
- throw new Error('OGC TileMatrixSet variableMatrixWidths are not supported');
107
+ if (matrix.variableMatrixWidths !== undefined && !Array.isArray(matrix.variableMatrixWidths)) {
108
+ throw new Error('OGC TileMatrixSet variableMatrixWidths require an array');
109
109
  }
110
110
  if (
111
111
  matrix.cellSize !== undefined &&
@@ -136,7 +136,8 @@ function toTileGridMatrix(
136
136
  tileWidth: matrix.tileWidth,
137
137
  tileHeight: matrix.tileHeight,
138
138
  matrixWidth: matrix.matrixWidth,
139
- matrixHeight: matrix.matrixHeight
139
+ matrixHeight: matrix.matrixHeight,
140
+ variableMatrixWidths: matrix.variableMatrixWidths
140
141
  });
141
142
  }
142
143
 
@@ -11,7 +11,9 @@ import {parseXMLTextSync} from '../xml/parse-xml-text';
11
11
  * @returns a string with a human readable message
12
12
  */
13
13
  export function parseWMSError(text: string, options): string {
14
- const parsedXML = parseXMLTextSync(text, options);
14
+ const trimmed = text.trim();
15
+ const xml = trimmed.startsWith('"<') && trimmed.endsWith('>"') ? trimmed.slice(1, -1) : text;
16
+ const parsedXML = parseXMLTextSync(xml, options);
15
17
  const serviceExceptionXML =
16
18
  parsedXML?.ServiceExceptionReport?.ServiceException ||
17
19
  parsedXML?.['ogc:ServiceExceptionReport']?.['ogc:ServiceException'];
@@ -2,7 +2,7 @@
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
- import type {XMLLoaderOptions} from '@loaders.gl/xml';
5
+ import type {XMLLoaderOptions} from '@loaders.gl/documents';
6
6
  import {parseXMLTextSync} from '../xml/parse-xml-text';
7
7
 
8
8
  /** Layer description - response to a WMS `DescribeLayer` request */
@@ -100,7 +100,7 @@ export function parseWMTSCapabilities(text: string, options?: unknown): WMTSCapa
100
100
  ...((options as any)?.xml || {}),
101
101
  _parser: 'internal',
102
102
  textNodeName: '#text',
103
- _fastXML: {...((options as any)?.xml?._fastXML || {}), parseTagValue: false},
103
+ parseTagValue: false,
104
104
  removeNSPrefix: true,
105
105
  uncapitalizeKeys: true
106
106
  }
@@ -2,8 +2,9 @@
2
2
  // SPDX-License-Identifier: MIT
3
3
  // Copyright (c) vis.gl contributors
4
4
 
5
- import type {XMLLoaderOptions} from '@loaders.gl/xml';
6
- import {parseXMLSync, XMLLoader} from '@loaders.gl/xml';
5
+ import type {XMLLoaderOptions} from '@loaders.gl/documents';
6
+ import {parseXMLSync} from '@loaders.gl/documents/xml-parser';
7
+ import {XMLLoader} from '@loaders.gl/documents';
7
8
 
8
9
  /** Parses XML text with XMLLoader defaults without requiring a parser-bearing loader object. */
9
10
  export function parseXMLTextSync(text: string, options?: XMLLoaderOptions): any {
@@ -9,8 +9,8 @@ import type {
9
9
  VectorSourceData,
10
10
  VectorSourceMetadata
11
11
  } from '@loaders.gl/core/loader-utils';
12
- import {convertFeaturesToWKBArrowTable} from '@loaders.gl/arrow-geometry/feature-collection-to-arrow';
13
- import {convertGeojsonToBinaryFeatureCollection} from '@loaders.gl/arrow-geometry/legacy-binary';
12
+ import {convertFeaturesToWKBArrowTable} from '@loaders.gl/core/arrow-geometry/feature-collection-to-arrow';
13
+ import {convertGeojsonToBinaryFeatureCollection} from '@loaders.gl/core/arrow-geometry/legacy-binary';
14
14
  import {areServiceCRSEquivalent, normalizeServiceCRS} from './crs-utils';
15
15
 
16
16
  /** Closed extent in canonical XY order. */
@@ -138,7 +138,7 @@ export class ManagedVectorSource implements VectorSource {
138
138
  case 'arrow':
139
139
  return convertFeaturesToWKBArrowTable(features, {
140
140
  encodingPreference: parameters.geoarrow?.encodingPreference
141
- });
141
+ }).data;
142
142
  case 'binary':
143
143
  return convertGeojsonToBinaryFeatureCollection(features);
144
144
  default:
@@ -206,7 +206,7 @@ export class ManagedVectorSource implements VectorSource {
206
206
  const table = await this.source.getFeatures(request);
207
207
  throwIfAborted(controller.signal);
208
208
  const revision = ++this.responseRevision;
209
- if (table.shape !== 'geojson-table')
209
+ if (!('shape' in table) || table.shape !== 'geojson-table')
210
210
  throw new Error('ManagedVectorSource requires GeoJSON responses');
211
211
  if (
212
212
  generation === this.generation &&
@@ -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 Coverages source. */
10
- export type OGCAPICoveragesSourceOptions = DataSourceOptions & {
10
+ export type OGCAPICoveragesLoaderOptions = DataSourceOptions & {
11
11
  /** Coverage request defaults. */
12
12
  'ogc-api-coverages'?: {collectionId?: string; parameters?: Record<string, string>};
13
13
  };
@@ -31,10 +31,10 @@ export type OGCAPICoveragesQueryParameters = {
31
31
  };
32
32
 
33
33
  /** Minimal OGC API Coverages source for discovery and coverage retrieval. */
34
- export class OGCAPICoveragesSource extends DataSource<string, OGCAPICoveragesSourceOptions> {
34
+ export class OGCAPICoveragesSource extends DataSource<string, OGCAPICoveragesLoaderOptions> {
35
35
  /** Creates an OGC API Coverages source. */
36
- constructor(url: string, options: OGCAPICoveragesSourceOptions = {}, coreApi?: CoreAPI) {
37
- super(url.replace(/\/$/, ''), options, OGCAPICoveragesSourceLoader.defaultOptions, coreApi);
36
+ constructor(url: string, options: OGCAPICoveragesLoaderOptions = {}, coreApi?: CoreAPI) {
37
+ super(url.replace(/\/$/, ''), options, OGCAPICoveragesLoader.defaultOptions, coreApi);
38
38
  }
39
39
 
40
40
  /** Returns the OGC API landing page. */
@@ -88,7 +88,7 @@ export class OGCAPICoveragesSource extends DataSource<string, OGCAPICoveragesSou
88
88
  }
89
89
 
90
90
  /** Source loader for minimal OGC API Coverages support. */
91
- export const OGCAPICoveragesSourceLoader = {
91
+ export const OGCAPICoveragesLoader = {
92
92
  dataType: null as unknown as OGCAPICoveragesSource,
93
93
  batchType: null as never,
94
94
  name: 'OGC API Coverages',
@@ -104,6 +104,9 @@ export const OGCAPICoveragesSourceLoader = {
104
104
  defaultOptions: {'ogc-api-coverages': {}},
105
105
  testURL: (url: string): boolean =>
106
106
  /(?:\/coverage(?:s)?(?:\/|$)|ogc[/-]?api[/-]?coverages)/i.test(url),
107
- createDataSource: (url: string, options: OGCAPICoveragesSourceOptions = {}, coreApi?: CoreAPI) =>
108
- new OGCAPICoveragesSource(url, options, coreApi)
107
+ createDataSourceSync: (
108
+ url: string,
109
+ options: OGCAPICoveragesLoaderOptions = {},
110
+ coreApi?: CoreAPI
111
+ ) => new OGCAPICoveragesSource(url, options, coreApi)
109
112
  } as const satisfies SourceLoader<OGCAPICoveragesSource>;