vislite 1.6.0 → 1.6.1

package/src/common/webgl/shader.ts

@@ -1,76 +1,76 @@
-// 着色器分为两类：顶点着色器 + 片段着色器
-// 前者用于定义一个点的特性，比如位置，大小，颜色等
-// 后者用于针对每个片段（可以理解为像素）进行处理
-
-// 着色器采用的语言是：GLSL ES语言
-
-// 把着色器字符串加载成着色器对象
-const loadShader = (painter: WebGLRenderingContext, type: number, source: string) => {
-
-    // 创建着色器对象
-    const shader = painter.createShader(type)
-    if (shader == null) throw new Error('Unable to create shader!')
-
-    // 绑定资源
-    painter.shaderSource(shader, source)
-
-    // 编译着色器
-    painter.compileShader(shader)
-
-    // 检测着色器编译是否成功
-    if (!painter.getShaderParameter(shader, painter.COMPILE_STATUS))
-        throw new Error('Failed to compile shader:' + painter.getShaderInfoLog(shader))
-
-    return shader
-}
-
-//  建立着色器
-const useShader = (painter: WebGLRenderingContext, vshaderSource: string, fshaderSource: string) => {
-
-    // 分别加载顶点着色器对象和片段着色器对象
-    const vertexShader = loadShader(painter, painter.VERTEX_SHADER, vshaderSource)
-    const fragmentShader = loadShader(painter, painter.FRAGMENT_SHADER, fshaderSource)
-
-    // 创建一个着色器程序
-    const glProgram = painter.createProgram() as WebGLProgram
-
-    // 把前面创建的两个着色器对象添加到着色器程序中
-    painter.attachShader(glProgram, vertexShader)
-    painter.attachShader(glProgram, fragmentShader)
-
-    // 把着色器程序链接成一个完整的程序
-    painter.linkProgram(glProgram)
-
-    // 检测着色器程序链接是否成功
-    if (!painter.getProgramParameter(glProgram, painter.LINK_STATUS))
-        throw new Error('Failed to link program: ' + painter.getProgramInfoLog(glProgram))
-
-    return glProgram
-}
-
-class ShaderObject {
-
-    private __painter: WebGLRenderingContext
-
-    program: WebGLProgram
-
-    constructor(painter: WebGLRenderingContext) {
-        this.__painter = painter
-    }
-
-    // 使用这个程序
-    // （后于编译）
-    use() {
-        this.__painter.useProgram(this.program)
-        return this
-    }
-
-    // 编译着色器程序
-    compile(vshaderSource: string, fshaderSource: string) {
-        this.program = useShader(this.__painter, vshaderSource, fshaderSource) as WebGLProgram
-        return this
-    }
-
-}
-
+// 着色器分为两类：顶点着色器 + 片段着色器
+// 前者用于定义一个点的特性，比如位置，大小，颜色等
+// 后者用于针对每个片段（可以理解为像素）进行处理
+
+// 着色器采用的语言是：GLSL ES语言
+
+// 把着色器字符串加载成着色器对象
+const loadShader = (painter: WebGLRenderingContext, type: number, source: string) => {
+
+    // 创建着色器对象
+    const shader = painter.createShader(type)
+    if (shader == null) throw new Error('Unable to create shader!')
+
+    // 绑定资源
+    painter.shaderSource(shader, source)
+
+    // 编译着色器
+    painter.compileShader(shader)
+
+    // 检测着色器编译是否成功
+    if (!painter.getShaderParameter(shader, painter.COMPILE_STATUS))
+        throw new Error('Failed to compile shader:' + painter.getShaderInfoLog(shader))
+
+    return shader
+}
+
+//  建立着色器
+const useShader = (painter: WebGLRenderingContext, vshaderSource: string, fshaderSource: string) => {
+
+    // 分别加载顶点着色器对象和片段着色器对象
+    const vertexShader = loadShader(painter, painter.VERTEX_SHADER, vshaderSource)
+    const fragmentShader = loadShader(painter, painter.FRAGMENT_SHADER, fshaderSource)
+
+    // 创建一个着色器程序
+    const glProgram = painter.createProgram() as WebGLProgram
+
+    // 把前面创建的两个着色器对象添加到着色器程序中
+    painter.attachShader(glProgram, vertexShader)
+    painter.attachShader(glProgram, fragmentShader)
+
+    // 把着色器程序链接成一个完整的程序
+    painter.linkProgram(glProgram)
+
+    // 检测着色器程序链接是否成功
+    if (!painter.getProgramParameter(glProgram, painter.LINK_STATUS))
+        throw new Error('Failed to link program: ' + painter.getProgramInfoLog(glProgram))
+
+    return glProgram
+}
+
+class ShaderObject {
+
+    private __painter: WebGLRenderingContext
+
+    program: WebGLProgram
+
+    constructor(painter: WebGLRenderingContext) {
+        this.__painter = painter
+    }
+
+    // 使用这个程序
+    // （后于编译）
+    use() {
+        this.__painter.useProgram(this.program)
+        return this
+    }
+
+    // 编译着色器程序
+    compile(vshaderSource: string, fshaderSource: string) {
+        this.program = useShader(this.__painter, vshaderSource, fshaderSource) as WebGLProgram
+        return this
+    }
+
+}
+
 export default ShaderObject

