diff --git a/CHANGES.md b/CHANGES.md
index 23a607a..9b4e37b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,7 @@
+# v0.0.3
+- Add support for MultiLinestring
+- Rejigging bundling
+
 # v0.0.2
 - Fix up handling of 0 values in attributes
 
diff --git a/README.md b/README.md
index 90927d3..16089f8 100644
--- a/README.md
+++ b/README.md
@@ -38,12 +38,12 @@ This was cobbled together fairly quickly based on the [minimal documentation](ht
   - Inc MultiPolygon
   - Inc Polygon with holes
 - LineString
+  - Inc MultiLineString
 - Point
 - Attributes
 
 ### To Do
 - MultiPoint (a sample service would be helpful)
-- MultiLineString (a sample service would be helpful)
 - Write proper tests
 
 
diff --git a/package.json b/package.json
index d01879e..0981cbc 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,17 @@
 {
   "name": "arcgis-pbf-parser",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "A library for parsing the arcgis pbf format into geojson",
-  "main": "dist/arcgis-pbf.js",
-  "module": "dist/arcgis-pbf.esm.js",
+  "main": "dist/arcgis-pbf.cjs",
+  "module": "dist/arcgis-pbf.mjs",
   "browser": "dist/arcgis-pbf.min.js",
+  "type": "module",
+  "exports": {
+    ".": {
+      "require": "./dist/arcgis-pbf.cjs",
+      "import": "./dist/arcgis-pbf.mjs"
+    }
+  },
   "files": [
     "dist"
   ],
diff --git a/rollup.config.js b/rollup.config.js
index e7fbd36..ff64655 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -9,22 +9,19 @@ const output = (input, file, format, plugins) => ({
     file,
     format
   },
-  external: ['pbf'],
   plugins
 })
 
 export default [
-  output('./src/main.js', './dist/arcgis-pbf.js', 'umd', [
-    commonjs(),
-    resolve()
+  output('./src/main.js', './dist/arcgis-pbf.cjs', 'cjs', [
+    commonjs()
   ]),
   output('./src/main.js', './dist/arcgis-pbf.min.js', 'umd', [
     commonjs(),
     resolve(),
     terser()
   ]),
-  output('./src/main.js', './dist/arcgis-pbf.esm.js', 'esm', [
-    commonjs(),
-    resolve()
+  output('./src/main.js', './dist/arcgis-pbf.mjs', 'esm', [
+    commonjs()
   ])
 ]
diff --git a/src/main.js b/src/main.js
index ba632e8..7f011b4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,4 +1,4 @@
-import {FeatureCollectionPBuffer as EsriPbfBuffer} from './parser/PbfFeatureCollection'
+import {FeatureCollectionPBuffer as EsriPbfBuffer} from './parser/PbfFeatureCollection.js'
 import Pbf from 'pbf'
 
 export default function decode(featureCollectionBuffer) {
@@ -72,11 +72,28 @@ function createPoint (f, transform) {
 }
 
 function createLine (f, transform) {
-  const p = {
-    type: 'LineString',
-    coordinates: createLinearRing(f.geometry.coords, transform, 0, f.geometry.lengths[0] * 2)
+  let l = null
+  const lengths = f.geometry.lengths.length
+
+  if (lengths === 1) {
+    l = {
+      type: 'LineString',
+      coordinates: createLinearRing(f.geometry.coords, transform, 0, f.geometry.lengths[0] * 2)
+    }
+  } else if (lengths > 1) {
+    l = {
+      type: 'MultiLineString',
+      coordinates: []
+    }
+    let startPoint = 0
+    for (let index = 0; index < lengths; index++) {
+      const stopPoint = startPoint + (f.geometry.lengths[index] * 2)
+      const line = createLinearRing(f.geometry.coords, transform, startPoint, stopPoint)
+      l.coordinates.push(line)
+      startPoint = stopPoint
+    }
   }
-  return p
+  return l
 }
 
 function createPolygon (f, transform) {
diff --git a/src/parser/EsriFeatureCollection.js b/src/parser/EsriFeatureCollection.js
index 016dd89..600d609 100644
--- a/src/parser/EsriFeatureCollection.js
+++ b/src/parser/EsriFeatureCollection.js
@@ -1,10 +1,10 @@
 
 /**
- * This file `FeatureCollection.js` file is a slightly slimmed down version of 
+ * This file `FeatureCollection.js` file is a slightly slimmed down version of
  * https://github.com/Esri/arcgis-pbf/blob/main/proto/FeatureCollection/parsers/js/FeatureCollection.js
  * It's currently unused but kept for completeness sake because it's a bit bigger and uses
  * the protocol-buffer dependency.
- * 
+ *
  * Copyright 2021 Esri
  *
  * Licensed under the Apache License Version 2.0 (the "License");
@@ -21,26 +21,26 @@
  */
 
 /*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
-import * as $protobuf from "protobufjs/minimal";
+import * as $protobuf from 'protobufjs/minimal';
 
 // Common aliases
 const $Reader = $protobuf.Reader, $util = $protobuf.util;
 
 // Exported root namespace
-const $root = $protobuf.roots["default"] || ($protobuf.roots["default"] = {});
+const $root = $protobuf.roots['default'] || ($protobuf.roots['default'] = {});
 
 export const esriPBuffer = $root.esriPBuffer = (() => {
 
-    /**
+  /**
      * Namespace esriPBuffer.
      * @exports esriPBuffer
      * @namespace
      */
-    const esriPBuffer = {};
+  const esriPBuffer = {};
 
-    esriPBuffer.FeatureCollectionPBuffer = (function() {
+  esriPBuffer.FeatureCollectionPBuffer = (function() {
 
-        /**
+    /**
          * Properties of a FeatureCollectionPBuffer.
          * @memberof esriPBuffer
          * @interface IFeatureCollectionPBuffer
@@ -48,7 +48,7 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
          * @property {esriPBuffer.FeatureCollectionPBuffer.QueryResult|null} [queryResult] FeatureCollectionPBuffer queryResult
          */
 
-        /**
+    /**
          * Constructs a new FeatureCollectionPBuffer.
          * @memberof esriPBuffer
          * @classdesc Represents a FeatureCollectionPBuffer.
@@ -56,30 +56,30 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
          * @constructor
          * @param {esriPBuffer.IFeatureCollectionPBuffer=} [properties] Properties to set
          */
-        function FeatureCollectionPBuffer(properties) {
-            if (properties)
-                for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                    if (properties[keys[i]] != null)
-                        this[keys[i]] = properties[keys[i]];
-        }
+    function FeatureCollectionPBuffer(properties) {
+      if (properties)
+        for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+          if (properties[keys[i]] != null)
+            this[keys[i]] = properties[keys[i]];
+    }
 
-        /**
+    /**
          * FeatureCollectionPBuffer version.
          * @member {string} version
          * @memberof esriPBuffer.FeatureCollectionPBuffer
          * @instance
          */
-        FeatureCollectionPBuffer.prototype.version = "";
+    FeatureCollectionPBuffer.prototype.version = '';
 
-        /**
+    /**
          * FeatureCollectionPBuffer queryResult.
          * @member {esriPBuffer.FeatureCollectionPBuffer.QueryResult|null|undefined} queryResult
          * @memberof esriPBuffer.FeatureCollectionPBuffer
          * @instance
          */
-        FeatureCollectionPBuffer.prototype.queryResult = null;
+    FeatureCollectionPBuffer.prototype.queryResult = null;
 
-        /**
+    /**
          * Decodes a FeatureCollectionPBuffer message from the specified reader or buffer.
          * @function decode
          * @memberof esriPBuffer.FeatureCollectionPBuffer
@@ -90,28 +90,28 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
          * @throws {Error} If the payload is not a reader or valid buffer
          * @throws {$protobuf.util.ProtocolError} If required fields are missing
          */
-        FeatureCollectionPBuffer.decode = function decode(reader, length) {
-            if (!(reader instanceof $Reader))
-                reader = $Reader.create(reader);
-            let end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer();
-            while (reader.pos < end) {
-                let tag = reader.uint32();
-                switch (tag >>> 3) {
-                case 1:
-                    message.version = reader.string();
-                    break;
-                case 2:
-                    message.queryResult = $root.esriPBuffer.FeatureCollectionPBuffer.QueryResult.decode(reader, reader.uint32());
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
-                }
-            }
-            return message;
-        };
-
-        /**
+    FeatureCollectionPBuffer.decode = function decode(reader, length) {
+      if (!(reader instanceof $Reader))
+        reader = $Reader.create(reader);
+      const end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer();
+      while (reader.pos < end) {
+        const tag = reader.uint32();
+        switch (tag >>> 3) {
+        case 1:
+          message.version = reader.string();
+          break;
+        case 2:
+          message.queryResult = $root.esriPBuffer.FeatureCollectionPBuffer.QueryResult.decode(reader, reader.uint32());
+          break;
+        default:
+          reader.skipType(tag & 7);
+          break;
+        }
+      }
+      return message;
+    };
+
+    /**
          * GeometryType enum.
          * @name esriPBuffer.FeatureCollectionPBuffer.GeometryType
          * @enum {number}
@@ -122,18 +122,18 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
          * @property {number} esriGeometryTypeMultipatch=4 esriGeometryTypeMultipatch value
          * @property {number} esriGeometryTypeNone=127 esriGeometryTypeNone value
          */
-        FeatureCollectionPBuffer.GeometryType = (function() {
-            const valuesById = {}, values = Object.create(valuesById);
-            values[valuesById[0] = "esriGeometryTypePoint"] = 0;
-            values[valuesById[1] = "esriGeometryTypeMultipoint"] = 1;
-            values[valuesById[2] = "esriGeometryTypePolyline"] = 2;
-            values[valuesById[3] = "esriGeometryTypePolygon"] = 3;
-            values[valuesById[4] = "esriGeometryTypeMultipatch"] = 4;
-            values[valuesById[127] = "esriGeometryTypeNone"] = 127;
-            return values;
-        })();
-
-        /**
+    FeatureCollectionPBuffer.GeometryType = (function() {
+      const valuesById = {}, values = Object.create(valuesById);
+      values[valuesById[0] = 'esriGeometryTypePoint'] = 0;
+      values[valuesById[1] = 'esriGeometryTypeMultipoint'] = 1;
+      values[valuesById[2] = 'esriGeometryTypePolyline'] = 2;
+      values[valuesById[3] = 'esriGeometryTypePolygon'] = 3;
+      values[valuesById[4] = 'esriGeometryTypeMultipatch'] = 4;
+      values[valuesById[127] = 'esriGeometryTypeNone'] = 127;
+      return values;
+    })();
+
+    /**
          * FieldType enum.
          * @name esriPBuffer.FeatureCollectionPBuffer.FieldType
          * @enum {number}
@@ -151,41 +151,41 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
          * @property {number} esriFieldTypeGlobalID=11 esriFieldTypeGlobalID value
          * @property {number} esriFieldTypeXML=12 esriFieldTypeXML value
          */
-        FeatureCollectionPBuffer.FieldType = (function() {
-            const valuesById = {}, values = Object.create(valuesById);
-            values[valuesById[0] = "esriFieldTypeSmallInteger"] = 0;
-            values[valuesById[1] = "esriFieldTypeInteger"] = 1;
-            values[valuesById[2] = "esriFieldTypeSingle"] = 2;
-            values[valuesById[3] = "esriFieldTypeDouble"] = 3;
-            values[valuesById[4] = "esriFieldTypeString"] = 4;
-            values[valuesById[5] = "esriFieldTypeDate"] = 5;
-            values[valuesById[6] = "esriFieldTypeOID"] = 6;
-            values[valuesById[7] = "esriFieldTypeGeometry"] = 7;
-            values[valuesById[8] = "esriFieldTypeBlob"] = 8;
-            values[valuesById[9] = "esriFieldTypeRaster"] = 9;
-            values[valuesById[10] = "esriFieldTypeGUID"] = 10;
-            values[valuesById[11] = "esriFieldTypeGlobalID"] = 11;
-            values[valuesById[12] = "esriFieldTypeXML"] = 12;
-            return values;
-        })();
-
-        /**
+    FeatureCollectionPBuffer.FieldType = (function() {
+      const valuesById = {}, values = Object.create(valuesById);
+      values[valuesById[0] = 'esriFieldTypeSmallInteger'] = 0;
+      values[valuesById[1] = 'esriFieldTypeInteger'] = 1;
+      values[valuesById[2] = 'esriFieldTypeSingle'] = 2;
+      values[valuesById[3] = 'esriFieldTypeDouble'] = 3;
+      values[valuesById[4] = 'esriFieldTypeString'] = 4;
+      values[valuesById[5] = 'esriFieldTypeDate'] = 5;
+      values[valuesById[6] = 'esriFieldTypeOID'] = 6;
+      values[valuesById[7] = 'esriFieldTypeGeometry'] = 7;
+      values[valuesById[8] = 'esriFieldTypeBlob'] = 8;
+      values[valuesById[9] = 'esriFieldTypeRaster'] = 9;
+      values[valuesById[10] = 'esriFieldTypeGUID'] = 10;
+      values[valuesById[11] = 'esriFieldTypeGlobalID'] = 11;
+      values[valuesById[12] = 'esriFieldTypeXML'] = 12;
+      return values;
+    })();
+
+    /**
          * QuantizeOriginPostion enum.
          * @name esriPBuffer.FeatureCollectionPBuffer.QuantizeOriginPostion
          * @enum {number}
          * @property {number} upperLeft=0 upperLeft value
          * @property {number} lowerLeft=1 lowerLeft value
          */
-        FeatureCollectionPBuffer.QuantizeOriginPostion = (function() {
-            const valuesById = {}, values = Object.create(valuesById);
-            values[valuesById[0] = "upperLeft"] = 0;
-            values[valuesById[1] = "lowerLeft"] = 1;
-            return values;
-        })();
+    FeatureCollectionPBuffer.QuantizeOriginPostion = (function() {
+      const valuesById = {}, values = Object.create(valuesById);
+      values[valuesById[0] = 'upperLeft'] = 0;
+      values[valuesById[1] = 'lowerLeft'] = 1;
+      return values;
+    })();
 
-        FeatureCollectionPBuffer.SpatialReference = (function() {
+    FeatureCollectionPBuffer.SpatialReference = (function() {
 
-            /**
+      /**
              * Properties of a SpatialReference.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @interface ISpatialReference
@@ -196,7 +196,7 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @property {string|null} [wkt] SpatialReference wkt
              */
 
-            /**
+      /**
              * Constructs a new SpatialReference.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @classdesc Represents a SpatialReference.
@@ -204,54 +204,54 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @constructor
              * @param {esriPBuffer.FeatureCollectionPBuffer.ISpatialReference=} [properties] Properties to set
              */
-            function SpatialReference(properties) {
-                if (properties)
-                    for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                        if (properties[keys[i]] != null)
-                            this[keys[i]] = properties[keys[i]];
-            }
+      function SpatialReference(properties) {
+        if (properties)
+          for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+            if (properties[keys[i]] != null)
+              this[keys[i]] = properties[keys[i]];
+      }
 
-            /**
+      /**
              * SpatialReference wkid.
              * @member {number} wkid
              * @memberof esriPBuffer.FeatureCollectionPBuffer.SpatialReference
              * @instance
              */
-            SpatialReference.prototype.wkid = 0;
+      SpatialReference.prototype.wkid = 0;
 
-            /**
+      /**
              * SpatialReference lastestWkid.
              * @member {number} lastestWkid
              * @memberof esriPBuffer.FeatureCollectionPBuffer.SpatialReference
              * @instance
              */
-            SpatialReference.prototype.lastestWkid = 0;
+      SpatialReference.prototype.lastestWkid = 0;
 
-            /**
+      /**
              * SpatialReference vcsWkid.
              * @member {number} vcsWkid
              * @memberof esriPBuffer.FeatureCollectionPBuffer.SpatialReference
              * @instance
              */
-            SpatialReference.prototype.vcsWkid = 0;
+      SpatialReference.prototype.vcsWkid = 0;
 
-            /**
+      /**
              * SpatialReference latestVcsWkid.
              * @member {number} latestVcsWkid
              * @memberof esriPBuffer.FeatureCollectionPBuffer.SpatialReference
              * @instance
              */
-            SpatialReference.prototype.latestVcsWkid = 0;
+      SpatialReference.prototype.latestVcsWkid = 0;
 
-            /**
+      /**
              * SpatialReference wkt.
              * @member {string} wkt
              * @memberof esriPBuffer.FeatureCollectionPBuffer.SpatialReference
              * @instance
              */
-            SpatialReference.prototype.wkt = "";
+      SpatialReference.prototype.wkt = '';
 
-            /**
+      /**
              * Decodes a SpatialReference message from the specified reader or buffer.
              * @function decode
              * @memberof esriPBuffer.FeatureCollectionPBuffer.SpatialReference
@@ -262,42 +262,42 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @throws {Error} If the payload is not a reader or valid buffer
              * @throws {$protobuf.util.ProtocolError} If required fields are missing
              */
-            SpatialReference.decode = function decode(reader, length) {
-                if (!(reader instanceof $Reader))
-                    reader = $Reader.create(reader);
-                let end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.SpatialReference();
-                while (reader.pos < end) {
-                    let tag = reader.uint32();
-                    switch (tag >>> 3) {
-                    case 1:
-                        message.wkid = reader.uint32();
-                        break;
-                    case 2:
-                        message.lastestWkid = reader.uint32();
-                        break;
-                    case 3:
-                        message.vcsWkid = reader.uint32();
-                        break;
-                    case 4:
-                        message.latestVcsWkid = reader.uint32();
-                        break;
-                    case 5:
-                        message.wkt = reader.string();
-                        break;
-                    default:
-                        reader.skipType(tag & 7);
-                        break;
-                    }
-                }
-                return message;
-            };
-
-            return SpatialReference;
-        })();
-
-        FeatureCollectionPBuffer.Field = (function() {
-
-            /**
+      SpatialReference.decode = function decode(reader, length) {
+        if (!(reader instanceof $Reader))
+          reader = $Reader.create(reader);
+        const end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.SpatialReference();
+        while (reader.pos < end) {
+          const tag = reader.uint32();
+          switch (tag >>> 3) {
+          case 1:
+            message.wkid = reader.uint32();
+            break;
+          case 2:
+            message.lastestWkid = reader.uint32();
+            break;
+          case 3:
+            message.vcsWkid = reader.uint32();
+            break;
+          case 4:
+            message.latestVcsWkid = reader.uint32();
+            break;
+          case 5:
+            message.wkt = reader.string();
+            break;
+          default:
+            reader.skipType(tag & 7);
+            break;
+          }
+        }
+        return message;
+      };
+
+      return SpatialReference;
+    })();
+
+    FeatureCollectionPBuffer.Field = (function() {
+
+      /**
              * Properties of a Field.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @interface IField
@@ -309,7 +309,7 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @property {string|null} [defaultValue] Field defaultValue
              */
 
-            /**
+      /**
              * Constructs a new Field.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @classdesc Represents a Field.
@@ -317,62 +317,62 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @constructor
              * @param {esriPBuffer.FeatureCollectionPBuffer.IField=} [properties] Properties to set
              */
-            function Field(properties) {
-                if (properties)
-                    for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                        if (properties[keys[i]] != null)
-                            this[keys[i]] = properties[keys[i]];
-            }
+      function Field(properties) {
+        if (properties)
+          for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+            if (properties[keys[i]] != null)
+              this[keys[i]] = properties[keys[i]];
+      }
 
-            /**
+      /**
              * Field name.
              * @member {string} name
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Field
              * @instance
              */
-            Field.prototype.name = "";
+      Field.prototype.name = '';
 
-            /**
+      /**
              * Field fieldType.
              * @member {esriPBuffer.FeatureCollectionPBuffer.FieldType} fieldType
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Field
              * @instance
              */
-            Field.prototype.fieldType = 0;
+      Field.prototype.fieldType = 0;
 
-            /**
+      /**
              * Field alias.
              * @member {string} alias
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Field
              * @instance
              */
-            Field.prototype.alias = "";
+      Field.prototype.alias = '';
 
-            /**
+      /**
              * Field sqlType.
              * @member {esriPBuffer.FeatureCollectionPBuffer.SQLType} sqlType
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Field
              * @instance
              */
-            Field.prototype.sqlType = 0;
+      Field.prototype.sqlType = 0;
 
-            /**
+      /**
              * Field domain.
              * @member {string} domain
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Field
              * @instance
              */
-            Field.prototype.domain = "";
+      Field.prototype.domain = '';
 
-            /**
+      /**
              * Field defaultValue.
              * @member {string} defaultValue
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Field
              * @instance
              */
-            Field.prototype.defaultValue = "";
+      Field.prototype.defaultValue = '';
 
-            /**
+      /**
              * Decodes a Field message from the specified reader or buffer.
              * @function decode
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Field
@@ -383,45 +383,45 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @throws {Error} If the payload is not a reader or valid buffer
              * @throws {$protobuf.util.ProtocolError} If required fields are missing
              */
-             Field.decode = function decode(reader, length) {
-                if (!(reader instanceof $Reader))
-                    reader = $Reader.create(reader);
-                let end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.Field();
-                while (reader.pos < end) {
-                    let tag = reader.uint32();
-                    switch (tag >>> 3) {
-                    case 1:
-                        message.name = reader.string();
-                        break;
-                    case 2:
-                        message.fieldType = reader.int32();
-                        break;
-                    case 3:
-                        message.alias = reader.string();
-                        break;
-                    case 4:
-                        message.sqlType = reader.int32();
-                        break;
-                    case 5:
-                        message.domain = reader.string();
-                        break;
-                    case 6:
-                        message.defaultValue = reader.string();
-                        break;
-                    default:
-                        reader.skipType(tag & 7);
-                        break;
-                    }
-                }
-                return message;
-            };
-
-            return Field;
-        })();
-
-        FeatureCollectionPBuffer.Value = (function() {
-
-            /**
+      Field.decode = function decode(reader, length) {
+        if (!(reader instanceof $Reader))
+          reader = $Reader.create(reader);
+        const end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.Field();
+        while (reader.pos < end) {
+          const tag = reader.uint32();
+          switch (tag >>> 3) {
+          case 1:
+            message.name = reader.string();
+            break;
+          case 2:
+            message.fieldType = reader.int32();
+            break;
+          case 3:
+            message.alias = reader.string();
+            break;
+          case 4:
+            message.sqlType = reader.int32();
+            break;
+          case 5:
+            message.domain = reader.string();
+            break;
+          case 6:
+            message.defaultValue = reader.string();
+            break;
+          default:
+            reader.skipType(tag & 7);
+            break;
+          }
+        }
+        return message;
+      };
+
+      return Field;
+    })();
+
+    FeatureCollectionPBuffer.Value = (function() {
+
+      /**
              * Properties of a Value.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @interface IValue
@@ -436,7 +436,7 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @property {boolean|null} [boolValue] Value boolValue
              */
 
-            /**
+      /**
              * Constructs a new Value.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @classdesc Represents a Value.
@@ -444,100 +444,100 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @constructor
              * @param {esriPBuffer.FeatureCollectionPBuffer.IValue=} [properties] Properties to set
              */
-            function Value(properties) {
-                if (properties)
-                    for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                        if (properties[keys[i]] != null)
-                            this[keys[i]] = properties[keys[i]];
-            }
+      function Value(properties) {
+        if (properties)
+          for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+            if (properties[keys[i]] != null)
+              this[keys[i]] = properties[keys[i]];
+      }
 
-            /**
+      /**
              * Value stringValue.
              * @member {string|null|undefined} stringValue
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Value
              * @instance
              */
-            Value.prototype.stringValue = null;
+      Value.prototype.stringValue = null;
 
-            /**
+      /**
              * Value floatValue.
              * @member {number|null|undefined} floatValue
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Value
              * @instance
              */
-            Value.prototype.floatValue = null;
+      Value.prototype.floatValue = null;
 
-            /**
+      /**
              * Value doubleValue.
              * @member {number|null|undefined} doubleValue
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Value
              * @instance
              */
-            Value.prototype.doubleValue = null;
+      Value.prototype.doubleValue = null;
 
-            /**
+      /**
              * Value sintValue.
              * @member {number|null|undefined} sintValue
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Value
              * @instance
              */
-            Value.prototype.sintValue = null;
+      Value.prototype.sintValue = null;
 
-            /**
+      /**
              * Value uintValue.
              * @member {number|null|undefined} uintValue
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Value
              * @instance
              */
-            Value.prototype.uintValue = null;
+      Value.prototype.uintValue = null;
 
-            /**
+      /**
              * Value int64Value.
              * @member {number|Long|null|undefined} int64Value
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Value
              * @instance
              */
-            Value.prototype.int64Value = null;
+      Value.prototype.int64Value = null;
 
-            /**
+      /**
              * Value uint64Value.
              * @member {number|Long|null|undefined} uint64Value
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Value
              * @instance
              */
-            Value.prototype.uint64Value = null;
+      Value.prototype.uint64Value = null;
 
-            /**
+      /**
              * Value sint64Value.
              * @member {number|Long|null|undefined} sint64Value
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Value
              * @instance
              */
-            Value.prototype.sint64Value = null;
+      Value.prototype.sint64Value = null;
 
-            /**
+      /**
              * Value boolValue.
              * @member {boolean|null|undefined} boolValue
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Value
              * @instance
              */
-            Value.prototype.boolValue = null;
+      Value.prototype.boolValue = null;
 
-            // OneOf field names bound to virtual getters and setters
-            let $oneOfFields;
+      // OneOf field names bound to virtual getters and setters
+      let $oneOfFields;
 
-            /**
+      /**
              * Value valueType.
              * @member {"stringValue"|"floatValue"|"doubleValue"|"sintValue"|"uintValue"|"int64Value"|"uint64Value"|"sint64Value"|"boolValue"|undefined} valueType
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Value
              * @instance
              */
-            Object.defineProperty(Value.prototype, "valueType", {
-                get: $util.oneOfGetter($oneOfFields = ["stringValue", "floatValue", "doubleValue", "sintValue", "uintValue", "int64Value", "uint64Value", "sint64Value", "boolValue"]),
-                set: $util.oneOfSetter($oneOfFields)
-            });
+      Object.defineProperty(Value.prototype, 'valueType', {
+        get: $util.oneOfGetter($oneOfFields = ['stringValue', 'floatValue', 'doubleValue', 'sintValue', 'uintValue', 'int64Value', 'uint64Value', 'sint64Value', 'boolValue']),
+        set: $util.oneOfSetter($oneOfFields)
+      });
 
-            /**
+      /**
              * Decodes a Value message from the specified reader or buffer.
              * @function decode
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Value
@@ -548,54 +548,54 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @throws {Error} If the payload is not a reader or valid buffer
              * @throws {$protobuf.util.ProtocolError} If required fields are missing
              */
-            Value.decode = function decode(reader, length) {
-                if (!(reader instanceof $Reader))
-                    reader = $Reader.create(reader);
-                let end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.Value();
-                while (reader.pos < end) {
-                    let tag = reader.uint32();
-                    switch (tag >>> 3) {
-                    case 1:
-                        message.stringValue = reader.string();
-                        break;
-                    case 2:
-                        message.floatValue = reader.float();
-                        break;
-                    case 3:
-                        message.doubleValue = reader.double();
-                        break;
-                    case 4:
-                        message.sintValue = reader.sint32();
-                        break;
-                    case 5:
-                        message.uintValue = reader.uint32();
-                        break;
-                    case 6:
-                        message.int64Value = reader.int64();
-                        break;
-                    case 7:
-                        message.uint64Value = reader.uint64();
-                        break;
-                    case 8:
-                        message.sint64Value = reader.sint64();
-                        break;
-                    case 9:
-                        message.boolValue = reader.bool();
-                        break;
-                    default:
-                        reader.skipType(tag & 7);
-                        break;
-                    }
-                }
-                return message;
-            };
-
-            return Value;
-        })();
-
-        FeatureCollectionPBuffer.Geometry = (function() {
-
-            /**
+      Value.decode = function decode(reader, length) {
+        if (!(reader instanceof $Reader))
+          reader = $Reader.create(reader);
+        const end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.Value();
+        while (reader.pos < end) {
+          const tag = reader.uint32();
+          switch (tag >>> 3) {
+          case 1:
+            message.stringValue = reader.string();
+            break;
+          case 2:
+            message.floatValue = reader.float();
+            break;
+          case 3:
+            message.doubleValue = reader.double();
+            break;
+          case 4:
+            message.sintValue = reader.sint32();
+            break;
+          case 5:
+            message.uintValue = reader.uint32();
+            break;
+          case 6:
+            message.int64Value = reader.int64();
+            break;
+          case 7:
+            message.uint64Value = reader.uint64();
+            break;
+          case 8:
+            message.sint64Value = reader.sint64();
+            break;
+          case 9:
+            message.boolValue = reader.bool();
+            break;
+          default:
+            reader.skipType(tag & 7);
+            break;
+          }
+        }
+        return message;
+      };
+
+      return Value;
+    })();
+
+    FeatureCollectionPBuffer.Geometry = (function() {
+
+      /**
              * Properties of a Geometry.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @interface IGeometry
@@ -603,7 +603,7 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @property {Array.<number|Long>|null} [coords] Geometry coords
              */
 
-            /**
+      /**
              * Constructs a new Geometry.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @classdesc Represents a Geometry.
@@ -611,32 +611,32 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @constructor
              * @param {esriPBuffer.FeatureCollectionPBuffer.IGeometry=} [properties] Properties to set
              */
-            function Geometry(properties) {
-                this.lengths = [];
-                this.coords = [];
-                if (properties)
-                    for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                        if (properties[keys[i]] != null)
-                            this[keys[i]] = properties[keys[i]];
-            }
+      function Geometry(properties) {
+        this.lengths = [];
+        this.coords = [];
+        if (properties)
+          for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+            if (properties[keys[i]] != null)
+              this[keys[i]] = properties[keys[i]];
+      }
 
-            /**
+      /**
              * Geometry lengths.
              * @member {Array.<number>} lengths
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Geometry
              * @instance
              */
-            Geometry.prototype.lengths = $util.emptyArray;
+      Geometry.prototype.lengths = $util.emptyArray;
 
-            /**
+      /**
              * Geometry coords.
              * @member {Array.<number|Long>} coords
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Geometry
              * @instance
              */
-            Geometry.prototype.coords = $util.emptyArray;
+      Geometry.prototype.coords = $util.emptyArray;
 
-            /**
+      /**
              * Decodes a Geometry message from the specified reader or buffer.
              * @function decode
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Geometry
@@ -647,54 +647,54 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @throws {Error} If the payload is not a reader or valid buffer
              * @throws {$protobuf.util.ProtocolError} If required fields are missing
              */
-            Geometry.decode = function decode(reader, length) {
-                if (!(reader instanceof $Reader))
-                    reader = $Reader.create(reader);
-                let end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.Geometry();
-                while (reader.pos < end) {
-                    let tag = reader.uint32();
-                    switch (tag >>> 3) {
-                    case 2:
-                        if (!(message.lengths && message.lengths.length))
-                            message.lengths = [];
-                        if ((tag & 7) === 2) {
-                            let end2 = reader.uint32() + reader.pos;
-                            while (reader.pos < end2)
-                                message.lengths.push(reader.uint32());
-                        } else
-                            message.lengths.push(reader.uint32());
-                        break;
-                    case 3:
-                        if (!(message.coords && message.coords.length))
-                            message.coords = [];
-                        if ((tag & 7) === 2) {
-                            let end2 = reader.uint32() + reader.pos;
-                            while (reader.pos < end2)
-                                message.coords.push(reader.sint64());
-                        } else
-                            message.coords.push(reader.sint64());
-                        break;
-                    default:
-                        reader.skipType(tag & 7);
-                        break;
-                    }
-                }
-                return message;
-            };
-
-            return Geometry;
-        })();
-
-        FeatureCollectionPBuffer.esriShapeBuffer = (function() {
-
-            /**
+      Geometry.decode = function decode(reader, length) {
+        if (!(reader instanceof $Reader))
+          reader = $Reader.create(reader);
+        const end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.Geometry();
+        while (reader.pos < end) {
+          const tag = reader.uint32();
+          switch (tag >>> 3) {
+          case 2:
+            if (!(message.lengths && message.lengths.length))
+              message.lengths = [];
+            if ((tag & 7) === 2) {
+              const end2 = reader.uint32() + reader.pos;
+              while (reader.pos < end2)
+                message.lengths.push(reader.uint32());
+            } else
+              message.lengths.push(reader.uint32());
+            break;
+          case 3:
+            if (!(message.coords && message.coords.length))
+              message.coords = [];
+            if ((tag & 7) === 2) {
+              const end2 = reader.uint32() + reader.pos;
+              while (reader.pos < end2)
+                message.coords.push(reader.sint64());
+            } else
+              message.coords.push(reader.sint64());
+            break;
+          default:
+            reader.skipType(tag & 7);
+            break;
+          }
+        }
+        return message;
+      };
+
+      return Geometry;
+    })();
+
+    FeatureCollectionPBuffer.esriShapeBuffer = (function() {
+
+      /**
              * Properties of an esriShapeBuffer.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @interface IesriShapeBuffer
              * @property {Uint8Array|null} [bytes] esriShapeBuffer bytes
              */
 
-            /**
+      /**
              * Constructs a new esriShapeBuffer.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @classdesc Represents an esriShapeBuffer.
@@ -702,22 +702,22 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @constructor
              * @param {esriPBuffer.FeatureCollectionPBuffer.IesriShapeBuffer=} [properties] Properties to set
              */
-            function esriShapeBuffer(properties) {
-                if (properties)
-                    for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                        if (properties[keys[i]] != null)
-                            this[keys[i]] = properties[keys[i]];
-            }
+      function esriShapeBuffer(properties) {
+        if (properties)
+          for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+            if (properties[keys[i]] != null)
+              this[keys[i]] = properties[keys[i]];
+      }
 
-            /**
+      /**
              * esriShapeBuffer bytes.
              * @member {Uint8Array} bytes
              * @memberof esriPBuffer.FeatureCollectionPBuffer.esriShapeBuffer
              * @instance
              */
-            esriShapeBuffer.prototype.bytes = $util.newBuffer([]);
+      esriShapeBuffer.prototype.bytes = $util.newBuffer([]);
 
-            /**
+      /**
              * Decodes an esriShapeBuffer message from the specified reader or buffer.
              * @function decode
              * @memberof esriPBuffer.FeatureCollectionPBuffer.esriShapeBuffer
@@ -728,30 +728,30 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @throws {Error} If the payload is not a reader or valid buffer
              * @throws {$protobuf.util.ProtocolError} If required fields are missing
              */
-            esriShapeBuffer.decode = function decode(reader, length) {
-                if (!(reader instanceof $Reader))
-                    reader = $Reader.create(reader);
-                let end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.esriShapeBuffer();
-                while (reader.pos < end) {
-                    let tag = reader.uint32();
-                    switch (tag >>> 3) {
-                    case 1:
-                        message.bytes = reader.bytes();
-                        break;
-                    default:
-                        reader.skipType(tag & 7);
-                        break;
-                    }
-                }
-                return message;
-            };
-
-            return esriShapeBuffer;
-        })();
-
-        FeatureCollectionPBuffer.Feature = (function() {
-
-            /**
+      esriShapeBuffer.decode = function decode(reader, length) {
+        if (!(reader instanceof $Reader))
+          reader = $Reader.create(reader);
+        const end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.esriShapeBuffer();
+        while (reader.pos < end) {
+          const tag = reader.uint32();
+          switch (tag >>> 3) {
+          case 1:
+            message.bytes = reader.bytes();
+            break;
+          default:
+            reader.skipType(tag & 7);
+            break;
+          }
+        }
+        return message;
+      };
+
+      return esriShapeBuffer;
+    })();
+
+    FeatureCollectionPBuffer.Feature = (function() {
+
+      /**
              * Properties of a Feature.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @interface IFeature
@@ -761,7 +761,7 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @property {esriPBuffer.FeatureCollectionPBuffer.Geometry|null} [centroid] Feature centroid
              */
 
-            /**
+      /**
              * Constructs a new Feature.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @classdesc Represents a Feature.
@@ -769,61 +769,61 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @constructor
              * @param {esriPBuffer.FeatureCollectionPBuffer.IFeature=} [properties] Properties to set
              */
-            function Feature(properties) {
-                this.attributes = [];
-                if (properties)
-                    for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                        if (properties[keys[i]] != null)
-                            this[keys[i]] = properties[keys[i]];
-            }
+      function Feature(properties) {
+        this.attributes = [];
+        if (properties)
+          for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+            if (properties[keys[i]] != null)
+              this[keys[i]] = properties[keys[i]];
+      }
 
-            /**
+      /**
              * Feature attributes.
              * @member {Array.<esriPBuffer.FeatureCollectionPBuffer.Value>} attributes
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Feature
              * @instance
              */
-            Feature.prototype.attributes = $util.emptyArray;
+      Feature.prototype.attributes = $util.emptyArray;
 
-            /**
+      /**
              * Feature geometry.
              * @member {esriPBuffer.FeatureCollectionPBuffer.Geometry|null|undefined} geometry
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Feature
              * @instance
              */
-            Feature.prototype.geometry = null;
+      Feature.prototype.geometry = null;
 
-            /**
+      /**
              * Feature shapeBuffer.
              * @member {esriPBuffer.FeatureCollectionPBuffer.esriShapeBuffer|null|undefined} shapeBuffer
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Feature
              * @instance
              */
-            Feature.prototype.shapeBuffer = null;
+      Feature.prototype.shapeBuffer = null;
 
-            /**
+      /**
              * Feature centroid.
              * @member {esriPBuffer.FeatureCollectionPBuffer.Geometry|null|undefined} centroid
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Feature
              * @instance
              */
-            Feature.prototype.centroid = null;
+      Feature.prototype.centroid = null;
 
-            // OneOf field names bound to virtual getters and setters
-            let $oneOfFields;
+      // OneOf field names bound to virtual getters and setters
+      let $oneOfFields;
 
-            /**
+      /**
              * Feature compressedGeometry.
              * @member {"geometry"|"shapeBuffer"|undefined} compressedGeometry
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Feature
              * @instance
              */
-            Object.defineProperty(Feature.prototype, "compressedGeometry", {
-                get: $util.oneOfGetter($oneOfFields = ["geometry", "shapeBuffer"]),
-                set: $util.oneOfSetter($oneOfFields)
-            });
+      Object.defineProperty(Feature.prototype, 'compressedGeometry', {
+        get: $util.oneOfGetter($oneOfFields = ['geometry', 'shapeBuffer']),
+        set: $util.oneOfSetter($oneOfFields)
+      });
 
-            /**
+      /**
              * Decodes a Feature message from the specified reader or buffer.
              * @function decode
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Feature
@@ -834,41 +834,41 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @throws {Error} If the payload is not a reader or valid buffer
              * @throws {$protobuf.util.ProtocolError} If required fields are missing
              */
-            Feature.decode = function decode(reader, length) {
-                if (!(reader instanceof $Reader))
-                    reader = $Reader.create(reader);
-                let end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.Feature();
-                while (reader.pos < end) {
-                    let tag = reader.uint32();
-                    switch (tag >>> 3) {
-                    case 1:
-                        if (!(message.attributes && message.attributes.length))
-                            message.attributes = [];
-                        message.attributes.push($root.esriPBuffer.FeatureCollectionPBuffer.Value.decode(reader, reader.uint32()));
-                        break;
-                    case 2:
-                        message.geometry = $root.esriPBuffer.FeatureCollectionPBuffer.Geometry.decode(reader, reader.uint32());
-                        break;
-                    case 3:
-                        message.shapeBuffer = $root.esriPBuffer.FeatureCollectionPBuffer.esriShapeBuffer.decode(reader, reader.uint32());
-                        break;
-                    case 4:
-                        message.centroid = $root.esriPBuffer.FeatureCollectionPBuffer.Geometry.decode(reader, reader.uint32());
-                        break;
-                    default:
-                        reader.skipType(tag & 7);
-                        break;
-                    }
-                }
-                return message;
-            };
-
-            return Feature;
-        })();
-
-        FeatureCollectionPBuffer.UniqueIdField = (function() {
-
-            /**
+      Feature.decode = function decode(reader, length) {
+        if (!(reader instanceof $Reader))
+          reader = $Reader.create(reader);
+        const end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.Feature();
+        while (reader.pos < end) {
+          const tag = reader.uint32();
+          switch (tag >>> 3) {
+          case 1:
+            if (!(message.attributes && message.attributes.length))
+              message.attributes = [];
+            message.attributes.push($root.esriPBuffer.FeatureCollectionPBuffer.Value.decode(reader, reader.uint32()));
+            break;
+          case 2:
+            message.geometry = $root.esriPBuffer.FeatureCollectionPBuffer.Geometry.decode(reader, reader.uint32());
+            break;
+          case 3:
+            message.shapeBuffer = $root.esriPBuffer.FeatureCollectionPBuffer.esriShapeBuffer.decode(reader, reader.uint32());
+            break;
+          case 4:
+            message.centroid = $root.esriPBuffer.FeatureCollectionPBuffer.Geometry.decode(reader, reader.uint32());
+            break;
+          default:
+            reader.skipType(tag & 7);
+            break;
+          }
+        }
+        return message;
+      };
+
+      return Feature;
+    })();
+
+    FeatureCollectionPBuffer.UniqueIdField = (function() {
+
+      /**
              * Properties of an UniqueIdField.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @interface IUniqueIdField
@@ -876,7 +876,7 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @property {boolean|null} [isSystemMaintained] UniqueIdField isSystemMaintained
              */
 
-            /**
+      /**
              * Constructs a new UniqueIdField.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @classdesc Represents an UniqueIdField.
@@ -884,30 +884,30 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @constructor
              * @param {esriPBuffer.FeatureCollectionPBuffer.IUniqueIdField=} [properties] Properties to set
              */
-            function UniqueIdField(properties) {
-                if (properties)
-                    for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                        if (properties[keys[i]] != null)
-                            this[keys[i]] = properties[keys[i]];
-            }
+      function UniqueIdField(properties) {
+        if (properties)
+          for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+            if (properties[keys[i]] != null)
+              this[keys[i]] = properties[keys[i]];
+      }
 
-            /**
+      /**
              * UniqueIdField name.
              * @member {string} name
              * @memberof esriPBuffer.FeatureCollectionPBuffer.UniqueIdField
              * @instance
              */
-            UniqueIdField.prototype.name = "";
+      UniqueIdField.prototype.name = '';
 
-            /**
+      /**
              * UniqueIdField isSystemMaintained.
              * @member {boolean} isSystemMaintained
              * @memberof esriPBuffer.FeatureCollectionPBuffer.UniqueIdField
              * @instance
              */
-            UniqueIdField.prototype.isSystemMaintained = false;
+      UniqueIdField.prototype.isSystemMaintained = false;
 
-            /**
+      /**
              * Decodes an UniqueIdField message from the specified reader or buffer.
              * @function decode
              * @memberof esriPBuffer.FeatureCollectionPBuffer.UniqueIdField
@@ -918,33 +918,33 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @throws {Error} If the payload is not a reader or valid buffer
              * @throws {$protobuf.util.ProtocolError} If required fields are missing
              */
-            UniqueIdField.decode = function decode(reader, length) {
-                if (!(reader instanceof $Reader))
-                    reader = $Reader.create(reader);
-                let end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.UniqueIdField();
-                while (reader.pos < end) {
-                    let tag = reader.uint32();
-                    switch (tag >>> 3) {
-                    case 1:
-                        message.name = reader.string();
-                        break;
-                    case 2:
-                        message.isSystemMaintained = reader.bool();
-                        break;
-                    default:
-                        reader.skipType(tag & 7);
-                        break;
-                    }
-                }
-                return message;
-            };
-
-            return UniqueIdField;
-        })();
-
-        FeatureCollectionPBuffer.GeometryProperties = (function() {
-
-            /**
+      UniqueIdField.decode = function decode(reader, length) {
+        if (!(reader instanceof $Reader))
+          reader = $Reader.create(reader);
+        const end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.UniqueIdField();
+        while (reader.pos < end) {
+          const tag = reader.uint32();
+          switch (tag >>> 3) {
+          case 1:
+            message.name = reader.string();
+            break;
+          case 2:
+            message.isSystemMaintained = reader.bool();
+            break;
+          default:
+            reader.skipType(tag & 7);
+            break;
+          }
+        }
+        return message;
+      };
+
+      return UniqueIdField;
+    })();
+
+    FeatureCollectionPBuffer.GeometryProperties = (function() {
+
+      /**
              * Properties of a GeometryProperties.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @interface IGeometryProperties
@@ -953,7 +953,7 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @property {string|null} [units] GeometryProperties units
              */
 
-            /**
+      /**
              * Constructs a new GeometryProperties.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @classdesc Represents a GeometryProperties.
@@ -961,38 +961,38 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @constructor
              * @param {esriPBuffer.FeatureCollectionPBuffer.IGeometryProperties=} [properties] Properties to set
              */
-            function GeometryProperties(properties) {
-                if (properties)
-                    for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                        if (properties[keys[i]] != null)
-                            this[keys[i]] = properties[keys[i]];
-            }
+      function GeometryProperties(properties) {
+        if (properties)
+          for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+            if (properties[keys[i]] != null)
+              this[keys[i]] = properties[keys[i]];
+      }
 
-            /**
+      /**
              * GeometryProperties shapeAreaFieldName.
              * @member {string} shapeAreaFieldName
              * @memberof esriPBuffer.FeatureCollectionPBuffer.GeometryProperties
              * @instance
              */
-            GeometryProperties.prototype.shapeAreaFieldName = "";
+      GeometryProperties.prototype.shapeAreaFieldName = '';
 
-            /**
+      /**
              * GeometryProperties shapeLengthFieldName.
              * @member {string} shapeLengthFieldName
              * @memberof esriPBuffer.FeatureCollectionPBuffer.GeometryProperties
              * @instance
              */
-            GeometryProperties.prototype.shapeLengthFieldName = "";
+      GeometryProperties.prototype.shapeLengthFieldName = '';
 
-            /**
+      /**
              * GeometryProperties units.
              * @member {string} units
              * @memberof esriPBuffer.FeatureCollectionPBuffer.GeometryProperties
              * @instance
              */
-            GeometryProperties.prototype.units = "";
+      GeometryProperties.prototype.units = '';
 
-            /**
+      /**
              * Decodes a GeometryProperties message from the specified reader or buffer.
              * @function decode
              * @memberof esriPBuffer.FeatureCollectionPBuffer.GeometryProperties
@@ -1003,36 +1003,36 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @throws {Error} If the payload is not a reader or valid buffer
              * @throws {$protobuf.util.ProtocolError} If required fields are missing
              */
-            GeometryProperties.decode = function decode(reader, length) {
-                if (!(reader instanceof $Reader))
-                    reader = $Reader.create(reader);
-                let end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.GeometryProperties();
-                while (reader.pos < end) {
-                    let tag = reader.uint32();
-                    switch (tag >>> 3) {
-                    case 1:
-                        message.shapeAreaFieldName = reader.string();
-                        break;
-                    case 2:
-                        message.shapeLengthFieldName = reader.string();
-                        break;
-                    case 3:
-                        message.units = reader.string();
-                        break;
-                    default:
-                        reader.skipType(tag & 7);
-                        break;
-                    }
-                }
-                return message;
-            };
-
-            return GeometryProperties;
-        })();
-
-        FeatureCollectionPBuffer.Scale = (function() {
-
-            /**
+      GeometryProperties.decode = function decode(reader, length) {
+        if (!(reader instanceof $Reader))
+          reader = $Reader.create(reader);
+        const end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.GeometryProperties();
+        while (reader.pos < end) {
+          const tag = reader.uint32();
+          switch (tag >>> 3) {
+          case 1:
+            message.shapeAreaFieldName = reader.string();
+            break;
+          case 2:
+            message.shapeLengthFieldName = reader.string();
+            break;
+          case 3:
+            message.units = reader.string();
+            break;
+          default:
+            reader.skipType(tag & 7);
+            break;
+          }
+        }
+        return message;
+      };
+
+      return GeometryProperties;
+    })();
+
+    FeatureCollectionPBuffer.Scale = (function() {
+
+      /**
              * Properties of a Scale.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @interface IScale
@@ -1042,7 +1042,7 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @property {number|null} [zScale] Scale zScale
              */
 
-            /**
+      /**
              * Constructs a new Scale.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @classdesc Represents a Scale.
@@ -1050,46 +1050,46 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @constructor
              * @param {esriPBuffer.FeatureCollectionPBuffer.IScale=} [properties] Properties to set
              */
-            function Scale(properties) {
-                if (properties)
-                    for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                        if (properties[keys[i]] != null)
-                            this[keys[i]] = properties[keys[i]];
-            }
+      function Scale(properties) {
+        if (properties)
+          for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+            if (properties[keys[i]] != null)
+              this[keys[i]] = properties[keys[i]];
+      }
 
-            /**
+      /**
              * Scale xScale.
              * @member {number} xScale
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Scale
              * @instance
              */
-            Scale.prototype.xScale = 0;
+      Scale.prototype.xScale = 0;
 
-            /**
+      /**
              * Scale yScale.
              * @member {number} yScale
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Scale
              * @instance
              */
-            Scale.prototype.yScale = 0;
+      Scale.prototype.yScale = 0;
 
-            /**
+      /**
              * Scale mScale.
              * @member {number} mScale
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Scale
              * @instance
              */
-            Scale.prototype.mScale = 0;
+      Scale.prototype.mScale = 0;
 
-            /**
+      /**
              * Scale zScale.
              * @member {number} zScale
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Scale
              * @instance
              */
-            Scale.prototype.zScale = 0;
+      Scale.prototype.zScale = 0;
 
-            /**
+      /**
              * Decodes a Scale message from the specified reader or buffer.
              * @function decode
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Scale
@@ -1100,40 +1100,40 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @throws {Error} If the payload is not a reader or valid buffer
              * @throws {$protobuf.util.ProtocolError} If required fields are missing
              */
-            Scale.decode = function decode(reader, length) {
-                if (!(reader instanceof $Reader))
-                    reader = $Reader.create(reader);
-                let end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.Scale();
-                while (reader.pos < end) {
-                    let tag = reader.uint32();
-                    switch (tag >>> 3) {
-                    case 1:
-                        message.xScale = reader.double();
-                        break;
-                    case 2:
-                        message.yScale = reader.double();
-                        break;
-                    case 3:
-                        message.mScale = reader.double();
-                        break;
-                    case 4:
-                        message.zScale = reader.double();
-                        break;
-                    default:
-                        reader.skipType(tag & 7);
-                        break;
-                    }
-                }
-                return message;
-            };
-
-
-            return Scale;
-        })();
-
-        FeatureCollectionPBuffer.Translate = (function() {
-
-            /**
+      Scale.decode = function decode(reader, length) {
+        if (!(reader instanceof $Reader))
+          reader = $Reader.create(reader);
+        const end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.Scale();
+        while (reader.pos < end) {
+          const tag = reader.uint32();
+          switch (tag >>> 3) {
+          case 1:
+            message.xScale = reader.double();
+            break;
+          case 2:
+            message.yScale = reader.double();
+            break;
+          case 3:
+            message.mScale = reader.double();
+            break;
+          case 4:
+            message.zScale = reader.double();
+            break;
+          default:
+            reader.skipType(tag & 7);
+            break;
+          }
+        }
+        return message;
+      };
+
+
+      return Scale;
+    })();
+
+    FeatureCollectionPBuffer.Translate = (function() {
+
+      /**
              * Properties of a Translate.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @interface ITranslate
@@ -1143,7 +1143,7 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @property {number|null} [zTranslate] Translate zTranslate
              */
 
-            /**
+      /**
              * Constructs a new Translate.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @classdesc Represents a Translate.
@@ -1151,46 +1151,46 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @constructor
              * @param {esriPBuffer.FeatureCollectionPBuffer.ITranslate=} [properties] Properties to set
              */
-            function Translate(properties) {
-                if (properties)
-                    for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                        if (properties[keys[i]] != null)
-                            this[keys[i]] = properties[keys[i]];
-            }
+      function Translate(properties) {
+        if (properties)
+          for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+            if (properties[keys[i]] != null)
+              this[keys[i]] = properties[keys[i]];
+      }
 
-            /**
+      /**
              * Translate xTranslate.
              * @member {number} xTranslate
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Translate
              * @instance
              */
-            Translate.prototype.xTranslate = 0;
+      Translate.prototype.xTranslate = 0;
 
-            /**
+      /**
              * Translate yTranslate.
              * @member {number} yTranslate
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Translate
              * @instance
              */
-            Translate.prototype.yTranslate = 0;
+      Translate.prototype.yTranslate = 0;
 
-            /**
+      /**
              * Translate mTranslate.
              * @member {number} mTranslate
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Translate
              * @instance
              */
-            Translate.prototype.mTranslate = 0;
+      Translate.prototype.mTranslate = 0;
 
-            /**
+      /**
              * Translate zTranslate.
              * @member {number} zTranslate
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Translate
              * @instance
              */
-            Translate.prototype.zTranslate = 0;
+      Translate.prototype.zTranslate = 0;
 
-            /**
+      /**
              * Decodes a Translate message from the specified reader or buffer.
              * @function decode
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Translate
@@ -1201,39 +1201,39 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @throws {Error} If the payload is not a reader or valid buffer
              * @throws {$protobuf.util.ProtocolError} If required fields are missing
              */
-            Translate.decode = function decode(reader, length) {
-                if (!(reader instanceof $Reader))
-                    reader = $Reader.create(reader);
-                let end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.Translate();
-                while (reader.pos < end) {
-                    let tag = reader.uint32();
-                    switch (tag >>> 3) {
-                    case 1:
-                        message.xTranslate = reader.double();
-                        break;
-                    case 2:
-                        message.yTranslate = reader.double();
-                        break;
-                    case 3:
-                        message.mTranslate = reader.double();
-                        break;
-                    case 4:
-                        message.zTranslate = reader.double();
-                        break;
-                    default:
-                        reader.skipType(tag & 7);
-                        break;
-                    }
-                }
-                return message;
-            };
-
-            return Translate;
-        })();
-
-        FeatureCollectionPBuffer.Transform = (function() {
-
-            /**
+      Translate.decode = function decode(reader, length) {
+        if (!(reader instanceof $Reader))
+          reader = $Reader.create(reader);
+        const end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.Translate();
+        while (reader.pos < end) {
+          const tag = reader.uint32();
+          switch (tag >>> 3) {
+          case 1:
+            message.xTranslate = reader.double();
+            break;
+          case 2:
+            message.yTranslate = reader.double();
+            break;
+          case 3:
+            message.mTranslate = reader.double();
+            break;
+          case 4:
+            message.zTranslate = reader.double();
+            break;
+          default:
+            reader.skipType(tag & 7);
+            break;
+          }
+        }
+        return message;
+      };
+
+      return Translate;
+    })();
+
+    FeatureCollectionPBuffer.Transform = (function() {
+
+      /**
              * Properties of a Transform.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @interface ITransform
@@ -1242,7 +1242,7 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @property {esriPBuffer.FeatureCollectionPBuffer.Translate|null} [translate] Transform translate
              */
 
-            /**
+      /**
              * Constructs a new Transform.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @classdesc Represents a Transform.
@@ -1250,38 +1250,38 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @constructor
              * @param {esriPBuffer.FeatureCollectionPBuffer.ITransform=} [properties] Properties to set
              */
-            function Transform(properties) {
-                if (properties)
-                    for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                        if (properties[keys[i]] != null)
-                            this[keys[i]] = properties[keys[i]];
-            }
+      function Transform(properties) {
+        if (properties)
+          for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+            if (properties[keys[i]] != null)
+              this[keys[i]] = properties[keys[i]];
+      }
 
-            /**
+      /**
              * Transform quantizeOriginPostion.
              * @member {esriPBuffer.FeatureCollectionPBuffer.QuantizeOriginPostion} quantizeOriginPostion
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Transform
              * @instance
              */
-            Transform.prototype.quantizeOriginPostion = 0;
+      Transform.prototype.quantizeOriginPostion = 0;
 
-            /**
+      /**
              * Transform scale.
              * @member {esriPBuffer.FeatureCollectionPBuffer.Scale|null|undefined} scale
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Transform
              * @instance
              */
-            Transform.prototype.scale = null;
+      Transform.prototype.scale = null;
 
-            /**
+      /**
              * Transform translate.
              * @member {esriPBuffer.FeatureCollectionPBuffer.Translate|null|undefined} translate
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Transform
              * @instance
              */
-            Transform.prototype.translate = null;
+      Transform.prototype.translate = null;
 
-            /**
+      /**
              * Decodes a Transform message from the specified reader or buffer.
              * @function decode
              * @memberof esriPBuffer.FeatureCollectionPBuffer.Transform
@@ -1292,36 +1292,36 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @throws {Error} If the payload is not a reader or valid buffer
              * @throws {$protobuf.util.ProtocolError} If required fields are missing
              */
-            Transform.decode = function decode(reader, length) {
-                if (!(reader instanceof $Reader))
-                    reader = $Reader.create(reader);
-                let end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.Transform();
-                while (reader.pos < end) {
-                    let tag = reader.uint32();
-                    switch (tag >>> 3) {
-                    case 1:
-                        message.quantizeOriginPostion = reader.int32();
-                        break;
-                    case 2:
-                        message.scale = $root.esriPBuffer.FeatureCollectionPBuffer.Scale.decode(reader, reader.uint32());
-                        break;
-                    case 3:
-                        message.translate = $root.esriPBuffer.FeatureCollectionPBuffer.Translate.decode(reader, reader.uint32());
-                        break;
-                    default:
-                        reader.skipType(tag & 7);
-                        break;
-                    }
-                }
-                return message;
-            };
-
-            return Transform;
-        })();
-
-        FeatureCollectionPBuffer.FeatureResult = (function() {
-
-            /**
+      Transform.decode = function decode(reader, length) {
+        if (!(reader instanceof $Reader))
+          reader = $Reader.create(reader);
+        const end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.Transform();
+        while (reader.pos < end) {
+          const tag = reader.uint32();
+          switch (tag >>> 3) {
+          case 1:
+            message.quantizeOriginPostion = reader.int32();
+            break;
+          case 2:
+            message.scale = $root.esriPBuffer.FeatureCollectionPBuffer.Scale.decode(reader, reader.uint32());
+            break;
+          case 3:
+            message.translate = $root.esriPBuffer.FeatureCollectionPBuffer.Translate.decode(reader, reader.uint32());
+            break;
+          default:
+            reader.skipType(tag & 7);
+            break;
+          }
+        }
+        return message;
+      };
+
+      return Transform;
+    })();
+
+    FeatureCollectionPBuffer.FeatureResult = (function() {
+
+      /**
              * Properties of a FeatureResult.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @interface IFeatureResult
@@ -1342,7 +1342,7 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @property {Array.<esriPBuffer.FeatureCollectionPBuffer.Feature>|null} [features] FeatureResult features
              */
 
-            /**
+      /**
              * Constructs a new FeatureResult.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @classdesc Represents a FeatureResult.
@@ -1350,137 +1350,137 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @constructor
              * @param {esriPBuffer.FeatureCollectionPBuffer.IFeatureResult=} [properties] Properties to set
              */
-            function FeatureResult(properties) {
-                this.fields = [];
-                this.values = [];
-                this.features = [];
-                if (properties)
-                    for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                        if (properties[keys[i]] != null)
-                            this[keys[i]] = properties[keys[i]];
-            }
-
-            /**
+      function FeatureResult(properties) {
+        this.fields = [];
+        this.values = [];
+        this.features = [];
+        if (properties)
+          for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+            if (properties[keys[i]] != null)
+              this[keys[i]] = properties[keys[i]];
+      }
+
+      /**
              * FeatureResult objectIdFieldName.
              * @member {string} objectIdFieldName
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
              * @instance
              */
-            FeatureResult.prototype.objectIdFieldName = "";
+      FeatureResult.prototype.objectIdFieldName = '';
 
-            /**
+      /**
              * FeatureResult uniqueIdField.
              * @member {esriPBuffer.FeatureCollectionPBuffer.UniqueIdField|null|undefined} uniqueIdField
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
              * @instance
              */
-            FeatureResult.prototype.uniqueIdField = null;
+      FeatureResult.prototype.uniqueIdField = null;
 
-            /**
+      /**
              * FeatureResult globalIdFieldName.
              * @member {string} globalIdFieldName
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
              * @instance
              */
-            FeatureResult.prototype.globalIdFieldName = "";
+      FeatureResult.prototype.globalIdFieldName = '';
 
-            /**
+      /**
              * FeatureResult geohashFieldName.
              * @member {string} geohashFieldName
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
              * @instance
              */
-            FeatureResult.prototype.geohashFieldName = "";
+      FeatureResult.prototype.geohashFieldName = '';
 
-            /**
+      /**
              * FeatureResult geometryProperties.
              * @member {esriPBuffer.FeatureCollectionPBuffer.GeometryProperties|null|undefined} geometryProperties
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
              * @instance
              */
-            FeatureResult.prototype.geometryProperties = null;
+      FeatureResult.prototype.geometryProperties = null;
 
-            /**
+      /**
              * FeatureResult serverGens.
              * @member {esriPBuffer.FeatureCollectionPBuffer.ServerGens|null|undefined} serverGens
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
              * @instance
              */
-            FeatureResult.prototype.serverGens = null;
+      FeatureResult.prototype.serverGens = null;
 
-            /**
+      /**
              * FeatureResult geometryType.
              * @member {esriPBuffer.FeatureCollectionPBuffer.GeometryType} geometryType
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
              * @instance
              */
-            FeatureResult.prototype.geometryType = 0;
+      FeatureResult.prototype.geometryType = 0;
 
-            /**
+      /**
              * FeatureResult spatialReference.
              * @member {esriPBuffer.FeatureCollectionPBuffer.SpatialReference|null|undefined} spatialReference
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
              * @instance
              */
-            FeatureResult.prototype.spatialReference = null;
+      FeatureResult.prototype.spatialReference = null;
 
-            /**
+      /**
              * FeatureResult exceededTransferLimit.
              * @member {boolean} exceededTransferLimit
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
              * @instance
              */
-            FeatureResult.prototype.exceededTransferLimit = false;
+      FeatureResult.prototype.exceededTransferLimit = false;
 
-            /**
+      /**
              * FeatureResult hasZ.
              * @member {boolean} hasZ
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
              * @instance
              */
-            FeatureResult.prototype.hasZ = false;
+      FeatureResult.prototype.hasZ = false;
 
-            /**
+      /**
              * FeatureResult hasM.
              * @member {boolean} hasM
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
              * @instance
              */
-            FeatureResult.prototype.hasM = false;
+      FeatureResult.prototype.hasM = false;
 
-            /**
+      /**
              * FeatureResult transform.
              * @member {esriPBuffer.FeatureCollectionPBuffer.Transform|null|undefined} transform
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
              * @instance
              */
-            FeatureResult.prototype.transform = null;
+      FeatureResult.prototype.transform = null;
 
-            /**
+      /**
              * FeatureResult fields.
              * @member {Array.<esriPBuffer.FeatureCollectionPBuffer.Field>} fields
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
              * @instance
              */
-            FeatureResult.prototype.fields = $util.emptyArray;
+      FeatureResult.prototype.fields = $util.emptyArray;
 
-            /**
+      /**
              * FeatureResult values.
              * @member {Array.<esriPBuffer.FeatureCollectionPBuffer.Value>} values
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
              * @instance
              */
-            FeatureResult.prototype.values = $util.emptyArray;
+      FeatureResult.prototype.values = $util.emptyArray;
 
-            /**
+      /**
              * FeatureResult features.
              * @member {Array.<esriPBuffer.FeatureCollectionPBuffer.Feature>} features
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
              * @instance
              */
-            FeatureResult.prototype.features = $util.emptyArray;
+      FeatureResult.prototype.features = $util.emptyArray;
 
-            /**
+      /**
              * Decodes a FeatureResult message from the specified reader or buffer.
              * @function decode
              * @memberof esriPBuffer.FeatureCollectionPBuffer.FeatureResult
@@ -1491,75 +1491,75 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @throws {Error} If the payload is not a reader or valid buffer
              * @throws {$protobuf.util.ProtocolError} If required fields are missing
              */
-            FeatureResult.decode = function decode(reader, length) {
-                if (!(reader instanceof $Reader))
-                    reader = $Reader.create(reader);
-                let end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.FeatureResult();
-                while (reader.pos < end) {
-                    let tag = reader.uint32();
-                    switch (tag >>> 3) {
-                    case 1:
-                        message.objectIdFieldName = reader.string();
-                        break;
-                    case 2:
-                        message.uniqueIdField = $root.esriPBuffer.FeatureCollectionPBuffer.UniqueIdField.decode(reader, reader.uint32());
-                        break;
-                    case 3:
-                        message.globalIdFieldName = reader.string();
-                        break;
-                    case 4:
-                        message.geohashFieldName = reader.string();
-                        break;
-                    case 5:
-                        message.geometryProperties = $root.esriPBuffer.FeatureCollectionPBuffer.GeometryProperties.decode(reader, reader.uint32());
-                        break;
-                     case 7:
-                        message.geometryType = reader.int32();
-                        break;
-                    case 8:
-                        message.spatialReference = $root.esriPBuffer.FeatureCollectionPBuffer.SpatialReference.decode(reader, reader.uint32());
-                        break;
-                    case 9:
-                        message.exceededTransferLimit = reader.bool();
-                        break;
-                    case 10:
-                        message.hasZ = reader.bool();
-                        break;
-                    case 11:
-                        message.hasM = reader.bool();
-                        break;
-                    case 12:
-                        message.transform = $root.esriPBuffer.FeatureCollectionPBuffer.Transform.decode(reader, reader.uint32());
-                        break;
-                    case 13:
-                        if (!(message.fields && message.fields.length))
-                            message.fields = [];
-                        message.fields.push($root.esriPBuffer.FeatureCollectionPBuffer.Field.decode(reader, reader.uint32()));
-                        break;
-                    case 14:
-                        if (!(message.values && message.values.length))
-                            message.values = [];
-                        message.values.push($root.esriPBuffer.FeatureCollectionPBuffer.Value.decode(reader, reader.uint32()));
-                        break;
-                    case 15:
-                        if (!(message.features && message.features.length))
-                            message.features = [];
-                        message.features.push($root.esriPBuffer.FeatureCollectionPBuffer.Feature.decode(reader, reader.uint32()));
-                        break;
-                    default:
-                        reader.skipType(tag & 7);
-                        break;
-                    }
-                }
-                return message;
-            };
-
-            return FeatureResult;
-        })();
-
-        FeatureCollectionPBuffer.QueryResult = (function() {
-
-            /**
+      FeatureResult.decode = function decode(reader, length) {
+        if (!(reader instanceof $Reader))
+          reader = $Reader.create(reader);
+        const end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.FeatureResult();
+        while (reader.pos < end) {
+          const tag = reader.uint32();
+          switch (tag >>> 3) {
+          case 1:
+            message.objectIdFieldName = reader.string();
+            break;
+          case 2:
+            message.uniqueIdField = $root.esriPBuffer.FeatureCollectionPBuffer.UniqueIdField.decode(reader, reader.uint32());
+            break;
+          case 3:
+            message.globalIdFieldName = reader.string();
+            break;
+          case 4:
+            message.geohashFieldName = reader.string();
+            break;
+          case 5:
+            message.geometryProperties = $root.esriPBuffer.FeatureCollectionPBuffer.GeometryProperties.decode(reader, reader.uint32());
+            break;
+          case 7:
+            message.geometryType = reader.int32();
+            break;
+          case 8:
+            message.spatialReference = $root.esriPBuffer.FeatureCollectionPBuffer.SpatialReference.decode(reader, reader.uint32());
+            break;
+          case 9:
+            message.exceededTransferLimit = reader.bool();
+            break;
+          case 10:
+            message.hasZ = reader.bool();
+            break;
+          case 11:
+            message.hasM = reader.bool();
+            break;
+          case 12:
+            message.transform = $root.esriPBuffer.FeatureCollectionPBuffer.Transform.decode(reader, reader.uint32());
+            break;
+          case 13:
+            if (!(message.fields && message.fields.length))
+              message.fields = [];
+            message.fields.push($root.esriPBuffer.FeatureCollectionPBuffer.Field.decode(reader, reader.uint32()));
+            break;
+          case 14:
+            if (!(message.values && message.values.length))
+              message.values = [];
+            message.values.push($root.esriPBuffer.FeatureCollectionPBuffer.Value.decode(reader, reader.uint32()));
+            break;
+          case 15:
+            if (!(message.features && message.features.length))
+              message.features = [];
+            message.features.push($root.esriPBuffer.FeatureCollectionPBuffer.Feature.decode(reader, reader.uint32()));
+            break;
+          default:
+            reader.skipType(tag & 7);
+            break;
+          }
+        }
+        return message;
+      };
+
+      return FeatureResult;
+    })();
+
+    FeatureCollectionPBuffer.QueryResult = (function() {
+
+      /**
              * Properties of a QueryResult.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @interface IQueryResult
@@ -1568,7 +1568,7 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @property {esriPBuffer.FeatureCollectionPBuffer.ObjectIdsResult|null} [idsResult] QueryResult idsResult
              */
 
-            /**
+      /**
              * Constructs a new QueryResult.
              * @memberof esriPBuffer.FeatureCollectionPBuffer
              * @classdesc Represents a QueryResult.
@@ -1576,37 +1576,37 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @constructor
              * @param {esriPBuffer.FeatureCollectionPBuffer.IQueryResult=} [properties] Properties to set
              */
-            function QueryResult(properties) {
-                if (properties)
-                    for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                        if (properties[keys[i]] != null)
-                            this[keys[i]] = properties[keys[i]];
-            }
+      function QueryResult(properties) {
+        if (properties)
+          for (let keys = Object.keys(properties), i = 0; i < keys.length; ++i)
+            if (properties[keys[i]] != null)
+              this[keys[i]] = properties[keys[i]];
+      }
 
-            /**
+      /**
              * QueryResult featureResult.
              * @member {esriPBuffer.FeatureCollectionPBuffer.FeatureResult|null|undefined} featureResult
              * @memberof esriPBuffer.FeatureCollectionPBuffer.QueryResult
              * @instance
              */
-            QueryResult.prototype.featureResult = null;
+      QueryResult.prototype.featureResult = null;
 
 
-            // OneOf field names bound to virtual getters and setters
-            let $oneOfFields;
+      // OneOf field names bound to virtual getters and setters
+      let $oneOfFields;
 
-            /**
+      /**
              * QueryResult Results.
              * @member {"featureResult"|"countResult"|"idsResult"|undefined} Results
              * @memberof esriPBuffer.FeatureCollectionPBuffer.QueryResult
              * @instance
              */
-            Object.defineProperty(QueryResult.prototype, "Results", {
-                get: $util.oneOfGetter($oneOfFields = ["featureResult"]),
-                set: $util.oneOfSetter($oneOfFields)
-            });
+      Object.defineProperty(QueryResult.prototype, 'Results', {
+        get: $util.oneOfGetter($oneOfFields = ['featureResult']),
+        set: $util.oneOfSetter($oneOfFields)
+      });
 
-            /**
+      /**
              * Decodes a QueryResult message from the specified reader or buffer.
              * @function decode
              * @memberof esriPBuffer.FeatureCollectionPBuffer.QueryResult
@@ -1617,32 +1617,32 @@ export const esriPBuffer = $root.esriPBuffer = (() => {
              * @throws {Error} If the payload is not a reader or valid buffer
              * @throws {$protobuf.util.ProtocolError} If required fields are missing
              */
-            QueryResult.decode = function decode(reader, length) {
-                if (!(reader instanceof $Reader))
-                    reader = $Reader.create(reader);
-                let end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.QueryResult();
-                while (reader.pos < end) {
-                    let tag = reader.uint32();
-                    switch (tag >>> 3) {
-                    case 1:
-                        message.featureResult = $root.esriPBuffer.FeatureCollectionPBuffer.FeatureResult.decode(reader, reader.uint32());
-                        break;
-                    default:
-                        reader.skipType(tag & 7);
-                        break;
-                    }
-                }
-                return message;
-            };
-
-
-            return QueryResult;
-        })();
-
-        return FeatureCollectionPBuffer;
+      QueryResult.decode = function decode(reader, length) {
+        if (!(reader instanceof $Reader))
+          reader = $Reader.create(reader);
+        const end = length === undefined ? reader.len : reader.pos + length, message = new $root.esriPBuffer.FeatureCollectionPBuffer.QueryResult();
+        while (reader.pos < end) {
+          const tag = reader.uint32();
+          switch (tag >>> 3) {
+          case 1:
+            message.featureResult = $root.esriPBuffer.FeatureCollectionPBuffer.FeatureResult.decode(reader, reader.uint32());
+            break;
+          default:
+            reader.skipType(tag & 7);
+            break;
+          }
+        }
+        return message;
+      };
+
+
+      return QueryResult;
     })();
 
-    return esriPBuffer;
+    return FeatureCollectionPBuffer;
+  })();
+
+  return esriPBuffer;
 })();
 
-export { $root as default };
\ No newline at end of file
+export {$root as default};
diff --git a/src/parser/PbfFeatureCollection.js b/src/parser/PbfFeatureCollection.js
index 1a8c4be..8b2153a 100644
--- a/src/parser/PbfFeatureCollection.js
+++ b/src/parser/PbfFeatureCollection.js
@@ -2,218 +2,218 @@
 
 // FeatureCollectionPBuffer ========================================
 
-var FeatureCollectionPBuffer = exports.FeatureCollectionPBuffer = {};
+export const FeatureCollectionPBuffer = {}
 
 FeatureCollectionPBuffer.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer._readField, {version: "", queryResult: null}, end);
+  return pbf.readFields(FeatureCollectionPBuffer._readField, {version: '', queryResult: null}, end);
 };
 FeatureCollectionPBuffer._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.version = pbf.readString();
-    else if (tag === 2) obj.queryResult = FeatureCollectionPBuffer.QueryResult.read(pbf, pbf.readVarint() + pbf.pos);
+  if (tag === 1) obj.version = pbf.readString();
+  else if (tag === 2) obj.queryResult = FeatureCollectionPBuffer.QueryResult.read(pbf, pbf.readVarint() + pbf.pos);
 };
 FeatureCollectionPBuffer.write = function (obj, pbf) {
-    if (obj.version) pbf.writeStringField(1, obj.version);
-    if (obj.queryResult) pbf.writeMessage(2, FeatureCollectionPBuffer.QueryResult.write, obj.queryResult);
+  if (obj.version) pbf.writeStringField(1, obj.version);
+  if (obj.queryResult) pbf.writeMessage(2, FeatureCollectionPBuffer.QueryResult.write, obj.queryResult);
 };
 
 FeatureCollectionPBuffer.GeometryType = {
-    "esriGeometryTypePoint": {
-        "value": 0,
-        "options": {}
-    },
-    "esriGeometryTypeMultipoint": {
-        "value": 1,
-        "options": {}
-    },
-    "esriGeometryTypePolyline": {
-        "value": 2,
-        "options": {}
-    },
-    "esriGeometryTypePolygon": {
-        "value": 3,
-        "options": {}
-    },
-    "esriGeometryTypeMultipatch": {
-        "value": 4,
-        "options": {}
-    },
-    "esriGeometryTypeNone": {
-        "value": 127,
-        "options": {}
-    }
+  'esriGeometryTypePoint': {
+    'value': 0,
+    'options': {}
+  },
+  'esriGeometryTypeMultipoint': {
+    'value': 1,
+    'options': {}
+  },
+  'esriGeometryTypePolyline': {
+    'value': 2,
+    'options': {}
+  },
+  'esriGeometryTypePolygon': {
+    'value': 3,
+    'options': {}
+  },
+  'esriGeometryTypeMultipatch': {
+    'value': 4,
+    'options': {}
+  },
+  'esriGeometryTypeNone': {
+    'value': 127,
+    'options': {}
+  }
 };
 
 FeatureCollectionPBuffer.FieldType = {
-    "esriFieldTypeSmallInteger": {
-        "value": 0,
-        "options": {}
-    },
-    "esriFieldTypeInteger": {
-        "value": 1,
-        "options": {}
-    },
-    "esriFieldTypeSingle": {
-        "value": 2,
-        "options": {}
-    },
-    "esriFieldTypeDouble": {
-        "value": 3,
-        "options": {}
-    },
-    "esriFieldTypeString": {
-        "value": 4,
-        "options": {}
-    },
-    "esriFieldTypeDate": {
-        "value": 5,
-        "options": {}
-    },
-    "esriFieldTypeOID": {
-        "value": 6,
-        "options": {}
-    },
-    "esriFieldTypeGeometry": {
-        "value": 7,
-        "options": {}
-    },
-    "esriFieldTypeBlob": {
-        "value": 8,
-        "options": {}
-    },
-    "esriFieldTypeRaster": {
-        "value": 9,
-        "options": {}
-    },
-    "esriFieldTypeGUID": {
-        "value": 10,
-        "options": {}
-    },
-    "esriFieldTypeGlobalID": {
-        "value": 11,
-        "options": {}
-    },
-    "esriFieldTypeXML": {
-        "value": 12,
-        "options": {}
-    }
+  'esriFieldTypeSmallInteger': {
+    'value': 0,
+    'options': {}
+  },
+  'esriFieldTypeInteger': {
+    'value': 1,
+    'options': {}
+  },
+  'esriFieldTypeSingle': {
+    'value': 2,
+    'options': {}
+  },
+  'esriFieldTypeDouble': {
+    'value': 3,
+    'options': {}
+  },
+  'esriFieldTypeString': {
+    'value': 4,
+    'options': {}
+  },
+  'esriFieldTypeDate': {
+    'value': 5,
+    'options': {}
+  },
+  'esriFieldTypeOID': {
+    'value': 6,
+    'options': {}
+  },
+  'esriFieldTypeGeometry': {
+    'value': 7,
+    'options': {}
+  },
+  'esriFieldTypeBlob': {
+    'value': 8,
+    'options': {}
+  },
+  'esriFieldTypeRaster': {
+    'value': 9,
+    'options': {}
+  },
+  'esriFieldTypeGUID': {
+    'value': 10,
+    'options': {}
+  },
+  'esriFieldTypeGlobalID': {
+    'value': 11,
+    'options': {}
+  },
+  'esriFieldTypeXML': {
+    'value': 12,
+    'options': {}
+  }
 };
 
 FeatureCollectionPBuffer.SQLType = {
-    "sqlTypeBigInt": {
-        "value": 0,
-        "options": {}
-    },
-    "sqlTypeBinary": {
-        "value": 1,
-        "options": {}
-    },
-    "sqlTypeBit": {
-        "value": 2,
-        "options": {}
-    },
-    "sqlTypeChar": {
-        "value": 3,
-        "options": {}
-    },
-    "sqlTypeDate": {
-        "value": 4,
-        "options": {}
-    },
-    "sqlTypeDecimal": {
-        "value": 5,
-        "options": {}
-    },
-    "sqlTypeDouble": {
-        "value": 6,
-        "options": {}
-    },
-    "sqlTypeFloat": {
-        "value": 7,
-        "options": {}
-    },
-    "sqlTypeGeometry": {
-        "value": 8,
-        "options": {}
-    },
-    "sqlTypeGUID": {
-        "value": 9,
-        "options": {}
-    },
-    "sqlTypeInteger": {
-        "value": 10,
-        "options": {}
-    },
-    "sqlTypeLongNVarchar": {
-        "value": 11,
-        "options": {}
-    },
-    "sqlTypeLongVarbinary": {
-        "value": 12,
-        "options": {}
-    },
-    "sqlTypeLongVarchar": {
-        "value": 13,
-        "options": {}
-    },
-    "sqlTypeNChar": {
-        "value": 14,
-        "options": {}
-    },
-    "sqlTypeNVarchar": {
-        "value": 15,
-        "options": {}
-    },
-    "sqlTypeOther": {
-        "value": 16,
-        "options": {}
-    },
-    "sqlTypeReal": {
-        "value": 17,
-        "options": {}
-    },
-    "sqlTypeSmallInt": {
-        "value": 18,
-        "options": {}
-    },
-    "sqlTypeSqlXml": {
-        "value": 19,
-        "options": {}
-    },
-    "sqlTypeTime": {
-        "value": 20,
-        "options": {}
-    },
-    "sqlTypeTimestamp": {
-        "value": 21,
-        "options": {}
-    },
-    "sqlTypeTimestamp2": {
-        "value": 22,
-        "options": {}
-    },
-    "sqlTypeTinyInt": {
-        "value": 23,
-        "options": {}
-    },
-    "sqlTypeVarbinary": {
-        "value": 24,
-        "options": {}
-    },
-    "sqlTypeVarchar": {
-        "value": 25,
-        "options": {}
-    }
+  'sqlTypeBigInt': {
+    'value': 0,
+    'options': {}
+  },
+  'sqlTypeBinary': {
+    'value': 1,
+    'options': {}
+  },
+  'sqlTypeBit': {
+    'value': 2,
+    'options': {}
+  },
+  'sqlTypeChar': {
+    'value': 3,
+    'options': {}
+  },
+  'sqlTypeDate': {
+    'value': 4,
+    'options': {}
+  },
+  'sqlTypeDecimal': {
+    'value': 5,
+    'options': {}
+  },
+  'sqlTypeDouble': {
+    'value': 6,
+    'options': {}
+  },
+  'sqlTypeFloat': {
+    'value': 7,
+    'options': {}
+  },
+  'sqlTypeGeometry': {
+    'value': 8,
+    'options': {}
+  },
+  'sqlTypeGUID': {
+    'value': 9,
+    'options': {}
+  },
+  'sqlTypeInteger': {
+    'value': 10,
+    'options': {}
+  },
+  'sqlTypeLongNVarchar': {
+    'value': 11,
+    'options': {}
+  },
+  'sqlTypeLongVarbinary': {
+    'value': 12,
+    'options': {}
+  },
+  'sqlTypeLongVarchar': {
+    'value': 13,
+    'options': {}
+  },
+  'sqlTypeNChar': {
+    'value': 14,
+    'options': {}
+  },
+  'sqlTypeNVarchar': {
+    'value': 15,
+    'options': {}
+  },
+  'sqlTypeOther': {
+    'value': 16,
+    'options': {}
+  },
+  'sqlTypeReal': {
+    'value': 17,
+    'options': {}
+  },
+  'sqlTypeSmallInt': {
+    'value': 18,
+    'options': {}
+  },
+  'sqlTypeSqlXml': {
+    'value': 19,
+    'options': {}
+  },
+  'sqlTypeTime': {
+    'value': 20,
+    'options': {}
+  },
+  'sqlTypeTimestamp': {
+    'value': 21,
+    'options': {}
+  },
+  'sqlTypeTimestamp2': {
+    'value': 22,
+    'options': {}
+  },
+  'sqlTypeTinyInt': {
+    'value': 23,
+    'options': {}
+  },
+  'sqlTypeVarbinary': {
+    'value': 24,
+    'options': {}
+  },
+  'sqlTypeVarchar': {
+    'value': 25,
+    'options': {}
+  }
 };
 
 FeatureCollectionPBuffer.QuantizeOriginPostion = {
-    "upperLeft": {
-        "value": 0,
-        "options": {}
-    },
-    "lowerLeft": {
-        "value": 1,
-        "options": {}
-    }
+  'upperLeft': {
+    'value': 0,
+    'options': {}
+  },
+  'lowerLeft': {
+    'value': 1,
+    'options': {}
+  }
 };
 
 // FeatureCollectionPBuffer.SpatialReference ========================================
@@ -221,21 +221,21 @@ FeatureCollectionPBuffer.QuantizeOriginPostion = {
 FeatureCollectionPBuffer.SpatialReference = {};
 
 FeatureCollectionPBuffer.SpatialReference.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.SpatialReference._readField, {wkid: 0, lastestWkid: 0, vcsWkid: 0, latestVcsWkid: 0, wkt: ""}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.SpatialReference._readField, {wkid: 0, lastestWkid: 0, vcsWkid: 0, latestVcsWkid: 0, wkt: ''}, end);
 };
 FeatureCollectionPBuffer.SpatialReference._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.wkid = pbf.readVarint();
-    else if (tag === 2) obj.lastestWkid = pbf.readVarint();
-    else if (tag === 3) obj.vcsWkid = pbf.readVarint();
-    else if (tag === 4) obj.latestVcsWkid = pbf.readVarint();
-    else if (tag === 5) obj.wkt = pbf.readString();
+  if (tag === 1) obj.wkid = pbf.readVarint();
+  else if (tag === 2) obj.lastestWkid = pbf.readVarint();
+  else if (tag === 3) obj.vcsWkid = pbf.readVarint();
+  else if (tag === 4) obj.latestVcsWkid = pbf.readVarint();
+  else if (tag === 5) obj.wkt = pbf.readString();
 };
 FeatureCollectionPBuffer.SpatialReference.write = function (obj, pbf) {
-    if (obj.wkid) pbf.writeVarintField(1, obj.wkid);
-    if (obj.lastestWkid) pbf.writeVarintField(2, obj.lastestWkid);
-    if (obj.vcsWkid) pbf.writeVarintField(3, obj.vcsWkid);
-    if (obj.latestVcsWkid) pbf.writeVarintField(4, obj.latestVcsWkid);
-    if (obj.wkt) pbf.writeStringField(5, obj.wkt);
+  if (obj.wkid) pbf.writeVarintField(1, obj.wkid);
+  if (obj.lastestWkid) pbf.writeVarintField(2, obj.lastestWkid);
+  if (obj.vcsWkid) pbf.writeVarintField(3, obj.vcsWkid);
+  if (obj.latestVcsWkid) pbf.writeVarintField(4, obj.latestVcsWkid);
+  if (obj.wkt) pbf.writeStringField(5, obj.wkt);
 };
 
 // FeatureCollectionPBuffer.Field ========================================
@@ -243,23 +243,23 @@ FeatureCollectionPBuffer.SpatialReference.write = function (obj, pbf) {
 FeatureCollectionPBuffer.Field = {};
 
 FeatureCollectionPBuffer.Field.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.Field._readField, {name: "", fieldType: 0, alias: "", sqlType: 0, domain: "", defaultValue: ""}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.Field._readField, {name: '', fieldType: 0, alias: '', sqlType: 0, domain: '', defaultValue: ''}, end);
 };
 FeatureCollectionPBuffer.Field._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.name = pbf.readString();
-    else if (tag === 2) obj.fieldType = pbf.readVarint();
-    else if (tag === 3) obj.alias = pbf.readString();
-    else if (tag === 4) obj.sqlType = pbf.readVarint();
-    else if (tag === 5) obj.domain = pbf.readString();
-    else if (tag === 6) obj.defaultValue = pbf.readString();
+  if (tag === 1) obj.name = pbf.readString();
+  else if (tag === 2) obj.fieldType = pbf.readVarint();
+  else if (tag === 3) obj.alias = pbf.readString();
+  else if (tag === 4) obj.sqlType = pbf.readVarint();
+  else if (tag === 5) obj.domain = pbf.readString();
+  else if (tag === 6) obj.defaultValue = pbf.readString();
 };
 FeatureCollectionPBuffer.Field.write = function (obj, pbf) {
-    if (obj.name) pbf.writeStringField(1, obj.name);
-    if (obj.fieldType) pbf.writeVarintField(2, obj.fieldType);
-    if (obj.alias) pbf.writeStringField(3, obj.alias);
-    if (obj.sqlType) pbf.writeVarintField(4, obj.sqlType);
-    if (obj.domain) pbf.writeStringField(5, obj.domain);
-    if (obj.defaultValue) pbf.writeStringField(6, obj.defaultValue);
+  if (obj.name) pbf.writeStringField(1, obj.name);
+  if (obj.fieldType) pbf.writeVarintField(2, obj.fieldType);
+  if (obj.alias) pbf.writeStringField(3, obj.alias);
+  if (obj.sqlType) pbf.writeVarintField(4, obj.sqlType);
+  if (obj.domain) pbf.writeStringField(5, obj.domain);
+  if (obj.defaultValue) pbf.writeStringField(6, obj.defaultValue);
 };
 
 // FeatureCollectionPBuffer.Value ========================================
@@ -267,29 +267,29 @@ FeatureCollectionPBuffer.Field.write = function (obj, pbf) {
 FeatureCollectionPBuffer.Value = {};
 
 FeatureCollectionPBuffer.Value.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.Value._readField, {string_value: "", value_type: null, float_value: 0, double_value: 0, sint_value: 0, uint_value: 0, int64_value: 0, uint64_value: 0, sint64_value: 0, bool_value: false}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.Value._readField, {string_value: '', value_type: null, float_value: 0, double_value: 0, sint_value: 0, uint_value: 0, int64_value: 0, uint64_value: 0, sint64_value: 0, bool_value: false}, end);
 };
 FeatureCollectionPBuffer.Value._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.string_value = pbf.readString(), obj.value_type = "string_value";
