w-geo 1.0.76 → 1.0.78

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. package/README.md +1 -1
  2. package/dist/w-geo.umd.js +3 -3
  3. package/dist/w-geo.umd.js.map +1 -1
  4. package/docs/-_class.mjs.html +1 -1
  5. package/docs/calcDepthStartEndByConnect.mjs.html +1 -1
  6. package/docs/calcDepthStartEndByGroup.mjs.html +1 -1
  7. package/docs/calcDepthStartEndFromCenter.mjs.html +1 -1
  8. package/docs/calcLiquefaction.mjs.html +1 -1
  9. package/docs/calcVerticalStress.mjs.html +1 -1
  10. package/docs/checkDepth.mjs.html +1 -1
  11. package/docs/checkDepthStartEnd.mjs.html +1 -1
  12. package/docs/complementDepthData.mjs.html +1 -1
  13. package/docs/groupByDepthStartEnd.mjs.html +1 -1
  14. package/docs/index.html +1 -1
  15. package/docs/mergeByDepthStartEnd.mjs.html +1 -1
  16. package/docs/relaPlasticityParams.mjs.html +1 -1
  17. package/docs/relaPorousParams.mjs.html +1 -1
  18. package/docs/sepDepthStartEndByDepth.mjs.html +1 -1
  19. package/docs/smoothDepthByKey.mjs.html +1 -1
  20. package/docs/w-geo.html +1 -1
  21. package/package.json +1 -1
  22. package/src/_soilGroup.mjs +40 -0
  23. package/src/calcLayers.mjs +6 -4
package/docs/-_class.mjs.html CHANGED
@@ -62,7 +62,7 @@
62
62
  <br class="clear">
63
63
 
64
64
  <footer>
65
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
65
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
66
66
  </footer>
67
67
 
68
68
  <script>prettyPrint();</script>
package/docs/calcDepthStartEndByConnect.mjs.html CHANGED
@@ -325,7 +325,7 @@ export default calcDepthStartEndByConnect
325
325
  <br class="clear">
326
326
 
327
327
  <footer>
328
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
328
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
329
329
  </footer>
330
330
 
331
331
  <script>prettyPrint();</script>
package/docs/calcDepthStartEndByGroup.mjs.html CHANGED
@@ -569,7 +569,7 @@ export default calcDepthStartEndByGroup
569
569
  <br class="clear">
570
570
 
571
571
  <footer>
572
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
572
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
573
573
  </footer>
574
574
 
575
575
  <script>prettyPrint();</script>
package/docs/calcDepthStartEndFromCenter.mjs.html CHANGED
@@ -349,7 +349,7 @@ export default calcDepthStartEndFromCenter
349
349
  <br class="clear">
350
350
 
351
351
  <footer>
352
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
352
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
353
353
  </footer>
354
354
 
355
355
  <script>prettyPrint();</script>
package/docs/calcLiquefaction.mjs.html CHANGED
@@ -7241,7 +7241,7 @@ export default calcLiquefaction
7241
7241
  <br class="clear">
7242
7242
 
7243
7243
  <footer>
7244
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
7244
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
7245
7245
  </footer>
7246
7246
 
7247
7247
  <script>prettyPrint();</script>
