vislite 1.4.0 → 1.5.0

package/package/assemble/index.ts

@@ -1,3 +1,3 @@
-import assemble from "../../src/common/assemble"
-
+import assemble from "../../src/common/assemble"
+
 export default assemble

package/package/getLoopColors/index.ts

@@ -1,3 +1,3 @@
-import getLoopColors from "../../src/getLoopColors"
-
+import getLoopColors from "../../src/getLoopColors"
+
 export default getLoopColors

package/package/getWebGLContext/index.ts

@@ -1,41 +1,41 @@
-import getWebGLContext from "../../src/common/webgl/getWebGLContext"
-import type { WebGLmodeType } from "../../types/getWebGLContext"
-
-export default (el: HTMLElement | null, scale: number = 1, mode?: WebGLmodeType) => {
-    if (!el) {
-        throw new Error("VISLite getWebGLContext:The mount point requires an HTMLElement type but encountered null.")
-    }
-
-    let width = el.clientWidth, height = el.clientHeight
-
-    let ViewCanvas: HTMLCanvasElement
-
-    let _el = el as any
-
-    // 如果已经初始化过了
-    if (_el._vislite_canvas_) {
-        ViewCanvas = _el._vislite_canvas_
-    }
-
-    // 否则就初始化
-    else {
-
-        ViewCanvas = document.createElement('canvas')
-        el.appendChild(ViewCanvas)
-
-        _el._vislite_canvas_ = ViewCanvas
-
-        el.setAttribute('vislite', 'WebGL')
-
-    }
-
-    // 设置画布大小
-
-    ViewCanvas.style.width = width + "px"
-    ViewCanvas.setAttribute('width', width + "")
-
-    ViewCanvas.style.height = height + "px"
-    ViewCanvas.setAttribute('height', height + "")
-
-    return getWebGLContext(ViewCanvas, scale, {}, mode)
+import getWebGLContext from "../../src/common/webgl/getWebGLContext"
+import type { WebGLmodeType } from "../../types/getWebGLContext"
+
+export default (el: HTMLElement | null, scale: number = 1, mode?: WebGLmodeType) => {
+    if (!el) {
+        throw new Error("VISLite getWebGLContext:The mount point requires an HTMLElement type but encountered null.")
+    }
+
+    let width = el.clientWidth, height = el.clientHeight
+
+    let ViewCanvas: HTMLCanvasElement
+
+    let _el = el as any
+
+    // 如果已经初始化过了
+    if (_el._vislite_canvas_) {
+        ViewCanvas = _el._vislite_canvas_
+    }
+
+    // 否则就初始化
+    else {
+
+        ViewCanvas = document.createElement('canvas')
+        el.appendChild(ViewCanvas)
+
+        _el._vislite_canvas_ = ViewCanvas
+
+        el.setAttribute('vislite', 'WebGL')
+
+    }
+
+    // 设置画布大小
+
+    ViewCanvas.style.width = width + "px"
+    ViewCanvas.setAttribute('width', width + "")
+
+    ViewCanvas.style.height = height + "px"
+    ViewCanvas.setAttribute('height', height + "")
+
+    return getWebGLContext(ViewCanvas, scale, {}, mode)
 }

package/package/initOption/index.ts

@@ -1,3 +1,3 @@
-import { initOption } from "../../src/common/option"
-
+import { initOption } from "../../src/common/option"
+
 export default initOption

package/package/mergeOption/index.ts

@@ -1,3 +1,3 @@
-import { mergeOption } from "../../src/common/option"
-
+import { mergeOption } from "../../src/common/option"
+
 export default mergeOption

package/package/move/index.ts

@@ -1,3 +1,3 @@
-import move from "../../src/move"
-
+import move from "../../src/move"
+
 export default move

package/package/rotate/index.ts

@@ -1,3 +1,3 @@
-import rotate from "../../src/rotate"
-
+import rotate from "../../src/rotate"
+
 export default rotate

package/package/ruler/index.ts

@@ -1,3 +1,3 @@
-import ruler from "../../src/ruler"
-
+import ruler from "../../src/ruler"
+
 export default ruler

package/package/scale/index.ts

@@ -1,3 +1,3 @@
-import scale from "../../src/scale"
-
+import scale from "../../src/scale"
+
 export default scale

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vislite",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "灵活、快速、简单的数据可视化交互式跨端前端库",
   "main": "./lib/index.umd.min.js",
   "typings": "./types/index.d.ts",

package/src/Canvas.ts

@@ -1,85 +1,90 @@
-import type CanvasType from '../types/Canvas'
-import type CanvasOptionType from '../types/CanvasOption'
-
-import OralCanvas from './common/canvas/index'
-import { initOption } from './common/option'
-
-class Canvas extends OralCanvas implements CanvasType {
-    private __canvas: HTMLCanvasElement
-    private __el: HTMLElement
-    constructor(el: HTMLElement | null, option: CanvasOptionType = {}, width: number = 0, height: number = 0) {
-        if (!el) {
-            throw new Error("VISLite Canvas:The mount point requires an HTMLElement type but encountered null.")
-        }
-
-        option = initOption(option, {
-            region: true,
-            willReadFrequently: false
-        })
-
-        width = width || el.clientWidth
-        height = height || el.clientHeight
-
-        let ViewCanvas: HTMLCanvasElement, RegionCanvas: HTMLCanvasElement | null = null
-
-        const _el = el as any
-
-        // 如果已经初始化过了
-        if (_el._vislite_canvas_) {
-            ViewCanvas = _el._vislite_canvas_[0]
-            RegionCanvas = _el._vislite_canvas_[1]
-        }
-
-        // 否则就初始化
-        else {
-            ViewCanvas = document.createElement('canvas')
-            el.appendChild(ViewCanvas)
-
-            if (option.region) {
-                RegionCanvas = document.createElement('canvas')
-            }
-
-            _el._vislite_canvas_ = [ViewCanvas, RegionCanvas]
-
-            el.setAttribute('vislite', 'Canvas')
-        }
-
-        // 设置画布大小
-        const canvasArray = [RegionCanvas, ViewCanvas]
-        for (let index = 0; index < canvasArray.length; index++) {
-            const canvas = canvasArray[index]
-            if (canvas) {
-                canvas.style.width = width + "px"
-                canvas.setAttribute('width', (index * width + width) + "")
-
-                canvas.style.height = height + "px"
-                canvas.setAttribute('height', (index * height + height) + "")
-            }
-        }
-
-        super(ViewCanvas, RegionCanvas, {
-            willReadFrequently: option.willReadFrequently,
-        }, 2)
-
-        this.__canvas = ViewCanvas
-        this.__el = el
-        this.painter.scale(2, 2)
-    }
-
-    toDataURL(): Promise<string> {
-        return new Promise(resolve => {
-            resolve(this.__canvas.toDataURL())
-        })
-    }
-
-    bind(eventName: string, callback: (regionName: string, x: number, y: number) => void) {
-        this.__el.addEventListener(eventName, (event: any) => {
-            this.getRegion(event.offsetX, event.offsetY).then(regionName => {
-                callback(regionName, event.offsetX, event.offsetY)
-            })
-        })
-        return this
-    }
-}
-
+import type CanvasType from '../types/Canvas'
+import type CanvasOptionType from '../types/CanvasOption'
+
+import OralCanvas from './common/canvas/index'
+import { initOption } from './common/option'
+
+class Canvas extends OralCanvas implements CanvasType {
+    private __canvas: HTMLCanvasElement
+    private __el: HTMLElement
+    constructor(el: HTMLElement | null, option: CanvasOptionType = {}, width: number = 0, height: number = 0) {
+        if (!el) {
+            throw new Error("VISLite Canvas:The mount point requires an HTMLElement type but encountered null.")
+        }
+
+        option = initOption(option, {
+
+            // 对外暴露自定义缩放倍率（为满足特殊场景，以简化使用）
+            // 2025年7月25日 于秦皇岛
+            scale: 2,
+
+            region: true,
+            willReadFrequently: false
+        })
+
+        width = width || el.clientWidth
+        height = height || el.clientHeight
+
+        let ViewCanvas: HTMLCanvasElement, RegionCanvas: HTMLCanvasElement | null = null
+
+        const _el = el as any
+
+        // 如果已经初始化过了
+        if (_el._vislite_canvas_) {
+            ViewCanvas = _el._vislite_canvas_[0]
+            RegionCanvas = _el._vislite_canvas_[1]
+        }
+
+        // 否则就初始化
+        else {
+            ViewCanvas = document.createElement('canvas')
+            el.appendChild(ViewCanvas)
+
+            if (option.region) {
+                RegionCanvas = document.createElement('canvas')
+            }
+
+            _el._vislite_canvas_ = [ViewCanvas, RegionCanvas]
+
+            el.setAttribute('vislite', 'Canvas')
+        }
+
+        // 设置画布大小
+        const canvasArray = [RegionCanvas, ViewCanvas]
+        for (let index = 0; index < canvasArray.length; index++) {
+            const canvas = canvasArray[index]
+            if (canvas) {
+                canvas.style.width = width + "px"
+                canvas.setAttribute('width', ((index === 1 ? option.scale as number : 1) * width) + "")
+
+                canvas.style.height = height + "px"
+                canvas.setAttribute('height', ((index === 1 ? option.scale as number : 1) * height) + "")
+            }
+        }
+
+        super(ViewCanvas, RegionCanvas, {
+            willReadFrequently: option.willReadFrequently,
+        }, option.scale)
+
+        this.__canvas = ViewCanvas
+        this.__el = el
+        this.painter.scale(option.scale as number, option.scale as number)
+    }
+
+    toDataURL(): Promise<string> {
+        return new Promise(resolve => {
+            resolve(this.__canvas.toDataURL())
+        })
+    }
+
+    bind(eventName: string, callback: (regionName: string, x: number, y: number) => void) {
+        this.__el.addEventListener(eventName, (event: any) => {
+            this.getRegion(event.offsetX, event.offsetY).then(regionName => {
+                callback(regionName, event.offsetX, event.offsetY)
+            })
+        })
+        return this
+    }
+}
+
 export default Canvas

package/src/Eoap.ts

@@ -1,66 +1,66 @@
-import type MapType from '../types/Map'
-
-// 围绕X轴旋转
-const rotateX = function (deg: number, x: number, y: number, z: number) {
-    const cos = Math.cos(deg), sin = Math.sin(deg)
-    return [x, y * cos - z * sin, y * sin + z * cos]
-}
-
-// 围绕Y轴旋转
-const rotateY = function (deg: number, x: number, y: number, z: number) {
-    const cos = Math.cos(deg), sin = Math.sin(deg)
-    return [z * sin + x * cos, y, z * cos - x * sin]
-}
-
-// 围绕Z轴旋转
-const rotateZ = function (deg: number, x: number, y: number, z: number) {
-    const cos = Math.cos(deg), sin = Math.sin(deg)
-    return [x * cos - y * sin, x * sin + y * cos, z]
-}
-
-/* 等角斜方位投影 */
-class Eoap implements MapType {
-    readonly name: string = 'Eoap'
-
-    private __scale: number // 缩放比例
-    private __center: number[] // 投影中心经纬度
-
-    constructor(scale: number = 7, center: number[] = [107, 36]) {
-        this.__scale = scale
-        this.__center = center
-    }
-
-    use(λ: number, φ: number): [number, number, number] {
-        /**
-         * 通过旋转的方法
-         * 先旋转出点的位置
-         * 然后根据把地心到旋转中心的这条射线变成OZ这条射线的变换应用到初始化点上
-         * 这样求的的点的x,y就是最终结果
-         *
-         *  计算过程：
-         *  1.初始化点的位置是p（x,0,0）,其中x的值是地球半径除以缩放倍速
-         *  2.根据点的纬度对p进行旋转，旋转后得到的p的坐标纬度就是目标纬度
-         *  3.同样的对此刻的p进行经度的旋转，这样就获取了极点作为中心点的坐标
-         *  4.接着想象一下为了让旋转中心移动到极点需要进行旋转的经纬度是多少，记为lo和la
-         *  5.然后再对p进行经度度旋转lo获得新的p
-         *  6.然后再对p进行纬度旋转la获得新的p
-         *  7.旋转结束
-         *
-         * 特别注意：第5和第6步顺序一定不可以调换，原因来自经纬度定义上
-         * 【除了经度为0的位置，不然纬度的旋转会改变原来的经度值，反过来不会】
-         *
-         */
-        let p = rotateY((360 - φ) / 180 * Math.PI, 100 * this.__scale, 0, 0)
-        p = rotateZ(λ / 180 * Math.PI, p[0], p[1], p[2])
-        p = rotateZ((90 - this.__center[0]) / 180 * Math.PI, p[0], p[1], p[2])
-        p = rotateX((90 - this.__center[1]) / 180 * Math.PI, p[0], p[1], p[2])
-
-        return [
-            -p[0], // 加-号是因为浏览器坐标和地图不一样
-            p[1],
-            p[2]
-        ]
-    }
-}
-
-export default Eoap
+import type MapType from '../types/Map'
+
+// 围绕X轴旋转
+const rotateX = function (deg: number, x: number, y: number, z: number) {
+    const cos = Math.cos(deg), sin = Math.sin(deg)
+    return [x, y * cos - z * sin, y * sin + z * cos]
+}
+
+// 围绕Y轴旋转
+const rotateY = function (deg: number, x: number, y: number, z: number) {
+    const cos = Math.cos(deg), sin = Math.sin(deg)
+    return [z * sin + x * cos, y, z * cos - x * sin]
+}
+
+// 围绕Z轴旋转
+const rotateZ = function (deg: number, x: number, y: number, z: number) {
+    const cos = Math.cos(deg), sin = Math.sin(deg)
+    return [x * cos - y * sin, x * sin + y * cos, z]
+}
+
+/* 等角斜方位投影 */
+class Eoap implements MapType {
+    readonly name: string = 'Eoap'
+
+    private __scale: number // 缩放比例
+    private __center: number[] // 投影中心经纬度
+
+    constructor(scale: number = 7, center: number[] = [107, 36]) {
+        this.__scale = scale
+        this.__center = center
+    }
+
+    use(λ: number, φ: number): [number, number, number] {
+        /**
+         * 通过旋转的方法
+         * 先旋转出点的位置
+         * 然后根据把地心到旋转中心的这条射线变成OZ这条射线的变换应用到初始化点上
+         * 这样求的的点的x,y就是最终结果
+         *
+         *  计算过程：
+         *  1.初始化点的位置是p（x,0,0）,其中x的值是地球半径除以缩放倍速
+         *  2.根据点的纬度对p进行旋转，旋转后得到的p的坐标纬度就是目标纬度
+         *  3.同样的对此刻的p进行经度的旋转，这样就获取了极点作为中心点的坐标
+         *  4.接着想象一下为了让旋转中心移动到极点需要进行旋转的经纬度是多少，记为lo和la
+         *  5.然后再对p进行经度度旋转lo获得新的p
+         *  6.然后再对p进行纬度旋转la获得新的p
+         *  7.旋转结束
+         *
+         * 特别注意：第5和第6步顺序一定不可以调换，原因来自经纬度定义上
+         * 【除了经度为0的位置，不然纬度的旋转会改变原来的经度值，反过来不会】
+         *
+         */
+        let p = rotateY((360 - φ) / 180 * Math.PI, 100 * this.__scale, 0, 0)
+        p = rotateZ(λ / 180 * Math.PI, p[0], p[1], p[2])
+        p = rotateZ((90 - this.__center[0]) / 180 * Math.PI, p[0], p[1], p[2])
+        p = rotateX((90 - this.__center[1]) / 180 * Math.PI, p[0], p[1], p[2])
+
+        return [
+            -p[0], // 加负号是因为浏览器坐标和地图不一样
+            p[1],
+            p[2]
+        ]
+    }
+}
+
+export default Eoap

package/src/Matrix4/index.ts

@@ -1,85 +1,85 @@
-import type Matrix4Type from '../../types/Matrix4'
-
-// 两个4x4矩阵相乘
-// 或矩阵和齐次坐标相乘
-const _multiply = function (matrix4: number[], param: number[]) {
-    const newParam: number[] = []
-    for (let i = 0; i < 4; i++)
-        for (let j = 0; j < param.length / 4; j++)
-            newParam[j * 4 + i] =
-                matrix4[i] * param[j * 4] +
-                matrix4[i + 4] * param[j * 4 + 1] +
-                matrix4[i + 8] * param[j * 4 + 2] +
-                matrix4[i + 12] * param[j * 4 + 3]
-    return newParam
-}
-
-import _move from './move'
-import _rotate from './rotate'
-import _scale from './scale'
-import _transform from './transform'
-
-// 列主序存储的4x4矩阵
-
-const __initMatrix4 = [
-    1, 0, 0, 0,
-    0, 1, 0, 0,
-    0, 0, 1, 0,
-    0, 0, 0, 1
-]
-
-class Matrix4 implements Matrix4Type {
-    readonly name: string = 'Matrix4'
-
-    private __matrix4: number[]
-
-    constructor(initMatrix4: number[] = __initMatrix4) {
-        this.__matrix4 = initMatrix4
-    }
-
-    // 设置内置矩阵
-    setValue(initMatrix4: number[] = __initMatrix4) {
-        this.__matrix4 = initMatrix4
-        return this
-    }
-
-    // 移动
-    move(dis: number, a: number, b: number, c: number = 0) {
-        this.__matrix4 = _multiply(_move(dis, a, b, c), this.__matrix4)
-        return this
-    }
-
-    // 旋转
-    rotate(deg: number, a1: number, b1: number, c1?: number, a2?: number, b2?: number, c2?: number) {
-        const matrix4s = _transform(a1, b1, c1, a2, b2, c2)
-        this.__matrix4 = _multiply(_multiply(_multiply(matrix4s[1], _rotate(deg)), matrix4s[0]), this.__matrix4)
-        return this
-    }
-
-    // 缩放
-    scale(xTimes: number, yTimes: number, zTimes: number, cx: number = 0, cy: number = 0, cz: number = 0) {
-        this.__matrix4 = _multiply(_scale(xTimes, yTimes, zTimes, cx, cy, cz), this.__matrix4)
-        return this
-    }
-
-    // 乘法
-    // 可以传入一个矩阵(matrix4,flag)
-    multiply(newMatrix4: number[], flag: boolean = false) {
-        this.__matrix4 = flag ? _multiply(this.__matrix4, newMatrix4) : _multiply(newMatrix4, this.__matrix4)
-        return this
-    }
-
-    // 对一个坐标应用变换
-    // 齐次坐标(x,y,z,w)
-    use(x: number, y: number, z: number = 0, w: number = 1): [number, number, number, number] {
-        // w为0表示点位于无穷远处，忽略
-        return _multiply(this.__matrix4, [x, y, z, w]) as [number, number, number, number]
-    }
-
-    // 矩阵的值
-    value() {
-        return this.__matrix4
-    }
-}
-
+import type Matrix4Type from '../../types/Matrix4'
+
+// 两个4x4矩阵相乘
+// 或矩阵和齐次坐标相乘
+const _multiply = function (matrix4: number[], param: number[]) {
+    const newParam: number[] = []
+    for (let i = 0; i < 4; i++)
+        for (let j = 0; j < param.length / 4; j++)
+            newParam[j * 4 + i] =
+                matrix4[i] * param[j * 4] +
+                matrix4[i + 4] * param[j * 4 + 1] +
+                matrix4[i + 8] * param[j * 4 + 2] +
+                matrix4[i + 12] * param[j * 4 + 3]
+    return newParam
+}
+
+import _move from './move'
+import _rotate from './rotate'
+import _scale from './scale'
+import _transform from './transform'
+
+// 列主序存储的4x4矩阵
+
+const __initMatrix4 = [
+    1, 0, 0, 0,
+    0, 1, 0, 0,
+    0, 0, 1, 0,
+    0, 0, 0, 1
+]
+
+class Matrix4 implements Matrix4Type {
+    readonly name: string = 'Matrix4'
+
+    private __matrix4: number[]
+
+    constructor(initMatrix4: number[] = __initMatrix4) {
+        this.__matrix4 = initMatrix4
+    }
+
+    // 设置内置矩阵
+    setValue(initMatrix4: number[] = __initMatrix4) {
+        this.__matrix4 = initMatrix4
+        return this
+    }
+
+    // 移动
+    move(dis: number, a: number, b: number, c: number = 0) {
+        this.__matrix4 = _multiply(_move(dis, a, b, c), this.__matrix4)
+        return this
+    }
+
+    // 旋转
+    rotate(deg: number, a1: number, b1: number, c1?: number, a2?: number, b2?: number, c2?: number) {
+        const matrix4s = _transform(a1, b1, c1, a2, b2, c2)
+        this.__matrix4 = _multiply(_multiply(_multiply(matrix4s[1], _rotate(deg)), matrix4s[0]), this.__matrix4)
+        return this
+    }
+
+    // 缩放
+    scale(xTimes: number, yTimes: number, zTimes: number, cx: number = 0, cy: number = 0, cz: number = 0) {
+        this.__matrix4 = _multiply(_scale(xTimes, yTimes, zTimes, cx, cy, cz), this.__matrix4)
+        return this
+    }
+
+    // 乘法
+    // 可以传入一个矩阵(matrix4,flag)
+    multiply(newMatrix4: number[], flag: boolean = false) {
+        this.__matrix4 = flag ? _multiply(this.__matrix4, newMatrix4) : _multiply(newMatrix4, this.__matrix4)
+        return this
+    }
+
+    // 对一个坐标应用变换
+    // 齐次坐标(x,y,z,w)
+    use(x: number, y: number, z: number = 0, w: number = 1): [number, number, number, number] {
+        // w为0表示点位于无穷远处，忽略
+        return _multiply(this.__matrix4, [x, y, z, w]) as [number, number, number, number]
+    }
+
+    // 矩阵的值
+    value() {
+        return this.__matrix4
+    }
+}
+
 export default Matrix4

package/src/Matrix4/move.ts

@@ -1,12 +1,12 @@
-/**
- * 在(a,b,c)方向位移d
- */
-export default function (d: number, a: number, b: number, c: number = 0) {
-    const sqrt = Math.sqrt(a * a + b * b + c * c)
-    return [
-        1, 0, 0, 0,
-        0, 1, 0, 0,
-        0, 0, 1, 0,
-        a * d / sqrt, b * d / sqrt, c * d / sqrt, 1
-    ]
-}
+/**
+ * 在(a,b,c)方向位移d
+ */
+export default function (d: number, a: number, b: number, c: number = 0) {
+    const sqrt = Math.sqrt(a * a + b * b + c * c)
+    return [
+        1, 0, 0, 0,
+        0, 1, 0, 0,
+        0, 0, 1, 0,
+        a * d / sqrt, b * d / sqrt, c * d / sqrt, 1
+    ]
+}