-    else if (tag === 2) obj.float_value = pbf.readFloat(), obj.value_type = "float_value";
-    else if (tag === 3) obj.double_value = pbf.readDouble(), obj.value_type = "double_value";
-    else if (tag === 4) obj.sint_value = pbf.readSVarint(), obj.value_type = "sint_value";
-    else if (tag === 5) obj.uint_value = pbf.readVarint(), obj.value_type = "uint_value";
-    else if (tag === 6) obj.int64_value = pbf.readVarint(true), obj.value_type = "int64_value";
-    else if (tag === 7) obj.uint64_value = pbf.readVarint(), obj.value_type = "uint64_value";
-    else if (tag === 8) obj.sint64_value = pbf.readSVarint(), obj.value_type = "sint64_value";
-    else if (tag === 9) obj.bool_value = pbf.readBoolean(), obj.value_type = "bool_value";
+  if (tag === 1) obj.string_value = pbf.readString(), obj.value_type = 'string_value';
+  else if (tag === 2) obj.float_value = pbf.readFloat(), obj.value_type = 'float_value';
+  else if (tag === 3) obj.double_value = pbf.readDouble(), obj.value_type = 'double_value';
+  else if (tag === 4) obj.sint_value = pbf.readSVarint(), obj.value_type = 'sint_value';
+  else if (tag === 5) obj.uint_value = pbf.readVarint(), obj.value_type = 'uint_value';
+  else if (tag === 6) obj.int64_value = pbf.readVarint(true), obj.value_type = 'int64_value';
+  else if (tag === 7) obj.uint64_value = pbf.readVarint(), obj.value_type = 'uint64_value';
+  else if (tag === 8) obj.sint64_value = pbf.readSVarint(), obj.value_type = 'sint64_value';
+  else if (tag === 9) obj.bool_value = pbf.readBoolean(), obj.value_type = 'bool_value';
 };
 FeatureCollectionPBuffer.Value.write = function (obj, pbf) {
-    if (obj.string_value) pbf.writeStringField(1, obj.string_value);
-    if (obj.float_value) pbf.writeFloatField(2, obj.float_value);
-    if (obj.double_value) pbf.writeDoubleField(3, obj.double_value);
-    if (obj.sint_value) pbf.writeSVarintField(4, obj.sint_value);
-    if (obj.uint_value) pbf.writeVarintField(5, obj.uint_value);
-    if (obj.int64_value) pbf.writeVarintField(6, obj.int64_value);
-    if (obj.uint64_value) pbf.writeVarintField(7, obj.uint64_value);
-    if (obj.sint64_value) pbf.writeSVarintField(8, obj.sint64_value);
-    if (obj.bool_value) pbf.writeBooleanField(9, obj.bool_value);
+  if (obj.string_value) pbf.writeStringField(1, obj.string_value);
+  if (obj.float_value) pbf.writeFloatField(2, obj.float_value);
+  if (obj.double_value) pbf.writeDoubleField(3, obj.double_value);
+  if (obj.sint_value) pbf.writeSVarintField(4, obj.sint_value);
+  if (obj.uint_value) pbf.writeVarintField(5, obj.uint_value);
+  if (obj.int64_value) pbf.writeVarintField(6, obj.int64_value);
+  if (obj.uint64_value) pbf.writeVarintField(7, obj.uint64_value);
+  if (obj.sint64_value) pbf.writeSVarintField(8, obj.sint64_value);
+  if (obj.bool_value) pbf.writeBooleanField(9, obj.bool_value);
 };
 
 // FeatureCollectionPBuffer.Geometry ========================================
