@itwin/map-layers-formats 3.5.0-dev.52 → 3.5.0-dev.57

package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureQuery.ts.html

@@ -25,28 +25,28 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>54/54</span>
+                <span class='fraction'>50/50</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">97.36% </span>
+                <span class="strong">96.87% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>37/38</span>
+                <span class='fraction'>31/32</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>3/3</span>
+                <span class='fraction'>2/2</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>54/54</span>
+                <span class='fraction'>50/50</span>
             </div>
         
             
@@ -289,17 +289,7 @@
 <a name='L224'></a><a href='#L224'>224</a>
 <a name='L225'></a><a href='#L225'>225</a>
 <a name='L226'></a><a href='#L226'>226</a>
-<a name='L227'></a><a href='#L227'>227</a>
-<a name='L228'></a><a href='#L228'>228</a>
-<a name='L229'></a><a href='#L229'>229</a>
-<a name='L230'></a><a href='#L230'>230</a>
-<a name='L231'></a><a href='#L231'>231</a>
-<a name='L232'></a><a href='#L232'>232</a>
-<a name='L233'></a><a href='#L233'>233</a>
-<a name='L234'></a><a href='#L234'>234</a>
-<a name='L235'></a><a href='#L235'>235</a>
-<a name='L236'></a><a href='#L236'>236</a>
-<a name='L237'></a><a href='#L237'>237</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L227'></a><a href='#L227'>227</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -461,6 +451,8 @@
 <span class="cline-any cline-yes">14x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">14x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">14x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -497,6 +489,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-yes">12x</span>
