Moved records to include file

include/epgsql_geometry.hrl

@@ -0,0 +1,121 @@
+-type point_type() :: '2d' | '3d' | '2dm' | '3dm'.
+
+-record(point,{
+  point_type :: point_type(),
+  x :: float(),
+  y :: float(),
+  z :: float(),
+  m :: float()
+  }).
+
+-type point(PointType) :: #point{ point_type :: PointType }.
+
+-record(multi_point,{
+  point_type :: PointType,
+  points :: [point(PointType)]
+  }).
+
+-type multi_point(PointType) :: #multi_point{ point_type :: PointType }.
+
+-record(line_string,{
+  point_type :: PointType,
+  points :: [point(PointType)]
+  }).
+
+-type line_string(PointType) :: #line_string{ point_type :: PointType }.
+
+-record(multi_line_string,{
+  point_type :: PointType,
+  line_strings :: [line_string(PointType)]
+  }).
+
+-type multi_line_string(PointType) :: #multi_line_string{ point_type :: PointType }.
+
+-record(circular_string,{
+  point_type :: PointType,
+  points :: [point(PointType)]
+  }).
+
+-type basic_string(PointType) :: #circular_string{ point_type :: PointType } | #line_string{ point_type :: PointType }.
+
+-record(compound_curve,{
+  point_type :: PointType,
+  lines :: [basic_string(PointType)]
+  }).
+
+-type curve(PointType) :: #circular_string{ point_type :: PointType } | #line_string{ point_type :: PointType } | #compound_curve{ point_type :: PointType }.
+
+-record(multi_curve,{
+  point_type :: PointType,
+  curves :: [curve(PointType)]
+  }).
+
+-type multi_curve(PointType) :: #multi_curve{ point_type :: PointType }.
+
+-record(polygon,{
+  point_type :: PointType,
+  rings :: [line_string(PointType)]
+  }).
+
+-type polygon(PointType) :: #polygon{ point_type :: PointType }.
+
+-record(multi_polygon,{
+  point_type :: PointType,
+  polygons :: [polygon(PointType)]
+  }).
+
+-type multi_polygon(PointType) :: #multi_polygon{ point_type :: PointType }.
+
+-record(triangle,{
+  point_type :: PointType,
+  rings :: [line_string(PointType)]
+  }).
+
+-type triangle(PointType) :: #triangle{ point_type :: PointType }.
+
+-record(curve_polygon,{
+  point_type :: PointType,
+  rings :: [curve(PointType)] 
+  }).
+
+-type curve_polygon(PointType) :: #curve_polygon{ point_type :: PointType }.
+
+-record(polyhedral_surface,{
+  point_type :: PointType,
+  polygons :: [polygon(PointType)]
+  }).
+
+-type polyhedral_surface(PointType) :: #polyhedral_surface{ point_type :: PointType }.
+
+-type surface(PointType) :: polygon(PointType) | curve_polygon(PointType) | polyhedral_surface(PointType).
+
+-record(multi_surface,{
+  point_type :: PointType,
+  surfaces :: [surface(PointType)]
+  }).
+
+-type multi_surface(PointType) :: #multi_surface{ point_type :: PointType }.
+
+-record(tin,{
+  point_type :: PointType,
+  triangles :: [triangle(PointType)]
+  }).
+
+-type tin(PointType) :: #tin{ point_type :: PointType }.
+
+-type geometry(PointType) :: point(PointType) | 
+                             line_string(PointType) | 
+                             triangle(PointType) | 
+                             tin(PointType) | 
+                             curve(PointType) | 
+                             surface(PointType) |
+                             multi_point(PointType) | 
+                             multi_line_string(PointType) | 
+                             multi_polygon(PointType) | 
+                             multi_curve(PointType) |
+                             multi_surface(PointType) |
+                             geometry_collection(PointType).
+
+-type geometry() :: geometry(point_type()).
+
+-type geometry_collection(PointType) :: [geometry(PointType)].

src/ewkb.erl

