w-geo 1.0.61 → 1.0.63

package/README.md

@@ -23,5 +23,5 @@ npm i w-geo
 
 Add script for w-geo.
 ```alias
-<script src="https://cdn.jsdelivr.net/npm/w-geo@1.0.61/dist/w-geo.umd.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/w-geo@1.0.63/dist/w-geo.umd.js"></script>
 ```

package/docs/-_class.mjs.html

@@ -62,7 +62,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcDepthStartEndByConnect.mjs.html

@@ -325,7 +325,7 @@ export default calcDepthStartEndByConnect
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcDepthStartEndByGroup.mjs.html

@@ -569,7 +569,7 @@ export default calcDepthStartEndByGroup
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcDepthStartEndFromCenter.mjs.html

@@ -349,7 +349,7 @@ export default calcDepthStartEndFromCenter
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcLiquefaction.mjs.html

@@ -6918,7 +6918,7 @@ export default calcLiquefaction
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/calcVerticalStress.mjs.html

@@ -646,7 +646,7 @@ export default calcVerticalStress
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/checkDepth.mjs.html

@@ -214,7 +214,7 @@ export default checkDepth
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/checkDepthStartEnd.mjs.html

@@ -273,7 +273,7 @@ export default checkDepthStartEnd
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/complementDepthData.mjs.html

@@ -506,7 +506,7 @@ export default complementDepthData
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/groupByDepthStartEnd.mjs.html

@@ -492,7 +492,7 @@ export default groupByDepthStartEnd
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/mergeByDepthStartEnd.mjs.html

@@ -519,7 +519,7 @@ export default mergeByDepthStartEnd
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/relaPlasticityParams.mjs.html

@@ -334,7 +334,7 @@ export default relaPlasticityParams
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/relaPorousParams.mjs.html

@@ -524,7 +524,7 @@ export default relaPorousParams
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/sepDepthStartEndByDepth.mjs.html

@@ -324,7 +324,7 @@ export default sepDepthStartEndByDepth
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/smoothDepthByKey.mjs.html

@@ -280,7 +280,7 @@ export default smoothDepthByKey
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/w-geo.html