+<span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -506,8 +499,8 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">14x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">14x</span>
@@ -522,19 +515,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">112x</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">111x</span>
-<span class="cline-any cline-yes">111x</span>
-<span class="cline-any cline-yes">97x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">111x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">/*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -694,80 +674,70 @@ export class ArcGisFeatureQuery {
   }
 &nbsp;
   public toString() {
-    let customParams = "";
+    const url = new URL(`${this.baseUrl}/${this.layerIdx}/query`);
+&nbsp;
+    url.searchParams.append("f", this.format);
 &nbsp;
     if ( this.resultRecordCount !== undefined) {
-      customParams = ArcGisFeatureQuery.appendParam(customParams, "resultRecordCount", `${this.resultRecordCount}`);
+      url.searchParams.append("resultRecordCount", `${this.resultRecordCount}`);
     }
 &nbsp;
     if ( this.resultOffset !== undefined) {
-      customParams = ArcGisFeatureQuery.appendParam(customParams, "resultOffset", `${this.resultOffset}`);
+      url.searchParams.append( "resultOffset", `${this.resultOffset}`);
     }
 &nbsp;
     if ( this.returnGeometry !== undefined) {
-      customParams = ArcGisFeatureQuery.appendParam(customParams, "returnGeometry", this.returnGeometry?"true":"false");
+      url.searchParams.append("returnGeometry", this.returnGeometry?"true":"false");
     }
 &nbsp;
     if ( this.resultType !== undefined) {
-      customParams = ArcGisFeatureQuery.appendParam(customParams, "resultType", this.resultType);
+      url.searchParams.append("resultType", this.resultType);
     }
 &nbsp;
     if ( this.maxRecordCountFactor !== undefined) {
-      customParams = ArcGisFeatureQuery.appendParam(customParams, "maxRecordCountFactor", `${this.maxRecordCountFactor}`);
+      url.searchParams.append( "maxRecordCountFactor", `${this.maxRecordCountFactor}`);
     }
 &nbsp;
     if ( this.returnExceededLimitFeatures !== undefined) {
-      customParams = ArcGisFeatureQuery.appendParam(customParams, "returnExceededLimitFeatures", this.returnExceededLimitFeatures?<span class="branch-0 cbranch-no" title="branch not covered" >"true":</span>"false");
+      url.searchParams.append( "returnExceededLimitFeatures", this.returnExceededLimitFeatures?<span class="branch-0 cbranch-no" title="branch not covered" >"true":</span>"false");
     }
 &nbsp;
-    customParams = ArcGisFeatureQuery.appendParam(customParams, "outSR", `${this.outSR}`);
+    url.searchParams.append( "outSR", `${this.outSR}`);
 &nbsp;
     if (this.geometry || this.spatialRel) {
 &nbsp;
       if (this.spatialRel) {
-        customParams = ArcGisFeatureQuery.appendParam(customParams, "spatialRel", this.spatialRel);
+        url.searchParams.append( "spatialRel", this.spatialRel);
       }
 &nbsp;
       if (this.geometry) {
-        customParams = ArcGisFeatureQuery.appendParam(customParams, "geometryType", this.geometry.type);
+        url.searchParams.append( "geometryType", this.geometry.type);
 &nbsp;
         const geomStr = JSON.stringify(this.geometry.geom);
-        customParams = ArcGisFeatureQuery.appendParam(customParams, "geometry", geomStr);
+        url.searchParams.append( "geometry", geomStr);
+        url.searchParams.append( "units", "esriSRUnit_Meter");    // required on older server for get feature info
 &nbsp;
-        customParams = ArcGisFeatureQuery.appendParam(customParams, "inSR", `${this.geometry.geom.spatialReference.wkid}`);
+        url.searchParams.append( "inSR", `${this.geometry.geom.spatialReference.wkid}`);
       }
     } else {
       // No custom params, fetch all geometries
-      customParams = "where=1=1";
+      url.searchParams.append("where", "1=1");
     }
 &nbsp;
     if (this.quantizationParams) {
       const quantizationParamsStr = JSON.stringify(this.quantizationParams);
-      customParams = ArcGisFeatureQuery.appendParam(customParams, "quantizationParameters", quantizationParamsStr);
+      url.searchParams.append("quantizationParameters", quantizationParamsStr);
     }
 &nbsp;
     if (this.outFields) {
-      customParams = ArcGisFeatureQuery.appendParam(customParams, "outFields", this.outFields);
+      url.searchParams.append( "outFields", this.outFields);
     }
 &nbsp;
     if (this.distance) {
-      customParams = ArcGisFeatureQuery.appendParam(customParams, "distance", `${this.distance}`);
-    }
-&nbsp;
-    return `${this.baseUrl}/${this.layerIdx}/query/?f=${this.format}&amp;${customParams}`;
-  }
-&nbsp;
-  private static  appendParam(urlToAppend: string, paramName: string, paramValue: string) {
-    if (paramName.length === 0) {
-      return urlToAppend;
-    }
-&nbsp;
-    let url = urlToAppend;
-    if (urlToAppend.length &gt; 0 &amp;&amp; !urlToAppend.endsWith("&amp;")) {
-      url = `${urlToAppend  }&amp;`;
+      url.searchParams.append("distance", `${this.distance}`);
     }
 &nbsp;
-    return `${url}${paramName}=${paramValue}`;
+    return url.toString();
   }
 &nbsp;
 }
@@ -778,7 +748,7 @@ export class ArcGisFeatureQuery {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-18T05:16:13.625Z
+                at 2022-11-23T05:16:33.533Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureReader.ts.html

@@ -208,7 +208,7 @@ export abstract class ArcGisFeatureReader  {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-18T05:16:13.625Z
+                at 2022-11-23T05:16:33.533Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureRenderer.ts.html

@@ -583,7 +583,7 @@ export class ArcGisFeatureRenderer  {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-18T05:16:13.625Z
+                at 2022-11-23T05:16:33.533Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureResponse.ts.html

@@ -286,7 +286,7 @@ export class ArcGisFeatureResponse {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-18T05:16:13.625Z
+                at 2022-11-23T05:16:33.533Z
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisSymbologyRenderer.ts.html

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">89.58% </span>
+                <span class="strong">89.79% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>86/96</span>
+                <span class='fraction'>88/98</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">78.26% </span>
+                <span class="strong">78.12% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>72/92</span>
+                <span class='fraction'>75/96</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">89.47% </span>
+                <span class="strong">89.69% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>85/95</span>
+                <span class='fraction'>87/97</span>
             </div>
         
             
@@ -309,7 +309,10 @@
 <a name='L244'></a><a href='#L244'>244</a>
 <a name='L245'></a><a href='#L245'>245</a>
 <a name='L246'></a><a href='#L246'>246</a>
-<a name='L247'></a><a href='#L247'>247</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L247'></a><a href='#L247'>247</a>
+<a name='L248'></a><a href='#L248'>248</a>
+<a name='L249'></a><a href='#L249'>249</a>
+<a name='L250'></a><a href='#L250'>250</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -320,9 +323,9 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">36x</span>
+<span class="cline-any cline-yes">42x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">36x</span>
+<span class="cline-any cline-yes">42x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -350,17 +353,17 @@
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">28x</span>
-<span class="cline-any cline-yes">22x</span>
-<span class="cline-any cline-yes">15x</span>
-<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">32x</span>
+<span class="cline-any cline-yes">26x</span>
+<span class="cline-any cline-yes">19x</span>
+<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">22x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">22x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -381,26 +384,26 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-yes">13x</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">21x</span>
+<span class="cline-any cline-yes">15x</span>
 <span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">13x</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">8x</span>
+<span class="cline-any cline-yes">21x</span>
+<span class="cline-any cline-yes">14x</span>
+<span class="cline-any cline-yes">14x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
-<span class="cline-any cline-yes">11x</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">15x</span>
+<span class="cline-any cline-yes">15x</span>
+<span class="cline-any cline-yes">15x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">15x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -418,18 +421,18 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">9x</span>
-<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -446,6 +449,8 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -461,13 +466,13 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">51x</span>
+<span class="cline-any cline-yes">53x</span>
 <span class="cline-any cline-yes">28x</span>
-<span class="cline-any cline-yes">23x</span>
+<span class="cline-any cline-yes">25x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">51x</span>
+<span class="cline-any cline-yes">53x</span>
 <span class="cline-any cline-yes">29x</span>
 <span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-yes">24x</span>
@@ -480,16 +485,16 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">51x</span>
-<span class="cline-any cline-yes">22x</span>
+<span class="cline-any cline-yes">53x</span>
+<span class="cline-any cline-yes">24x</span>
+<span class="cline-any cline-yes">24x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">22x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">20x</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">18x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">19x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -539,14 +544,15 @@
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -670,7 +676,7 @@ export class EsriSFS implements EsriSymbol {
   public get outline() { return this._outline; }
   constructor(json: EsriSFSProps) {
     this.props = json;
-    <span class="missing-if-branch" title="else path not taken" >E</span>if (json.outline)
+    if (json.outline)
       this._outline = EsriSLS.fromJSON(json.outline);
   }
 &nbsp;
@@ -687,21 +693,23 @@ export class ArcGisSymbologyRenderer {
     type: "esriPMS",
     url: "",
     contentType: "image/png",
-    imageData: "iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAAXNSR0IB2cksfwAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAT9JREFUOI2t1E8rRGEUx/HvMHViIm5ZXGt/3gFlwdKGhYjyAmxs7IassDHFyguwwkbZYJKNslVWJDZT1C3psRv9NMpmJk/Tvc3MHWf3/PuccxbPyfKPkW1wPmBmQ5L6giB4d849Al+tYjNAHpiQ1AHgnAMoA+dhGG5HUfTQCOsCDoGlhCTdwGIURfPVZPtJWCdwBkwntVF3d6+K78Rh+SYhP7bM7FbSjY8FwHqLEEBGUgEY97E5oCcFBjAGDAMvNWwyJVSLKR8L28QG4a/N7zYx+VipTazkY0VgNSVUAa597MrMniWNpMBOAOdjFUlrwAWQaQFywGZt4f+AIrAB7DYJlc1sQdJrHAZQAN6AA6A/STGzp1wut+ycu/f340bQEXAJrACzwCjQC3wAd8CppGNJP/UPk+bZZ7XKQlJ1cfEL1AZaAcKna+kAAAAASUVORK5CYII=",
-    width: 14,
-    height: 14,
+    imageData: "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAmBJREFUOE+Nk01IVFEUx//n3jfvOZOaJkMtiiJ7o9RG3LgoqKhFSFJBTS1ahFBBi0ijfJXCIyQr+hBbSIsoW7iQoKKFCw2CkAI3tZAgy8Ei+xhoTCbnje/NPfHGnA816KzuPR+/c8/HJRQJE7o+VUhym0DcCOYGgBQEXjOLlyqo+nHanCkMoaL4rslKjZwOQLT4ek3Mmz3FACFNLB67ut6M1nWphbg8wI6VyJK5KEH0EQFVJRKbwzokAW++p/ErraAYSQK3u47bC3vLnA+ZB9i2gHF0oyQMCfCGNaUa+vauxs71wWz2V18cnBj8gQ8J1/eeBnHUa4sMFQDGdGno+4gwEAoQzjVUon3rqlx1KY9x7+0MWobjAPg3QJ2eZV4tAEyFNCN5FkSXyw2B3j1hRGvLcgBXMV5MptA4MOXr0gT0u5bZnAf0jBsyiSgJPAxqhON1K3FlRxUMvwFAtv7u0Wl0jvwEmJNEuOhakTt5wKEBifr6Oo14BIBRpgt07w6jcVMIngKGY7NofR5HwlF+zDcpsC193vyYB/innvHywCzdZfAR/+onX1segBTAxHzzfPE7/8yzzIPLjJE1LTixHZx5CtCK4gXLzovBiDPUsYxVM7gUkB3nWKlm6DYEnQGzXARxCOK+a1WfKtQXb6LNAvr7iCboCUA1Ocdsdv5KLPe7F6pH/w3wLbc+BwOuc5IZ1wEE/jonQbjptZn24tKKX7BgvR2r0NKZRwDvAqCI+Z30VJPTURv7P4A9psuQcYAUPwAoReBLrmX2Lmls7i8sZ7kWLwuoxA1FVJGxzMPLufi6P2r+2xFbOUjGAAAAAElFTkSuQmCC",
+    width: 16,
+    height: 16,
+    xoffset: -8,
+    yoffset: -16,
   };
 &nbsp;
   private static readonly defaultSLS: EsriSLSProps = {
     type: "esriSLS",
-    color: [0, 0.0],
+    color: [0, 0, 0, 255],
     width: 1,
     style: "esriSLSSolid",
   };
 &nbsp;
   private static readonly defaultSFS: EsriSFSProps = {
     type: "esriSFS",
-    color: [0, 0.0],
+    color:  [0, 0, 0, 255],
     style: "esriSFSSolid",
   };
 &nbsp;
@@ -729,11 +737,11 @@ export class ArcGisSymbologyRenderer {
     if (this._symbol === undefined) {
       Logger.logWarning(loggerCategory, "Symbology definition not supported, using default symbology");
       if (geometryType === "esriGeometryPoint" || geometryType === "esriGeometryMultipoint") {
-        this._symbol = ArcGisSymbologyRenderer.defaultPMS;
+        this._symbol = EsriPMS.fromJSON(ArcGisSymbologyRenderer.defaultPMS);
       } else if (geometryType === "esriGeometryLine" || geometryType === "esriGeometryPolyline") {
-        this._symbol = ArcGisSymbologyRenderer.defaultSLS;
+        this._symbol = EsriSLS.fromJSON(ArcGisSymbologyRenderer.defaultSLS);
       } else if (geometryType === "esriGeometryPolygon") {
-        this._symbol = ArcGisSymbologyRenderer.defaultSFS;
+        this._symbol = EsriSFS.fromJSON(ArcGisSymbologyRenderer.defaultSFS);
       } else {
         Logger.logError(loggerCategory, "Could not determine default symbology: geometry type not supported");
       }
@@ -784,14 +792,15 @@ export class ArcGisSymbologyRenderer {
       let xOffset = 0, yOffset = 0;
       <span class="missing-if-branch" title="if path not taken" >I</span>if (pms.xoffset)
 <span class="cstat-no" title="statement not covered" >        xOffset = pms.xoffset;</span>
+      else <span class="missing-if-branch" title="else path not taken" >E</span>if (pms.width)
+        xOffset = pms.width * -0.5;  // if no offset center in the middle
+&nbsp;
       <span class="missing-if-branch" title="if path not taken" >I</span>if (pms.yoffset)
 <span class="cstat-no" title="statement not covered" >        yOffset = pms.yoffset;</span>
+      else <span class="missing-if-branch" title="else path not taken" >E</span>if (pms.height)
+        yOffset = pms.height * -0.5; // if no offset center in the middle
 &nbsp;
       <span class="missing-if-branch" title="else path not taken" >E</span>if (pms.width &amp;&amp; pms.height) {
-        // // make sure the marker is centered on the point
-        xOffset += pms.width * -0.5;
-        yOffset += pms.height * -0.5;
-&nbsp;
         context.drawImage(pms.image, ptX + xOffset, ptY + yOffset, pms.width, pms.height);
       } else {
 <span class="cstat-no" title="statement not covered" >        context.drawImage(pms.image, ptX + xOffset, ptY + yOffset);</span>
@@ -808,7 +817,7 @@ export class ArcGisSymbologyRenderer {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2022-11-18T05:16:13.625Z
+                at 2022-11-23T05:16:33.533Z
             </div>
         <script src="../../prettify.js"></script>
         <script>