Skip to content

explicit any TS fix #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bferguso merged 2 commits into from
Feb 25, 2026
Merged

explicit any TS fix #83

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7fa18c
explicit any TS fix
P-Hansen Feb 23, 2026
6c6bb30
added GeoJSONFeature type and replaced anys
P-Hansen Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 40 additions & 31 deletions ...hes_common/src/bcgov_arches_common/datatypes/geojson-feature-collection/validation/zod.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { z } from 'zod';

export const GeoJSONPositionSchema = z
.array(z.number())
.refine((arr) => arr.length >= 2 && arr.length <= 4, {
.refine((arr: number[]) => arr.length >= 2 && arr.length <= 4, {
message:
'Position must have 2-4 coordinates (longitude, latitude, [altitude], [m])',
});
Expand Down Expand Up @@ -35,14 +35,14 @@ export const PolygonGeometrySchema = z.object({
z
.array(GeoJSONPositionSchema)
.refine(
(ring) => ring.length >= 4, // First and last positions are the same
(ring: Array<number[]>) => ring.length >= 4, // First and last positions are the same
{
message:
'Polygon rings must have at least 4 positions (first and last positions are equal)',
},
)
.refine(
(ring) =>
(ring: Array<number[]>) =>
JSON.stringify(ring[0]) ===
JSON.stringify(ring[ring.length - 1]),
{
Expand Down Expand Up @@ -71,11 +71,11 @@ export const MultiPolygonGeometrySchema = z.object({
.array(
z
.array(GeoJSONPositionSchema)
.refine((ring) => ring.length >= 4, {
.refine((ring: Array<number[]>) => ring.length >= 4, {
message: 'Polygon rings must have at least 4 positions',
})
.refine(
(ring) =>
(ring: Array<number[]>) =>
JSON.stringify(ring[0]) ===
JSON.stringify(ring[ring.length - 1]),
{
Expand Down Expand Up @@ -114,6 +114,8 @@ export const GeoJSONFeatureSchema = z.object({
id: z.union([z.string(), z.number()]).optional(),
});

export type GeoJSONFeature = z.infer<typeof GeoJSONFeatureSchema>;

export const GeoJSONFeatureCollectionSchema = z.object({
type: z.literal('FeatureCollection'),
features: z.array(GeoJSONFeatureSchema),
Expand Down Expand Up @@ -154,9 +156,11 @@ export const validateFeatureCollection = (data: unknown) => {
*/
export const NonEmptyPointGeometrySchema = PointGeometrySchema.extend({
coordinates: GeoJSONPositionSchema.refine(
(coords) =>
(coords: Array<number>) =>
coords.length >= 2 &&
coords.every((coord) => typeof coord === 'number' && !isNaN(coord)),
coords.every(
(coord: number) => typeof coord === 'number' && !isNaN(coord),
),
{
message: 'Point must have valid numeric coordinates',
},
Expand All @@ -173,7 +177,7 @@ export const NonEmptyLineStringGeometrySchema = LineStringGeometrySchema.extend(
.array(GeoJSONPositionSchema)
.min(2)
.refine(
(coords) => {
(coords: Array<number[]>) => {
// Check that at least two points are different (non-zero length)
for (let i = 0; i < coords.length - 1; i++) {
const p1 = coords[i];
Expand Down Expand Up @@ -205,11 +209,11 @@ export const NonEmptyPolygonGeometrySchema = PolygonGeometrySchema.extend({
.array(
z
.array(GeoJSONPositionSchema)
.refine((ring) => ring.length >= 4, {
.refine((ring: Array<number[]>) => ring.length >= 4, {
message: 'Polygon rings must have at least 4 positions',
})
.refine(
(ring) =>
(ring: Array<number[]>) =>
JSON.stringify(ring[0]) ===
JSON.stringify(ring[ring.length - 1]),
{
Expand All @@ -218,7 +222,7 @@ export const NonEmptyPolygonGeometrySchema = PolygonGeometrySchema.extend({
},
)
.refine(
(ring) => {
(ring: Array<number[]>) => {
// Check that the polygon has a non-zero area
// For a simple check, ensure at least 3 distinct vertices
const distinctPoints = new Set();
Expand Down Expand Up @@ -267,23 +271,24 @@ export const FeatureCollectionWithNonEmptyPointsSchema =
GeoJSONFeatureCollectionSchema.extend({
features: z
.array(GeoJSONFeatureSchema)
.refine((features) => features.length > 0, {
.refine((features: GeoJSONFeature[]) => features.length > 0, {
message: 'Feature collection must contain at least one feature',
})
.refine(
(features) =>
(features: GeoJSONFeature[]) =>
features.some(
(feature) => feature.geometry?.type === 'Point',
(feature: GeoJSONFeature) =>
feature.geometry?.type === 'Point',
),
{
message:
'Feature collection must contain at least one Point feature',
},
)
.refine(
(features) =>
(features: GeoJSONFeature[]) =>
features.every(
(feature) =>
(feature: GeoJSONFeature) =>
feature.geometry?.type !== 'Point' ||
NonEmptyPointGeometrySchema.safeParse(
feature.geometry,
Expand All @@ -303,23 +308,24 @@ export const FeatureCollectionWithNonEmptyLinesSchema =
GeoJSONFeatureCollectionSchema.extend({
features: z
.array(GeoJSONFeatureSchema)
.refine((features) => features.length > 0, {
.refine((features: GeoJSONFeature[]) => features.length > 0, {
message: 'Feature collection must contain at least one feature',
})
.refine(
(features) =>
(features: GeoJSONFeature[]) =>
features.some(
(feature) => feature.geometry?.type === 'LineString',
(feature: GeoJSONFeature) =>
feature.geometry?.type === 'LineString',
),
{
message:
'Feature collection must contain at least one LineString feature',
},
)
.refine(
(features) =>
(features: GeoJSONFeature[]) =>
features.every(
(feature) =>
(feature: GeoJSONFeature) =>
feature.geometry?.type !== 'LineString' ||
NonEmptyLineStringGeometrySchema.safeParse(
feature.geometry,
Expand All @@ -339,23 +345,24 @@ export const FeatureCollectionWithNonEmptyPolygonsSchema =
GeoJSONFeatureCollectionSchema.extend({
features: z
.array(GeoJSONFeatureSchema)
.refine((features) => features.length > 0, {
.refine((features: GeoJSONFeature[]) => features.length > 0, {
message: 'Feature collection must contain at least one feature',
})
.refine(
(features) =>
(features: GeoJSONFeature[]) =>
features.some(
(feature) => feature.geometry?.type === 'Polygon',
(feature: GeoJSONFeature) =>
feature.geometry?.type === 'Polygon',
),
{
message:
'Feature collection must contain at least one Polygon feature',
},
)
.refine(
(features) =>
(features: GeoJSONFeature[]) =>
features.every(
(feature) =>
(feature: GeoJSONFeature) =>
feature.geometry?.type !== 'Polygon' ||
NonEmptyPolygonGeometrySchema.safeParse(
feature.geometry,
Expand All @@ -375,21 +382,23 @@ export const FeatureCollectionWithNonEmptyGeometriesSchema =
GeoJSONFeatureCollectionSchema.extend({
features: z
.array(GeoJSONFeatureSchema)
.refine((features) => features.length > 0, {
.refine((features: GeoJSONFeature[]) => features.length > 0, {
message: 'Feature collection must contain at least one feature',
})
.refine(
(features) =>
features.some((feature) => feature.geometry !== null),
(features: GeoJSONFeature[]) =>
features.some(
(feature: GeoJSONFeature) => feature.geometry !== null,
),
{
message:
'Feature collection must contain at least one feature with geometry',
},
)
.refine(
(features) =>
(features: GeoJSONFeature[]) =>
features.every(
(feature) =>
(feature: GeoJSONFeature) =>
feature.geometry === null ||
(feature.geometry.type === 'Point'
? NonEmptyPointGeometrySchema.safeParse(
Expand Down