@sswroom/sswr 1.5.5 → 1.6.1

package/cesium.d.ts

@@ -1,32 +1,32 @@
-import { Cartesian3, Ellipsoid, Viewer } from "cesium";
+import { Cartesian3, Ellipsoid, Viewer, Color, PolygonGraphics } from "cesium";
 import * as geometry from "./geometry";
 import * as kml from "./kml";
 import * as map from "./map";
-import { Coord2D } from "./math";
+import * as math from "./math";
 
 declare class KMLFeatureOptions
 {
 	noPopup: boolean;
 }
 
-export function screenToLatLon(viewer: Viewer, x: number, y: number, ellipsoid: Ellipsoid) : Coord2D;
+export function screenToLatLon(viewer: Viewer, x: number, y: number, ellipsoid: Ellipsoid) : math.Coord2D;
 export function fromCXYZArray(arr: any[]): Cartesian3[];
 export function toCartesian3Arr(coords: number[][]) : Cartesian3[];	
 export function newObjFromGeoJSON(geoJSON: object) : object;
-export function addGeoJSON(viewer: Viewer, geoJSON: object, color: any, extSize: number): void;
+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: any): geometry.Polygon;
-export function createFromKMLFeature(feature: kml.Feature, options: KMLFeatureOptions): any;
-export function createFromGeometry(geom: geometry.Vector2D, options: GeometryOptions)
+export function fromPolygonGraphics(viewer: Viewer, pg: PolygonGraphics): geometry.Polygon;
+export function createFromKML(feature: kml.Feature | kml.KMLFile, options: KMLFeatureOptions): any;
+export function createFromGeometry(geom: geometry.Vector2D, options: map.GeometryOptions)
 
 export class CesiumMap extends map.MapControl
 {
 	constructor(divId: string);
-	createLayer(layer: map.LayerInfo, options?: LayerOptions): any;
-	createMarkerLayer(name: string, options?: LayerOptions): any;
-	createGeometryLayer(name: string, options?: LayerOptions): any;
+	createLayer(layer: map.LayerInfo, options?: map.LayerOptions): any;
+	createMarkerLayer(name: string, options?: map.LayerOptions): any;
+	createGeometryLayer(name: string, options?: map.LayerOptions): any;
 	addLayer(layer: any): void;
-	addKMLFeature(feature: kml.Feature): void;
+	addKML(feature: kml.Feature | kml.KMLFile): void;
 	uninit(): void;
 	zoomIn(): void;
 	zoomOut(): void;
@@ -40,13 +40,13 @@ export class CesiumMap extends map.MapControl
 	map2ScnPos(mapPos: math.Coord2D): math.Coord2D;
 	scn2MapPos(scnPos: math.Coord2D): math.Coord2D;
 
-	createMarker(mapPos: math.Coord2D, imgURL: string, imgWidth: number, imgHeight: number, options?: MarkerOptions): any;
+	createMarker(mapPos: math.Coord2D, imgURL: string, imgWidth: number, imgHeight: number, options?: map.MarkerOptions): any;
 	layerAddMarker(markerLayer: any, marker: any): void;
 	layerRemoveMarker(markerLayer: any, marker: any): void;
 	layerClearMarkers(markerLayer: any): void;
 	markerIsOver(marker: any, scnPos: math.Coord2D): boolean;
 
-	createGeometry(geom: geometry.Vector2D, options: GeometryOptions): any;
+	createGeometry(geom: geometry.Vector2D, options: map.GeometryOptions): any;
 	layerAddGeometry(geometryLayer: any, geom: any): void;
 	layerRemoveGeometry(geometryLayer: any, geom: any): void;
 	layerClearGeometries(geometryLayer: any): void;

package/cesium.js

@@ -154,8 +154,12 @@ export function fromPolygonGraphics(viewer, pg)
 	return new geometry.Polygon(4326, coordinates);
 }
 
