@sswroom/sswr 1.6.22 → 1.6.23

package/Changelog

@@ -1,3 +1,8 @@
+1.6.23
+-Enhance cesium types
+-Fixed time shift on Android after monitor off
+-Added geometry.LineString.calcLength
+
 1.6.22
 -Enhance map.MapControl Marker
 -Added map.MapControl.layerMoveMarker

package/cesium.d.ts

@@ -7,7 +7,7 @@ import * as web from "./web";
 
 declare class KMLFeatureOptions
 {
-	noPopup: boolean;
+	noPopup?: boolean;
 }
 
 export function screenToLatLon(viewer: Viewer, x: number, y: number, ellipsoid: Ellipsoid) : math.Coord2D;
@@ -17,7 +17,7 @@ export function newObjFromGeoJSON(geoJSON: object) : object;
 export function addGeoJSON(viewer: Viewer, geoJSON: object, color: Color, extSize: number): void;
 export function fromCartesian3Array(viewer: Viewer, arr: Cartesian3[]): object[];
 export function fromPolygonGraphics(viewer: Viewer, pg: PolygonGraphics): geometry.Polygon;
-export function createFromKML(feature: kml.Feature | kml.KMLFile, options: KMLFeatureOptions): any;
+export function createFromKML(feature: kml.Feature | kml.KMLFile, options?: KMLFeatureOptions): any;
 export function createFromGeometry(geom: geometry.Vector2D, options: map.GeometryOptions)
 export function parseColor(c: string): web.Color;
 export class CesiumMap extends map.MapControl

package/data.js

@@ -2276,7 +2276,15 @@ export class TimeInstant
 			let ns = (t1 / 1000) - Math.floor(t1 / 1000) + (t2 / 1000) - Math.floor(t2 / 1000);
 			if (ns >= 1)
 				ns -= 1;
-			return new TimeInstant(secs, Math.round(ns * 1000000000));
+			let n = Date.now();
+			if (secs == Math.floor(n))
+			{
+				return new TimeInstant(secs, Math.round(ns * 1000000000));
+			}
+			else
+			{
+				return TimeInstant.fromTicks(n);
+			}
 		}
 		else
 		{

package/geometry.d.ts

@@ -1,4 +1,5 @@
 import * as math from "./math";
+import * as unit from "./unit";
 
 declare class BoundaryPointResult
 {
@@ -70,6 +71,7 @@ export class LineString extends Vector2D
 	hasArea(): boolean;
 	calcHIntersacts(y: double): number[];
 	getDisplayCenter(): math.Coord2D;
+	calcLength(distUnit: unit.Distance.Unit): number | null;
 }
 
 export class LinearRing extends LineString

package/geometry.js

@@ -1,4 +1,5 @@
 import * as math from "./math.js";
+import * as unit from "./unit.js";
 
 export const VectorType = {
 	Unknown: "Unknown",
@@ -397,6 +398,28 @@ export class LineString extends Vector2D
 		}
 		return new math.Coord2D(xList[xList.length >> 1], pt.y);
 	}
+
+	/**
+	 * @param {unit.Distance.Unit} distUnit
+	 */
+	calcLength(distUnit)
+	{
+		let csys = math.CoordinateSystemManager.srCreateCsys(this.srid);
+		if (!csys)
+			return null;
+		let totalLength = 0;
+		let i = 1;
+		let lastPt = this.coordinates[0];
+		let thisPt;
+		while (i < this.coordinates.length)
+		{
+			thisPt = this.coordinates[i];
+			totalLength += csys.calcSurfaceDistance(lastPt[0], lastPt[1], thisPt[0], thisPt[1], distUnit);
+			lastPt = thisPt;
+			i++;
+		}
+		return totalLength;
+	}
 }
 
 export class LinearRing extends LineString

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sswroom/sswr",
-  "version": "1.6.22",
+  "version": "1.6.23",
   "description": "Libraries made by sswroom",
   "main": "sswr.js",
   "scripts": {