Skip to content

Commit ccba62a

Browse files
isc-rsinghisc-rsingh
committed
organizing for IPM
1 parent 40af4e6 commit ccba62a

File tree

10 files changed

+130
-128
lines changed

10 files changed

+130
-128
lines changed

‎README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ Many of these operations match those found in PostGIS, but the selection here is
66

77
## Classes
88

9-
### geo.model.Point
9+
### rsingh.spatialiris.geo.Point
1010

1111
A Point is a 0-dimensional geometry that represents a single location in coordinate space.
1212

13-
### geo.model.LineString
13+
### rsingh.spatialiris.geo.LineString
1414

1515
A LineString is a 1-dimensional line formed by a contiguous sequence of line segments. Each line segment is defined by two points, with the end point of one segment forming the start point of the next segment.
1616

17-
### geo.model.Polygon
17+
### rsingh.spatialiris.geo.Polygon
1818

1919
A Polygon is a 2-dimensional planar region, delimited by an exterior boundary. Each boundary is a LineString for which the first and last points must be equal, and the line must not self-intersect.
2020

@@ -42,41 +42,41 @@ Returns the OGC Well-Known Text (WKT) representation of the geometry/geography
4242

4343
Returns a geometry as a GeoJSON "feature" (See the [GeoJSON specifications RFC 7946](https://tools.ietf.org/html/rfc7946)).
4444

45-
### Implemented by geo.model.Point
45+
### Implemented by rsingh.spatialiris.geo.Point
4646

4747
`pointInsideCircle(centerX As %Float, centerY As %Float, radius As %Float) returns %Boolean`
4848

4949
Returns true if the point is inside the circle with center `center_x,center_y` and radius (in kilometers) `radius`.
5050

51-
`distance(geo.model.Point) returns %Integer`
51+
`distance(rsingh.spatialiris.geo.Point) returns %Integer`
5252

5353
Returns the minimum 2D Cartesian (planar) distance between two Points, in kilometers
5454

55-
### Implemented by geo.model.Line
55+
### Implemented by rsingh.spatialiris.geo.Line
5656

57-
`startPoint() returns geo.model.Point`
57+
`startPoint() returns rsingh.spatialiris.geo.Point`
5858

5959
Returns the first point of a LineString.
6060

61-
`endPoint() returns geo.model.Point`
61+
`endPoint() returns rsingh.spatialiris.geo.Point`
6262

6363
Returns the last point of a LineString.
6464

65-
### Implemented by geo.model.Polygon
65+
### Implemented by rsingh.spatialiris.geo.Polygon
6666

6767
`isClosed() returns %Boolean`
6868

6969
Returns TRUE if the Polygon's start and end points are coinciden
7070

71-
`contains(geo.model.AbstractGeometry) returns %Boolean`
71+
`contains(rsingh.spatialiris.geo.AbstractGeometry) returns %Boolean`
7272

7373
Returns TRUE if and only if no points of the passed geometry lie in the exterior of Polygon, and at least one point of the interior of the geometry lies in the interior of Polygon.
7474

75-
`intersects(geo.model.AbstractGeometry) returns %Boolean`
75+
`intersects(rsingh.spatialiris.geo.AbstractGeometry) returns %Boolean`
7676

7777
Returns TRUE if any point of the passed geometry falls within the polygon.
7878

79-
`within(geo.model.Polygon) returns %Boolean`
79+
`within(rsingh.spatialiris.geo.Polygon) returns %Boolean`
8080

8181
Returns TRUE if all points of the passed geometry fall within the polygon.
8282

‎module.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<Version>0.0.1</Version>
77
<Packaging>module</Packaging>
88
<SourcesRoot>src</SourcesRoot>
9-
<Resource Name="spatialiris.PKG"/>
9+
<Resource Name="rsingh.spatialiris.geo.PKG"/>
10+
<Resource Name="rsingh.spatialiris.Tools"/>
1011
</Module>
1112
</Document>
1213
</Export>

‎src/app/Patient.cls

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Property name As %String;
66

77
// Location in decimal degrees
88

9-
Property location As geo.model.Point;
9+
Property location As rsingh.spatialiris.geo.Point;
1010

1111
// Restrict randomly generated patients to an area around Boston, MA USA
1212

‎src/cls/rsingh/spatialiris/Testing.cls

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
Class rsingh.spatialiris.Testing
2+
{
3+
4+
ClassMethod createSimpleTestPolygon() As rsingh.spatialiris.geo.Polygon
5+
{
6+
set l = ##class(rsingh.spatialiris.geo.LineString).%New()
7+
do l.addPoint(##class(rsingh.spatialiris.geo.Point).%New(0.01,0.01))
8+
do l.addPoint(##class(rsingh.spatialiris.geo.Point).%New(2.01,0.01))
9+
do l.addPoint(##class(rsingh.spatialiris.geo.Point).%New(2.01,2.01))
10+
do l.addPoint(##class(rsingh.spatialiris.geo.Point).%New(0.01,2.01))
11+
do l.addPoint(##class(rsingh.spatialiris.geo.Point).%New(0.01,0.01))
12+
set polygon = ##class(rsingh.spatialiris.geo.Polygon).%New()
13+
set polygon.line = l
14+
Return polygon
15+
}
16+
17+
ClassMethod createCambridgePolygon() As rsingh.spatialiris.geo.Polygon
18+
{
19+
set l = ##class(rsingh.spatialiris.geo.LineString).%New()
20+
do l.addPoint(##class(rsingh.spatialiris.geo.Point).%New(-71.07296971120546, 42.36751524646158))
21+
do l.addPoint(##class(rsingh.spatialiris.geo.Point).%New(-71.08872828096423, 42.36897060744346))
22+
do l.addPoint(##class(rsingh.spatialiris.geo.Point).%New(-71.08982906341102, 42.36605985176101))
23+
do l.addPoint(##class(rsingh.spatialiris.geo.Point).%New(-71.09226237197649, 42.36717280368296))
24+
do l.addPoint(##class(rsingh.spatialiris.geo.Point).%New(-71.09434806503295, 42.36511810781076))
25+
do l.addPoint(##class(rsingh.spatialiris.geo.Point).%New(-71.08814892178214, 42.358268636220345))
26+
do l.addPoint(##class(rsingh.spatialiris.geo.Point).%New(-71.0776045846639, 42.36019512557601))
27+
do l.addPoint(##class(rsingh.spatialiris.geo.Point).%New(-71.07296971120546, 42.36751524646158))
28+
set polygon = ##class(rsingh.spatialiris.geo.Polygon).%New()
29+
set polygon.line = l
30+
Return polygon
31+
}
32+
33+
ClassMethod createLineIntersectingKendall() As rsingh.spatialiris.geo.LineString
34+
{
35+
set l = ##class(rsingh.spatialiris.geo.LineString).%New()
36+
do l.addPointFromCoords(-71.09009501700031,42.36703809)
37+
do l.addPointFromCoords(-71.08100073568535,42.3670380723421)
38+
do l.addPointFromCoords(-71.085000,42.3670380723)
39+
Return l
40+
}
41+
42+
ClassMethod createLineInsideKendall() As rsingh.spatialiris.geo.LineString
43+
{
44+
set l = ##class(rsingh.spatialiris.geo.LineString).%New()
45+
do l.addPointFromCoords(-71.08100073568535,42.3670380723421)
46+
do l.addPointFromCoords(-71.085000,42.3670380723)
47+
Return l
48+
}
49+
50+
ClassMethod createLineOutsideKendall() As rsingh.spatialiris.geo.LineString
51+
{
52+
set l = ##class(rsingh.spatialiris.geo.LineString).%New()
53+
do l.addPointFromCoords(-71.09009501700031,42.3670380723421)
54+
do l.addPointFromCoords(-71.09009501700031,42.60000)
55+
Return l
56+
}
57+
58+
ClassMethod createPointOutsideKendall() As rsingh.spatialiris.geo.Point
59+
{
60+
Return ##class(rsingh.spatialiris.geo.Point).%New(-71.09009501700031,42.3670380723421)
61+
}
62+
63+
ClassMethod createPointInsideKendall() As rsingh.spatialiris.geo.Point
64+
{
65+
Return ##class(rsingh.spatialiris.geo.Point).%New(-71.08100073568535,42.3670380723421)
66+
}
67+
68+
ClassMethod test()
69+
{
70+
set polygon = ..createSimpleTestPolygon()
71+
set isin = ##class(rsingh.spatialiris.Tools).PointInPolygon(polygon, ##class(rsingh.spatialiris.geo.Point).%New(1.01,1.01))
72+
w isin,!
73+
set isout = ##class(rsingh.spatialiris.Tools).PointInPolygon(polygon, ##class(rsingh.spatialiris.geo.Point).%New(3.01,3.01))
74+
w isout,!
75+
}
76+
77+
}

‎src/spatialiris/Tools.cls ‎src/cls/rsingh/spatialiris/Tools.cls

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
Class geo.Tools Extends %RegisteredObject
1+
Class rsingh.spatialiris.Tools Extends %RegisteredObject
22
{
33

44
/// Earth's radius in km
55
Parameter RADIUSEARTH = 6371;
66

7-
ClassMethod PointInPolygon(poly As geo.model.Polygon, pt As geo.model.Point) As %Boolean
7+
ClassMethod PointInPolygon(poly As rsingh.spatialiris.geo.Polygon, pt As rsingh.spatialiris.geo.Point) As %Boolean
88
{
99
#; https://stackoverflow.com/questions/36399381/whats-the-fastest-way-of-checking-if-a-point-is-inside-a-polygon-in-python
1010
#; https://matplotlib.org/stable/api/path_api.html
@@ -26,7 +26,8 @@ ClassMethod invoke(ByRef mpltPath As %SYS.Python, ByRef poly2) As %SYS.Python [
2626

2727
/// Computes the great-circle distance between a point and the closest point to it on a line
2828
/// returns: distance in kilometers
29-
ClassMethod DistancePointandLine(pt As geo.model.Point, line As geo.model.LineString) As %Float
29+
/// NOTE: This is WIP. Currently inaccurate!
30+
ClassMethod DistancePointandLine(pt As rsingh.spatialiris.geo.Point, line As rsingh.spatialiris.geo.LineString) As %Float
3031
{
3132
set dist = 0
3233
for i = 2:1:line.points.Count() {
@@ -38,7 +39,7 @@ ClassMethod DistancePointandLine(pt As geo.model.Point, line As geo.model.LineSt
3839

3940
/// Computes the great-circle distance between two points on a sphere
4041
/// returns: distance in kilometers
41-
ClassMethod Distance(p1 As geo.model.Point, p2 As geo.model.Point) As %Float
42+
ClassMethod Distance(p1 As rsingh.spatialiris.geo.Point, p2 As rsingh.spatialiris.geo.Point) As %Float
4243
{
4344
Set lat1Radianos = (p1.latitude * $ZPI) / 180
4445
Set lng1Radianos = (p1.longitude * $ZPI) / 180
@@ -49,7 +50,7 @@ ClassMethod Distance(p1 As geo.model.Point, p2 As geo.model.Point) As %Float
4950
}
5051

5152
/// Are two points identical -- have the same latitude and longitude values
52-
ClassMethod Identity(p1 As geo.model.Point, p2 As geo.model.Point) As %Boolean
53+
ClassMethod Identity(p1 As rsingh.spatialiris.geo.Point, p2 As rsingh.spatialiris.geo.Point) As %Boolean
5354
{
5455
Return (p1.latitude = p2.latitude) && (p1.longitude = p2.longitude)
5556
}

‎src/spatialiris/model/AbstractGeometry.cls ‎src/cls/rsingh/spatialiris/geo/AbstractGeometry.cls

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Class geo.model.AbstractGeometry Extends %SerialObject
1+
Class rsingh.spatialiris.geo.AbstractGeometry Extends %SerialObject
22
{
33

44
// Returns the geometry as a $LIST
@@ -39,7 +39,7 @@ ClassMethod dimension() As %Integer [ Abstract ]
3939

4040
Storage Default
4141
{
42-
<StreamLocation>^geo.model.AbstractGeometryS</StreamLocation>
42+
<StreamLocation>^rsingh.spatialiris.geo.AbstractGeometryS</StreamLocation>
4343
<Type>%Storage.Serial</Type>
4444
}
4545

‎src/spatialiris/model/LineString.cls ‎src/cls/rsingh/spatialiris/geo/LineString.cls

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
/// Model of a geospatial linear feature
2-
Class geo.model.LineString Extends AbstractGeometry
2+
Class rsingh.spatialiris.geo.LineString Extends AbstractGeometry
33
{
44

5-
Property points As list Of geo.model.Point;
5+
Property points As list Of rsingh.spatialiris.geo.Point;
66

77
/// Returns the first point of the line. Returns NULL if line has no points.
8-
Method startPoint() As geo.model.Point
8+
Method startPoint() As rsingh.spatialiris.geo.Point
99
{
1010
if ..points.Count()<1 Return
1111
return ..points.GetAt(1)
1212
}
1313

1414
/// Returns the last point of the line. Returns NULL if line has no points.
15-
Method endPoint() As geo.model.Point
15+
Method endPoint() As rsingh.spatialiris.geo.Point
1616
{
1717
if ..points.Count()<1 Return
1818
return ..points.GetAt(..points.Count())
1919
}
2020

21-
Method addPoint(pt As geo.model.Point) As %Status
21+
Method addPoint(pt As rsingh.spatialiris.geo.Point) As %Status
2222
{
2323
do ..points.Insert(pt)
2424
}
2525

2626
Method addPointFromCoords(lon As %Float, lat As %Float) As %Status
2727
{
28-
do ..points.Insert(##class(geo.model.Point).%New(lon, lat))
28+
do ..points.Insert(##class(rsingh.spatialiris.geo.Point).%New(lon, lat))
2929
}
3030

3131
/// Returns the geometry as a $LIST
@@ -64,7 +64,7 @@ Method asText() As %String
6464
/// Returns TRUE if the LINESTRING's start and end points are coincident.
6565
Method isClosed() As %String
6666
{
67-
Return ##class(geo.Tools).Identity(..startPoint(), ..endPoint())
67+
Return ##class(rsingh.spatialiris.Tools).Identity(..startPoint(), ..endPoint())
6868
}
6969

7070
/// Number of vertices comprising this LineString

‎src/spatialiris/model/Point.cls ‎src/cls/rsingh/spatialiris/geo/Point.cls

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/// Model of a geospatial location
2-
Class geo.model.Point Extends AbstractGeometry
2+
Class rsingh.spatialiris.geo.Point Extends AbstractGeometry
33
{
44

55
Property latitude As %Float(MAXVAL = 90.0, MINVAL = -90.0, SCALE = 6);
@@ -10,20 +10,20 @@ Property longitude As %Float(MAXVAL = 180.0, MINVAL = -180.0, SCALE = 6);
1010
/// radius: measured in kilometers
1111
Method insideCircle(centerX As %Float, centerY As %Float, radius As %Float) As %Boolean
1212
{
13-
set cpoint = ##class(geo.model.Point).%New(centerX, centerY)
13+
set cpoint = ##class(rsingh.spatialiris.geo.Point).%New(centerX, centerY)
1414
Return '(..distance(cpoint)>radius)
1515
}
1616

1717
/// Computes the great-circle distance between two points on a sphere
1818
/// returns: distance in kilometers
19-
Method distance(p1 As geo.model.Point) As %Float
19+
Method distance(p1 As rsingh.spatialiris.geo.Point) As %Float
2020
{
2121
Set lat1Radianos = (p1.latitude * $ZPI) / 180
2222
Set lng1Radianos = (p1.longitude * $ZPI) / 180
2323
Set lat2Radianos = (..latitude * $ZPI) / 180
2424
Set lng2Radianos = (..longitude * $ZPI) / 180
2525
// Haversine formula
26-
Return ($ZARCCOS((($ZCOS(lat1Radianos) * $ZCOS(lng1Radianos)) * ($ZCOS(lat2Radianos) * $ZCOS(lng2Radianos))) + ($ZCOS(lat1Radianos) * $ZSIN(lng1Radianos) * $ZCOS(lat2Radianos) * $ZSIN(lng2Radianos)) + ($ZSIN(lat1Radianos) * $ZSIN(lat2Radianos))) * (##class(geo.Tools).#RADIUSEARTH))
26+
Return ($ZARCCOS((($ZCOS(lat1Radianos) * $ZCOS(lng1Radianos)) * ($ZCOS(lat2Radianos) * $ZCOS(lng2Radianos))) + ($ZCOS(lat1Radianos) * $ZSIN(lng1Radianos) * $ZCOS(lat2Radianos) * $ZSIN(lng2Radianos)) + ($ZSIN(lat1Radianos) * $ZSIN(lat2Radianos))) * (##class(rsingh.spatialiris.Tools).#RADIUSEARTH))
2727
}
2828

2929
Method %OnNew(lon As %Float, lat As %Float) As %Status [ Private, ServerOnly = 1 ]
@@ -81,7 +81,7 @@ Storage Default
8181
</Value>
8282
</Data>
8383
<State>PointState</State>
84-
<StreamLocation>^geo.model.PointS</StreamLocation>
84+
<StreamLocation>^rsingh.spatialiris.geo.PointS</StreamLocation>
8585
<Type>%Storage.Serial</Type>
8686
}
8787

0 commit comments

Comments
 (0)