-export function createFromKMLFeature(feature, options)
+export function createFromKML(feature, options)
 {
+	if (feature instanceof kml.KMLFile)
+	{
+		return createFromKML(feature.root, options);
+	}
 	options = data.mergeOptions(options, {noPopup: false});
 	if (feature instanceof kml.Container)
 	{
@@ -164,7 +168,7 @@ export function createFromKMLFeature(feature, options)
 		let layer;
 		for (i in feature.features)
 		{
-			layer = createFromKMLFeature(feature.features[i], options);
+			layer = createFromKML(feature.features[i], options);
 			if (layer instanceof Cesium.Entity)
 			{
 				layers.push(layer);
@@ -432,9 +436,9 @@ export class CesiumMap extends map.MapControl
 		}
 	}
 
-	addKMLFeature(feature)
+	addKML(feature)
 	{
-		this.addLayer(createFromKMLFeature(feature));
+		this.addLayer(createFromKML(feature));
 	}
 
 //	uninit(): void;

package/data.d.ts

@@ -1,7 +1,8 @@
 export function isArray(o: any): boolean;
 export function isObject(o: any): boolean;
 export function toObjectString(o: any, lev: number): string;
-export function arrayBuffer2Base64(buff: any): string;
+export function arrayBuffer2Base64(buff: ArrayBuffer): string;
+export function arrayBufferEquals(buff1: ArrayBuffer, buff2: ArrayBuffer): boolean;
 export function compare(a: any, b: any): number;
 export function sort(arr: object[], compareFunc?: (val1: object, val2: object) => number, firstIndex?: number, lastIndex?: number): void;
 export function mergeOptions(options: object | null, defOptions: object): object;
@@ -11,6 +12,11 @@ export function readUInt24(arr: Uint8Array, index: number): number;
 export function readMUInt24(arr: Uint8Array, index: number): number;
 export function readUInt32(arr: Uint8Array, index: number): number;
 export function readMUInt32(arr: Uint8Array, index: number): number;
+export function rol32(v: number, n: number): number;
+export function ror32(v: number, n: number): number;
+export function shl32(v: number, n: number): number;
+export function sar32(v: number, n: number): number;
+export function shr32(v: number, n: number): number;
 
 export class DateValue
 {
@@ -19,7 +25,7 @@ export class DateValue
 	day: number;
 
 	constructor();
-};
+}
 
 export class TimeValue extends DateValue
 {
@@ -30,7 +36,7 @@ export class TimeValue extends DateValue
 	tzQhr: number;
 	
 	constructor();
-};
+}
 
 export class DateTimeUtil
 {
@@ -40,28 +46,28 @@ export class DateTimeUtil
 	static timeValueSetTime(t: TimeValue, timeStrs: string[]): void;
 	static date2TotalDays(year: number, month: number, day: number): number;
 	static dateValue2TotalDays(d: DateValue): number;
-	static timeValue2Secs(tval: TimeValue): number;
-	static timeValue2Ticks(t: TimeValue): number;
+	static timeValue2Secs(tval: TimeValue): bigint;
+	static timeValue2Ticks(t: TimeValue): bigint;
 	static ticks2TimeValue(ticks: number, tzQhr?: number): TimeValue;
-	static secs2TimeValue(secs: number, tzQhr?: number): TimeValue;
+	static secs2TimeValue(secs: bigint, tzQhr?: number): TimeValue;
 	static totalDays2DateValue(totalDays: number, d: DateValue): void;
-	static instant2TimeValue(secs: number, nanosec: number, tzQhr?: number): TimeValue;
+	static instant2TimeValue(secs: bigint, nanosec: number, tzQhr?: number): TimeValue;
 	static toString(tval: TimeValue, pattern: string): string;
 	static string2TimeValue(dateStr: string, tzQhr?: number): TimeValue;
 	static isYearLeap(year: number): boolean;
 	static parseYearStr(year: string): number;
 	static parseMonthStr(month: string): number;
 	static getLocalTzQhr(): number;
-};
+}
 
 export class Duration
 {
-	seconds: number;
+	seconds: bigint;
 	ns: number;
-	constructor(seconds: number, nanosec: number);
+	constructor(seconds: number | bigint, nanosec: number);
 	static fromTicks(ticks: number): Duration;
-	static fromUs(us: number): Duration;
-	getSeconds(): number;
+	static fromUs(us: bigint): Duration;
+	getSeconds(): bigint;
 	getNS(): number;
 	getTotalMS(): number;
 	getTotalSec(): number;
@@ -72,7 +78,7 @@ export class Duration
 
 export class LocalDate
 {
-	static DATE_NULL: number = -1234567;
+	static DATE_NULL: number;
 
 	dateVal: number;
 	constructor();
@@ -91,17 +97,19 @@ export class LocalDate
 	toString(pattern: string | null): string;
 	compareTo(obj: Date): number;
 	isNull(): boolean;
+	static today(): LocalDate;
+	static fromStr(s: string): LocalDate | null;
 }
 
 export class TimeInstant
 {
-	sec: number;
+	sec: bigint;
 	nanosec: number;
 
-	constructor(sec: number, nanosec: number);
+	constructor(sec: bigint | number, nanosec: number);
 	static now(): TimeInstant;
-	static fromVariTime(variTime: number): TimeInstant;
-	static fromTicks(ticks: number): TimeInstant;
+	static fromVariTime(variTime: bigint | number): TimeInstant;
+	static fromTicks(ticks: bigint | number): TimeInstant;
 	addDay(val: number): TimeInstant;
 	addHour(val: number): TimeInstant;
 	addMinute(val: number): TimeInstant;
@@ -117,26 +125,26 @@ export class TimeInstant
 	diffSecDbl(ts: TimeInstant): number;
 	diff(ts: TimeInstant): Duration;
 	toTicks(): number;
-	toDotNetTicks(): number;
+	toDotNetTicks(): bigint;
 	toUnixTimestamp(): number;
-	toEpochSec(): number;
-	toEpochMS(): number;
-	toEpochNS(): number;
+	toEpochSec(): bigint;
+	toEpochMS(): bigint;
+	toEpochNS(): bigint;
 }
 
 export class Timestamp {
 	constructor(inst: TimeInstant, tzQhr?: number);
-	static fromTicks(ticks: number, tzQhr?: number): Timestamp;
-	static fromStr(str: string, defTzQhr?: number): Timestamp;
+	static fromTicks(ticks: number | number, tzQhr?: number): Timestamp;
+	static fromStr(str: string, defTzQhr?: number): Timestamp | null;
 	static now(): Timestamp;
 	static utcNow(): Timestamp;
 	static fromVariTime(variTime: any): Timestamp;
 	static fromSecNS(unixTS: number, nanosec: number, tzQhr?: number): Timestamp;
-	static fromDotNetTicks(ticks: number, tzQhr?: number): Timestamp;
-	static fromEpochSec(epochSec: number, tzQhr?: number): Timestamp;
-	static fromEpochMS(epochMS: number, tzQhr?: number): Timestamp;
-	static fromEpochUS(epochUS: number, tzQhr?: number): Timestamp;
-	static fromEpochNS(epochNS: number, tzQhr?: number): Timestamp;
+	static fromDotNetTicks(ticks: bigint, tzQhr?: number): Timestamp;
+	static fromEpochSec(epochSec: number | bigint, tzQhr?: number): Timestamp;
+	static fromEpochMS(epochMS: number | bigint, tzQhr?: number): Timestamp;
+	static fromEpochUS(epochUS: number | bigint, tzQhr?: number): Timestamp;
+	static fromEpochNS(epochNS: number | bigint, tzQhr?: number): Timestamp;
 	static fromTimeValue(tval: TimeValue): Timestamp;
 	static fromYMDHMS(ymdhms: number, tzQhr?: number): Timestamp;
 	addMonth(val: number): Timestamp;
@@ -161,9 +169,9 @@ export class Timestamp {
 	toTicks(): number;
 	toDotNetTicks(): number;
 	toUnixTimestamp(): number;
-	toEpochSec(): number;
-	toEpochMS(): number;
-	toEpochNS(): number;
+	toEpochSec(): bigint;
+	toEpochMS(): bigint;
+	toEpochNS(): bigint;
 	toString(pattern?: string): string;
 	toStringISO8601(): string;
 	toStringNoZone(): string;
@@ -183,18 +191,22 @@ export class ByteReader
 
 	constructor(arr: ArrayBuffer);
 	getLength(): number;
-	getArrayBuffer(ofst: number, size: number): ArrayBuffer;
+	getArrayBuffer(ofst?: number, size?: number): ArrayBuffer;
+	getU8Arr(ofst?: number, size?: number): Uint8Array;
 
 	readUInt8(ofst: number): number;
 	readUInt16(ofst: number, lsb: boolean): number;
+	readUInt24(ofst: number, lsb: boolean): number;
 	readUInt32(ofst: number, lsb: boolean): number;
 	readInt8(ofst: number): number;
 	readInt16(ofst: number, lsb: boolean): number;
+	readInt24(ofst: number, lsb: boolean): number;
 	readInt32(ofst: number, lsb: boolean): number;
 	readFloat64(ofst: number, lsb: boolean): number;
 	readUTF8(ofst: number, len: number): string;
 	readUTF8Z(ofst: number, maxSize?: number): string;
-
+	readUTF16(ofst: number, nChar: number, lsb: boolean): string;
+	
 	readUInt8Arr(ofst: number, cnt: number): number[];
 	readUInt16Arr(ofst: number, lsb: boolean, cnt: number): number[];
 	readUInt32Arr(ofst: number, lsb: boolean, cnt: number): number[];
@@ -202,4 +214,13 @@ export class ByteReader
 	readInt16Arr(ofst: number, lsb: boolean, cnt: number): number[];
 	readInt32Arr(ofst: number, lsb: boolean, cnt: number): number[];
 	readFloat64Arr(ofst: number, lsb: boolean, cnt: number): number[];
+
+	isASCIIText(ofst: number, len: number): boolean;
+}
+
+export abstract class ParsedObject
+{
+	sourceName: string;
+	objType: string;
+	constructor(sourceName: string, objType: string);
 }