Merge pull request #140 from matthewdowns/release/v1.1.1

1.1.1

Author: matthewdowns

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "shapefile.js",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Easily read and parse Shapefiles from the browser.",
   "keywords": [
     "shapefiles",

package.json

@@ -79,9 +79,8 @@ describe('Shapefile', () => {
     })
 
     test('dbf', () => {
-      const dbf = USA_adm1.parse('dbf', { timezone: 'Europe/Oslo', properties: true })
+      const dbf = USA_adm1.parse('dbf', { properties: true })
       expect(dbf.header.version).toBe(DbaseVersion.Level5) // 3
-      console.log(dbf.header.lastUpdated)
       expect(dbf.header.lastUpdated.toISOString()).toBe('2015-08-11T00:00:00.000Z')
       expect(dbf.header.numberOfRecords).toBe(52)
       expect(dbf.header.numberOfBytesInHeader).toBe(321)

src/lib/Shapefile/Shapefile.test.ts

@@ -19,9 +19,9 @@ class Shapefile {
     this.contents = contents
   }
 
-  public parse(key: 'shp'): Shape;
-  public parse(key: 'shx'): ShapeIndex;
-  public parse(key: 'dbf', options: DbfOptions): Dbase<DbaseVersion, typeof options.properties>;
+  public parse(key: 'shp'): Shape
+  public parse(key: 'shx'): ShapeIndex
+  public parse(key: 'dbf', options: DbfOptions): Dbase<DbaseVersion, typeof options.properties>
   public parse(key: keyof ShapefileContents, ...args: any) {
     switch (key) {
       case 'shp':

src/lib/Shapefile/Shapefile.ts

@@ -9,7 +9,7 @@ export interface DbfOptions {
   properties: boolean
 }
 
-function dbf(arrayBuffer: ArrayBuffer, properties = true): Dbase<DbaseVersion, typeof properties> {
+function dbf(arrayBuffer: ArrayBuffer, options: DbfOptions): Dbase<DbaseVersion, typeof options.properties> {
   const array = new Uint8Array(arrayBuffer)
   const dv = new DataView(arrayBuffer)
 
@@ -43,15 +43,15 @@ function dbf(arrayBuffer: ArrayBuffer, properties = true): Dbase<DbaseVersion, t
       : 68,
       arrayBuffer.byteLength)),
     header,
-    properties)
+    options)
 
   return {
     header,
     fields
   }
 }
 
-function getFields(array: Uint8Array, header: DbaseHeader<DbaseVersion>, properties: boolean): Array<DbaseField<typeof header.version, typeof properties>> {
+function getFields(array: Uint8Array, header: DbaseHeader<DbaseVersion>, options: DbfOptions): Array<DbaseField<typeof header.version, typeof options.properties>> {
   let size: number
   switch (header.version) {
     case DbaseVersion.Level5:
@@ -62,20 +62,20 @@ function getFields(array: Uint8Array, header: DbaseHeader<DbaseVersion>, propert
       break
   }
 
-  const fields: Array<DbaseField<typeof header.version, typeof properties>> = []
+  const fields: Array<DbaseField<typeof header.version, typeof options.properties>> = []
   let bp = 0
   let terminated = false
   do {
     const terminator = array[bp]
     if (terminator === 0x0D) terminated = true
     else {
-      fields.push(getField(array.slice(bp, bp + size), header.version, properties))
+      fields.push(getField(array.slice(bp, bp + size), header.version, options.properties))
       bp += size
     }
   } while (!terminated)
   bp += 1
 
-  if (properties === true) {
+  if (options.properties === true) {
     do {
       for (let i = 0; i < fields.length; i++) {
         const valueRaw = Buffer.from(array.slice(bp, bp + fields[i].length)).toString('utf-8').trim()