@@ -297,15 +297,15 @@ FeatureCollectionPBuffer.Value.write = function (obj, pbf) {
 FeatureCollectionPBuffer.Geometry = {};
 
 FeatureCollectionPBuffer.Geometry.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.Geometry._readField, {lengths: [], coords: []}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.Geometry._readField, {lengths: [], coords: []}, end);
 };
 FeatureCollectionPBuffer.Geometry._readField = function (tag, obj, pbf) {
-    if (tag === 2) pbf.readPackedVarint(obj.lengths);
-    else if (tag === 3) pbf.readPackedSVarint(obj.coords);
+  if (tag === 2) pbf.readPackedVarint(obj.lengths);
+  else if (tag === 3) pbf.readPackedSVarint(obj.coords);
 };
 FeatureCollectionPBuffer.Geometry.write = function (obj, pbf) {
-    if (obj.lengths) pbf.writePackedVarint(2, obj.lengths);
-    if (obj.coords) pbf.writePackedSVarint(3, obj.coords);
+  if (obj.lengths) pbf.writePackedVarint(2, obj.lengths);
+  if (obj.coords) pbf.writePackedSVarint(3, obj.coords);
 };
 
 // FeatureCollectionPBuffer.esriShapeBuffer ========================================
@@ -313,13 +313,13 @@ FeatureCollectionPBuffer.Geometry.write = function (obj, pbf) {
 FeatureCollectionPBuffer.esriShapeBuffer = {};
 
 FeatureCollectionPBuffer.esriShapeBuffer.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.esriShapeBuffer._readField, {bytes: null}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.esriShapeBuffer._readField, {bytes: null}, end);
 };
 FeatureCollectionPBuffer.esriShapeBuffer._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.bytes = pbf.readBytes();
