@loaders.gl/gis 4.0.4 → 4.1.0-alpha.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.
- package/dist/index.cjs +16 -10
- package/dist/lib/binary-features/binary-to-geojson.d.ts.map +1 -1
- package/dist/lib/binary-features/binary-to-geojson.js.map +1 -1
- package/dist/lib/geo/geoarrow-metadata.d.ts +13 -1
- package/dist/lib/geo/geoarrow-metadata.d.ts.map +1 -1
- package/dist/lib/geo/geoarrow-metadata.js +15 -9
- package/dist/lib/geo/geoarrow-metadata.js.map +1 -1
- package/dist/lib/geo/geoparquet-metadata-schema.d.ts.map +1 -1
- package/dist/lib/geo/geoparquet-metadata-schema.js.map +1 -1
- package/dist/lib/geo/geoparquet-metadata.d.ts.map +1 -1
- package/dist/lib/geo/geoparquet-metadata.js.map +1 -1
- package/dist/lib/tables/convert-table-to-geojson.d.ts.map +1 -1
- package/dist/lib/tables/convert-table-to-geojson.js +1 -1
- package/dist/lib/tables/convert-table-to-geojson.js.map +1 -1
- package/package.json +6 -6
- package/src/lib/binary-features/binary-to-geojson.ts +2 -1
- package/src/lib/geo/geoarrow-metadata.ts +33 -14
- package/src/lib/geo/geoparquet-metadata-schema.ts +2 -1
- package/src/lib/geo/geoparquet-metadata.ts +2 -1
- package/src/lib/tables/convert-table-to-geojson.ts +3 -2
package/dist/index.cjs
CHANGED
|
@@ -230,17 +230,15 @@ function getGeometryColumnsFromSchema(schema) {
|
|
|
230
230
|
function getGeometryMetadataForField(field) {
|
|
231
231
|
var _a, _b;
|
|
232
232
|
let metadata = null;
|
|
233
|
-
|
|
234
|
-
if (columnMetadata) {
|
|
235
|
-
try {
|
|
236
|
-
metadata = JSON.parse(columnMetadata);
|
|
237
|
-
} catch (error) {
|
|
238
|
-
console.warn("Failed to parse GeoArrow metadata", error);
|
|
239
|
-
}
|
|
240
|
-
}
|
|
241
|
-
let geoEncoding = (_b = field.metadata) == null ? void 0 : _b[GEOARROW_COLUMN_METADATA_ENCODING];
|
|
233
|
+
let geoEncoding = (_a = field.metadata) == null ? void 0 : _a[GEOARROW_COLUMN_METADATA_ENCODING];
|
|
242
234
|
if (geoEncoding) {
|
|
243
235
|
geoEncoding = geoEncoding.toLowerCase();
|
|
236
|
+
if (geoEncoding === "wkb") {
|
|
237
|
+
geoEncoding = "geoarrow.wkb";
|
|
238
|
+
}
|
|
239
|
+
if (geoEncoding === "wkt") {
|
|
240
|
+
geoEncoding = "geoarrow.wkt";
|
|
241
|
+
}
|
|
244
242
|
if (!GEOARROW_ENCODINGS.includes(geoEncoding)) {
|
|
245
243
|
console.warn(`Invalid GeoArrow encoding: ${geoEncoding}`);
|
|
246
244
|
} else {
|
|
@@ -248,6 +246,14 @@ function getGeometryMetadataForField(field) {
|
|
|
248
246
|
metadata.encoding = geoEncoding;
|
|
249
247
|
}
|
|
250
248
|
}
|
|
249
|
+
const columnMetadata = (_b = field.metadata) == null ? void 0 : _b[GEOARROW_COLUMN_METADATA_METADATA];
|
|
250
|
+
if (columnMetadata) {
|
|
251
|
+
try {
|
|
252
|
+
metadata = JSON.parse(columnMetadata);
|
|
253
|
+
} catch (error) {
|
|
254
|
+
console.warn("Failed to parse GeoArrow metadata", error);
|
|
255
|
+
}
|
|
256
|
+
}
|
|
251
257
|
return metadata || null;
|
|
252
258
|
}
|
|
253
259
|
|
|
@@ -282,7 +288,7 @@ function parseGeometry(geometry, columnMetadata, loaders) {
|
|
|
282
288
|
const wkbLoader = loaders.find((loader) => loader.id === "wkb");
|
|
283
289
|
const arrayBuffer = ArrayBuffer.isView(geometry) ? geometry.buffer.slice(geometry.byteOffset, geometry.byteOffset + geometry.byteLength) : geometry;
|
|
284
290
|
const geojson = (_b = wkbLoader == null ? void 0 : wkbLoader.parseSync) == null ? void 0 : _b.call(wkbLoader, arrayBuffer, {
|
|
285
|
-
wkb: { shape: "geometry" }
|
|
291
|
+
wkb: { shape: "geojson-geometry" }
|
|
286
292
|
});
|
|
287
293
|
return geojson;
|
|
288
294
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binary-to-geojson.d.ts","sourceRoot":"","sources":["../../../src/lib/binary-features/binary-to-geojson.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"binary-to-geojson.d.ts","sourceRoot":"","sources":["../../../src/lib/binary-features/binary-to-geojson.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAIlB,uBAAuB,EAMxB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAC,OAAO,EAAE,QAAQ,EAA8B,MAAM,oBAAoB,CAAC;AAavF,KAAK,sBAAsB,GAAG;IAC5B,IAAI,CAAC,EAAE,kBAAkB,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,uBAAuB,EAC7B,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,EAAE,GAAG,OAAO,CAMrB;AAwCD,yEAAyE;AACzE,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,cAAc,EACpB,UAAU,CAAC,EAAE,MAAM,EACnB,QAAQ,CAAC,EAAE,MAAM,GAChB,QAAQ,CAYV"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binary-to-geojson.js","names":["binaryToGeojson","data","options","globalFeatureId","undefined","getSingleFeature","parseFeatures","type","dataArray","normalizeInput","lastIndex","lastValue","featureIds","value","i","length","currValue","globalFeatureIds","parseFeature","Error","parseFeatureCollection","binaryToGeometry","startIndex","endIndex","pointToGeoJson","lineStringToGeoJson","polygonToGeoJson","unexpectedInput","features","points","push","lines","polygons","geometry","properties","parseProperties","fields","parseFields","arguments","Object","assign","key","numericProps","Infinity","positions","polygonIndices","filter","x","primitivePolygonIndices","multi","coordinates","startRingIndex","endRingIndex","ringCoordinates","ringToGeoJson","startPolygonIndex","endPolygonIndex","polygonCoordinates","pathIndices","size","j","coord","Array","k","Number"],"sources":["../../../src/lib/binary-features/binary-to-geojson.ts"],"sourcesContent":["// loaders.gl, MIT license\n// Copyright (c) vis.gl contributors\n\nimport type {\n BinaryGeometry,\n BinaryGeometryType,\n BinaryPointGeometry,\n BinaryLineGeometry,\n BinaryPolygonGeometry,\n BinaryFeatureCollection,\n BinaryFeature,\n // BinaryPointFeature,\n // BinaryLineFeature,\n // BinaryPolygonFeature,\n BinaryAttribute\n} from '@loaders.gl/schema';\nimport type {Feature, Geometry, Position, GeoJsonProperties} from '@loaders.gl/schema';\nimport type {\n Point,\n MultiPoint,\n LineString,\n MultiLineString,\n Polygon,\n MultiPolygon\n} from '@loaders.gl/schema';\n\n// Note:L We do not handle GeometryCollection, define a limited Geometry type that always has coordinates.\n// type FeatureGeometry = Point | MultiPoint | LineString | MultiLineString | Polygon | MultiPolygon;\n\ntype BinaryToGeoJsonOptions = {\n type?: BinaryGeometryType;\n globalFeatureId?: number;\n};\n\n/**\n * Convert binary geometry representation to GeoJSON\n * @param data geometry data in binary representation\n * @param options\n * @param options.type Input data type: Point, LineString, or Polygon\n * @param options.featureId Global feature id. If specified, only a single feature is extracted\n * @return GeoJSON objects\n */\nexport function binaryToGeojson(\n data: BinaryFeatureCollection,\n options?: BinaryToGeoJsonOptions\n): Feature[] | Feature {\n const globalFeatureId = options?.globalFeatureId;\n if (globalFeatureId !== undefined) {\n return getSingleFeature(data, globalFeatureId);\n }\n return parseFeatures(data, options?.type);\n}\n\n/**\n * Return a single feature from a binary geometry representation as GeoJSON\n * @param data geometry data in binary representation\n * @return GeoJSON feature\n */\nfunction getSingleFeature(data: BinaryFeatureCollection, globalFeatureId: number): Feature {\n const dataArray = normalizeInput(data);\n for (const data of dataArray) {\n let lastIndex = 0;\n let lastValue = data.featureIds.value[0];\n\n // Scan through data until we find matching feature\n for (let i = 0; i < data.featureIds.value.length; i++) {\n const currValue = data.featureIds.value[i];\n if (currValue === lastValue) {\n // eslint-disable-next-line no-continue\n continue;\n }\n if (globalFeatureId === data.globalFeatureIds.value[lastIndex]) {\n return parseFeature(data, lastIndex, i);\n }\n lastIndex = i;\n lastValue = currValue;\n }\n\n if (globalFeatureId === data.globalFeatureIds.value[lastIndex]) {\n return parseFeature(data, lastIndex, data.featureIds.value.length);\n }\n }\n\n throw new Error(`featureId:${globalFeatureId} not found`);\n}\n\nfunction parseFeatures(data: BinaryFeatureCollection, type?: BinaryGeometryType): Feature[] {\n const dataArray = normalizeInput(data, type);\n return parseFeatureCollection(dataArray);\n}\n\n/** Parse input binary data and return a valid GeoJSON geometry object */\nexport function binaryToGeometry(\n data: BinaryGeometry,\n startIndex?: number,\n endIndex?: number\n): Geometry {\n switch (data.type) {\n case 'Point':\n return pointToGeoJson(data, startIndex, endIndex);\n case 'LineString':\n return lineStringToGeoJson(data, startIndex, endIndex);\n case 'Polygon':\n return polygonToGeoJson(data, startIndex, endIndex);\n default:\n const unexpectedInput: never = data;\n throw new Error(`Unsupported geometry type: ${(unexpectedInput as any)?.type}`);\n }\n}\n\n// Normalize features\n// Return an array of data objects, each of which have a type key\nfunction normalizeInput(data: BinaryFeatureCollection, type?: BinaryGeometryType): BinaryFeature[] {\n const features: BinaryFeature[] = [];\n if (data.points) {\n data.points.type = 'Point';\n features.push(data.points);\n }\n if (data.lines) {\n data.lines.type = 'LineString';\n features.push(data.lines);\n }\n if (data.polygons) {\n data.polygons.type = 'Polygon';\n features.push(data.polygons);\n }\n\n return features;\n}\n\n/** Parse input binary data and return an array of GeoJSON Features */\nfunction parseFeatureCollection(dataArray: BinaryFeature[]): Feature[] {\n const features: Feature[] = [];\n for (const data of dataArray) {\n if (data.featureIds.value.length === 0) {\n // eslint-disable-next-line no-continue\n continue;\n }\n let lastIndex = 0;\n let lastValue = data.featureIds.value[0];\n\n // Need to deduce start, end indices of each feature\n for (let i = 0; i < data.featureIds.value.length; i++) {\n const currValue = data.featureIds.value[i];\n if (currValue === lastValue) {\n // eslint-disable-next-line no-continue\n continue;\n }\n\n features.push(parseFeature(data, lastIndex, i));\n lastIndex = i;\n lastValue = currValue;\n }\n\n // Last feature\n features.push(parseFeature(data, lastIndex, data.featureIds.value.length));\n }\n return features;\n}\n\n/** Parse input binary data and return a single GeoJSON Feature */\nfunction parseFeature(data: BinaryFeature, startIndex?: number, endIndex?: number): Feature {\n const geometry = binaryToGeometry(data, startIndex, endIndex);\n const properties = parseProperties(data, startIndex, endIndex);\n const fields = parseFields(data, startIndex, endIndex);\n return {type: 'Feature', geometry, properties, ...fields};\n}\n\n/** Parse input binary data and return an object of fields */\nfunction parseFields(data, startIndex: number = 0, endIndex?: number): GeoJsonProperties {\n return data.fields && data.fields[data.featureIds.value[startIndex]];\n}\n\n/** Parse input binary data and return an object of properties */\nfunction parseProperties(data, startIndex: number = 0, endIndex?: number): GeoJsonProperties {\n const properties = Object.assign({}, data.properties[data.featureIds.value[startIndex]]);\n for (const key in data.numericProps) {\n properties[key] = data.numericProps[key].value[startIndex];\n }\n return properties;\n}\n\n/** Parse binary data of type Polygon */\nfunction polygonToGeoJson(\n data: BinaryPolygonGeometry,\n startIndex: number = -Infinity,\n endIndex: number = Infinity\n): Polygon | MultiPolygon {\n const {positions} = data;\n const polygonIndices = data.polygonIndices.value.filter((x) => x >= startIndex && x <= endIndex);\n const primitivePolygonIndices = data.primitivePolygonIndices.value.filter(\n (x) => x >= startIndex && x <= endIndex\n );\n const multi = polygonIndices.length > 2;\n\n // Polygon\n if (!multi) {\n const coordinates: Position[][] = [];\n for (let i = 0; i < primitivePolygonIndices.length - 1; i++) {\n const startRingIndex = primitivePolygonIndices[i];\n const endRingIndex = primitivePolygonIndices[i + 1];\n const ringCoordinates = ringToGeoJson(positions, startRingIndex, endRingIndex);\n coordinates.push(ringCoordinates);\n }\n\n return {type: 'Polygon', coordinates};\n }\n\n // MultiPolygon\n const coordinates: Position[][][] = [];\n for (let i = 0; i < polygonIndices.length - 1; i++) {\n const startPolygonIndex = polygonIndices[i];\n const endPolygonIndex = polygonIndices[i + 1];\n const polygonCoordinates = polygonToGeoJson(\n data,\n startPolygonIndex,\n endPolygonIndex\n ).coordinates;\n coordinates.push(polygonCoordinates as Position[][]);\n }\n\n return {type: 'MultiPolygon', coordinates};\n}\n\n/** Parse binary data of type LineString */\nfunction lineStringToGeoJson(\n data: BinaryLineGeometry,\n startIndex: number = -Infinity,\n endIndex: number = Infinity\n): LineString | MultiLineString {\n const {positions} = data;\n const pathIndices = data.pathIndices.value.filter((x) => x >= startIndex && x <= endIndex);\n const multi = pathIndices.length > 2;\n\n if (!multi) {\n const coordinates = ringToGeoJson(positions, pathIndices[0], pathIndices[1]);\n return {type: 'LineString', coordinates};\n }\n\n const coordinates: Position[][] = [];\n for (let i = 0; i < pathIndices.length - 1; i++) {\n const ringCoordinates = ringToGeoJson(positions, pathIndices[i], pathIndices[i + 1]);\n coordinates.push(ringCoordinates);\n }\n\n return {type: 'MultiLineString', coordinates};\n}\n\n/** Parse binary data of type Point */\nfunction pointToGeoJson(data: BinaryPointGeometry, startIndex, endIndex): Point | MultiPoint {\n const {positions} = data;\n const coordinates = ringToGeoJson(positions, startIndex, endIndex);\n const multi = coordinates.length > 1;\n\n if (multi) {\n return {type: 'MultiPoint', coordinates};\n }\n\n return {type: 'Point', coordinates: coordinates[0]};\n}\n\n/**\n * Parse a linear ring of positions to a GeoJSON linear ring\n *\n * @param positions Positions TypedArray\n * @param startIndex Start index to include in ring\n * @param endIndex End index to include in ring\n * @returns GeoJSON ring\n */\nfunction ringToGeoJson(\n positions: BinaryAttribute,\n startIndex?: number,\n endIndex?: number\n): Position[] {\n startIndex = startIndex || 0;\n endIndex = endIndex || positions.value.length / positions.size;\n\n const ringCoordinates: Position[] = [];\n for (let j = startIndex; j < endIndex; j++) {\n const coord = Array<number>();\n for (let k = j * positions.size; k < (j + 1) * positions.size; k++) {\n coord.push(Number(positions.value[k]));\n }\n ringCoordinates.push(coord);\n }\n return ringCoordinates;\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"binary-to-geojson.js","names":["binaryToGeojson","data","options","globalFeatureId","undefined","getSingleFeature","parseFeatures","type","dataArray","normalizeInput","lastIndex","lastValue","featureIds","value","i","length","currValue","globalFeatureIds","parseFeature","Error","parseFeatureCollection","binaryToGeometry","startIndex","endIndex","pointToGeoJson","lineStringToGeoJson","polygonToGeoJson","unexpectedInput","features","points","push","lines","polygons","geometry","properties","parseProperties","fields","parseFields","arguments","Object","assign","key","numericProps","Infinity","positions","polygonIndices","filter","x","primitivePolygonIndices","multi","coordinates","startRingIndex","endRingIndex","ringCoordinates","ringToGeoJson","startPolygonIndex","endPolygonIndex","polygonCoordinates","pathIndices","size","j","coord","Array","k","Number"],"sources":["../../../src/lib/binary-features/binary-to-geojson.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport type {\n BinaryGeometry,\n BinaryGeometryType,\n BinaryPointGeometry,\n BinaryLineGeometry,\n BinaryPolygonGeometry,\n BinaryFeatureCollection,\n BinaryFeature,\n // BinaryPointFeature,\n // BinaryLineFeature,\n // BinaryPolygonFeature,\n BinaryAttribute\n} from '@loaders.gl/schema';\nimport type {Feature, Geometry, Position, GeoJsonProperties} from '@loaders.gl/schema';\nimport type {\n Point,\n MultiPoint,\n LineString,\n MultiLineString,\n Polygon,\n MultiPolygon\n} from '@loaders.gl/schema';\n\n// Note:L We do not handle GeometryCollection, define a limited Geometry type that always has coordinates.\n// type FeatureGeometry = Point | MultiPoint | LineString | MultiLineString | Polygon | MultiPolygon;\n\ntype BinaryToGeoJsonOptions = {\n type?: BinaryGeometryType;\n globalFeatureId?: number;\n};\n\n/**\n * Convert binary geometry representation to GeoJSON\n * @param data geometry data in binary representation\n * @param options\n * @param options.type Input data type: Point, LineString, or Polygon\n * @param options.featureId Global feature id. If specified, only a single feature is extracted\n * @return GeoJSON objects\n */\nexport function binaryToGeojson(\n data: BinaryFeatureCollection,\n options?: BinaryToGeoJsonOptions\n): Feature[] | Feature {\n const globalFeatureId = options?.globalFeatureId;\n if (globalFeatureId !== undefined) {\n return getSingleFeature(data, globalFeatureId);\n }\n return parseFeatures(data, options?.type);\n}\n\n/**\n * Return a single feature from a binary geometry representation as GeoJSON\n * @param data geometry data in binary representation\n * @return GeoJSON feature\n */\nfunction getSingleFeature(data: BinaryFeatureCollection, globalFeatureId: number): Feature {\n const dataArray = normalizeInput(data);\n for (const data of dataArray) {\n let lastIndex = 0;\n let lastValue = data.featureIds.value[0];\n\n // Scan through data until we find matching feature\n for (let i = 0; i < data.featureIds.value.length; i++) {\n const currValue = data.featureIds.value[i];\n if (currValue === lastValue) {\n // eslint-disable-next-line no-continue\n continue;\n }\n if (globalFeatureId === data.globalFeatureIds.value[lastIndex]) {\n return parseFeature(data, lastIndex, i);\n }\n lastIndex = i;\n lastValue = currValue;\n }\n\n if (globalFeatureId === data.globalFeatureIds.value[lastIndex]) {\n return parseFeature(data, lastIndex, data.featureIds.value.length);\n }\n }\n\n throw new Error(`featureId:${globalFeatureId} not found`);\n}\n\nfunction parseFeatures(data: BinaryFeatureCollection, type?: BinaryGeometryType): Feature[] {\n const dataArray = normalizeInput(data, type);\n return parseFeatureCollection(dataArray);\n}\n\n/** Parse input binary data and return a valid GeoJSON geometry object */\nexport function binaryToGeometry(\n data: BinaryGeometry,\n startIndex?: number,\n endIndex?: number\n): Geometry {\n switch (data.type) {\n case 'Point':\n return pointToGeoJson(data, startIndex, endIndex);\n case 'LineString':\n return lineStringToGeoJson(data, startIndex, endIndex);\n case 'Polygon':\n return polygonToGeoJson(data, startIndex, endIndex);\n default:\n const unexpectedInput: never = data;\n throw new Error(`Unsupported geometry type: ${(unexpectedInput as any)?.type}`);\n }\n}\n\n// Normalize features\n// Return an array of data objects, each of which have a type key\nfunction normalizeInput(data: BinaryFeatureCollection, type?: BinaryGeometryType): BinaryFeature[] {\n const features: BinaryFeature[] = [];\n if (data.points) {\n data.points.type = 'Point';\n features.push(data.points);\n }\n if (data.lines) {\n data.lines.type = 'LineString';\n features.push(data.lines);\n }\n if (data.polygons) {\n data.polygons.type = 'Polygon';\n features.push(data.polygons);\n }\n\n return features;\n}\n\n/** Parse input binary data and return an array of GeoJSON Features */\nfunction parseFeatureCollection(dataArray: BinaryFeature[]): Feature[] {\n const features: Feature[] = [];\n for (const data of dataArray) {\n if (data.featureIds.value.length === 0) {\n // eslint-disable-next-line no-continue\n continue;\n }\n let lastIndex = 0;\n let lastValue = data.featureIds.value[0];\n\n // Need to deduce start, end indices of each feature\n for (let i = 0; i < data.featureIds.value.length; i++) {\n const currValue = data.featureIds.value[i];\n if (currValue === lastValue) {\n // eslint-disable-next-line no-continue\n continue;\n }\n\n features.push(parseFeature(data, lastIndex, i));\n lastIndex = i;\n lastValue = currValue;\n }\n\n // Last feature\n features.push(parseFeature(data, lastIndex, data.featureIds.value.length));\n }\n return features;\n}\n\n/** Parse input binary data and return a single GeoJSON Feature */\nfunction parseFeature(data: BinaryFeature, startIndex?: number, endIndex?: number): Feature {\n const geometry = binaryToGeometry(data, startIndex, endIndex);\n const properties = parseProperties(data, startIndex, endIndex);\n const fields = parseFields(data, startIndex, endIndex);\n return {type: 'Feature', geometry, properties, ...fields};\n}\n\n/** Parse input binary data and return an object of fields */\nfunction parseFields(data, startIndex: number = 0, endIndex?: number): GeoJsonProperties {\n return data.fields && data.fields[data.featureIds.value[startIndex]];\n}\n\n/** Parse input binary data and return an object of properties */\nfunction parseProperties(data, startIndex: number = 0, endIndex?: number): GeoJsonProperties {\n const properties = Object.assign({}, data.properties[data.featureIds.value[startIndex]]);\n for (const key in data.numericProps) {\n properties[key] = data.numericProps[key].value[startIndex];\n }\n return properties;\n}\n\n/** Parse binary data of type Polygon */\nfunction polygonToGeoJson(\n data: BinaryPolygonGeometry,\n startIndex: number = -Infinity,\n endIndex: number = Infinity\n): Polygon | MultiPolygon {\n const {positions} = data;\n const polygonIndices = data.polygonIndices.value.filter((x) => x >= startIndex && x <= endIndex);\n const primitivePolygonIndices = data.primitivePolygonIndices.value.filter(\n (x) => x >= startIndex && x <= endIndex\n );\n const multi = polygonIndices.length > 2;\n\n // Polygon\n if (!multi) {\n const coordinates: Position[][] = [];\n for (let i = 0; i < primitivePolygonIndices.length - 1; i++) {\n const startRingIndex = primitivePolygonIndices[i];\n const endRingIndex = primitivePolygonIndices[i + 1];\n const ringCoordinates = ringToGeoJson(positions, startRingIndex, endRingIndex);\n coordinates.push(ringCoordinates);\n }\n\n return {type: 'Polygon', coordinates};\n }\n\n // MultiPolygon\n const coordinates: Position[][][] = [];\n for (let i = 0; i < polygonIndices.length - 1; i++) {\n const startPolygonIndex = polygonIndices[i];\n const endPolygonIndex = polygonIndices[i + 1];\n const polygonCoordinates = polygonToGeoJson(\n data,\n startPolygonIndex,\n endPolygonIndex\n ).coordinates;\n coordinates.push(polygonCoordinates as Position[][]);\n }\n\n return {type: 'MultiPolygon', coordinates};\n}\n\n/** Parse binary data of type LineString */\nfunction lineStringToGeoJson(\n data: BinaryLineGeometry,\n startIndex: number = -Infinity,\n endIndex: number = Infinity\n): LineString | MultiLineString {\n const {positions} = data;\n const pathIndices = data.pathIndices.value.filter((x) => x >= startIndex && x <= endIndex);\n const multi = pathIndices.length > 2;\n\n if (!multi) {\n const coordinates = ringToGeoJson(positions, pathIndices[0], pathIndices[1]);\n return {type: 'LineString', coordinates};\n }\n\n const coordinates: Position[][] = [];\n for (let i = 0; i < pathIndices.length - 1; i++) {\n const ringCoordinates = ringToGeoJson(positions, pathIndices[i], pathIndices[i + 1]);\n coordinates.push(ringCoordinates);\n }\n\n return {type: 'MultiLineString', coordinates};\n}\n\n/** Parse binary data of type Point */\nfunction pointToGeoJson(data: BinaryPointGeometry, startIndex, endIndex): Point | MultiPoint {\n const {positions} = data;\n const coordinates = ringToGeoJson(positions, startIndex, endIndex);\n const multi = coordinates.length > 1;\n\n if (multi) {\n return {type: 'MultiPoint', coordinates};\n }\n\n return {type: 'Point', coordinates: coordinates[0]};\n}\n\n/**\n * Parse a linear ring of positions to a GeoJSON linear ring\n *\n * @param positions Positions TypedArray\n * @param startIndex Start index to include in ring\n * @param endIndex End index to include in ring\n * @returns GeoJSON ring\n */\nfunction ringToGeoJson(\n positions: BinaryAttribute,\n startIndex?: number,\n endIndex?: number\n): Position[] {\n startIndex = startIndex || 0;\n endIndex = endIndex || positions.value.length / positions.size;\n\n const ringCoordinates: Position[] = [];\n for (let j = startIndex; j < endIndex; j++) {\n const coord = Array<number>();\n for (let k = j * positions.size; k < (j + 1) * positions.size; k++) {\n coord.push(Number(positions.value[k]));\n }\n ringCoordinates.push(coord);\n }\n return ringCoordinates;\n}\n"],"mappings":"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"}
|
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
import { Schema, Field } from '@loaders.gl/schema';
|
|
2
2
|
export type GeoArrowEncoding = 'geoarrow.multipolygon' | 'geoarrow.polygon' | 'geoarrow.multilinestring' | 'geoarrow.linestring' | 'geoarrow.multipoint' | 'geoarrow.point' | 'geoarrow.wkb' | 'geoarrow.wkt';
|
|
3
|
-
/**
|
|
3
|
+
/**
|
|
4
|
+
* Geospatial metadata for one column, extracted from Apache Arrow metadata
|
|
5
|
+
* @see https://github.com/geoarrow/geoarrow/blob/main/extension-types.md
|
|
6
|
+
*/
|
|
4
7
|
export type GeoArrowMetadata = {
|
|
8
|
+
/** Encoding of geometry in this column */
|
|
5
9
|
encoding?: GeoArrowEncoding;
|
|
10
|
+
/** CRS in [PROJJSON](https://proj.org/specifications/projjson.html). Omitted if producer has no information about CRS */
|
|
6
11
|
crs?: Record<string, unknown>;
|
|
12
|
+
/** Edges are either spherical or omitted */
|
|
7
13
|
edges?: 'spherical';
|
|
8
14
|
[key: string]: unknown;
|
|
9
15
|
};
|
|
@@ -11,5 +17,11 @@ export type GeoArrowMetadata = {
|
|
|
11
17
|
* get geometry columns from arrow table
|
|
12
18
|
*/
|
|
13
19
|
export declare function getGeometryColumnsFromSchema(schema: Schema): Record<string, GeoArrowMetadata>;
|
|
20
|
+
/**
|
|
21
|
+
* Extracts GeoArrow metadata from a field
|
|
22
|
+
* @param field
|
|
23
|
+
* @returns
|
|
24
|
+
* @see https://github.com/geoarrow/geoarrow/blob/d2f56704414d9ae71e8a5170a8671343ed15eefe/extension-types.md
|
|
25
|
+
*/
|
|
14
26
|
export declare function getGeometryMetadataForField(field: Field): GeoArrowMetadata | null;
|
|
15
27
|
//# sourceMappingURL=geoarrow-metadata.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geoarrow-metadata.d.ts","sourceRoot":"","sources":["../../../src/lib/geo/geoarrow-metadata.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"geoarrow-metadata.d.ts","sourceRoot":"","sources":["../../../src/lib/geo/geoarrow-metadata.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAEjD,MAAM,MAAM,gBAAgB,GACxB,uBAAuB,GACvB,kBAAkB,GAClB,0BAA0B,GAC1B,qBAAqB,GACrB,qBAAqB,GACrB,gBAAgB,GAChB,cAAc,GACd,cAAc,CAAC;AAiBnB;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,0CAA0C;IAC1C,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,yHAAyH;IACzH,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,4CAA4C;IAC5C,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AAEF;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAS7F;AACD;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,KAAK,GAAG,gBAAgB,GAAG,IAAI,CAmCjF"}
|
|
@@ -14,17 +14,15 @@ export function getGeometryColumnsFromSchema(schema) {
|
|
|
14
14
|
export function getGeometryMetadataForField(field) {
|
|
15
15
|
var _field$metadata, _field$metadata2;
|
|
16
16
|
let metadata = null;
|
|
17
|
-
|
|
18
|
-
if (columnMetadata) {
|
|
19
|
-
try {
|
|
20
|
-
metadata = JSON.parse(columnMetadata);
|
|
21
|
-
} catch (error) {
|
|
22
|
-
console.warn('Failed to parse GeoArrow metadata', error);
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
let geoEncoding = (_field$metadata2 = field.metadata) === null || _field$metadata2 === void 0 ? void 0 : _field$metadata2[GEOARROW_COLUMN_METADATA_ENCODING];
|
|
17
|
+
let geoEncoding = (_field$metadata = field.metadata) === null || _field$metadata === void 0 ? void 0 : _field$metadata[GEOARROW_COLUMN_METADATA_ENCODING];
|
|
26
18
|
if (geoEncoding) {
|
|
27
19
|
geoEncoding = geoEncoding.toLowerCase();
|
|
20
|
+
if (geoEncoding === 'wkb') {
|
|
21
|
+
geoEncoding = 'geoarrow.wkb';
|
|
22
|
+
}
|
|
23
|
+
if (geoEncoding === 'wkt') {
|
|
24
|
+
geoEncoding = 'geoarrow.wkt';
|
|
25
|
+
}
|
|
28
26
|
if (!GEOARROW_ENCODINGS.includes(geoEncoding)) {
|
|
29
27
|
console.warn(`Invalid GeoArrow encoding: ${geoEncoding}`);
|
|
30
28
|
} else {
|
|
@@ -32,6 +30,14 @@ export function getGeometryMetadataForField(field) {
|
|
|
32
30
|
metadata.encoding = geoEncoding;
|
|
33
31
|
}
|
|
34
32
|
}
|
|
33
|
+
const columnMetadata = (_field$metadata2 = field.metadata) === null || _field$metadata2 === void 0 ? void 0 : _field$metadata2[GEOARROW_COLUMN_METADATA_METADATA];
|
|
34
|
+
if (columnMetadata) {
|
|
35
|
+
try {
|
|
36
|
+
metadata = JSON.parse(columnMetadata);
|
|
37
|
+
} catch (error) {
|
|
38
|
+
console.warn('Failed to parse GeoArrow metadata', error);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
35
41
|
return metadata || null;
|
|
36
42
|
}
|
|
37
43
|
//# sourceMappingURL=geoarrow-metadata.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geoarrow-metadata.js","names":["GEOARROW_ENCODINGS","GEOARROW_COLUMN_METADATA_ENCODING","GEOARROW_COLUMN_METADATA_METADATA","getGeometryColumnsFromSchema","schema","geometryColumns","field","fields","metadata","getGeometryMetadataForField","name","_field$metadata","_field$metadata2","
|
|
1
|
+
{"version":3,"file":"geoarrow-metadata.js","names":["GEOARROW_ENCODINGS","GEOARROW_COLUMN_METADATA_ENCODING","GEOARROW_COLUMN_METADATA_METADATA","getGeometryColumnsFromSchema","schema","geometryColumns","field","fields","metadata","getGeometryMetadataForField","name","_field$metadata","_field$metadata2","geoEncoding","toLowerCase","includes","console","warn","encoding","columnMetadata","JSON","parse","error"],"sources":["../../../src/lib/geo/geoarrow-metadata.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport {Schema, Field} from '@loaders.gl/schema';\n\nexport type GeoArrowEncoding =\n | 'geoarrow.multipolygon'\n | 'geoarrow.polygon'\n | 'geoarrow.multilinestring'\n | 'geoarrow.linestring'\n | 'geoarrow.multipoint'\n | 'geoarrow.point'\n | 'geoarrow.wkb'\n | 'geoarrow.wkt';\n\n/** Array containing all encodings */\nconst GEOARROW_ENCODINGS = [\n 'geoarrow.multipolygon',\n 'geoarrow.polygon',\n 'geoarrow.multilinestring',\n 'geoarrow.linestring',\n 'geoarrow.multipoint',\n 'geoarrow.point',\n 'geoarrow.wkb',\n 'geoarrow.wkt'\n];\n\nconst GEOARROW_COLUMN_METADATA_ENCODING = 'ARROW:extension:name';\nconst GEOARROW_COLUMN_METADATA_METADATA = 'ARROW:extension:metadata';\n\n/**\n * Geospatial metadata for one column, extracted from Apache Arrow metadata\n * @see https://github.com/geoarrow/geoarrow/blob/main/extension-types.md\n */\nexport type GeoArrowMetadata = {\n /** Encoding of geometry in this column */\n encoding?: GeoArrowEncoding;\n /** CRS in [PROJJSON](https://proj.org/specifications/projjson.html). Omitted if producer has no information about CRS */\n crs?: Record<string, unknown>;\n /** Edges are either spherical or omitted */\n edges?: 'spherical';\n [key: string]: unknown;\n};\n\n/**\n * get geometry columns from arrow table\n */\nexport function getGeometryColumnsFromSchema(schema: Schema): Record<string, GeoArrowMetadata> {\n const geometryColumns: Record<string, GeoArrowMetadata> = {};\n for (const field of schema.fields) {\n const metadata = getGeometryMetadataForField(field);\n if (metadata) {\n geometryColumns[field.name] = metadata;\n }\n }\n return geometryColumns;\n}\n/**\n * Extracts GeoArrow metadata from a field\n * @param field\n * @returns\n * @see https://github.com/geoarrow/geoarrow/blob/d2f56704414d9ae71e8a5170a8671343ed15eefe/extension-types.md\n */\nexport function getGeometryMetadataForField(field: Field): GeoArrowMetadata | null {\n let metadata: GeoArrowMetadata | null = null;\n\n // Check for GeoArrow column encoding\n let geoEncoding = field.metadata?.[GEOARROW_COLUMN_METADATA_ENCODING];\n if (geoEncoding) {\n geoEncoding = geoEncoding.toLowerCase();\n // at time of testing, ogr2ogr uses WKB/WKT for encoding.\n if (geoEncoding === 'wkb') {\n geoEncoding = 'geoarrow.wkb';\n }\n if (geoEncoding === 'wkt') {\n geoEncoding = 'geoarrow.wkt';\n }\n if (!GEOARROW_ENCODINGS.includes(geoEncoding)) {\n // eslint-disable-next-line no-console\n console.warn(`Invalid GeoArrow encoding: ${geoEncoding}`);\n } else {\n metadata = metadata || ({} as GeoArrowMetadata);\n metadata.encoding = geoEncoding as GeoArrowEncoding;\n }\n }\n\n // Check for GeoArrow metadata\n const columnMetadata = field.metadata?.[GEOARROW_COLUMN_METADATA_METADATA];\n if (columnMetadata) {\n try {\n metadata = JSON.parse(columnMetadata);\n } catch (error) {\n // eslint-disable-next-line no-console\n console.warn('Failed to parse GeoArrow metadata', error);\n }\n }\n\n return metadata || null;\n}\n"],"mappings":"AAiBA,MAAMA,kBAAkB,GAAG,CACzB,uBAAuB,EACvB,kBAAkB,EAClB,0BAA0B,EAC1B,qBAAqB,EACrB,qBAAqB,EACrB,gBAAgB,EAChB,cAAc,EACd,cAAc,CACf;AAED,MAAMC,iCAAiC,GAAG,sBAAsB;AAChE,MAAMC,iCAAiC,GAAG,0BAA0B;AAmBpE,OAAO,SAASC,4BAA4BA,CAACC,MAAc,EAAoC;EAC7F,MAAMC,eAAiD,GAAG,CAAC,CAAC;EAC5D,KAAK,MAAMC,KAAK,IAAIF,MAAM,CAACG,MAAM,EAAE;IACjC,MAAMC,QAAQ,GAAGC,2BAA2B,CAACH,KAAK,CAAC;IACnD,IAAIE,QAAQ,EAAE;MACZH,eAAe,CAACC,KAAK,CAACI,IAAI,CAAC,GAAGF,QAAQ;IACxC;EACF;EACA,OAAOH,eAAe;AACxB;AAOA,OAAO,SAASI,2BAA2BA,CAACH,KAAY,EAA2B;EAAA,IAAAK,eAAA,EAAAC,gBAAA;EACjF,IAAIJ,QAAiC,GAAG,IAAI;EAG5C,IAAIK,WAAW,IAAAF,eAAA,GAAGL,KAAK,CAACE,QAAQ,cAAAG,eAAA,uBAAdA,eAAA,CAAiBV,iCAAiC,CAAC;EACrE,IAAIY,WAAW,EAAE;IACfA,WAAW,GAAGA,WAAW,CAACC,WAAW,CAAC,CAAC;IAEvC,IAAID,WAAW,KAAK,KAAK,EAAE;MACzBA,WAAW,GAAG,cAAc;IAC9B;IACA,IAAIA,WAAW,KAAK,KAAK,EAAE;MACzBA,WAAW,GAAG,cAAc;IAC9B;IACA,IAAI,CAACb,kBAAkB,CAACe,QAAQ,CAACF,WAAW,CAAC,EAAE;MAE7CG,OAAO,CAACC,IAAI,CAAE,8BAA6BJ,WAAY,EAAC,CAAC;IAC3D,CAAC,MAAM;MACLL,QAAQ,GAAGA,QAAQ,IAAK,CAAC,CAAsB;MAC/CA,QAAQ,CAACU,QAAQ,GAAGL,WAA+B;IACrD;EACF;EAGA,MAAMM,cAAc,IAAAP,gBAAA,GAAGN,KAAK,CAACE,QAAQ,cAAAI,gBAAA,uBAAdA,gBAAA,CAAiBV,iCAAiC,CAAC;EAC1E,IAAIiB,cAAc,EAAE;IAClB,IAAI;MACFX,QAAQ,GAAGY,IAAI,CAACC,KAAK,CAACF,cAAc,CAAC;IACvC,CAAC,CAAC,OAAOG,KAAK,EAAE;MAEdN,OAAO,CAACC,IAAI,CAAC,mCAAmC,EAAEK,KAAK,CAAC;IAC1D;EACF;EAEA,OAAOd,QAAQ,IAAI,IAAI;AACzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geoparquet-metadata-schema.d.ts","sourceRoot":"","sources":["../../../src/lib/geo/geoparquet-metadata-schema.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"geoparquet-metadata-schema.d.ts","sourceRoot":"","sources":["../../../src/lib/geo/geoparquet-metadata-schema.ts"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2D3C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geoparquet-metadata-schema.js","names":["GEOPARQUET_METADATA_JSON_SCHEMA","$schema","title","description","type","required","properties","version","const","primary_column","minLength","columns","minProperties","patternProperties","encoding","geometry_types","uniqueItems","items","pattern","crs","oneOf","$ref","edges","enum","orientation","bbox","minItems","maxItems","epoch","additionalProperties"],"sources":["../../../src/lib/geo/geoparquet-metadata-schema.ts"],"sourcesContent":["// loaders.gl
|
|
1
|
+
{"version":3,"file":"geoparquet-metadata-schema.js","names":["GEOPARQUET_METADATA_JSON_SCHEMA","$schema","title","description","type","required","properties","version","const","primary_column","minLength","columns","minProperties","patternProperties","encoding","geometry_types","uniqueItems","items","pattern","crs","oneOf","$ref","edges","enum","orientation","bbox","minItems","maxItems","epoch","additionalProperties"],"sources":["../../../src/lib/geo/geoparquet-metadata-schema.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\n/* eslint-disable camelcase */\n\n/**\n * Geoparquet JSON schema for geo metadata\n * @see https://github.com/geoarrow/geoarrow/blob/main/metadata.md\n * @see https://github.com/opengeospatial/geoparquet/blob/main/format-specs/geoparquet.md\n */\nexport const GEOPARQUET_METADATA_JSON_SCHEMA = {\n $schema: 'http://json-schema.org/draft-07/schema#',\n title: 'GeoParquet',\n description: 'Parquet metadata included in the geo field.',\n type: 'object',\n required: ['version', 'primary_column', 'columns'],\n properties: {\n version: {type: 'string', const: '1.0.0-beta.1'},\n primary_column: {type: 'string', minLength: 1},\n columns: {\n type: 'object',\n minProperties: 1,\n patternProperties: {\n '.+': {\n type: 'object',\n required: ['encoding', 'geometry_types'],\n properties: {\n encoding: {type: 'string', const: 'WKB'},\n geometry_types: {\n type: 'array',\n uniqueItems: true,\n items: {\n type: 'string',\n pattern: '^(GeometryCollection|(Multi)?(Point|LineString|Polygon))( Z)?$'\n }\n },\n crs: {\n oneOf: [\n {\n $ref: 'https://proj.org/schemas/v0.5/projjson.schema.json'\n },\n {type: 'null'}\n ]\n },\n edges: {type: 'string', enum: ['planar', 'spherical']},\n orientation: {type: 'string', const: 'counterclockwise'},\n bbox: {\n type: 'array',\n items: {type: 'number'},\n oneOf: [\n {\n description: '2D bbox consisting of (xmin, ymin, xmax, ymax)',\n minItems: 4,\n maxItems: 4\n },\n {\n description: '3D bbox consisting of (xmin, ymin, zmin, xmax, ymax, zmax)',\n minItems: 6,\n maxItems: 6\n }\n ]\n },\n epoch: {type: 'number'}\n }\n }\n },\n additionalProperties: false\n }\n }\n};\n"],"mappings":"AAWA,OAAO,MAAMA,+BAA+B,GAAG;EAC7CC,OAAO,EAAE,yCAAyC;EAClDC,KAAK,EAAE,YAAY;EACnBC,WAAW,EAAE,6CAA6C;EAC1DC,IAAI,EAAE,QAAQ;EACdC,QAAQ,EAAE,CAAC,SAAS,EAAE,gBAAgB,EAAE,SAAS,CAAC;EAClDC,UAAU,EAAE;IACVC,OAAO,EAAE;MAACH,IAAI,EAAE,QAAQ;MAAEI,KAAK,EAAE;IAAc,CAAC;IAChDC,cAAc,EAAE;MAACL,IAAI,EAAE,QAAQ;MAAEM,SAAS,EAAE;IAAC,CAAC;IAC9CC,OAAO,EAAE;MACPP,IAAI,EAAE,QAAQ;MACdQ,aAAa,EAAE,CAAC;MAChBC,iBAAiB,EAAE;QACjB,IAAI,EAAE;UACJT,IAAI,EAAE,QAAQ;UACdC,QAAQ,EAAE,CAAC,UAAU,EAAE,gBAAgB,CAAC;UACxCC,UAAU,EAAE;YACVQ,QAAQ,EAAE;cAACV,IAAI,EAAE,QAAQ;cAAEI,KAAK,EAAE;YAAK,CAAC;YACxCO,cAAc,EAAE;cACdX,IAAI,EAAE,OAAO;cACbY,WAAW,EAAE,IAAI;cACjBC,KAAK,EAAE;gBACLb,IAAI,EAAE,QAAQ;gBACdc,OAAO,EAAE;cACX;YACF,CAAC;YACDC,GAAG,EAAE;cACHC,KAAK,EAAE,CACL;gBACEC,IAAI,EAAE;cACR,CAAC,EACD;gBAACjB,IAAI,EAAE;cAAM,CAAC;YAElB,CAAC;YACDkB,KAAK,EAAE;cAAClB,IAAI,EAAE,QAAQ;cAAEmB,IAAI,EAAE,CAAC,QAAQ,EAAE,WAAW;YAAC,CAAC;YACtDC,WAAW,EAAE;cAACpB,IAAI,EAAE,QAAQ;cAAEI,KAAK,EAAE;YAAkB,CAAC;YACxDiB,IAAI,EAAE;cACJrB,IAAI,EAAE,OAAO;cACba,KAAK,EAAE;gBAACb,IAAI,EAAE;cAAQ,CAAC;cACvBgB,KAAK,EAAE,CACL;gBACEjB,WAAW,EAAE,gDAAgD;gBAC7DuB,QAAQ,EAAE,CAAC;gBACXC,QAAQ,EAAE;cACZ,CAAC,EACD;gBACExB,WAAW,EAAE,4DAA4D;gBACzEuB,QAAQ,EAAE,CAAC;gBACXC,QAAQ,EAAE;cACZ,CAAC;YAEL,CAAC;YACDC,KAAK,EAAE;cAACxB,IAAI,EAAE;YAAQ;UACxB;QACF;MACF,CAAC;MACDyB,oBAAoB,EAAE;IACxB;EACF;AACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geoparquet-metadata.d.ts","sourceRoot":"","sources":["../../../src/lib/geo/geoparquet-metadata.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"geoparquet-metadata.d.ts","sourceRoot":"","sources":["../../../src/lib/geo/geoparquet-metadata.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,MAAM,EAAQ,MAAM,oBAAoB,CAAC;AAIjD;;;;;KAKK;AACL,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC3C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AAEF,oEAAoE;AACpE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,KAAK,GAAG,KAAK,CAAC;IACxB,cAAc,EAAE,sBAAsB,EAAE,CAAC;IACzC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3F,KAAK,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AAEF,0CAA0C;AAC1C,MAAM,MAAM,sBAAsB,GAC9B,OAAO,GACP,YAAY,GACZ,SAAS,GACT,YAAY,GACZ,iBAAiB,GACjB,cAAc,GACd,oBAAoB,GACpB,SAAS,GACT,cAAc,GACd,WAAW,GACX,cAAc,GACd,mBAAmB,GACnB,gBAAgB,GAChB,sBAAsB,CAAC;AAI3B;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAWjE;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CAG7E;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CA6BtD;AAoDD,kDAAkD;AAClD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAehC;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAMlF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geoparquet-metadata.js","names":["getGeoMetadata","schema","geoMetadata","parseJSONStringMetadata","column","Object","values","columns","encoding","toLowerCase","setGeoMetadata","stringifiedGeoMetadata","JSON","stringify","metadata","geo","unpackGeoMetadata","version","primary_column","keys","join","columnName","columnMetadata","entries","field","fields","find","name","setFieldMetadata","unpackGeoFieldMetadata","key","value","crsKey","crsValue","crsId","authority","code","metadataKey","stringifiedMetadata","parse","unpackJSONStringMetadata","json"],"sources":["../../../src/lib/geo/geoparquet-metadata.ts"],"sourcesContent":["// loaders.gl
|
|
1
|
+
{"version":3,"file":"geoparquet-metadata.js","names":["getGeoMetadata","schema","geoMetadata","parseJSONStringMetadata","column","Object","values","columns","encoding","toLowerCase","setGeoMetadata","stringifiedGeoMetadata","JSON","stringify","metadata","geo","unpackGeoMetadata","version","primary_column","keys","join","columnName","columnMetadata","entries","field","fields","find","name","setFieldMetadata","unpackGeoFieldMetadata","key","value","crsKey","crsValue","crsId","authority","code","metadataKey","stringifiedMetadata","parse","unpackJSONStringMetadata","json"],"sources":["../../../src/lib/geo/geoparquet-metadata.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\nimport {Schema, Field} from '@loaders.gl/schema';\n\n/* eslint-disable camelcase */\n\n/**\n * A geoarrow / geoparquet geo metadata object\n * (stored in stringified form in the top level metadata 'geo' key)\n * @see https://github.com/opengeospatial/geoparquet/blob/main/format-specs/geoparquet.md\n * @see https://github.com/geoarrow/geoarrow\n * */\nexport type GeoMetadata = {\n version?: string;\n primary_column?: string;\n columns: Record<string, GeoColumnMetadata>;\n [key: string]: unknown;\n};\n\n/** A geoarrow / geoparquet geo metadata for one geometry column */\nexport type GeoColumnMetadata = {\n encoding: 'wkb' | 'wkt';\n geometry_types: GeoParquetGeometryType[];\n crs?: object | null;\n orientation?: 'counterclockwise';\n bbox?: [number, number, number, number] | [number, number, number, number, number, number];\n edges?: 'planar' | 'spherical';\n epoch?: number;\n [key: string]: unknown;\n};\n\n/** A GeoParquet metadata geometry type */\nexport type GeoParquetGeometryType =\n | 'Point'\n | 'LineString'\n | 'Polygon'\n | 'MultiPoint'\n | 'MultiLineString'\n | 'MultiPolygon'\n | 'GeometryCollection'\n | 'Point Z'\n | 'LineString Z'\n | 'Polygon Z'\n | 'MultiPoint Z'\n | 'MultiLineString Z'\n | 'MultiPolygon Z'\n | 'GeometryCollection Z';\n\n// GEO METADATA\n\n/**\n * Reads the GeoMetadata object from the metadata\n * @note geoarrow / parquet schema is stringified into a single key-value pair in the parquet metadata\n */\nexport function getGeoMetadata(schema: Schema): GeoMetadata | null {\n const geoMetadata = parseJSONStringMetadata(schema, 'geo');\n if (!geoMetadata) {\n return null;\n }\n for (const column of Object.values(geoMetadata.columns || {})) {\n if (column.encoding) {\n column.encoding = column.encoding.toLowerCase();\n }\n }\n return geoMetadata as GeoMetadata;\n}\n\n/**\n * Stores a geoarrow / geoparquet geo metadata object in the schema\n * @note geoarrow / geoparquet geo metadata is a single stringified JSON field\n */\nexport function setGeoMetadata(schema: Schema, geoMetadata: GeoMetadata): void {\n const stringifiedGeoMetadata = JSON.stringify(geoMetadata);\n schema.metadata.geo = stringifiedGeoMetadata;\n}\n\n/**\n * Unpacks geo metadata into separate metadata fields (parses the long JSON string)\n * @note geoarrow / parquet schema is stringified into a single key-value pair in the parquet metadata\n */\nexport function unpackGeoMetadata(schema: Schema): void {\n const geoMetadata = getGeoMetadata(schema);\n if (!geoMetadata) {\n return;\n }\n\n // Store Parquet Schema Level Metadata\n\n const {version, primary_column, columns} = geoMetadata;\n if (version) {\n schema.metadata['geo.version'] = version;\n }\n\n if (primary_column) {\n schema.metadata['geo.primary_column'] = primary_column;\n }\n\n // store column names as comma separated list\n schema.metadata['geo.columns'] = Object.keys(columns || {}).join('');\n\n for (const [columnName, columnMetadata] of Object.entries(columns || {})) {\n const field = schema.fields.find((field) => field.name === columnName);\n if (field) {\n if (field.name === primary_column) {\n setFieldMetadata(field, 'geo.primary_field', 'true');\n }\n unpackGeoFieldMetadata(field, columnMetadata);\n }\n }\n}\n\n// eslint-disable-next-line complexity\nfunction unpackGeoFieldMetadata(field: Field, columnMetadata): void {\n for (const [key, value] of Object.entries(columnMetadata || {})) {\n switch (key) {\n case 'geometry_types':\n setFieldMetadata(field, `geo.${key}`, (value as string[]).join(','));\n break;\n case 'bbox':\n setFieldMetadata(field, `geo.crs.${key}`, JSON.stringify(value));\n break;\n case 'crs':\n // @ts-ignore\n for (const [crsKey, crsValue] of Object.entries(value || {})) {\n switch (crsKey) {\n case 'id':\n const crsId =\n typeof crsValue === 'object'\n ? // @ts-ignore\n `${crsValue?.authority}:${crsValue?.code}`\n : JSON.stringify(crsValue);\n setFieldMetadata(field, `geo.crs.${crsKey}`, crsId);\n break;\n default:\n setFieldMetadata(\n field,\n `geo.crs.${crsKey}`,\n typeof crsValue === 'string' ? crsValue : JSON.stringify(crsValue)\n );\n break;\n }\n }\n break;\n case 'edges':\n default:\n setFieldMetadata(\n field,\n `geo.${key}`,\n typeof value === 'string' ? value : JSON.stringify(value)\n );\n }\n }\n}\n\nfunction setFieldMetadata(field: Field, key: string, value: string): void {\n field.metadata = field.metadata || {};\n field.metadata[key] = value;\n}\n\n// HELPERS\n\n/** Parse a key with stringified arrow metadata */\nexport function parseJSONStringMetadata(\n schema: Schema,\n metadataKey: string\n): Record<string, unknown> | null {\n const stringifiedMetadata = schema.metadata[metadataKey];\n if (!stringifiedMetadata) {\n return null;\n }\n\n try {\n const metadata = JSON.parse(stringifiedMetadata);\n if (!metadata || typeof metadata !== 'object') {\n return null;\n }\n return metadata;\n } catch {\n return null;\n }\n}\n\nexport function unpackJSONStringMetadata(schema: Schema, metadataKey: string): void {\n const json = parseJSONStringMetadata(schema, metadataKey);\n for (const [key, value] of Object.entries(json || {})) {\n schema.metadata[`${metadataKey}.${key}`] =\n typeof value === 'string' ? value : JSON.stringify(value);\n }\n}\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-table-to-geojson.d.ts","sourceRoot":"","sources":["../../../src/lib/tables/convert-table-to-geojson.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"convert-table-to-geojson.d.ts","sourceRoot":"","sources":["../../../src/lib/tables/convert-table-to-geojson.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAC,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,EAAC,MAAM,oBAAoB,CAAC;AAM5F,qCAAqC;AACrC,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,aAAa,GAAG,cAAc,EACrC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,gBAAgB,EAAE,GAC1B,YAAY,CAoBd"}
|
|
@@ -39,7 +39,7 @@ function parseGeometry(geometry, columnMetadata, loaders) {
|
|
|
39
39
|
const arrayBuffer = ArrayBuffer.isView(geometry) ? geometry.buffer.slice(geometry.byteOffset, geometry.byteOffset + geometry.byteLength) : geometry;
|
|
40
40
|
const geojson = wkbLoader === null || wkbLoader === void 0 ? void 0 : (_wkbLoader$parseSync = wkbLoader.parseSync) === null || _wkbLoader$parseSync === void 0 ? void 0 : _wkbLoader$parseSync.call(wkbLoader, arrayBuffer, {
|
|
41
41
|
wkb: {
|
|
42
|
-
shape: 'geometry'
|
|
42
|
+
shape: 'geojson-geometry'
|
|
43
43
|
}
|
|
44
44
|
});
|
|
45
45
|
return geojson;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convert-table-to-geojson.js","names":["getTableLength","getTableRowAsObject","getGeoMetadata","convertWKBTableToGeoJSON","table","schema","loaders","geoMetadata","primaryColumn","primary_column","Error","columnMetadata","columns","features","length","rowIndex","row","geometry","parseGeometry","feature","type","properties","push","shape","_wktLoader$parseTextS","_wkbLoader$parseSync","encoding","wktLoader","find","loader","id","parseTextSync","call","wkbLoader","arrayBuffer","ArrayBuffer","isView","buffer","slice","byteOffset","byteLength","geojson","parseSync","wkb"],"sources":["../../../src/lib/tables/convert-table-to-geojson.ts"],"sourcesContent":["// loaders.gl
|
|
1
|
+
{"version":3,"file":"convert-table-to-geojson.js","names":["getTableLength","getTableRowAsObject","getGeoMetadata","convertWKBTableToGeoJSON","table","schema","loaders","geoMetadata","primaryColumn","primary_column","Error","columnMetadata","columns","features","length","rowIndex","row","geometry","parseGeometry","feature","type","properties","push","shape","_wktLoader$parseTextS","_wkbLoader$parseSync","encoding","wktLoader","find","loader","id","parseTextSync","call","wkbLoader","arrayBuffer","ArrayBuffer","isView","buffer","slice","byteOffset","byteLength","geojson","parseSync","wkb"],"sources":["../../../src/lib/tables/convert-table-to-geojson.ts"],"sourcesContent":["// loaders.gl\n// SPDX-License-Identifier: MIT\n// Copyright (c) vis.gl contributors\n\nimport type {LoaderWithParser} from '@loaders.gl/loader-utils';\nimport type {ArrayRowTable, GeoJSONTable, ObjectRowTable, Schema} from '@loaders.gl/schema';\nimport type {Feature, Geometry} from '@loaders.gl/schema';\nimport {getTableLength, getTableRowAsObject} from '@loaders.gl/schema';\n\nimport {GeoColumnMetadata, getGeoMetadata} from '../geo/geoparquet-metadata';\n\n/** TODO - move to loaders.gl/gis? */\nexport function convertWKBTableToGeoJSON(\n table: ArrayRowTable | ObjectRowTable,\n schema: Schema,\n loaders: LoaderWithParser[]\n): GeoJSONTable {\n const geoMetadata = getGeoMetadata(schema);\n const primaryColumn = geoMetadata?.primary_column;\n if (!primaryColumn) {\n throw new Error('no geometry column');\n }\n const columnMetadata = geoMetadata.columns[primaryColumn];\n\n const features: Feature[] = [];\n\n const length = getTableLength(table);\n for (let rowIndex = 0; rowIndex < length; rowIndex++) {\n const row = getTableRowAsObject(table, rowIndex);\n const geometry = parseGeometry(row[primaryColumn], columnMetadata, loaders);\n delete row[primaryColumn];\n const feature: Feature = {type: 'Feature', geometry: geometry!, properties: row};\n features.push(feature);\n }\n\n return {shape: 'geojson-table', schema, type: 'FeatureCollection', features};\n}\n\nfunction parseGeometry(\n geometry: unknown,\n columnMetadata: GeoColumnMetadata,\n loaders: LoaderWithParser[]\n): Geometry | null {\n switch (columnMetadata.encoding) {\n case 'wkt':\n const wktLoader = loaders.find((loader) => loader.id === 'wkt');\n return wktLoader?.parseTextSync?.(geometry as string) || null;\n case 'wkb':\n default:\n const wkbLoader = loaders.find((loader) => loader.id === 'wkb');\n const arrayBuffer = ArrayBuffer.isView(geometry)\n ? geometry.buffer.slice(geometry.byteOffset, geometry.byteOffset + geometry.byteLength)\n : (geometry as ArrayBuffer);\n const geojson = wkbLoader?.parseSync?.(arrayBuffer, {\n wkb: {shape: 'geojson-geometry'}\n }) as unknown as Geometry;\n return geojson; // binaryGeometry ? binaryToGeometry(binaryGeometry) : null;\n // const binaryGeometry = WKBLoader.parseSync?.(geometry);\n // ts-ignore\n // return binaryGeometry ? binaryToGeometry(binaryGeometry) : null;\n }\n}\n"],"mappings":"AAOA,SAAQA,cAAc,EAAEC,mBAAmB,QAAO,oBAAoB;AAAC,SAE5CC,cAAc;AAGzC,OAAO,SAASC,wBAAwBA,CACtCC,KAAqC,EACrCC,MAAc,EACdC,OAA2B,EACb;EACd,MAAMC,WAAW,GAAGL,cAAc,CAACG,MAAM,CAAC;EAC1C,MAAMG,aAAa,GAAGD,WAAW,aAAXA,WAAW,uBAAXA,WAAW,CAAEE,cAAc;EACjD,IAAI,CAACD,aAAa,EAAE;IAClB,MAAM,IAAIE,KAAK,CAAC,oBAAoB,CAAC;EACvC;EACA,MAAMC,cAAc,GAAGJ,WAAW,CAACK,OAAO,CAACJ,aAAa,CAAC;EAEzD,MAAMK,QAAmB,GAAG,EAAE;EAE9B,MAAMC,MAAM,GAAGd,cAAc,CAACI,KAAK,CAAC;EACpC,KAAK,IAAIW,QAAQ,GAAG,CAAC,EAAEA,QAAQ,GAAGD,MAAM,EAAEC,QAAQ,EAAE,EAAE;IACpD,MAAMC,GAAG,GAAGf,mBAAmB,CAACG,KAAK,EAAEW,QAAQ,CAAC;IAChD,MAAME,QAAQ,GAAGC,aAAa,CAACF,GAAG,CAACR,aAAa,CAAC,EAAEG,cAAc,EAAEL,OAAO,CAAC;IAC3E,OAAOU,GAAG,CAACR,aAAa,CAAC;IACzB,MAAMW,OAAgB,GAAG;MAACC,IAAI,EAAE,SAAS;MAAEH,QAAQ,EAAEA,QAAS;MAAEI,UAAU,EAAEL;IAAG,CAAC;IAChFH,QAAQ,CAACS,IAAI,CAACH,OAAO,CAAC;EACxB;EAEA,OAAO;IAACI,KAAK,EAAE,eAAe;IAAElB,MAAM;IAAEe,IAAI,EAAE,mBAAmB;IAAEP;EAAQ,CAAC;AAC9E;AAEA,SAASK,aAAaA,CACpBD,QAAiB,EACjBN,cAAiC,EACjCL,OAA2B,EACV;EAAA,IAAAkB,qBAAA,EAAAC,oBAAA;EACjB,QAAQd,cAAc,CAACe,QAAQ;IAC7B,KAAK,KAAK;MACR,MAAMC,SAAS,GAAGrB,OAAO,CAACsB,IAAI,CAAEC,MAAM,IAAKA,MAAM,CAACC,EAAE,KAAK,KAAK,CAAC;MAC/D,OAAO,CAAAH,SAAS,aAATA,SAAS,wBAAAH,qBAAA,GAATG,SAAS,CAAEI,aAAa,cAAAP,qBAAA,uBAAxBA,qBAAA,CAAAQ,IAAA,CAAAL,SAAS,EAAkBV,QAAkB,CAAC,KAAI,IAAI;IAC/D,KAAK,KAAK;IACV;MACE,MAAMgB,SAAS,GAAG3B,OAAO,CAACsB,IAAI,CAAEC,MAAM,IAAKA,MAAM,CAACC,EAAE,KAAK,KAAK,CAAC;MAC/D,MAAMI,WAAW,GAAGC,WAAW,CAACC,MAAM,CAACnB,QAAQ,CAAC,GAC5CA,QAAQ,CAACoB,MAAM,CAACC,KAAK,CAACrB,QAAQ,CAACsB,UAAU,EAAEtB,QAAQ,CAACsB,UAAU,GAAGtB,QAAQ,CAACuB,UAAU,CAAC,GACpFvB,QAAwB;MAC7B,MAAMwB,OAAO,GAAGR,SAAS,aAATA,SAAS,wBAAAR,oBAAA,GAATQ,SAAS,CAAES,SAAS,cAAAjB,oBAAA,uBAApBA,oBAAA,CAAAO,IAAA,CAAAC,SAAS,EAAcC,WAAW,EAAE;QAClDS,GAAG,EAAE;UAACpB,KAAK,EAAE;QAAkB;MACjC,CAAC,CAAwB;MACzB,OAAOkB,OAAO;EAIlB;AACF"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/gis",
|
|
3
3
|
"description": "Helpers for GIS category data",
|
|
4
|
-
"version": "4.0.
|
|
4
|
+
"version": "4.1.0-alpha.10",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"publishConfig": {
|
|
@@ -20,9 +20,9 @@
|
|
|
20
20
|
"module": "dist/index.js",
|
|
21
21
|
"exports": {
|
|
22
22
|
".": {
|
|
23
|
+
"types": "./dist/index.d.ts",
|
|
23
24
|
"import": "./dist/index.js",
|
|
24
|
-
"require": "./dist/index.cjs"
|
|
25
|
-
"types": "./dist/index.d.ts"
|
|
25
|
+
"require": "./dist/index.cjs"
|
|
26
26
|
}
|
|
27
27
|
},
|
|
28
28
|
"sideEffects": false,
|
|
@@ -32,8 +32,8 @@
|
|
|
32
32
|
"README.md"
|
|
33
33
|
],
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@loaders.gl/loader-utils": "4.0.
|
|
36
|
-
"@loaders.gl/schema": "4.0.
|
|
35
|
+
"@loaders.gl/loader-utils": "4.1.0-alpha.10",
|
|
36
|
+
"@loaders.gl/schema": "4.1.0-alpha.10",
|
|
37
37
|
"@mapbox/vector-tile": "^1.3.1",
|
|
38
38
|
"@math.gl/polygon": "^4.0.0",
|
|
39
39
|
"pbf": "^3.2.1"
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@math.gl/proj4": "^4.0.0"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "19f43c2d90d8b50860c3f8e487429779a386287d"
|
|
45
45
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
// loaders.gl
|
|
1
|
+
// loaders.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
2
3
|
// Copyright (c) vis.gl contributors
|
|
3
4
|
|
|
4
5
|
import {Schema, Field} from '@loaders.gl/schema';
|
|
@@ -28,10 +29,16 @@ const GEOARROW_ENCODINGS = [
|
|
|
28
29
|
const GEOARROW_COLUMN_METADATA_ENCODING = 'ARROW:extension:name';
|
|
29
30
|
const GEOARROW_COLUMN_METADATA_METADATA = 'ARROW:extension:metadata';
|
|
30
31
|
|
|
31
|
-
/**
|
|
32
|
+
/**
|
|
33
|
+
* Geospatial metadata for one column, extracted from Apache Arrow metadata
|
|
34
|
+
* @see https://github.com/geoarrow/geoarrow/blob/main/extension-types.md
|
|
35
|
+
*/
|
|
32
36
|
export type GeoArrowMetadata = {
|
|
37
|
+
/** Encoding of geometry in this column */
|
|
33
38
|
encoding?: GeoArrowEncoding;
|
|
39
|
+
/** CRS in [PROJJSON](https://proj.org/specifications/projjson.html). Omitted if producer has no information about CRS */
|
|
34
40
|
crs?: Record<string, unknown>;
|
|
41
|
+
/** Edges are either spherical or omitted */
|
|
35
42
|
edges?: 'spherical';
|
|
36
43
|
[key: string]: unknown;
|
|
37
44
|
};
|
|
@@ -49,25 +56,26 @@ export function getGeometryColumnsFromSchema(schema: Schema): Record<string, Geo
|
|
|
49
56
|
}
|
|
50
57
|
return geometryColumns;
|
|
51
58
|
}
|
|
52
|
-
|
|
59
|
+
/**
|
|
60
|
+
* Extracts GeoArrow metadata from a field
|
|
61
|
+
* @param field
|
|
62
|
+
* @returns
|
|
63
|
+
* @see https://github.com/geoarrow/geoarrow/blob/d2f56704414d9ae71e8a5170a8671343ed15eefe/extension-types.md
|
|
64
|
+
*/
|
|
53
65
|
export function getGeometryMetadataForField(field: Field): GeoArrowMetadata | null {
|
|
54
66
|
let metadata: GeoArrowMetadata | null = null;
|
|
55
67
|
|
|
56
|
-
// Check for GeoArrow metadata
|
|
57
|
-
const columnMetadata = field.metadata?.[GEOARROW_COLUMN_METADATA_METADATA];
|
|
58
|
-
if (columnMetadata) {
|
|
59
|
-
try {
|
|
60
|
-
metadata = JSON.parse(columnMetadata);
|
|
61
|
-
} catch (error) {
|
|
62
|
-
// eslint-disable-next-line no-console
|
|
63
|
-
console.warn('Failed to parse GeoArrow metadata', error);
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
|
|
67
68
|
// Check for GeoArrow column encoding
|
|
68
69
|
let geoEncoding = field.metadata?.[GEOARROW_COLUMN_METADATA_ENCODING];
|
|
69
70
|
if (geoEncoding) {
|
|
70
71
|
geoEncoding = geoEncoding.toLowerCase();
|
|
72
|
+
// at time of testing, ogr2ogr uses WKB/WKT for encoding.
|
|
73
|
+
if (geoEncoding === 'wkb') {
|
|
74
|
+
geoEncoding = 'geoarrow.wkb';
|
|
75
|
+
}
|
|
76
|
+
if (geoEncoding === 'wkt') {
|
|
77
|
+
geoEncoding = 'geoarrow.wkt';
|
|
78
|
+
}
|
|
71
79
|
if (!GEOARROW_ENCODINGS.includes(geoEncoding)) {
|
|
72
80
|
// eslint-disable-next-line no-console
|
|
73
81
|
console.warn(`Invalid GeoArrow encoding: ${geoEncoding}`);
|
|
@@ -77,5 +85,16 @@ export function getGeometryMetadataForField(field: Field): GeoArrowMetadata | nu
|
|
|
77
85
|
}
|
|
78
86
|
}
|
|
79
87
|
|
|
88
|
+
// Check for GeoArrow metadata
|
|
89
|
+
const columnMetadata = field.metadata?.[GEOARROW_COLUMN_METADATA_METADATA];
|
|
90
|
+
if (columnMetadata) {
|
|
91
|
+
try {
|
|
92
|
+
metadata = JSON.parse(columnMetadata);
|
|
93
|
+
} catch (error) {
|
|
94
|
+
// eslint-disable-next-line no-console
|
|
95
|
+
console.warn('Failed to parse GeoArrow metadata', error);
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
|
|
80
99
|
return metadata || null;
|
|
81
100
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
// loaders.gl
|
|
1
|
+
// loaders.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
2
3
|
// Copyright (c) vis.gl contributors
|
|
3
4
|
|
|
4
5
|
import type {LoaderWithParser} from '@loaders.gl/loader-utils';
|
|
@@ -51,7 +52,7 @@ function parseGeometry(
|
|
|
51
52
|
? geometry.buffer.slice(geometry.byteOffset, geometry.byteOffset + geometry.byteLength)
|
|
52
53
|
: (geometry as ArrayBuffer);
|
|
53
54
|
const geojson = wkbLoader?.parseSync?.(arrayBuffer, {
|
|
54
|
-
wkb: {shape: 'geometry'}
|
|
55
|
+
wkb: {shape: 'geojson-geometry'}
|
|
55
56
|
}) as unknown as Geometry;
|
|
56
57
|
return geojson; // binaryGeometry ? binaryToGeometry(binaryGeometry) : null;
|
|
57
58
|
// const binaryGeometry = WKBLoader.parseSync?.(geometry);
|