diff --git a/src/Draw/drawPolyline.js b/src/Draw/drawPolyline.js index 0c2deda..4317f70 100644 --- a/src/Draw/drawPolyline.js +++ b/src/Draw/drawPolyline.js @@ -104,7 +104,7 @@ class DrawPolyline extends Draw { let cache_positions = [] let car = undefined this.event.mouse_left((movement, cartesian) => { - if(into === '2D') { + if (into === '2D') { return } into = '3D' @@ -120,7 +120,6 @@ class DrawPolyline extends Draw { } cache_positions.push(cartesian) this.points_ids.push(this.create_point(cartesian, this.viewer)) - if (cache_positions.length >= this.options.number) { let positions = [] cache_positions.forEach((item) => { @@ -138,11 +137,12 @@ class DrawPolyline extends Draw { this.end() } else { - cb(cache_positions.length) + // cb(cache_positions.length) + cb(null, cache_positions) } }) this.event.mouse_right((movement, cartesian) => { - if(into === '2D') { + if (into === '2D') { return } let positions = [] @@ -161,7 +161,7 @@ class DrawPolyline extends Draw { this.end() }) this.event.mouse_move((movement, cartesian) => { - if(into === '2D') { + if (into === '2D') { return } this.positions = cache_positions.concat(cartesian) @@ -172,7 +172,7 @@ class DrawPolyline extends Draw { ) }) this.event.mouse_right_keyboard_ctrl((movement, cartesian) => { - if(into === '2D') { + if (into === '2D') { return } if (this.points_ids.length > 1) { @@ -183,7 +183,7 @@ class DrawPolyline extends Draw { }) this.event.gesture_pinck_start_keyboard_ctrl(() => { - if(into === '2D') { + if (into === '2D') { return } if (this.points_ids.length > 1) { @@ -195,7 +195,7 @@ class DrawPolyline extends Draw { }) this.event.gesture_pinck_start((movement, cartesian) => { - if(into === '2D') { + if (into === '2D') { return } let startTime = new Date() @@ -239,7 +239,7 @@ class DrawPolyline extends Draw { if (!this._is2D && this._sdk2D) { this.event2D = new MouseEvent(this._sdk2D) this.event2D.mouse_left((movement, cartesian) => { - if(into === '3D') { + if (into === '3D') { return } into = '2D' @@ -257,7 +257,7 @@ class DrawPolyline extends Draw { this.points_ids.push(this.create_point(cartesian, this._sdk2D.viewer)) }) this.event2D.mouse_right((movement, cartesian) => { - if(into === '3D') { + if (into === '3D') { return } let positions = [] @@ -276,7 +276,7 @@ class DrawPolyline extends Draw { this.end() }) this.event2D.mouse_move((movement, cartesian) => { - if(into === '3D') { + if (into === '3D') { return } this.positions = cache_positions.concat(cartesian) @@ -287,7 +287,7 @@ class DrawPolyline extends Draw { ) }) this.event2D.mouse_right_keyboard_ctrl((movement, cartesian) => { - if(into === '3D') { + if (into === '3D') { return } if (this.points_ids.length > 1) { @@ -298,7 +298,7 @@ class DrawPolyline extends Draw { }) this.event2D.gesture_pinck_start_keyboard_ctrl(() => { - if(into === '3D') { + if (into === '3D') { return } if (this.points_ids.length > 1) { @@ -309,7 +309,7 @@ class DrawPolyline extends Draw { }) this.event2D.gesture_pinck_start((movement, cartesian) => { - if(into === '3D') { + if (into === '3D') { return } let startTime = new Date() diff --git a/src/Global/SheetIndex/index.js b/src/Global/SheetIndex/index.js index 56a798d..6a261d5 100644 --- a/src/Global/SheetIndex/index.js +++ b/src/Global/SheetIndex/index.js @@ -9,7 +9,7 @@ let state = false let scale = '1:100万' function SheetIndexStatusSwitch(sdk, s = false) { - if(!sdk) { + if (!sdk) { return } if (!tools) { @@ -32,7 +32,7 @@ function SheetIndexStatusSwitch(sdk, s = false) { } let sdkD = getSdk().sdkD - if(sdkD && sdk !== sdkD) { + if (sdkD && sdk !== sdkD) { SheetIndexStatusSwitch(sdkD, s) } @@ -118,7 +118,6 @@ function open(sdk) { break; } } - if (!gridPrimitives) { gridPrimitives = new Cesium.PrimitiveCollection(); gridPrimitives.name = 'SheetIndexGridPrimitives'; @@ -128,7 +127,6 @@ function open(sdk) { labelCollection = new Cesium.LabelCollection(); labelCollection.name = 'SheetIndexLabelCollection'; } - let stationaryFrames = 0; let maxRectangle = null; gridPrimitives.postRenderEvent = () => { diff --git a/src/Obj/Base/BatchModel/index.js b/src/Obj/Base/BatchModel/index.js index adc67a1..d681af9 100644 --- a/src/Obj/Base/BatchModel/index.js +++ b/src/Obj/Base/BatchModel/index.js @@ -72,6 +72,7 @@ class BatchModel extends Base { break; } Draw && Draw.start((a, positions) => { + console.log(positions, 'positions') this.options.positions = positions; //判断范围是否过大 if (options.type == '面') {