+  if (tag === 1) obj.bytes = pbf.readBytes();
 };
 FeatureCollectionPBuffer.esriShapeBuffer.write = function (obj, pbf) {
-    if (obj.bytes) pbf.writeBytesField(1, obj.bytes);
+  if (obj.bytes) pbf.writeBytesField(1, obj.bytes);
 };
 
 // FeatureCollectionPBuffer.Feature ========================================
@@ -327,19 +327,19 @@ FeatureCollectionPBuffer.esriShapeBuffer.write = function (obj, pbf) {
 FeatureCollectionPBuffer.Feature = {};
 
 FeatureCollectionPBuffer.Feature.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.Feature._readField, {attributes: [], geometry: null, compressed_geometry: null, shapeBuffer: null, centroid: null}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.Feature._readField, {attributes: [], geometry: null, compressed_geometry: null, shapeBuffer: null, centroid: null}, end);
 };
 FeatureCollectionPBuffer.Feature._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.attributes.push(FeatureCollectionPBuffer.Value.read(pbf, pbf.readVarint() + pbf.pos));
-    else if (tag === 2) obj.geometry = FeatureCollectionPBuffer.Geometry.read(pbf, pbf.readVarint() + pbf.pos), obj.compressed_geometry = "geometry";
-    else if (tag === 3) obj.shapeBuffer = FeatureCollectionPBuffer.esriShapeBuffer.read(pbf, pbf.readVarint() + pbf.pos), obj.compressed_geometry = "shapeBuffer";
-    else if (tag === 4) obj.centroid = FeatureCollectionPBuffer.Geometry.read(pbf, pbf.readVarint() + pbf.pos);
+  if (tag === 1) obj.attributes.push(FeatureCollectionPBuffer.Value.read(pbf, pbf.readVarint() + pbf.pos));
+  else if (tag === 2) obj.geometry = FeatureCollectionPBuffer.Geometry.read(pbf, pbf.readVarint() + pbf.pos), obj.compressed_geometry = 'geometry';
+  else if (tag === 3) obj.shapeBuffer = FeatureCollectionPBuffer.esriShapeBuffer.read(pbf, pbf.readVarint() + pbf.pos), obj.compressed_geometry = 'shapeBuffer';
+  else if (tag === 4) obj.centroid = FeatureCollectionPBuffer.Geometry.read(pbf, pbf.readVarint() + pbf.pos);
 };
 FeatureCollectionPBuffer.Feature.write = function (obj, pbf) {
-    if (obj.attributes) for (var i = 0; i < obj.attributes.length; i++) pbf.writeMessage(1, FeatureCollectionPBuffer.Value.write, obj.attributes[i]);
-    if (obj.geometry) pbf.writeMessage(2, FeatureCollectionPBuffer.Geometry.write, obj.geometry);
-    if (obj.shapeBuffer) pbf.writeMessage(3, FeatureCollectionPBuffer.esriShapeBuffer.write, obj.shapeBuffer);
-    if (obj.centroid) pbf.writeMessage(4, FeatureCollectionPBuffer.Geometry.write, obj.centroid);
+  if (obj.attributes) for (let i = 0; i < obj.attributes.length; i++) pbf.writeMessage(1, FeatureCollectionPBuffer.Value.write, obj.attributes[i]);
+  if (obj.geometry) pbf.writeMessage(2, FeatureCollectionPBuffer.Geometry.write, obj.geometry);
+  if (obj.shapeBuffer) pbf.writeMessage(3, FeatureCollectionPBuffer.esriShapeBuffer.write, obj.shapeBuffer);
+  if (obj.centroid) pbf.writeMessage(4, FeatureCollectionPBuffer.Geometry.write, obj.centroid);
 };
 
 // FeatureCollectionPBuffer.UniqueIdField ========================================
