@kalisio/kdk 1.3.5 → 1.4.2

package/coverage/lcov-report/map/common/wfs-utils.js.html

@@ -25,14 +25,14 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>0/76</span>
+                <span class='fraction'>0/78</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/65</span>
+                <span class='fraction'>0/70</span>
             </div>
         
             
@@ -46,7 +46,7 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>0/69</span>
+                <span class='fraction'>0/70</span>
             </div>
         
             
@@ -218,7 +218,8 @@
 <a name='L159'></a><a href='#L159'>159</a>
 <a name='L160'></a><a href='#L160'>160</a>
 <a name='L161'></a><a href='#L161'>161</a>
-<a name='L162'></a><a href='#L162'>162</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L162'></a><a href='#L162'>162</a>
+<a name='L163'></a><a href='#L163'>163</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>
@@ -340,6 +341,7 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</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-neutral">&nbsp;</span>
@@ -493,6 +495,7 @@ export function <span class="fstat-no" title="function not covered" >decodeFeatu
 <span class="cstat-no" title="statement not covered" >    if (element.$.type) {</span>
 <span class="cstat-no" title="statement not covered" >      if (element.$.type === 'xsd:int' || element.$.type === 'int') <span class="cstat-no" title="statement not covered" >prop.type = 'number'</span></span>
       else <span class="cstat-no" title="statement not covered" >if (element.$.type === 'xsd:string' || element.$.type === 'string') <span class="cstat-no" title="statement not covered" >prop.type = 'string'</span></span>
+      else <span class="cstat-no" title="statement not covered" >if (element.$.type === 'gml:MultiSurfacePropertyType' || element.$.type === 'gml:PointPropertyType' || element.$.type === 'gml:MultiCurvePropertyType') <span class="cstat-no" title="statement not covered" >continue</span></span>
       else <span class="cstat-no" title="statement not covered" >console.log(`wfs-utils: unkown prop type ${element.$.type}`)</span>
     } else <span class="cstat-no" title="statement not covered" >if (element.simpleType) {</span>
       const root = <span class="cstat-no" title="statement not covered" >_.get(element, 'simpleType[0].restriction[0]')</span>
@@ -547,7 +550,7 @@ export function <span class="fstat-no" title="function not covered" >generatePro
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Jun 08 2021 18:08:53 GMT+0200 (GMT+02:00)
+                at Wed Dec 08 2021 20:41:51 GMT+0100 (GMT+01:00)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/map/common/wms-utils.js.html

@@ -412,7 +412,7 @@ export async function <span class="fstat-no" title="function not covered" >disco
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Jun 08 2021 18:08:53 GMT+0200 (GMT+02:00)
+                at Wed Dec 08 2021 20:41:51 GMT+0100 (GMT+01:00)
             </div>
         </div>
         <script src="../../prettify.js"></script>

package/coverage/lcov-report/map/common/wmts-utils.js.html

@@ -25,28 +25,28 @@
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>0/68</span>
+                <span class='fraction'>0/76</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>0/29</span>
+                <span class='fraction'>0/37</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>0/6</span>
+                <span class='fraction'>0/9</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">0% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>0/63</span>
+                <span class='fraction'>0/67</span>
             </div>
         
             
@@ -191,7 +191,27 @@
 <a name='L132'></a><a href='#L132'>132</a>
 <a name='L133'></a><a href='#L133'>133</a>
 <a name='L134'></a><a href='#L134'>134</a>
-<a name='L135'></a><a href='#L135'>135</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L135'></a><a href='#L135'>135</a>
+<a name='L136'></a><a href='#L136'>136</a>
+<a name='L137'></a><a href='#L137'>137</a>
+<a name='L138'></a><a href='#L138'>138</a>
+<a name='L139'></a><a href='#L139'>139</a>
+<a name='L140'></a><a href='#L140'>140</a>
+<a name='L141'></a><a href='#L141'>141</a>
+<a name='L142'></a><a href='#L142'>142</a>
+<a name='L143'></a><a href='#L143'>143</a>
+<a name='L144'></a><a href='#L144'>144</a>
+<a name='L145'></a><a href='#L145'>145</a>
+<a name='L146'></a><a href='#L146'>146</a>
+<a name='L147'></a><a href='#L147'>147</a>
+<a name='L148'></a><a href='#L148'>148</a>
+<a name='L149'></a><a href='#L149'>149</a>
+<a name='L150'></a><a href='#L150'>150</a>
+<a name='L151'></a><a href='#L151'>151</a>
+<a name='L152'></a><a href='#L152'>152</a>
+<a name='L153'></a><a href='#L153'>153</a>
+<a name='L154'></a><a href='#L154'>154</a>
+<a name='L155'></a><a href='#L155'>155</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>
@@ -223,6 +243,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-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</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-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -325,6 +352,19 @@
 <span class="cline-any cline-no">&nbsp;</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-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-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-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">import _ from 'lodash'
 import fetch from 'node-fetch'
 import xml2js from 'xml2js'
@@ -353,8 +393,15 @@ export async function <span class="fstat-no" title="function not covered" >disco
 &nbsp;
   const out = <span class="cstat-no" title="statement not covered" >{</span>
     version: _.get(caps, 'Capabilities.$.version'),
+    getTileUseKvpEncoding: false,
     availableLayers: {}
   }
+&nbsp;
+  // check how the server likes it's GetTile requests
+  const getTileOp = <span class="cstat-no" title="statement not covered" >_.get(caps, 'Capabilities.OperationsMetadata[0].Operation', []).find(<span class="fstat-no" title="function not covered" >e </span>=&gt; <span class="cstat-no" title="statement not covered" >e.$.name === 'GetTile')</span></span>
+  const constraint = <span class="cstat-no" title="statement not covered" >_.get(getTileOp, 'DCP[0].HTTP[0].Get[0].Constraint', []).find(<span class="fstat-no" title="function not covered" >e </span>=&gt; <span class="cstat-no" title="statement not covered" >e.$.name === 'GetEncoding')</span></span>
+  const encodings = <span class="cstat-no" title="statement not covered" >new Set(_.get(constraint, 'AllowedValues[0].Value', []).map(<span class="fstat-no" title="function not covered" >e </span>=&gt; <span class="cstat-no" title="statement not covered" >e.toLowerCase())</span>)</span>
+<span class="cstat-no" title="statement not covered" >  if (!encodings.has('rest') &amp;&amp; encodings.has('kvp')) <span class="cstat-no" title="statement not covered" >out.getTileUseKvpEncoding = true</span></span>
 &nbsp;
   // compute matching between tilematrixset and crs
   const tileMatrixSet2CRS = <span class="cstat-no" title="statement not covered" >{}</span>
@@ -389,21 +436,21 @@ export async function <span class="fstat-no" title="function not covered" >disco
 <span class="cstat-no" title="statement not covered" >      tileUrls[resurl.$.format] = resurl.$.template</span>
     }
     // lookup formats
