Move geometry type & position into geometry folder

reilem · Oct 22, 2024 · 927f766 · 927f766
1 parent aee3f44
commit 927f766
Show file tree

Hide file tree

Showing 20 changed files with 51 additions and 40 deletions.
diff --git a/src/feature.ts b/src/feature.ts
@@ -2,7 +2,12 @@ import { z } from "zod";
 import { GeoJSONBaseSchema } from "./base";
 import { GeoJSONGeometryGenericSchema } from "./geometry/geometry";
 import { INVALID_BBOX_ISSUE } from "./geometry/validation/bbox";
-import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "./position";
+import {
+    GeoJSON2DPositionSchema,
+    GeoJSON3DPositionSchema,
+    GeoJSONPosition,
+    GeoJSONPositionSchema,
+} from "./geometry/position";
 import { GeoJSONTypeSchema } from "./type";
 import { validBboxForFeature } from "./validation/bbox";
 

diff --git a/src/feature_collection.ts b/src/feature_collection.ts
@@ -2,7 +2,12 @@ import { z } from "zod";
 import { GeoJSONBaseSchema } from "./base";
 import { GeoJSONFeatureGenericSchema } from "./feature";
 import { INVALID_BBOX_ISSUE } from "./geometry/validation/bbox";
-import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "./position";
+import {
+    GeoJSON2DPositionSchema,
+    GeoJSON3DPositionSchema,
+    GeoJSONPosition,
+    GeoJSONPositionSchema,
+} from "./geometry/position";
 import { GeoJSONTypeSchema } from "./type";
 import { validBboxForFeatureCollection } from "./validation/bbox";
 import {

diff --git a/src/geojson.ts b/src/geojson.ts
@@ -2,7 +2,12 @@ import { z } from "zod";
 import { GeoJSONFeatureGenericSchema } from "./feature";
 import { GeoJSONFeatureCollectionGenericSchema } from "./feature_collection";
 import { GeoJSONGeometryGenericSchema } from "./geometry/geometry";
-import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "./position";
+import {
+    GeoJSON2DPositionSchema,
+    GeoJSON3DPositionSchema,
+    GeoJSONPosition,
+    GeoJSONPositionSchema,
+} from "./geometry/position";
 
 export const GeoJSONGenericSchema = <P extends GeoJSONPosition>(positionSchema: z.ZodSchema<P>) =>
     z.union([

diff --git a/src/geometry/geometry.ts b/src/geometry/geometry.ts
@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "../position";
+import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "./position";
 import { GeoJSONSimpleGeometryGenericSchema, GeoJSONSimpleGeometryGenericSchemaType } from "./helper/simple";
 import {
     GeoJSONGeometryCollectionGenericSchema,

diff --git a/src/geometry/geometry_collection.ts b/src/geometry/geometry_collection.ts
@@ -1,9 +1,9 @@
 import { z } from "zod";
 import { GeoJSONGeometryBaseGenericSchemaType } from "./helper/base";
 import { GeoJSONSimpleGeometryGenericSchema, GeoJSONSimpleGeometryGenericSchemaType } from "./helper/simple";
-import { GeoJSONGeometryTypeSchema } from "./helper/type";
+import { GeoJSONGeometryTypeSchema } from "./type";
 import { INVALID_BBOX_ISSUE, validBboxForCollection } from "./validation/bbox";
-import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "../position";
+import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "./position";
 import { GeoJSONBaseSchema, GeoJSONBaseSchemaInnerType } from "../base";
 import { INVALID_GEOMETRY_COLLECTION_DIMENSION_ISSUE, validDimensionsForCollection } from "./validation/dimension";
 

diff --git a/src/geometry/helper/simple.ts b/src/geometry/helper/simple.ts
@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { GeoJSONPosition } from "../../position";
+import { GeoJSONPosition } from "../position";
 import { GeoJSONLineStringGenericSchema, GeoJSONLineStringGenericSchemaType } from "../line_string";
 import { GeoJSONMultiLineStringGenericSchema, GeoJSONMultiLineStringGenericSchemaType } from "../multi_line_string";
 import { GeoJSONMultiPointGenericSchema, GeoJSONMultiPointGenericSchemaType } from "../multi_point";

diff --git a/src/geometry/line_string.ts b/src/geometry/line_string.ts
@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "../position";
+import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "./position";
 import { GeoJSONGeometryBaseGenericSchemaType, GeoJSONGeometryBaseSchema } from "./helper/base";
-import { GeoJSONGeometryTypeSchema } from "./helper/type";
+import { GeoJSONGeometryTypeSchema } from "./type";
 import { INVALID_BBOX_ISSUE, validBboxForPositionList } from "./validation/bbox";
 import { INVALID_DIMENSIONS_ISSUE, validDimensionsForPositionList } from "./validation/dimension";
 

diff --git a/src/geometry/multi_line_string.ts b/src/geometry/multi_line_string.ts
@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "../position";
+import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "./position";
 import { GeoJSONGeometryBaseGenericSchemaType, GeoJSONGeometryBaseSchema } from "./helper/base";
-import { GeoJSONGeometryTypeSchema } from "./helper/type";
+import { GeoJSONGeometryTypeSchema } from "./type";
 import { INVALID_BBOX_ISSUE, validBboxForPositionGrid } from "./validation/bbox";
 import { INVALID_DIMENSIONS_ISSUE, validDimensionsForPositionGrid } from "./validation/dimension";
 import { GeoJSONLineStringGenericSchema, GeoJSONLineStringGenericSchemaInnerType } from "./line_string";

diff --git a/src/geometry/multi_point.ts b/src/geometry/multi_point.ts
@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "../position";
+import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "./position";
 import { GeoJSONGeometryBaseGenericSchemaType, GeoJSONGeometryBaseSchema } from "./helper/base";
-import { GeoJSONGeometryTypeSchema } from "./helper/type";
+import { GeoJSONGeometryTypeSchema } from "./type";
 import { GeoJSONPointGenericSchemaInnerType } from "./point";
 import { INVALID_BBOX_ISSUE, validBboxForPositionList } from "./validation/bbox";
 import { INVALID_DIMENSIONS_ISSUE, validDimensionsForPositionList } from "./validation/dimension";

diff --git a/src/geometry/multi_polygon.ts b/src/geometry/multi_polygon.ts
@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "../position";
+import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "./position";
 import { GeoJSONGeometryBaseGenericSchemaType, GeoJSONGeometryBaseSchema } from "./helper/base";
-import { GeoJSONGeometryTypeSchema } from "./helper/type";
+import { GeoJSONGeometryTypeSchema } from "./type";
 import { GeoJSONPolygonGenericSchema, GeoJSONPolygonGenericSchemaInnerType } from "./polygon";
 import { INVALID_BBOX_ISSUE, validBboxForPositionGridList } from "./validation/bbox";
 import { INVALID_DIMENSIONS_ISSUE, validDimensionsForPositionGridList } from "./validation/dimension";

diff --git a/src/geometry/point.ts b/src/geometry/point.ts
@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "../position";
+import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "./position";
 import { GeoJSONGeometryBaseGenericSchemaType, GeoJSONGeometryBaseSchema } from "./helper/base";
-import { GeoJSONGeometryTypeSchema } from "./helper/type";
+import { GeoJSONGeometryTypeSchema } from "./type";
 import { INVALID_BBOX_ISSUE, validBboxForPosition } from "./validation/bbox";
 
 export type GeoJSONPointGenericSchemaInnerType<P extends GeoJSONPosition> = {

diff --git a/src/geometry/polygon.ts b/src/geometry/polygon.ts
@@ -1,7 +1,7 @@
 import { z } from "zod";
-import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "../position";
+import { GeoJSON2DPositionSchema, GeoJSON3DPositionSchema, GeoJSONPosition, GeoJSONPositionSchema } from "./position";
 import { GeoJSONGeometryBaseGenericSchemaType, GeoJSONGeometryBaseSchema } from "./helper/base";
-import { GeoJSONGeometryTypeSchema } from "./helper/type";
+import { GeoJSONGeometryTypeSchema } from "./type";
 import { INVALID_BBOX_ISSUE, validBboxForPositionGrid } from "./validation/bbox";
 import { INVALID_DIMENSIONS_ISSUE, validDimensionsForPositionGrid } from "./validation/dimension";
 import { INVALID_POLYGON_LINEAR_RING_MESSAGE, validPolygonRings } from "./validation/linear_ring";

diff --git a/src/position.ts → src/geometry/position.ts b/src/position.ts → src/geometry/position.ts
diff --git a/src/geometry/helper/type.ts → src/geometry/type.ts b/src/geometry/helper/type.ts → src/geometry/type.ts
diff --git a/src/geometry/validation/bbox.ts b/src/geometry/validation/bbox.ts
@@ -1,4 +1,4 @@
-import { GeoJSONPosition } from "../../position";
+import { GeoJSONPosition } from "../position";
 import {
     ValidatableCollection,
     ValidatableCoordinate,

diff --git a/src/geometry/validation/dimension.ts b/src/geometry/validation/dimension.ts
@@ -1,4 +1,4 @@
-import { GeoJSONPosition } from "../../position";
+import { GeoJSONPosition } from "../position";
 import { ValidatableCollection, ValidatableGeometry } from "./types";
 
 export const INVALID_DIMENSIONS_ISSUE = {

diff --git a/src/geometry/validation/linear_ring.ts b/src/geometry/validation/linear_ring.ts
@@ -1,4 +1,4 @@
-import { GeoJSONPosition } from "../../position";
+import { GeoJSONPosition } from "../position";
 
 export const INVALID_POLYGON_LINEAR_RING_MESSAGE = {
     code: "custom" as const,

diff --git a/src/geometry/validation/types.ts b/src/geometry/validation/types.ts
@@ -1,6 +1,6 @@
 import { GeoJSONBbox } from "../../bbox";
-import { GeoJSONPosition } from "../../position";
-import { GeoJSONGeometryEnumType } from "../helper/type";
+import { GeoJSONPosition } from "../position";
+import { GeoJSONGeometryEnumType } from "../type";
 
 /**
  * The bare essential types required to validate geometries

diff --git a/src/index.ts b/src/index.ts
@@ -2,12 +2,6 @@
 // TODO: Add negative typing examples for all types (like in point tests)
 // TODO: Make sure each exposed type & schema is tested
 
-export {
-    GeoJSONGeometryTypeSchema,
-    type GeoJSONGeometryEnumType,
-    type GeoJSONGeometryType,
-} from "./geometry/helper/type";
-
 export {
     GeoJSONGeometryGenericSchema,
     GeoJSONGeometrySchema,
@@ -88,6 +82,17 @@ export {
     type GeoJSON3DPolygon,
 } from "./geometry/polygon";
 
+export {
+    GeoJSONPositionSchema,
+    type GeoJSONPosition,
+    GeoJSON2DPositionSchema,
+    type GeoJSON2DPosition,
+    GeoJSON3DPositionSchema,
+    type GeoJSON3DPosition,
+} from "./geometry/position";
+
+export { GeoJSONGeometryTypeSchema, type GeoJSONGeometryEnumType, type GeoJSONGeometryType } from "./geometry/type";
+
 export { GeoJSONBboxSchema, type GeoJSONBbox } from "./bbox";
 
 export {
@@ -120,13 +125,4 @@ export {
     type GeoJSON3D,
 } from "./geojson";
 
-export {
-    GeoJSONPositionSchema,
-    type GeoJSONPosition,
-    GeoJSON2DPositionSchema,
-    type GeoJSON2DPosition,
-    GeoJSON3DPositionSchema,
-    type GeoJSON3DPosition,
-} from "./position";
-
 export { GeoJSONTypeSchema, type GeoJSONType } from "./type";
diff --git a/src/type.ts b/src/type.ts
@@ -1,6 +1,6 @@
 // GeoJSON types and Geometry type (see 1.4)
 import { z } from "zod";
-import { GeoJSONGeometryTypeSchema } from "./geometry/helper/type";
+import { GeoJSONGeometryTypeSchema } from "./geometry/type";
 
 export const GeoJSONTypeSchema = z.enum(["Feature", "FeatureCollection", ...GeoJSONGeometryTypeSchema.options]);