package/src/coordinate/MapCoordinate.ts

@@ -1,81 +1,81 @@
-import type MapConfigType from '../../types/MapConfig'
-import type MapCoordinateType from '../../types/MapCoordinate'
-import type MapType from '../../types/Map'
-
-import { initOption, mergeOption } from '../common/option'
-import getBoundary from '../common/map/getBoundary'
-import Mercator from '../Mercator'
-import Eoap from '../Eoap'
-
-class MapCoordinate implements MapCoordinateType {
-    readonly name: string = 'MapCoordinate'
-
-    private __config: MapConfigType
-    private __map: MapType
-    private __boundary: Array<number>
-
-    constructor(config: MapConfigType = {}) {
-        this.__config = initOption(config, {
-            api: "Mercator",
-            width: 400,
-            height: 300,
-            left: 0,
-            top: 0
-        })
-    }
-
-    private $$updateMap() {
-        const [minLongitude, maxLongitude, minLatitude, maxLatitude] = this.__boundary
-
-        if (this.__config.api == "Eoap") {
-
-            const xScale = (this.__config.width as number) * 0.836 / (maxLongitude - minLongitude)
-            const yScale = (this.__config.height as number) * 0.557 / (maxLatitude - minLatitude)
-
-            this.__map = new Eoap(xScale < yScale ? xScale : yScale, [
-                (minLongitude + maxLongitude) * 0.5 * 0.9778,
-                (minLatitude + maxLatitude) * 0.5 * 1.025
-            ])
-
-        } else if (this.__config.api == "Mercator") {
-
-            const xScale = (this.__config.width as number) * 0.72 / (maxLongitude - minLongitude)
-            const yScale = (this.__config.height as number) * 0.575 / (maxLatitude - minLatitude)
-
-            this.__map = new Mercator(xScale < yScale ? xScale : yScale, [
-                (minLongitude + maxLongitude) * 0.5,
-                (minLatitude + maxLatitude) * 0.5
-            ])
-
-        } else {
-            throw new Error("Unexpected API types:" + this.__config.api)
-        }
-    }
-
-    setConfig(config: MapConfigType) {
-        mergeOption(this.__config, config)
-        this.$$updateMap()
-        return this
-    }
-
-    setGeos(...geos: any[]) {
-        this.__boundary = getBoundary(...geos)
-        this.$$updateMap()
-        return this
-    }
-
-    use(λ: number, φ: number): [number, number] {
-        if (this.__map) {
-            const dxyz = this.__map.use(λ, φ)
-            return [
-                (this.__config.left as number) + (this.__config.width as number) * 0.5 + dxyz[0],
-                (this.__config.top as number) + (this.__config.height as number) * 0.5 + dxyz[1],
-            ]
-        } else {
-            throw new Error("Geographic data not set")
-        }
-    }
-
-}
-
+import type MapConfigType from '../../types/MapConfig'
+import type MapCoordinateType from '../../types/MapCoordinate'
+import type MapType from '../../types/Map'
+
+import { initOption, mergeOption } from '../common/option'
+import getBoundary from '../common/map/getBoundary'
+import Mercator from '../Mercator'
+import Eoap from '../Eoap'
+
+class MapCoordinate implements MapCoordinateType {
+    readonly name: string = 'MapCoordinate'
+
+    private __config: MapConfigType
+    private __map: MapType
+    private __boundary: Array<number>
+
+    constructor(config: MapConfigType = {}) {
+        this.__config = initOption(config, {
+            api: "Mercator",
+            width: 400,
+            height: 300,
+            left: 0,
+            top: 0
+        })
+    }
+
+    private $$updateMap() {
+        const [minLongitude, maxLongitude, minLatitude, maxLatitude] = this.__boundary
+
+        if (this.__config.api == "Eoap") {
+
+            const xScale = (this.__config.width as number) * 0.836 / (maxLongitude - minLongitude)
+            const yScale = (this.__config.height as number) * 0.557 / (maxLatitude - minLatitude)
+
+            this.__map = new Eoap(xScale < yScale ? xScale : yScale, [
+                (minLongitude + maxLongitude) * 0.5 * 0.9778,
+                (minLatitude + maxLatitude) * 0.5 * 1.025
+            ])
+
+        } else if (this.__config.api == "Mercator") {
+
+            const xScale = (this.__config.width as number) * 0.72 / (maxLongitude - minLongitude)
+            const yScale = (this.__config.height as number) * 0.575 / (maxLatitude - minLatitude)
+
+            this.__map = new Mercator(xScale < yScale ? xScale : yScale, [
+                (minLongitude + maxLongitude) * 0.5,
+                (minLatitude + maxLatitude) * 0.5
+            ])
+
+        } else {
+            throw new Error("Unexpected API types:" + this.__config.api)
+        }
+    }
+
+    setConfig(config: MapConfigType) {
+        mergeOption(this.__config, config)
+        this.$$updateMap()
+        return this
+    }
+
+    setGeos(...geos: any[]) {
+        this.__boundary = getBoundary(...geos)
+        this.$$updateMap()
+        return this
+    }
+
+    use(λ: number, φ: number): [number, number] {
+        if (this.__map) {
+            const dxyz = this.__map.use(λ, φ)
+            return [
+                (this.__config.left as number) + (this.__config.width as number) * 0.5 + dxyz[0],
+                (this.__config.top as number) + (this.__config.height as number) * 0.5 + dxyz[1],
+            ]
+        } else {
+            throw new Error("Geographic data not set")
+        }
+    }
+
+}
+
 export default MapCoordinate