@@ -1,128 +1,7 @@
 -module(ewkb).
-
+-include("epgsql_geometry.hrl").
 -export([decode_geometry/1, encode_geometry/1]).
 
--type point_type() :: '2d' | '3d' | '2dm' | '3dm'.
-
--record(point,{
-  point_type :: point_type(),
-  x :: float(),
-  y :: float(),
-  z :: float(),
-  m :: float()
-  }).
-
--type point(PointType) :: #point{ point_type :: PointType }.
-
--record(multi_point,{
-  point_type :: PointType,
-  points :: [point(PointType)]
-  }).
-
--type multi_point(PointType) :: #multi_point{ point_type :: PointType }.
-
--record(line_string,{
-  point_type :: PointType,
-  points :: [point(PointType)]
-  }).
-
--type line_string(PointType) :: #line_string{ point_type :: PointType }.
-
--record(multi_line_string,{
-  point_type :: PointType,
-  line_strings :: [line_string(PointType)]
-  }).
-
--type multi_line_string(PointType) :: #multi_line_string{ point_type :: PointType }.
-
--record(circular_string,{
-  point_type :: PointType,
-  points :: [point(PointType)]
-  }).
-
--type basic_string(PointType) :: #circular_string{ point_type :: PointType } | #line_string{ point_type :: PointType }.
-
--record(compound_curve,{
-  point_type :: PointType,
-  lines :: [basic_string(PointType)]
-  }).
-
--type curve(PointType) :: #circular_string{ point_type :: PointType } | #line_string{ point_type :: PointType } | #compound_curve{ point_type :: PointType }.
-
--record(multi_curve,{
-  point_type :: PointType,
-  curves :: [curve(PointType)]
-  }).
-
--type multi_curve(PointType) :: #multi_curve{ point_type :: PointType }.
-
--record(polygon,{
-  point_type :: PointType,
-  rings :: [line_string(PointType)]
-  }).
-
--type polygon(PointType) :: #polygon{ point_type :: PointType }.
-
--record(multi_polygon,{
-  point_type :: PointType,
-  polygons :: [polygon(PointType)]
-  }).
-
--type multi_polygon(PointType) :: #multi_polygon{ point_type :: PointType }.
-
--record(triangle,{
-  point_type :: PointType,
-  rings :: [line_string(PointType)]
-  }).
-
--type triangle(PointType) :: #triangle{ point_type :: PointType }.
-
--record(curve_polygon,{
-  point_type :: PointType,
-  rings :: [curve(PointType)] 
-  }).
-
--type curve_polygon(PointType) :: #curve_polygon{ point_type :: PointType }.
-
--record(polyhedral_surface,{
-  point_type :: PointType,
-  polygons :: [polygon(PointType)]
-  }).
-
--type polyhedral_surface(PointType) :: #polyhedral_surface{ point_type :: PointType }.
-
--type surface(PointType) :: polygon(PointType) | curve_polygon(PointType) | polyhedral_surface(PointType).
-
--record(multi_surface,{
-  point_type :: PointType,
-  surfaces :: [surface(PointType)]
-  }).
-
--type multi_surface(PointType) :: #multi_surface{ point_type :: PointType }.
-
--record(tin,{
-  point_type :: PointType,
-  triangles :: [triangle(PointType)]
-  }).
-
--type tin(PointType) :: #tin{ point_type :: PointType }.
-
--type geometry(PointType) :: point(PointType) | 
-                             line_string(PointType) | 
-                             triangle(PointType) | 
-                             tin(PointType) | 
-                             curve(PointType) | 
-                             surface(PointType) |
-                             multi_point(PointType) | 
-                             multi_line_string(PointType) | 
-                             multi_polygon(PointType) | 
-                             multi_curve(PointType) |
-                             multi_surface(PointType) |
-                             geometry_collection(PointType).
-
--type geometry() :: geometry(point_type()).
-
--type geometry_collection(PointType) :: [geometry(PointType)].
 
 -type geom_type() :: geometry
                    | point       %