@@ -347,15 +347,15 @@ FeatureCollectionPBuffer.Feature.write = function (obj, pbf) {
 FeatureCollectionPBuffer.UniqueIdField = {};
 
 FeatureCollectionPBuffer.UniqueIdField.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.UniqueIdField._readField, {name: "", isSystemMaintained: false}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.UniqueIdField._readField, {name: '', isSystemMaintained: false}, end);
 };
 FeatureCollectionPBuffer.UniqueIdField._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.name = pbf.readString();
-    else if (tag === 2) obj.isSystemMaintained = pbf.readBoolean();
+  if (tag === 1) obj.name = pbf.readString();
+  else if (tag === 2) obj.isSystemMaintained = pbf.readBoolean();
 };
 FeatureCollectionPBuffer.UniqueIdField.write = function (obj, pbf) {
-    if (obj.name) pbf.writeStringField(1, obj.name);
-    if (obj.isSystemMaintained) pbf.writeBooleanField(2, obj.isSystemMaintained);
+  if (obj.name) pbf.writeStringField(1, obj.name);
+  if (obj.isSystemMaintained) pbf.writeBooleanField(2, obj.isSystemMaintained);
 };
 
 // FeatureCollectionPBuffer.GeometryProperties ========================================
@@ -363,17 +363,17 @@ FeatureCollectionPBuffer.UniqueIdField.write = function (obj, pbf) {
 FeatureCollectionPBuffer.GeometryProperties = {};
 
 FeatureCollectionPBuffer.GeometryProperties.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.GeometryProperties._readField, {shapeAreaFieldName: "", shapeLengthFieldName: "", units: ""}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.GeometryProperties._readField, {shapeAreaFieldName: '', shapeLengthFieldName: '', units: ''}, end);
 };
 FeatureCollectionPBuffer.GeometryProperties._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.shapeAreaFieldName = pbf.readString();
