Merge pull request #8 from vojtatom/dev

Adding types to Records

Author: vojtatom

.github/workflows/ci.yaml

@@ -12,7 +12,7 @@ jobs:
         steps:
             - uses: actions/checkout@v3
             - name: 'Setup Node.js'
-              uses: 'actions/setup-node@v1'
+              uses: 'actions/setup-node@v3'
               with:
                   node-version: 18
             - name: Install dependencies

package.json

@@ -1,7 +1,7 @@
 {
     "name": "shpts",
     "private": false,
-    "version": "1.0.5",
+    "version": "1.0.6",
     "type": "module",
     "repository": {
         "type": "git",

shpts/geometry/base.ts

@@ -21,6 +21,8 @@ export abstract class BaseRecord {
         return 4;
     }
 
+    abstract get type(): string;
+
     protected static readBbox(stream: MemoryStream): BoundingBox {
         const xMin = stream.readDouble(true);
         const yMin = stream.readDouble(true);

shpts/geometry/multipatch.ts

@@ -16,6 +16,11 @@ export class MultiPatchRecord extends BaseRingedRecord {
         super(coordType);
     }
 
+    get type() {
+        if (this.coords.length === 1) return 'Polygon';
+        return 'MultiPolygon';
+    }
+
     static fromPresetReader(reader: ShapeReader, header: GeomHeader) {
         const hasZ = reader.hasZ;
         const hasM = reader.hasM;

shpts/geometry/multipoint.ts

@@ -11,6 +11,10 @@ export class MultiPointRecord extends BaseRecord {
         super(coordType);
     }
 
+    get type() {
+        return 'MultiPoint';
+    }
+
     static fromPresetReader(reader: ShapeReader, header: GeomHeader) {
         const hasZ = reader.hasZ;
         const hasM = reader.hasM;

shpts/geometry/null.ts

@@ -7,6 +7,10 @@ export class ShpNullGeom extends BaseRecord {
         super(CoordType.NULL);
     }
 
+    get type() {
+        return 'Null';
+    }
+
     public toGeoJson(): GeoJsonGeom {
         throw new Error('Method cannot be implemented.');
     }

shpts/geometry/point.ts

@@ -10,6 +10,10 @@ export class PointRecord extends BaseRecord {
         super(coordType);
     }
 
+    get type() {
+        return 'Point';
+    }
+
     static fromPresetReader(reader: ShapeReader, header: GeomHeader) {
         const hasZ = reader.hasZ;
         const hasM = reader.hasM;

shpts/geometry/polygon.ts

@@ -16,6 +16,11 @@ export class PolygonRecord extends BaseRingedRecord {
         super(coordType);
     }
 
+    get type() {
+        if (this.coords.length === 1) return 'Polygon';
+        return 'MultiPolygon';
+    }
+
     static fromPresetReader(reader: ShapeReader, header: GeomHeader) {
         const hasZ = reader.hasZ;
         const hasM = reader.hasM;

shpts/geometry/polyline.ts

@@ -4,13 +4,17 @@ import { BaseRingedRecord } from './base';
 import { GeoJsonCoord, GeoJsonLineString, GeoJsonMultiLineString } from '@shpts/types/geojson';
 import { GeomUtil } from '@shpts/utils/geometry';
 import { GeomHeader } from '@shpts/types/data';
-import { MemoryStream } from '@shpts/utils/stream';
 
 export class PolyLineRecord extends BaseRingedRecord {
     constructor(public coords: PolyLineCoord, coordType: CoordType) {
         super(coordType);
     }
 
+    get type() {
+        if (this.coords.length === 1) return 'LineString';
+        return 'MultiLineString';
+    }
+
     static fromPresetReader(reader: ShapeReader, header: GeomHeader) {
         const hasZ = reader.hasZ;
         const hasM = reader.hasM;

test/multipatch.test.ts

@@ -10,6 +10,7 @@ test('Reading MultiPatchRecord with Z', async () => {
 
     expect(reader.recordCount).toEqual(1);
     let geom = expectGeometry(reader, 0, CoordType.XYZM, MultiPatchRecord);
+    expect(geom.type).toEqual('MultiPolygon');
     expect(geom.coords.length).toEqual(12);
     let polygon = geom.coords[0];
     expectRing(polygon[0], [
@@ -116,6 +117,7 @@ test('Reading MultiPatchRecord with Outer/Inner Rings', async () => {
     expect(reader.recordCount).toEqual(1);
 
     let geom = expectGeometry(reader, 0, CoordType.XYZM, MultiPatchRecord);
+    expect(geom.type).toEqual('Polygon');
     expect(geom.coords.length).toBe(1);
     let polygon = geom.coords[0];
     expect(polygon.length).toBe(3);
@@ -150,6 +152,7 @@ test('Reading MultiPatchRecord with First Ring and Rings', async () => {
     expect(reader.recordCount).toEqual(1);
 
     let geom = expectGeometry(reader, 0, CoordType.XYZM, MultiPatchRecord);
+    expect(geom.type).toEqual('Polygon');
     expect(geom.coords.length).toBe(1);
     let polygon = geom.coords[0];
     expect(polygon.length).toBe(3);
@@ -184,6 +187,7 @@ test('Reading MultiPatchRecord with First Ring and Rings', async () => {
     expect(reader.recordCount).toEqual(1);
 
     let geom = expectGeometry(reader, 0, CoordType.XYZM, MultiPatchRecord);
+    expect(geom.type).toEqual('MultiPolygon');
     expect(geom.coords.length).toBe(3);
     let polygon = geom.coords[0];
     expect(polygon.length).toBe(1);