package/docs/calcVerticalStress.mjs.html CHANGED
@@ -720,7 +720,7 @@ export default { //整合輸出預設得要有default
720
720
  <br class="clear">
721
721
 
722
722
  <footer>
723
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
723
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
724
724
  </footer>
725
725
 
726
726
  <script>prettyPrint();</script>
package/docs/checkDepth.mjs.html CHANGED
@@ -214,7 +214,7 @@ export default checkDepth
214
214
  <br class="clear">
215
215
 
216
216
  <footer>
217
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
217
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
218
218
  </footer>
219
219
 
220
220
  <script>prettyPrint();</script>
package/docs/checkDepthStartEnd.mjs.html CHANGED
@@ -273,7 +273,7 @@ export default checkDepthStartEnd
273
273
  <br class="clear">
274
274
 
275
275
  <footer>
276
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
276
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
277
277
  </footer>
278
278
 
279
279
  <script>prettyPrint();</script>
package/docs/complementDepthData.mjs.html CHANGED
@@ -506,7 +506,7 @@ export default complementDepthData
506
506
  <br class="clear">
507
507
 
508
508
  <footer>
509
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
509
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
510
510
  </footer>
511
511
 
512
512
  <script>prettyPrint();</script>
package/docs/groupByDepthStartEnd.mjs.html CHANGED
@@ -492,7 +492,7 @@ export default groupByDepthStartEnd
492
492
  <br class="clear">
493
493
 
494
494
  <footer>
495
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
495
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
496
496
  </footer>
497
497
 
498
498
  <script>prettyPrint();</script>
package/docs/index.html CHANGED
@@ -71,7 +71,7 @@
71
71
  <br class="clear">
72
72
 
73
73
  <footer>
74
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
74
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
75
75
  </footer>
76
76
 
77
77
  <script>prettyPrint();</script>
package/docs/mergeByDepthStartEnd.mjs.html CHANGED
@@ -519,7 +519,7 @@ export default mergeByDepthStartEnd
519
519
  <br class="clear">
520
520
 
521
521
  <footer>
522
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
522
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
523
523
  </footer>
524
524
 
525
525
  <script>prettyPrint();</script>
package/docs/relaPlasticityParams.mjs.html CHANGED
@@ -334,7 +334,7 @@ export default relaPlasticityParams
334
334
  <br class="clear">
335
335
 
336
336
  <footer>
337
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
337
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
338
338
  </footer>
339
339
 
340
340
  <script>prettyPrint();</script>
package/docs/relaPorousParams.mjs.html CHANGED
@@ -524,7 +524,7 @@ export default relaPorousParams
524
524
  <br class="clear">
525
525
 
526
526
  <footer>
527
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
527
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
528
528
  </footer>
529
529
 
530
530
  <script>prettyPrint();</script>
package/docs/sepDepthStartEndByDepth.mjs.html CHANGED
@@ -324,7 +324,7 @@ export default sepDepthStartEndByDepth
324
324
  <br class="clear">
325
325
 
326
326
  <footer>
327
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
327
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
328
328
  </footer>
329
329
 
330
330
  <script>prettyPrint();</script>
package/docs/smoothDepthByKey.mjs.html CHANGED
@@ -280,7 +280,7 @@ export default smoothDepthByKey
280
280
  <br class="clear">
281
281
 
282
282
  <footer>
283
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
283
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
284
284
  </footer>
285
285
 
286
286
  <script>prettyPrint();</script>
package/docs/w-geo.html CHANGED
@@ -8554,7 +8554,7 @@
8554
8554
  <br class="clear">
8555
8555
 
8556
8556
  <footer>
8557
- Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 09:32:33 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
8557
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Apr 17 2023 10:24:42 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
8558
8558
  </footer>
8559
8559
 
8560
8560
  <script>prettyPrint();</script>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "w-geo",
3
- "version": "1.0.76",
3
+ "version": "1.0.78",
4
4
  "main": "dist/w-geo.umd.js",
5
5
  "dependencies": {
6
6
  "decimal.js": "^10.4.3",
package/src/_soilGroup.mjs CHANGED
@@ -244,6 +244,42 @@ function getSoilGroupsT9() {
244
244
  }
245
245
 
246
246
 
247
+ function getSoilGroupsIcIcn(k) {
248
+
249
+ //check
250
+ if (k !== 'Ic' && k !== 'Icn') {
251
+ throw new Error(`k[${k}] must be Ic or Icn`)
252
+ }
253
+
254
+ //getIcInfor
255
+ let icis = getIcInfor()
256
+
257
+ //useTypes
258
+ let useTypes = []
259
+ each(icis, (ici) => {
260
+ let key = `${k}(${dig(ici.min, 2)}-${dig(ici.max, 2)})`
261
+ let t = {
262
+ key,
263
+ ...ici,
264
+ }
265
+ useTypes.push(t)
266
+ })
267
+ // console.log('useTypes', useTypes)
268
+
269
+ return useTypes
270
+ }
271
+
272
+
273
+ function getSoilGroupsIc() {
274
+ return getSoilGroupsIcIcn('Ic')
275
+ }
276
+
277
+
278
+ function getSoilGroupsIcn() {
279
+ return getSoilGroupsIcIcn('Icn')
280
+ }
281
+
282
+
247
283
  function getKpSoilGroups() {
248
284
  let kp = {}
249
285
 
@@ -284,6 +320,8 @@ export {
284
320
  getSoilGroups,
285
321
  getSoilGroupByKV,
286
322
  sortSoilGroupsByKey,
323
+ getSoilGroupsIc,
324
+ getSoilGroupsIcn,
287
325
  getSoilGroupsT4,
288
326
  getSoilGroupsT6,
289
327
  getSoilGroupsT9,
@@ -293,6 +331,8 @@ export default { //整合輸出預設得要有default
293
331
  getSoilGroups,
294
332
  getSoilGroupByKV,
295
333
  sortSoilGroupsByKey,
334
+ getSoilGroupsIc,
335
+ getSoilGroupsIcn,
296
336
  getSoilGroupsT4,
297
337
  getSoilGroupsT6,
298
338
  getSoilGroupsT9,
package/src/calcLayers.mjs CHANGED
@@ -18,20 +18,22 @@ import cint from 'wsemi/src/cint.mjs'
18
18
  import haskey from 'wsemi/src/haskey.mjs'
19
19
  import judge from './judge.mjs'
20
20
  import { getIcInfor } from './_cpt.mjs'
21
- import { getSoilGroupByKV, getSoilGroupsT4, getSoilGroupsT6, getSoilGroupsT9 } from './_soilGroup.mjs'
21
+ import { getSoilGroupByKV, getSoilGroupsIc, getSoilGroupsIcn, getSoilGroupsT4, getSoilGroupsT6, getSoilGroupsT9 } from './_soilGroup.mjs'
22
22
  import calcDepthStartEndFromCenter from './calcDepthStartEndFromCenter.mjs'
23
23
  import { simplifyRobertson1986, simplifyRobertson1990, simplifyRobertson2009, simplifyRamsey } from './calcCptClassify.mjs'
24
24
  import calcLayersByMerge from './calcLayersByMerge.mjs'
25
25
 
26
26
 
27
- //soilGroupsT4, soilGroupsT6, soilGroupsT9
27
+ //soilGroupsIc, soilGroupsIcn, soilGroupsT4, soilGroupsT6, soilGroupsT9
28
+ let soilGroupsIc = getSoilGroupsIc()
29
+ let soilGroupsIcn = getSoilGroupsIcn()
28
30
  let soilGroupsT4 = getSoilGroupsT4()
29
31
  let soilGroupsT6 = getSoilGroupsT6()
30
32
  let soilGroupsT9 = getSoilGroupsT9()
31
33
 
32
34
 
33
35
  function getKpSoilGroupsTn() {
34
- return { soilGroupsT4, soilGroupsT6, soilGroupsT9 }
36
+ return { soilGroupsIc, soilGroupsIcn, soilGroupsT4, soilGroupsT6, soilGroupsT9 }
35
37
  }
36
38
 
37
39
 
@@ -163,7 +165,7 @@ function calcLayer(ltdt, method, opt = {}) {
163
165
  let icis = getIcInfor()
164
166
 
165
167
  //check
166
- if (key !== 'Ic' || key !== 'Icn') {
168
+ if (key !== 'Ic' && key !== 'Icn') {
167
169
  throw new Error(`key[${key}] must be Ic or Icn`)
168
170
  }
169
171