-    else if (tag === 2) obj.shapeLengthFieldName = pbf.readString();
-    else if (tag === 3) obj.units = pbf.readString();
+  if (tag === 1) obj.shapeAreaFieldName = pbf.readString();
+  else if (tag === 2) obj.shapeLengthFieldName = pbf.readString();
+  else if (tag === 3) obj.units = pbf.readString();
 };
 FeatureCollectionPBuffer.GeometryProperties.write = function (obj, pbf) {
-    if (obj.shapeAreaFieldName) pbf.writeStringField(1, obj.shapeAreaFieldName);
-    if (obj.shapeLengthFieldName) pbf.writeStringField(2, obj.shapeLengthFieldName);
-    if (obj.units) pbf.writeStringField(3, obj.units);
+  if (obj.shapeAreaFieldName) pbf.writeStringField(1, obj.shapeAreaFieldName);
+  if (obj.shapeLengthFieldName) pbf.writeStringField(2, obj.shapeLengthFieldName);
+  if (obj.units) pbf.writeStringField(3, obj.units);
 };
 
 // FeatureCollectionPBuffer.ServerGens ========================================
@@ -381,15 +381,15 @@ FeatureCollectionPBuffer.GeometryProperties.write = function (obj, pbf) {
 FeatureCollectionPBuffer.ServerGens = {};
 
 FeatureCollectionPBuffer.ServerGens.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.ServerGens._readField, {minServerGen: 0, serverGen: 0}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.ServerGens._readField, {minServerGen: 0, serverGen: 0}, end);
 };
 FeatureCollectionPBuffer.ServerGens._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.minServerGen = pbf.readVarint();