package/src/getLoopColors.ts

@@ -1,42 +1,42 @@
-// 获取一组循环色彩
-export default function (num: number, alpha: number = 1, colorsFactory?: (alpha: number) => Array<string>) {
-    // 颜色集合
-    const colorList = colorsFactory ? colorsFactory(alpha) : [
-        'rgba(84,112,198,' + alpha + ")", 'rgba(145,204,117,' + alpha + ")",
-        'rgba(250,200,88,' + alpha + ")", 'rgba(238,102,102,' + alpha + ")",
-        'rgba(115,192,222,' + alpha + ")", 'rgba(59,162,114,' + alpha + ")",
-        'rgba(252,132,82,' + alpha + ")", 'rgba(154,96,180,' + alpha + ")",
-        'rgba(234,124,204,' + alpha + ")"
-    ]
-
-    let colors: string[] = []
-
-    // 根据情况返回颜色数组
-    if (num <= colorList.length) {
-        // 这种情况就不需要任何处理
-        return colorList
-    } else {
-        // 如果正好是集合长度的倍数
-        if (num % colorList.length == 0) {
-            // 将颜色数组循环加入后再返回
-            for (let i = 0; i < (num / colorList.length); i++) {
-                colors = colors.concat(colorList)
-            }
-        } else {
-            for (let j = 1; j < (num / colorList.length); j++) {
-                colors = colors.concat(colorList)
-            }
-            // 防止最后一个颜色和第一个颜色重复
-            if (num % colorList.length == 1) {
-                colors = colors.concat(colorList[4])
-            } else {
-                for (let k = 0; k < num % colorList.length; k++) {
-                    colors = colors.concat(colorList[k])
-                }
-            }
-        }
-    }
-
-    // 返回结果
-    return colors
-}
+// 获取一组循环色彩
+export default function (num: number, alpha: number = 1, colorsFactory?: (alpha: number) => Array<string>) {
+    // 颜色集合
+    const colorList = colorsFactory ? colorsFactory(alpha) : [
+        'rgba(84,112,198,' + alpha + ")", 'rgba(145,204,117,' + alpha + ")",
+        'rgba(250,200,88,' + alpha + ")", 'rgba(238,102,102,' + alpha + ")",
+        'rgba(115,192,222,' + alpha + ")", 'rgba(59,162,114,' + alpha + ")",
+        'rgba(252,132,82,' + alpha + ")", 'rgba(154,96,180,' + alpha + ")",
+        'rgba(234,124,204,' + alpha + ")"
+    ]
+
+    let colors: string[] = []
+
+    // 根据情况返回颜色数组
+    if (num <= colorList.length) {
+        // 这种情况就不需要任何处理
+        return colorList
+    } else {
+        // 如果正好是集合长度的倍数
+        if (num % colorList.length == 0) {
+            // 将颜色数组循环加入后再返回
+            for (let i = 0; i < (num / colorList.length); i++) {
+                colors = colors.concat(colorList)
+            }
+        } else {
+            for (let j = 1; j < (num / colorList.length); j++) {
+                colors = colors.concat(colorList)
+            }
+            // 防止最后一个颜色和第一个颜色重复
+            if (num % colorList.length == 1) {
+                colors = colors.concat(colorList[4])
+            } else {
+                for (let k = 0; k < num % colorList.length; k++) {
+                    colors = colors.concat(colorList[k])
+                }
+            }
+        }
+    }
+
+    // 返回结果
+    return colors
+}