-<span class="cstat-no" title="statement not covered" >    for (const fmt of _.get(layer, 'Format')) {</span>
+<span class="cstat-no" title="statement not covered" >    for (const fmt of _.get(layer, 'Format', [])) {</span>
 <span class="cstat-no" title="statement not covered" >      obj.formats[fmt] = {</span>
         id: fmt,
         templateUrl: tileUrls[fmt]
       }
     }
     // lookup styles
-<span class="cstat-no" title="statement not covered" >    for (const st of _.get(layer, 'Style')) {</span>
+<span class="cstat-no" title="statement not covered" >    for (const st of _.get(layer, 'Style', [])) {</span>
       const id = <span class="cstat-no" title="statement not covered" >st.Identifier[0]</span>
       const display = <span class="cstat-no" title="statement not covered" >_.get(st, 'Title[0]', id || 'default')</span>
       const legend = <span class="cstat-no" title="statement not covered" >_.get(st, 'LegendURL[0].$.xlink:href')</span>
 <span class="cstat-no" title="statement not covered" >      obj.styles[id] = { id, display, legend: buildUrl(legend, searchParams) }</span>
     }
     // lookup available crs
-<span class="cstat-no" title="statement not covered" >    for (const link of _.get(layer, 'TileMatrixSetLink')) {</span>
+<span class="cstat-no" title="statement not covered" >    for (const link of _.get(layer, 'TileMatrixSetLink', [])) {</span>
       const tms = <span class="cstat-no" title="statement not covered" >_.get(link, 'TileMatrixSet[0]')</span>
 <span class="cstat-no" title="statement not covered" >      if (tms) <span class="cstat-no" title="statement not covered" >obj.crs[tileMatrixSet2CRS[tms]] = tms</span></span>
     }
@@ -430,7 +477,7 @@ export async function <span class="fstat-no" title="function not covered" >disco
 <span class="cstat-no" title="statement not covered" >  return out</span>
 }
 &nbsp;
-export function <span class="fstat-no" title="function not covered" >buildLeafletUrl </span>(baseUrl, layer, { style = <span class="branch-0 cbranch-no" title="branch not covered" >'',</span> crs = <span class="branch-0 cbranch-no" title="branch not covered" >'',</span> format = <span class="branch-0 cbranch-no" title="branch not covered" >'',</span> dims = <span class="branch-0 cbranch-no" title="branch not covered" >{},</span> searchParams = <span class="branch-0 cbranch-no" title="branch not covered" >{} </span>} = <span class="branch-0 cbranch-no" title="branch not covered" >{})</span> {
+export function <span class="fstat-no" title="function not covered" >buildLeafletUrl </span>(baseUrl, layer, { version = <span class="branch-0 cbranch-no" title="branch not covered" >'',</span> style = <span class="branch-0 cbranch-no" title="branch not covered" >'',</span> crs = <span class="branch-0 cbranch-no" title="branch not covered" >'',</span> format = <span class="branch-0 cbranch-no" title="branch not covered" >'',</span> dims = <span class="branch-0 cbranch-no" title="branch not covered" >{},</span> searchParams = <span class="branch-0 cbranch-no" title="branch not covered" >{},</span> useKvpEncoding = <span class="branch-0 cbranch-no" title="branch not covered" >false </span>} = <span class="branch-0 cbranch-no" title="branch not covered" >{})</span> {
   const templateUrl = <span class="cstat-no" title="statement not covered" >_.get(layer.formats, `${format}.templateUrl`)</span>
 <span class="cstat-no" title="statement not covered" >  if (templateUrl) {</span>
     let url = <span class="cstat-no" title="statement not covered" >templateUrl.replace(/{Style}/i, style)</span>
@@ -457,7 +504,20 @@ export function <span class="fstat-no" title="function not covered" >buildLeafle
     'image/jpeg': 'jpg'
   }
   const ext = <span class="cstat-no" title="statement not covered" >_.get(fmt2ext, format.toLowerCase(), 'png')</span>
-<span class="cstat-no" title="statement not covered" >  return buildUrl(`${baseUrl}/${layer.id}/${style}/${layer.crs[crs]}/{z}/{y}/{x}.${ext}`, searchParams)</span>
+<span class="cstat-no" title="statement not covered" >  return useKvpEncoding</span>
+    ? buildUrl(baseUrl, Object.assign({
+      SERVICE: 'WMTS',
+      REQUEST: 'GetTile',
+      VERSION: version,
+      LAYER: layer.id,
+      STYLE: style,
+      FORMAT: format,
+      TILEMATRIXSET: layer.crs[crs],
+      TILEMATRIX: '{z}',
+      TILEROW: '{y}',
+      TILECOL: '{x}'
+    }, searchParams))
+    : buildUrl(`${baseUrl}/${layer.id}/${style}/${layer.crs[crs]}/{z}/{y}/{x}.${ext}`, searchParams)
 }
 &nbsp;</pre></td></tr></table></pre>
 
@@ -466,7 +526,7 @@ export function <span class="fstat-no" title="function not covered" >buildLeafle
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank">istanbul</a>
-                at Tue Jun 08 2021 18:08:53 GMT+0200 (GMT+02:00)
+                at Wed Dec 08 2021 20:41:51 GMT+0100 (GMT+01:00)
             </div>
         </div>
         <script src="../../prettify.js"></script>