@@ -8970,7 +8970,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Apr 08 2023 11:45:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 12 2023 22:37:32 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "w-geo",
-  "version": "1.0.61",
+  "version": "1.0.63",
   "main": "dist/w-geo.umd.js",
   "dependencies": {
     "decimal.js": "^10.4.3",
     "lodash": "^4.17.21",
+    "w-highcharts": "^1.0.0",
     "w-optimization": "^1.0.9",
     "w-statistic": "^1.0.14",
-    "wsemi": "^1.7.2"
+    "wsemi": "^1.7.3"
   },
   "devDependencies": {
     "w-package-tools": "^1.0.69"

package/src/WGeo.mjs

@@ -11,6 +11,7 @@ export { default as checkDepth } from './checkDepth.mjs'
 export { default as checkDepthStartEnd } from './checkDepthStartEnd.mjs'
 export { default as cnst } from './cnst.mjs'
 export { default as complementDepthData } from './complementDepthData.mjs'
+export { default as getCptDepthHcOpt } from './getCptDepthHcOpt.mjs'
 export { default as getDepthMaxMin } from './getDepthMaxMin.mjs'
 export { default as groupByDepthStartEnd } from './groupByDepthStartEnd.mjs'
 export { default as intrpDefParam } from './intrpDefParam.mjs'
@@ -21,5 +22,6 @@ export { default as relaPorousParams } from './relaPorousParams.mjs'
 export { default as sepDepthStartEndByDepth } from './sepDepthStartEndByDepth.mjs'
 export { default as smoothDepthByKey } from './smoothDepthByKey.mjs'
 export { default as _cpt } from './_cpt.mjs'
+export { default as _hc } from './_hc.mjs'
 export { default as _share } from './_share.mjs'
 export { default as _soilGroup } from './_soilGroup.mjs'

package/src/_hc.mjs

@@ -0,0 +1,39 @@
+import cstr from 'wsemi/src/cstr.mjs'
+import isestr from 'wsemi/src/isestr.mjs'
+import getFontfamily from 'w-highcharts/src/getFontfamily.mjs'
+
+
+function genHtText(c, size = 11) {
+    //預設使用中英文混合, 但複製網頁html至word會失效
+    let fontFamily = getFontfamily()
+    return `<span style="font-family:${fontFamily}; font-size:${size}pt;">${cstr(c)}</span>`
+}
+
+
+function genHtTextSub(c, size = 11) {
+    //預設使用中英文混合, 但複製網頁html至word會失效
+    let fontFamily = getFontfamily()
+    return `<br><span style="font-family:${fontFamily}; font-size:${size}pt;">${cstr(c)}</span>`
+}
+
+
+function genTextParentheses(c) {
+    if (isestr(c)) {
+        return ` (${c})`
+    }
+    return ''
+}
+
+
+export {
+    genHtText,
+    genHtTextSub,
+    genTextParentheses,
+    getFontfamily
+}
+export default { //整合輸出預設得要有default
+    genHtText,
+    genHtTextSub,
+    genTextParentheses,
+    getFontfamily
+}

package/src/_share.mjs

@@ -1,28 +1,126 @@
 import get from 'lodash/get'
+import each from 'lodash/each'
+import sortBy from 'lodash/sortBy'
+import isNumber from 'lodash/isNumber'
+import size from 'lodash/size'
 import isestr from 'wsemi/src/isestr.mjs'
 import isnum from 'wsemi/src/isnum.mjs'
 import isfun from 'wsemi/src/isfun.mjs'
 import cdbl from 'wsemi/src/cdbl.mjs'
 
 
-function pickData(d, pickKey) {
+function pickData(dt, pickKey) {
     let value = null
     if (isestr(pickKey)) {
-        let t = get(d, pickKey)
+        let t = get(dt, pickKey)
         if (isnum(t)) {
             value = cdbl(t) //只有數字才回傳, 否則傳null
         }
     }
     else if (isfun(pickKey)) {
-        value = pickKey(d)
+        value = pickKey(dt)
     }
     return value
 }
 
 
+function extractLtdtDepthAndData(ltdt, pickKey1, allowNull = false) {
+
+    //ps
+    let ps = []
+    each(ltdt, function (v) {
+
+        //depthCenter
+        let depthCenter = pickData(v, 'depth')
+
+        //valueX
+        let valueX = pickData(v, pickKey1)
+
+        //check
+        if (depthCenter === null) { //因是繪製隨深度指定x值圖, depthCenter不允許null
+            return true
+        }
+
+        //check
+        if (!allowNull) {
+            if (valueX === null) { //若valueX允許null則繪製曲線可跳, 若不允許則曲線自動接續
+                return true
+            }
+        }
+
+        //push
+        ps.push([depthCenter, valueX]) //因點數過多highcharts會出現errors12, 需改使用浮點數陣列
+
+    })
+
+    //需偵測是否全部valueX為null
+    let numNull = 0
+    each(ps, (v) => {
+        if (!isNumber(v[1])) {
+            numNull += 1
+        }
+    })
+    if (numNull === size(ps)) {
+        ps = [] //若數據都為null則清空ps, 視為無任何數據
+    }
+
+    return ps
+}
+
+
+function extractLtdtDataXY(ltdt, pickKeyX, pickKeyY) {
+
+    //ps
+    let ps = []
+    each(ltdt, function (v) {
+
+        //valueX
+        let valueX = pickData(v, pickKeyX)
+
+        //valueY
+        let valueY = pickData(v, pickKeyY)
+
+        //check
+        if (valueX === null || valueY === null) { //因須繪製xy值圖, valueX與valueY不允許null
+            return true
+        }
+
+        //push
+        ps.push([valueX, valueY]) //因點數過多highcharts會出現errors12, 需改使用浮點數陣列
+
+    })
+
+    //sortBy
+    ps = sortBy(ps, 0) //highcharts需排序
+
+    return ps
+}
+
+
+// function extractData(ltdt, pickKey1, pickKeyY) {
+//     let ps = []
+//     if (!isestr(pickKeyY)) {
+//         //取深度與key1
+//         let allowNull = false
+//         ps = extractLtdtDepthAndData(ltdt, pickKey1, allowNull)
+//     }
+//     else {
+//         //取key1與key2
+//         ps = extractLtdtDataXY(ltdt, pickKey1, pickKeyY)
+//     }
+//     return ps
+// }
+
+
 export {
-    pickData
+    pickData,
+    extractLtdtDepthAndData,
+    extractLtdtDataXY
+    // extractData
 }
 export default { //整合輸出預設得要有default
-    pickData
+    pickData,
+    extractLtdtDepthAndData,
+    extractLtdtDataXY
+    // extractData
 }