-    else if (tag === 2) obj.serverGen = pbf.readVarint();
+  if (tag === 1) obj.minServerGen = pbf.readVarint();
+  else if (tag === 2) obj.serverGen = pbf.readVarint();
 };
 FeatureCollectionPBuffer.ServerGens.write = function (obj, pbf) {
-    if (obj.minServerGen) pbf.writeVarintField(1, obj.minServerGen);
-    if (obj.serverGen) pbf.writeVarintField(2, obj.serverGen);
+  if (obj.minServerGen) pbf.writeVarintField(1, obj.minServerGen);
+  if (obj.serverGen) pbf.writeVarintField(2, obj.serverGen);
 };
 
 // FeatureCollectionPBuffer.Scale ========================================
@@ -397,19 +397,19 @@ FeatureCollectionPBuffer.ServerGens.write = function (obj, pbf) {
 FeatureCollectionPBuffer.Scale = {};
 
 FeatureCollectionPBuffer.Scale.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.Scale._readField, {xScale: 0, yScale: 0, mScale: 0, zScale: 0}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.Scale._readField, {xScale: 0, yScale: 0, mScale: 0, zScale: 0}, end);
 };
 FeatureCollectionPBuffer.Scale._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.xScale = pbf.readDouble();
-    else if (tag === 2) obj.yScale = pbf.readDouble();
-    else if (tag === 3) obj.mScale = pbf.readDouble();
-    else if (tag === 4) obj.zScale = pbf.readDouble();
+  if (tag === 1) obj.xScale = pbf.readDouble();
+  else if (tag === 2) obj.yScale = pbf.readDouble();
+  else if (tag === 3) obj.mScale = pbf.readDouble();
+  else if (tag === 4) obj.zScale = pbf.readDouble();
 };
 FeatureCollectionPBuffer.Scale.write = function (obj, pbf) {
-    if (obj.xScale) pbf.writeDoubleField(1, obj.xScale);
-    if (obj.yScale) pbf.writeDoubleField(2, obj.yScale);
-    if (obj.mScale) pbf.writeDoubleField(3, obj.mScale);
-    if (obj.zScale) pbf.writeDoubleField(4, obj.zScale);
+  if (obj.xScale) pbf.writeDoubleField(1, obj.xScale);
+  if (obj.yScale) pbf.writeDoubleField(2, obj.yScale);
+  if (obj.mScale) pbf.writeDoubleField(3, obj.mScale);
+  if (obj.zScale) pbf.writeDoubleField(4, obj.zScale);
 };
 
 // FeatureCollectionPBuffer.Translate ========================================
@@ -417,19 +417,19 @@ FeatureCollectionPBuffer.Scale.write = function (obj, pbf) {
 FeatureCollectionPBuffer.Translate = {};
 
 FeatureCollectionPBuffer.Translate.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.Translate._readField, {xTranslate: 0, yTranslate: 0, mTranslate: 0, zTranslate: 0}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.Translate._readField, {xTranslate: 0, yTranslate: 0, mTranslate: 0, zTranslate: 0}, end);
 };
 FeatureCollectionPBuffer.Translate._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.xTranslate = pbf.readDouble();
-    else if (tag === 2) obj.yTranslate = pbf.readDouble();
-    else if (tag === 3) obj.mTranslate = pbf.readDouble();
-    else if (tag === 4) obj.zTranslate = pbf.readDouble();
+  if (tag === 1) obj.xTranslate = pbf.readDouble();
+  else if (tag === 2) obj.yTranslate = pbf.readDouble();
+  else if (tag === 3) obj.mTranslate = pbf.readDouble();
+  else if (tag === 4) obj.zTranslate = pbf.readDouble();
 };
 FeatureCollectionPBuffer.Translate.write = function (obj, pbf) {
-    if (obj.xTranslate) pbf.writeDoubleField(1, obj.xTranslate);
-    if (obj.yTranslate) pbf.writeDoubleField(2, obj.yTranslate);
-    if (obj.mTranslate) pbf.writeDoubleField(3, obj.mTranslate);
-    if (obj.zTranslate) pbf.writeDoubleField(4, obj.zTranslate);
+  if (obj.xTranslate) pbf.writeDoubleField(1, obj.xTranslate);
+  if (obj.yTranslate) pbf.writeDoubleField(2, obj.yTranslate);
+  if (obj.mTranslate) pbf.writeDoubleField(3, obj.mTranslate);
+  if (obj.zTranslate) pbf.writeDoubleField(4, obj.zTranslate);
 };
 
 // FeatureCollectionPBuffer.Transform ========================================
@@ -437,17 +437,17 @@ FeatureCollectionPBuffer.Translate.write = function (obj, pbf) {
 FeatureCollectionPBuffer.Transform = {};
 
 FeatureCollectionPBuffer.Transform.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.Transform._readField, {quantizeOriginPostion: 0, scale: null, translate: null}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.Transform._readField, {quantizeOriginPostion: 0, scale: null, translate: null}, end);
 };
 FeatureCollectionPBuffer.Transform._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.quantizeOriginPostion = pbf.readVarint();