package/src/interpolation/Cardinal.ts

@@ -1,111 +1,111 @@
-/**
- * Cardinal三次插值
- * ----------------------------
- * Hermite拟合的计算是，确定两个点和两个点的斜率
- * 用一个y=ax(3)+bx(2)+cx+d的三次多项式来求解
- * 而Cardinal是建立在此基础上
- * 给定需要拟合的两个点和第一个点的前一个点+最后一个点的后一个点
- * 第一个点的斜率由第一个点的前一个点和第二个点的斜率确定
- * 第二个点的斜率由第一个点和第二个点的后一个点的斜率确定
- */
-
-import type CardinalType from '../../types/Cardinal'
-
-import Hermite from './Hermite'
-
-class Cardinal implements CardinalType {
-    readonly name: string = 'Cardinal'
-
-    // 该参数用于调整曲线走势，默认数值t=0，分水岭t=-1，|t-(-1)|的值越大，曲线走势调整的越严重
-    private __t: number
-
-    private __HS: {
-        x: number[],
-        h: Hermite[]
-    }
-    private __i: number
-
-    constructor(t: number = 0) {
-        this.__t = t
-    }
-
-    // 设置点的位置
-    // 参数格式：[[x1, y1], [x2, y2], ... ]
-    // 至少两个点
-    setP(points: number[][]) {
-
-        this.__HS = {
-            "x": [],
-            "h": []
-        };
-        let flag: number,
-            slope = (points[1][1] - points[0][1]) / (points[1][0] - points[0][0]),
-            temp: number
-        this.__HS.x[0] = points[0][0]
-        for (flag = 1; flag < points.length; flag++) {
-            if (points[flag][0] <= points[flag - 1][0]) throw new Error('The point position should be increamented!')
-            this.__HS.x[flag] = points[flag][0]
-
-            // 求点斜率
-
-            // temp = flag < points.length - 1 ?
-            //     (points[flag + 1][1] - points[flag - 1][1]) / (points[flag + 1][0] - points[flag - 1][0]) :
-            //     (points[flag][1] - points[flag - 1][1]) / (points[flag][0] - points[flag - 1][0])
-
-            // 修复超过界限的值问题
-            // 2023年6月25日 于南京
-            if (flag < points.length - 1) {
-                if (
-                    (points[flag + 1][1] > points[flag][1] && points[flag - 1][1] > points[flag][1]) ||
-                    (points[flag + 1][1] < points[flag][1] && points[flag - 1][1] < points[flag][1]) ||
-                    points[flag + 1][1] == points[flag][1] ||
-                    points[flag - 1][1] == points[flag][1]
-                ) {
-                    temp = 0
-                } else {
-                    temp = (points[flag + 1][1] - points[flag - 1][1]) / (points[flag + 1][0] - points[flag - 1][0])
-                }
-            } else {
-                temp = (points[flag][1] - points[flag - 1][1]) / (points[flag][0] - points[flag - 1][0])
-            }
-
-            // 求解两个点直接的插值方程
-            // 第一个点的前一个点直接取第一个点
-            // 最后一个点的后一个点直接取最后一个点
-            this.__HS.h[flag - 1] = new Hermite((1 - this.__t) * 0.5).setP(points[flag - 1][0], points[flag - 1][1], points[flag][0], points[flag][1], slope, temp)
-            slope = temp
-        }
-        return this
-
-    }
-
-    // 根据x值返回y值
-    use(x: number) {
-        if (this.__HS) {
-            this.__i = -1
-
-            // 寻找记录x所在位置的区间
-            // 这里就是寻找对应的拟合函数
-            while (this.__i + 1 < this.__HS.x.length && (x > this.__HS.x[this.__i + 1] || (this.__i == -1 && x >= this.__HS.x[this.__i + 1]))) {
-                this.__i += 1
-            }
-
-            // 由于js浮点运算不准确，我们对于越界的情况进行兼容
-
-            if (this.__i < 0) {
-                return this.__HS.h[0].use(this.__HS.x[0])
-            }
-
-            else if (this.__i >= this.__HS.h.length) {
-                return this.__HS.h[this.__HS.h.length - 1].use(this.__HS.x[this.__HS.x.length - 1])
-            }
-
-            return this.__HS.h[this.__i].use(x)
-        } else {
-            throw new Error('You shoud first set the position!')
-        }
-    }
-
-}
-
+/**
+ * Cardinal三次插值
+ * ----------------------------
+ * Hermite拟合的计算是，确定两个点和两个点的斜率
+ * 用一个y=ax(3)+bx(2)+cx+d的三次多项式来求解
+ * 而Cardinal是建立在此基础上
+ * 给定需要拟合的两个点和第一个点的前一个点+最后一个点的后一个点
+ * 第一个点的斜率由第一个点的前一个点和第二个点的斜率确定
+ * 第二个点的斜率由第一个点和第二个点的后一个点的斜率确定
+ */
+
+import type CardinalType from '../../types/Cardinal'
+
+import Hermite from './Hermite'
+
+class Cardinal implements CardinalType {
+    readonly name: string = 'Cardinal'
+
+    // 该参数用于调整曲线走势，默认数值t=0，分水岭t=-1，|t-(-1)|的值越大，曲线走势调整的越严重
+    private __t: number
+
+    private __HS: {
+        x: number[],
+        h: Hermite[]
+    }
+    private __i: number
+
+    constructor(t: number = 0) {
+        this.__t = t
+    }
+
+    // 设置点的位置
+    // 参数格式：[[x1, y1], [x2, y2], ... ]
+    // 至少两个点
+    setP(points: number[][]) {
+
+        this.__HS = {
+            "x": [],
+            "h": []
+        };
+        let flag: number,
+            slope = (points[1][1] - points[0][1]) / (points[1][0] - points[0][0]),
+            temp: number
+        this.__HS.x[0] = points[0][0]
+        for (flag = 1; flag < points.length; flag++) {
+            if (points[flag][0] <= points[flag - 1][0]) throw new Error('The point position should be increamented!')
+            this.__HS.x[flag] = points[flag][0]
+
+            // 求点斜率
+
+            // temp = flag < points.length - 1 ?
+            //     (points[flag + 1][1] - points[flag - 1][1]) / (points[flag + 1][0] - points[flag - 1][0]) :
+            //     (points[flag][1] - points[flag - 1][1]) / (points[flag][0] - points[flag - 1][0])
+
+            // 修复超过界限的值问题
+            // 2023年6月25日 于南京
+            if (flag < points.length - 1) {
+                if (
+                    (points[flag + 1][1] > points[flag][1] && points[flag - 1][1] > points[flag][1]) ||
+                    (points[flag + 1][1] < points[flag][1] && points[flag - 1][1] < points[flag][1]) ||
+                    points[flag + 1][1] == points[flag][1] ||
+                    points[flag - 1][1] == points[flag][1]
+                ) {
+                    temp = 0
+                } else {
+                    temp = (points[flag + 1][1] - points[flag - 1][1]) / (points[flag + 1][0] - points[flag - 1][0])
+                }
+            } else {
+                temp = (points[flag][1] - points[flag - 1][1]) / (points[flag][0] - points[flag - 1][0])
+            }
+
+            // 求解两个点直接的插值方程
+            // 第一个点的前一个点直接取第一个点
+            // 最后一个点的后一个点直接取最后一个点
+            this.__HS.h[flag - 1] = new Hermite((1 - this.__t) * 0.5).setP(points[flag - 1][0], points[flag - 1][1], points[flag][0], points[flag][1], slope, temp)
+            slope = temp
+        }
+        return this
+
+    }
+
+    // 根据x值返回y值
+    use(x: number) {
+        if (this.__HS) {
+            this.__i = -1
+
+            // 寻找记录x所在位置的区间
+            // 这里就是寻找对应的拟合函数
+            while (this.__i + 1 < this.__HS.x.length && (x > this.__HS.x[this.__i + 1] || (this.__i == -1 && x >= this.__HS.x[this.__i + 1]))) {
+                this.__i += 1
+            }
+
+            // 由于js浮点运算不准确，我们对于越界的情况进行兼容
+
+            if (this.__i < 0) {
+                return this.__HS.h[0].use(this.__HS.x[0])
+            }
+
+            else if (this.__i >= this.__HS.h.length) {
+                return this.__HS.h[this.__HS.h.length - 1].use(this.__HS.x[this.__HS.x.length - 1])
+            }
+
+            return this.__HS.h[this.__i].use(x)
+        } else {
+            throw new Error('You shoud first set the position!')
+        }
+    }
+
+}
+
 export default Cardinal