Fix test again

matthewdowns · Jan 2, 2023 · 835bda7 · 835bda7
1 parent 4776893
commit 835bda7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/lib/Shapefile/Shapefile.test.ts b/src/lib/Shapefile/Shapefile.test.ts
@@ -81,7 +81,6 @@ describe('Shapefile', () => {
     test('dbf', () => {
       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)

diff --git a/src/lib/Shapefile/Shapefile.ts b/src/lib/Shapefile/Shapefile.ts
@@ -29,7 +29,7 @@ class Shapefile {
       case 'shx':
         return parsers.shx(this.contents.shx.buffer)
       case 'dbf':
-        return parsers.dbf(this.contents.dbf.buffer, ...args)
+        return parsers.dbf(this.contents.dbf.buffer, args[0])
     }
 
     return undefined

diff --git a/src/lib/Shapefile/parsers/dbf.ts b/src/lib/Shapefile/parsers/dbf.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()