-    else if (tag === 2) obj.scale = FeatureCollectionPBuffer.Scale.read(pbf, pbf.readVarint() + pbf.pos);
-    else if (tag === 3) obj.translate = FeatureCollectionPBuffer.Translate.read(pbf, pbf.readVarint() + pbf.pos);
+  if (tag === 1) obj.quantizeOriginPostion = pbf.readVarint();
+  else if (tag === 2) obj.scale = FeatureCollectionPBuffer.Scale.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 3) obj.translate = FeatureCollectionPBuffer.Translate.read(pbf, pbf.readVarint() + pbf.pos);
 };
 FeatureCollectionPBuffer.Transform.write = function (obj, pbf) {
-    if (obj.quantizeOriginPostion) pbf.writeVarintField(1, obj.quantizeOriginPostion);
-    if (obj.scale) pbf.writeMessage(2, FeatureCollectionPBuffer.Scale.write, obj.scale);
-    if (obj.translate) pbf.writeMessage(3, FeatureCollectionPBuffer.Translate.write, obj.translate);
+  if (obj.quantizeOriginPostion) pbf.writeVarintField(1, obj.quantizeOriginPostion);
+  if (obj.scale) pbf.writeMessage(2, FeatureCollectionPBuffer.Scale.write, obj.scale);
+  if (obj.translate) pbf.writeMessage(3, FeatureCollectionPBuffer.Translate.write, obj.translate);
 };
 
 // FeatureCollectionPBuffer.FeatureResult ========================================
@@ -455,41 +455,41 @@ FeatureCollectionPBuffer.Transform.write = function (obj, pbf) {
 FeatureCollectionPBuffer.FeatureResult = {};
 
 FeatureCollectionPBuffer.FeatureResult.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.FeatureResult._readField, {objectIdFieldName: "", uniqueIdField: null, globalIdFieldName: "", geohashFieldName: "", geometryProperties: null, serverGens: null, geometryType: 0, spatialReference: null, exceededTransferLimit: false, hasZ: false, hasM: false, transform: null, fields: [], values: [], features: []}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.FeatureResult._readField, {objectIdFieldName: '', uniqueIdField: null, globalIdFieldName: '', geohashFieldName: '', geometryProperties: null, serverGens: null, geometryType: 0, spatialReference: null, exceededTransferLimit: false, hasZ: false, hasM: false, transform: null, fields: [], values: [], features: []}, end);
 };
 FeatureCollectionPBuffer.FeatureResult._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.objectIdFieldName = pbf.readString();
-    else if (tag === 2) obj.uniqueIdField = FeatureCollectionPBuffer.UniqueIdField.read(pbf, pbf.readVarint() + pbf.pos);
-    else if (tag === 3) obj.globalIdFieldName = pbf.readString();
-    else if (tag === 4) obj.geohashFieldName = pbf.readString();
-    else if (tag === 5) obj.geometryProperties = FeatureCollectionPBuffer.GeometryProperties.read(pbf, pbf.readVarint() + pbf.pos);
-    else if (tag === 6) obj.serverGens = FeatureCollectionPBuffer.ServerGens.read(pbf, pbf.readVarint() + pbf.pos);
-    else if (tag === 7) obj.geometryType = pbf.readVarint();
-    else if (tag === 8) obj.spatialReference = FeatureCollectionPBuffer.SpatialReference.read(pbf, pbf.readVarint() + pbf.pos);
-    else if (tag === 9) obj.exceededTransferLimit = pbf.readBoolean();
-    else if (tag === 10) obj.hasZ = pbf.readBoolean();
-    else if (tag === 11) obj.hasM = pbf.readBoolean();
-    else if (tag === 12) obj.transform = FeatureCollectionPBuffer.Transform.read(pbf, pbf.readVarint() + pbf.pos);
-    else if (tag === 13) obj.fields.push(FeatureCollectionPBuffer.Field.read(pbf, pbf.readVarint() + pbf.pos));
-    else if (tag === 14) obj.values.push(FeatureCollectionPBuffer.Value.read(pbf, pbf.readVarint() + pbf.pos));
-    else if (tag === 15) obj.features.push(FeatureCollectionPBuffer.Feature.read(pbf, pbf.readVarint() + pbf.pos));
+  if (tag === 1) obj.objectIdFieldName = pbf.readString();
+  else if (tag === 2) obj.uniqueIdField = FeatureCollectionPBuffer.UniqueIdField.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 3) obj.globalIdFieldName = pbf.readString();
+  else if (tag === 4) obj.geohashFieldName = pbf.readString();
+  else if (tag === 5) obj.geometryProperties = FeatureCollectionPBuffer.GeometryProperties.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 6) obj.serverGens = FeatureCollectionPBuffer.ServerGens.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 7) obj.geometryType = pbf.readVarint();
+  else if (tag === 8) obj.spatialReference = FeatureCollectionPBuffer.SpatialReference.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 9) obj.exceededTransferLimit = pbf.readBoolean();
+  else if (tag === 10) obj.hasZ = pbf.readBoolean();
+  else if (tag === 11) obj.hasM = pbf.readBoolean();
+  else if (tag === 12) obj.transform = FeatureCollectionPBuffer.Transform.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 13) obj.fields.push(FeatureCollectionPBuffer.Field.read(pbf, pbf.readVarint() + pbf.pos));
+  else if (tag === 14) obj.values.push(FeatureCollectionPBuffer.Value.read(pbf, pbf.readVarint() + pbf.pos));
+  else if (tag === 15) obj.features.push(FeatureCollectionPBuffer.Feature.read(pbf, pbf.readVarint() + pbf.pos));
 };
 FeatureCollectionPBuffer.FeatureResult.write = function (obj, pbf) {
-    if (obj.objectIdFieldName) pbf.writeStringField(1, obj.objectIdFieldName);
-    if (obj.uniqueIdField) pbf.writeMessage(2, FeatureCollectionPBuffer.UniqueIdField.write, obj.uniqueIdField);
-    if (obj.globalIdFieldName) pbf.writeStringField(3, obj.globalIdFieldName);
-    if (obj.geohashFieldName) pbf.writeStringField(4, obj.geohashFieldName);
-    if (obj.geometryProperties) pbf.writeMessage(5, FeatureCollectionPBuffer.GeometryProperties.write, obj.geometryProperties);
-    if (obj.serverGens) pbf.writeMessage(6, FeatureCollectionPBuffer.ServerGens.write, obj.serverGens);
-    if (obj.geometryType) pbf.writeVarintField(7, obj.geometryType);
-    if (obj.spatialReference) pbf.writeMessage(8, FeatureCollectionPBuffer.SpatialReference.write, obj.spatialReference);
-    if (obj.exceededTransferLimit) pbf.writeBooleanField(9, obj.exceededTransferLimit);
-    if (obj.hasZ) pbf.writeBooleanField(10, obj.hasZ);
-    if (obj.hasM) pbf.writeBooleanField(11, obj.hasM);
-    if (obj.transform) pbf.writeMessage(12, FeatureCollectionPBuffer.Transform.write, obj.transform);
-    if (obj.fields) for (var i = 0; i < obj.fields.length; i++) pbf.writeMessage(13, FeatureCollectionPBuffer.Field.write, obj.fields[i]);
-    if (obj.values) for (i = 0; i < obj.values.length; i++) pbf.writeMessage(14, FeatureCollectionPBuffer.Value.write, obj.values[i]);
-    if (obj.features) for (i = 0; i < obj.features.length; i++) pbf.writeMessage(15, FeatureCollectionPBuffer.Feature.write, obj.features[i]);
+  if (obj.objectIdFieldName) pbf.writeStringField(1, obj.objectIdFieldName);
+  if (obj.uniqueIdField) pbf.writeMessage(2, FeatureCollectionPBuffer.UniqueIdField.write, obj.uniqueIdField);
+  if (obj.globalIdFieldName) pbf.writeStringField(3, obj.globalIdFieldName);
+  if (obj.geohashFieldName) pbf.writeStringField(4, obj.geohashFieldName);
+  if (obj.geometryProperties) pbf.writeMessage(5, FeatureCollectionPBuffer.GeometryProperties.write, obj.geometryProperties);
+  if (obj.serverGens) pbf.writeMessage(6, FeatureCollectionPBuffer.ServerGens.write, obj.serverGens);
+  if (obj.geometryType) pbf.writeVarintField(7, obj.geometryType);
+  if (obj.spatialReference) pbf.writeMessage(8, FeatureCollectionPBuffer.SpatialReference.write, obj.spatialReference);
+  if (obj.exceededTransferLimit) pbf.writeBooleanField(9, obj.exceededTransferLimit);
+  if (obj.hasZ) pbf.writeBooleanField(10, obj.hasZ);
+  if (obj.hasM) pbf.writeBooleanField(11, obj.hasM);
+  if (obj.transform) pbf.writeMessage(12, FeatureCollectionPBuffer.Transform.write, obj.transform);
+  if (obj.fields) for (var i = 0; i < obj.fields.length; i++) pbf.writeMessage(13, FeatureCollectionPBuffer.Field.write, obj.fields[i]);
+  if (obj.values) for (i = 0; i < obj.values.length; i++) pbf.writeMessage(14, FeatureCollectionPBuffer.Value.write, obj.values[i]);
+  if (obj.features) for (i = 0; i < obj.features.length; i++) pbf.writeMessage(15, FeatureCollectionPBuffer.Feature.write, obj.features[i]);
 };
 
 // FeatureCollectionPBuffer.CountResult ========================================
@@ -497,13 +497,13 @@ FeatureCollectionPBuffer.FeatureResult.write = function (obj, pbf) {
 FeatureCollectionPBuffer.CountResult = {};
 
 FeatureCollectionPBuffer.CountResult.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.CountResult._readField, {count: 0}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.CountResult._readField, {count: 0}, end);
 };
 FeatureCollectionPBuffer.CountResult._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.count = pbf.readVarint();
+  if (tag === 1) obj.count = pbf.readVarint();
 };
 FeatureCollectionPBuffer.CountResult.write = function (obj, pbf) {
-    if (obj.count) pbf.writeVarintField(1, obj.count);
+  if (obj.count) pbf.writeVarintField(1, obj.count);
 };
 
 // FeatureCollectionPBuffer.ObjectIdsResult ========================================
@@ -511,17 +511,17 @@ FeatureCollectionPBuffer.CountResult.write = function (obj, pbf) {
 FeatureCollectionPBuffer.ObjectIdsResult = {};
 
 FeatureCollectionPBuffer.ObjectIdsResult.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.ObjectIdsResult._readField, {objectIdFieldName: "", serverGens: null, objectIds: []}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.ObjectIdsResult._readField, {objectIdFieldName: '', serverGens: null, objectIds: []}, end);
 };
 FeatureCollectionPBuffer.ObjectIdsResult._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.objectIdFieldName = pbf.readString();
-    else if (tag === 2) obj.serverGens = FeatureCollectionPBuffer.ServerGens.read(pbf, pbf.readVarint() + pbf.pos);
-    else if (tag === 3) pbf.readPackedVarint(obj.objectIds);
+  if (tag === 1) obj.objectIdFieldName = pbf.readString();
+  else if (tag === 2) obj.serverGens = FeatureCollectionPBuffer.ServerGens.read(pbf, pbf.readVarint() + pbf.pos);
+  else if (tag === 3) pbf.readPackedVarint(obj.objectIds);
 };
 FeatureCollectionPBuffer.ObjectIdsResult.write = function (obj, pbf) {
-    if (obj.objectIdFieldName) pbf.writeStringField(1, obj.objectIdFieldName);
-    if (obj.serverGens) pbf.writeMessage(2, FeatureCollectionPBuffer.ServerGens.write, obj.serverGens);
-    if (obj.objectIds) pbf.writePackedVarint(3, obj.objectIds);
+  if (obj.objectIdFieldName) pbf.writeStringField(1, obj.objectIdFieldName);
+  if (obj.serverGens) pbf.writeMessage(2, FeatureCollectionPBuffer.ServerGens.write, obj.serverGens);
+  if (obj.objectIds) pbf.writePackedVarint(3, obj.objectIds);
 };
 
 // FeatureCollectionPBuffer.QueryResult ========================================
@@ -529,15 +529,15 @@ FeatureCollectionPBuffer.ObjectIdsResult.write = function (obj, pbf) {
 FeatureCollectionPBuffer.QueryResult = {};
 
 FeatureCollectionPBuffer.QueryResult.read = function (pbf, end) {
-    return pbf.readFields(FeatureCollectionPBuffer.QueryResult._readField, {featureResult: null, Results: null, countResult: null, idsResult: null}, end);
+  return pbf.readFields(FeatureCollectionPBuffer.QueryResult._readField, {featureResult: null, Results: null, countResult: null, idsResult: null}, end);
 };
 FeatureCollectionPBuffer.QueryResult._readField = function (tag, obj, pbf) {
-    if (tag === 1) obj.featureResult = FeatureCollectionPBuffer.FeatureResult.read(pbf, pbf.readVarint() + pbf.pos), obj.Results = "featureResult";
-    else if (tag === 2) obj.countResult = FeatureCollectionPBuffer.CountResult.read(pbf, pbf.readVarint() + pbf.pos), obj.Results = "countResult";
-    else if (tag === 3) obj.idsResult = FeatureCollectionPBuffer.ObjectIdsResult.read(pbf, pbf.readVarint() + pbf.pos), obj.Results = "idsResult";
+  if (tag === 1) obj.featureResult = FeatureCollectionPBuffer.FeatureResult.read(pbf, pbf.readVarint() + pbf.pos), obj.Results = 'featureResult';
+  else if (tag === 2) obj.countResult = FeatureCollectionPBuffer.CountResult.read(pbf, pbf.readVarint() + pbf.pos), obj.Results = 'countResult';
+  else if (tag === 3) obj.idsResult = FeatureCollectionPBuffer.ObjectIdsResult.read(pbf, pbf.readVarint() + pbf.pos), obj.Results = 'idsResult';
 };
 FeatureCollectionPBuffer.QueryResult.write = function (obj, pbf) {
-    if (obj.featureResult) pbf.writeMessage(1, FeatureCollectionPBuffer.FeatureResult.write, obj.featureResult);
-    if (obj.countResult) pbf.writeMessage(2, FeatureCollectionPBuffer.CountResult.write, obj.countResult);
-    if (obj.idsResult) pbf.writeMessage(3, FeatureCollectionPBuffer.ObjectIdsResult.write, obj.idsResult);
+  if (obj.featureResult) pbf.writeMessage(1, FeatureCollectionPBuffer.FeatureResult.write, obj.featureResult);
+  if (obj.countResult) pbf.writeMessage(2, FeatureCollectionPBuffer.CountResult.write, obj.countResult);
+  if (obj.idsResult) pbf.writeMessage(3, FeatureCollectionPBuffer.ObjectIdsResult.write, obj.idsResult);
 };
diff --git a/test/harness/pbf-multilinestring.pbf b/test/harness/pbf-multilinestring.pbf
new file mode 100644
index 0000000..4b38080
Binary files /dev/null and b/test/harness/pbf-multilinestring.pbf differ