vislite 1.6.0 → 1.6.1

package/package/Shader/index.ts

@@ -1,3 +1,3 @@
-import Shader from '../../src/common/webgl/shader'
-
+import Shader from '../../src/common/webgl/shader'
+
 export default Shader

package/package/Texture/index.ts

@@ -1,3 +1,3 @@
-import Texture from '../../src/common/webgl/texture'
-
+import Texture from '../../src/common/webgl/texture'
+
 export default Texture

package/package/TreeLayout/index.ts

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

package/package/animation/index.ts

@@ -1,6 +1,6 @@
-import type { animationFun } from "oipage/web/animation/index"
-import { animation } from "oipage/web/animation/index"
-
-export default function (doback: animationFun, duration?: number, callback?: animationFun) {
-    return animation(doback, duration || 400, callback || function () { }).stop
+import type { animationFun } from "oipage/web/animation/index"
+import { animation } from "oipage/web/animation/index"
+
+export default function (doback: animationFun, duration?: number, callback?: animationFun) {
+    return animation(doback, duration || 400, callback || function () { }).stop
 }

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/index.ts

@@ -1,85 +1,85 @@
-import Cardinal from "./Cardinal/index"
-import Hermite from "./Hermite/index"
-
-import Matrix4 from "./Matrix4/index"
-import rotate from "./rotate/index"
-import move from "./move/index"
-import scale from "./scale/index"
-
-import getLoopColors from "./getLoopColors/index"
-import animation from "./animation/index"
-import ruler from "./ruler/index"
-
-import SVG from "./SVG/index"
-import Canvas from "./Canvas/index"
-import RawCanvas from "../src/common/canvas/index"
-
-import getWebGLContext from "./getWebGLContext/index"
-import Shader from "./Shader/index"
-import Texture from "./Texture/index"
-import Buffer from "./Buffer/index"
-
-import Eoap from "./Eoap/index"
-import Mercator from "./Mercator/index"
-
-import throttle from "./throttle/index"
-
-import MapCoordinate from "./MapCoordinate/index"
-
-import TreeLayout from "./TreeLayout/index"
-import PieLayout from "./PieLayout/index"
-import BarLayout from "./BarLayout/index"
-
-import initOption from "./initOption/index"
-import mergeOption from "./mergeOption/index"
-
-import assemble from "./assemble/index"
-
-export default {
-
-    // 插值
-    Cardinal,
-    Hermite,
-
-    // 变换
-    Matrix4,
-    rotate,
-    move,
-    scale,
-
-    // 工具
-    getLoopColors,
-    animation,
-    ruler,
-
-    // 画笔
-    SVG,
-    Canvas,
-    RawCanvas,
-
-    // WebGL
-    getWebGLContext,
-    Shader,
-    Texture,
-    Buffer,
-
-    // 投影
-    Eoap,
-    Mercator,
-
-    // 辅助
-    throttle,
-    assemble,
-
-    // 坐标系
-    MapCoordinate,
-
-    // 布局
-    TreeLayout,
-    PieLayout,
-    BarLayout,
-
-    // 配置项
-    initOption,
-    mergeOption
+import Cardinal from "./Cardinal/index"
+import Hermite from "./Hermite/index"
+
+import Matrix4 from "./Matrix4/index"
+import rotate from "./rotate/index"
+import move from "./move/index"
+import scale from "./scale/index"
+
+import getLoopColors from "./getLoopColors/index"
+import animation from "./animation/index"
+import ruler from "./ruler/index"
+
+import SVG from "./SVG/index"
+import Canvas from "./Canvas/index"
+import RawCanvas from "../src/common/canvas/index"
+
+import getWebGLContext from "./getWebGLContext/index"
+import Shader from "./Shader/index"
+import Texture from "./Texture/index"
+import Buffer from "./Buffer/index"
+
+import Eoap from "./Eoap/index"
+import Mercator from "./Mercator/index"
+
+import throttle from "./throttle/index"
+
+import MapCoordinate from "./MapCoordinate/index"
+
+import TreeLayout from "./TreeLayout/index"
+import PieLayout from "./PieLayout/index"
+import BarLayout from "./BarLayout/index"
+
+import initOption from "./initOption/index"
+import mergeOption from "./mergeOption/index"
+
+import assemble from "./assemble/index"
+
+export default {
+
+    // 插值
+    Cardinal,
+    Hermite,
+
+    // 变换
+    Matrix4,
+    rotate,
+    move,
+    scale,
+
+    // 工具
+    getLoopColors,
+    animation,
+    ruler,
+
+    // 画笔
+    SVG,
+    Canvas,
+    RawCanvas,
+
+    // WebGL
+    getWebGLContext,
+    Shader,
+    Texture,
+    Buffer,
+
+    // 投影
+    Eoap,
+    Mercator,
+
+    // 辅助
+    throttle,
+    assemble,
+
+    // 坐标系
+    MapCoordinate,
+
+    // 布局
+    TreeLayout,
+    PieLayout,
+    BarLayout,
+
+    // 配置项
+    initOption,
+    mergeOption
 }

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/throttle/index.ts

@@ -1,3 +1,3 @@
-import { throttle } from "oipage/web/throttle/index"
-
+import { throttle } from "oipage/web/throttle/index"
+
 export default throttle

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vislite",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "灵活、快速、简单的数据可视化交互式跨端前端库",
   "main": "./lib/index.umd.min.js",
   "typings": "./types/index.d.ts",
@@ -70,6 +70,6 @@
     "webpack-dev-server": "^4.7.4"
   },
   "dependencies": {
-    "oipage": "^1.3.0"
+    "oipage": "^1.3.1"
   }
 }

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