@sswroom/sswr 1.5.5 → 1.6.0

package/leaflet.js

@@ -59,8 +59,12 @@ export function createLayer(layer, options)
 	return null;
 }
 
-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)
 	{
@@ -68,7 +72,7 @@ export function createFromKMLFeature(feature, options)
 		let layers = L.featureGroup();
 		for (i in feature.features)
 		{
-			createFromKMLFeature(feature.features[i], options).addTo(layers);
+			createFromKML(feature.features[i], options).addTo(layers);
 		}
 		return layers;
 	}
@@ -473,7 +477,7 @@ export class KMLNetworkLink
 					if (val instanceof kml.Feature)
 					{
 						this.container.clearLayers();
-						let layer = createFromKMLFeature(val);
+						let layer = createFromKML(val);
 						if (layer)
 							layer.addTo(this.container);
 					}
@@ -509,9 +513,9 @@ export class LeafletMap extends map.MapControl
 		layer.addTo(this.mapObj);
 	}
 
-	addKMLFeature(feature)
+	addKML(feature)
 	{
-		createFromKMLFeature(feature).addTo(this.mapObj);
+		createFromKML(feature).addTo(this.mapObj);
 	}
 
 //	uninit(): void;

package/map.d.ts

@@ -1,5 +1,6 @@
 import { Timestamp } from "./data";
 import * as geometry from "./geometry";
+import * as kml from "./kml";
 import * as map from "./map";
 import * as math from "./math";
 
@@ -8,7 +9,7 @@ export enum DataFormat
 	Cesium,
 	WKT,
 	GeoJSON
-};
+}
 
 export enum WebMapType
 {
@@ -16,13 +17,13 @@ export enum WebMapType
 	WFS,
 	ArcGIS,
 	OSMTile
-};
+}
 
 export enum GeoJSONType
 {
 	Feature,
 	FeatureCollection
-};
+}
 
 export enum GeometryType
 {
@@ -33,7 +34,7 @@ export enum GeometryType
 	Polygon,
 	MultiPolygon,
 	GeometryCollection
-};
+}
 
 declare class LayerInfo
 {
@@ -44,32 +45,32 @@ declare class LayerInfo
 	format?: string;
 	minZoom?: number;
 	maxZoom?: number;
-};
+}
 
 declare class GeoJSON
 {
 	type: GeoJSONType;
 	bbox?: number[];
-};
+}
 
 declare class Geometry
 {
 	type: GeometryType;
 	coordinates?: any[];
 	geometries?: Geometry[];
-};
+}
 
 declare class GeoJSONFeature<PropType> extends GeoJSON
 {
 	id?: string | number;
 	geometry: Geometry;
 	properties?: PropType;
-};
+}
 
-declare class GeoJSONFeatureCollection extends GeoJSON
+declare class GeoJSONFeatureCollection<PropType> extends GeoJSON
 {
-	features: GeoJSONFeature[];
-};
+	features: GeoJSONFeature<PropType>[];
+}
 
 export function calcDistance(srid: number, geom: geometry.Vector2D, x: number, y: number): number;
 export function getLayers(svcUrl: string, onResultFunc: Function): void;
@@ -85,7 +86,7 @@ declare class GPSRecord
 	d: number;
 	v: boolean;
 	sate: number;
-};
+}
 
 export class GPSTrack
 {
@@ -94,7 +95,7 @@ export class GPSTrack
 	createLineString(): geometry.LineString;
 	getPosByTime(ts: Timestamp): math.Vector3;
 	getPosByTicks(ticks: number): math.Vector3;
-};
+}
 
 export class GeolocationFilter
 {
@@ -105,12 +106,12 @@ export class GeolocationFilter
 
 	constructor(minSecs: number, minDistMeter: number);
 	isValid(pos: GeolocationPosition): boolean;
-};
+}
 
 
 declare class LayerOptions
 {
-};
+}
 
 declare class MarkerOptions
 {
@@ -156,7 +157,7 @@ export class MapControl
 	layerAddGeometry(geometryLayer: any, geom: any): void;
 	layerRemoveGeometry(geometryLayer: any, geom: any): void;
 	layerClearGeometries(geometryLayer: any): void;
-};
+}
 
 declare class OWSSpatialReference
 {

package/math.d.ts

@@ -6,7 +6,7 @@ export function roundToStr(n: number, decimalPoints: number): string;
 export class GeoJSON
 {
 	static parseGeometry(srid: null, geom: object): geometry.Vector2D | null;
-};
+}
 
 export class Coord2D
 {
@@ -17,7 +17,7 @@ export class Coord2D
 	get lon(): number;
 
 	mul(val: number): Coord2D;
-};
+}
 
 export class RectArea
 {
@@ -36,7 +36,7 @@ export class RectArea
 	getArea(): number;
 	unionInPlace(rect: RectArea): RectArea;
 	unionPointInPlace(x: number, y: number): RectArea;
-};
+}
 
 export class Vector3 extends Coord2D
 {
@@ -77,7 +77,7 @@ export enum EarthEllipsoidType
 	WGS84_OGC,
 	IERS1989,
 	IERS2003
-};
+}
 
 export class EarthEllipsoid
 {
@@ -86,7 +86,7 @@ export class EarthEllipsoid
 	eet: EarthEllipsoidType;
 	eccentricity: number;
 	constructor(semiMajorAxis: number, inverseFlattening: number, eet: EarthEllipsoidType);
-	calSurfaceDistance(dLat1: number, dLon1: number, dLat2: number, dLon2: number, distUnit: unit.DistanceUnit): number;
+	calSurfaceDistance(dLat1: number, dLon1: number, dLat2: number, dLon2: number, distUnit: unit.Distance.Unit): number;
 	getSemiMajorAxis(): number;
 	getSemiMinorAxis(): number;
 	getInverseFlattening(): number;
@@ -123,9 +123,9 @@ export class DatumData
 	yAngle: number;
 	zAngle: number;
 	scale: number;
-	aunit: unit.AngleUnit;
+	aunit: unit.Angle.Unit;
 
-	constructor(srid: number, spheroid: Spheroid, name: string, x0: number, y0: number, z0: number, cX: number, cY: number, cZ: number, xAngle: number, yAngle: number, zAngle: number, scale: number, aunit: unit.AngleUnit);
+	constructor(srid: number, spheroid: Spheroid, name: string, x0: number, y0: number, z0: number, cX: number, cY: number, cZ: number, xAngle: number, yAngle: number, zAngle: number, scale: number, aunit: unit.Angle.Unit);
 }
 
 export enum CoordinateSystemType
@@ -135,7 +135,7 @@ export enum CoordinateSystemType
 	Mercator1SPProjected,
 	PointMapping,
 	GausskrugerProjected
-};
+}
 
 export abstract class CoordinateSystem
 {
@@ -143,7 +143,7 @@ export abstract class CoordinateSystem
 	csysName: string;
 
 	constructor(srid: number, csysName: string);
-	abstract calcSurfaceDistance(x1: number, y1: number, x2: number, y2: number, distUnit: unit.DistanceUnit) : number;
+	abstract calcSurfaceDistance(x1: number, y1: number, x2: number, y2: number, distUnit: unit.Distance.Unit) : number;
 	abstract getCoordSysType(): CoordinateSystemType;
 	abstract isProjected(): boolean;
 
@@ -160,7 +160,7 @@ export class GeographicCoordinateSystem extends CoordinateSystem
 	datum: DatumData;
 	
 	constructor(srid: number, csysName: string, datumData: DatumData);
-	calcSurfaceDistance(x1: number, y1: number, x2: number, y2: number, unit: unit.DistanceUnit): number;
+	calcSurfaceDistance(x1: number, y1: number, x2: number, y2: number, unit: unit.Distance.Unit): number;
 	getCoordSysType(): CoordinateSystemType;
 	isProjected(): boolean;
 
@@ -172,7 +172,7 @@ export class GeographicCoordinateSystem extends CoordinateSystem
 	fromCartesianCoordDeg(coord: Vector3): Vector3;
 }
 
-export class ProjectedCoordinateSystem extends CoordinateSystem
+export abstract class ProjectedCoordinateSystem extends CoordinateSystem
 {
 	falseEasting: number;
 	falseNorthing: number;
@@ -181,7 +181,7 @@ export class ProjectedCoordinateSystem extends CoordinateSystem
 	scaleFactor: number;
 	gcs: GeographicCoordinateSystem;
 	constructor(srid: number, csysName: string, falseEasting: number, falseNorthing: number, dcentralMeridian: number, dlatitudeOfOrigin: number, scaleFactor: number, gcs: GeographicCoordinateSystem);
-	calcSurfaceDistance(x1: number, y1: number, x2: number, y2: number, distUnit: unit.DistanceUnit): number;
+	calcSurfaceDistance(x1: number, y1: number, x2: number, y2: number, distUnit: unit.Distance.Unit): number;
 	isProjected(): boolean;
 
 	getGeographicCoordinateSystem(): GeographicCoordinateSystem;
@@ -220,4 +220,4 @@ export class CoordinateSystemManager
 	static srCreateCsys(srid: number) : CoordinateSystem | null;
 	static srGetDatumData(srid: number) : DatumData | null;
 	static srGetSpheroid(srid: number) : Spheroid | null;
-};
+}

package/media.d.ts

@@ -12,7 +12,7 @@ export enum EXIFMaker
 	Nikon3,
 	Sanyo,
 	Apple
-};
+}
 
 export enum EXIFType
 {
@@ -30,7 +30,7 @@ export enum EXIFType
 	Double,
 	UINT64,
 	INT64
-};
+}
 
 declare class GPSInfo
 {
@@ -40,7 +40,7 @@ declare class GPSInfo
 	gpsTime: data.Timestamp;
 }
 
-export function loadImageFromBlob(blob: Blob): Promise<Image>;
+export function loadImageFromBlob(blob: Blob): Promise<HTMLImageElement>;
 
 export class EXIFItem
 {
@@ -50,7 +50,7 @@ export class EXIFItem
 
 	constructor(id: number, type: EXIFType, data: any);
 	clone(): EXIFItem;
-};
+}
 
 export class EXIFData
 {
@@ -98,16 +98,16 @@ export class EXIFData
 	parseMakerNote(buff: ArrayBuffer): EXIFData | null;
 
 	static getEXIFName(exifMaker: EXIFMaker, id: number, subId: number): string;
-	static parseIFD(reader: data.ByteReader, ofst: number, lsb: boolean, nextOfst: object, readBase: number, maker?: EXIFMaker);
-};
+	static parseIFD(reader: data.ByteReader, ofst: number, lsb: boolean, nextOfst: object, readBase: number, maker?: EXIFMaker): EXIFData | null;
+}
 
-export class StaticImage
+export class StaticImage extends data.ParsedObject
 {
 	img: HTMLImageElement;
-	exif: any;
+	exif: EXIFData;
 	
-	constructor(img: HTMLImageElement);
-	setExif(exif: any): void;
+	constructor(img: HTMLImageElement, sourceName: string, objType: string);
+	setExif(exif: EXIFData): void;
 	getWidth(): number;
 	getHeight(): number;
 	getProperties(): object;

package/media.js

@@ -2206,10 +2206,11 @@ export class EXIFData
 	}
 }
 
-export class StaticImage
+export class StaticImage extends data.ParsedObject
 {
-	constructor(img)
+	constructor(img, sourceName, objType)
 	{
+		super(sourceName, objType);
 		this.img = img;
 	}
 

package/net.d.ts

@@ -1,2 +1,3 @@
 export function oidText2PDU(txt: string): Uint8Array;
 export function oidToString(oid: ArrayBuffer): string;
+export function getIPv4Name(ip: number): string;

package/net.js

@@ -74,3 +74,8 @@ export function oidToString(oid)
 	}
 	return ret.join(".");
 }
+
+export function getIPv4Name(ip)
+{
+	return ((ip >> 24) & 0xff).toString() + "." + ((ip >> 16) & 0xff).toString() + "." + ((ip >> 8) & 0xff).toString() + "." + (ip & 0xff).toString()
+}

package/olayer2.d.ts

@@ -11,7 +11,7 @@ declare class Olayer2Options
 };
 
 export function toPointArray(numArr: number[][], options: Olayer2Options): OpenLayers.Geometry.Point[];
-export function createFromKMLFeature(feature: kml.Feature, options: Olayer2Options): Promise<OpenLayers.Feature.Vector | OpenLayers.Marker | any[] | null>;
+export function createFromKML(feature: kml.Feature | kml.KMLFile, options: Olayer2Options): Promise<OpenLayers.Feature.Vector | OpenLayers.Marker | any[] | null>;
 export function createFromGeometry(geom: geometry, options: Olayer2Options): Promise<OpenLayers.Marker | OpenLayers.Geometry | null>;
 
 export class Olayer2Map extends map.MapControl
@@ -33,7 +33,7 @@ export class Olayer2Map extends map.MapControl
 	createMarkerLayer(name: string, options?: LayerOptions): any;
 	createGeometryLayer(name: string, options?: LayerOptions): any;
 	addLayer(layer: any): void;
-	addKMLFeature(feature: kml.Feature): void;
+	addKML(feature: kml.Feature | kml.KMLFile): void;
 	uninit(): void;
 	zoomIn(): void;
 	zoomOut(): void;

package/olayer2.js

@@ -19,8 +19,12 @@ export function toPointArray(numArr, options)
 	return ret;
 }
 
-export async function createFromKMLFeature(feature, options)
+export async function createFromKML(feature, options)
 {
+	if (feature instanceof kml.KMLFile)
+	{
+		return await createFromKML(feature.root, options);
+	}
 	options = data.mergeOptions(options, {noPopup: false});
 	if (feature instanceof kml.Container)
 	{
@@ -29,7 +33,7 @@ export async function createFromKMLFeature(feature, options)
 		let layer;
 		for (i in feature.features)
 		{
-			layer = await createFromKMLFeature(feature.features[i], options);
+			layer = await createFromKML(feature.features[i], options);
 			if (layer instanceof OpenLayers.Marker)
 			{
 				layers.push(layer);
@@ -348,9 +352,9 @@ export class Olayer2Map extends map.MapControl
 		}
 	}
 
-	addKMLFeature(feature)
+	addKML(feature)
 	{
-		createFromKMLFeature(feature, {map: this.map, objProjection: this.mapProjection, mapProjection: this.map.getProjectionObject()}).then((layer)=>{this.addLayer(layer);});
+		createFromKML(feature, {map: this.map, objProjection: this.mapProjection, mapProjection: this.map.getProjectionObject()}).then((layer)=>{this.addLayer(layer);});
 	}
 
 	uninit()

package/package.json

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

package/parser.d.ts

@@ -1,5 +1,10 @@
+import * as data from "./data";
 import * as kml from "./kml";
-import * as media from "./media";
 
-export function parseXML(txt: string): kml.Feature | kml.NetworkLinkControl | null;
-export function parseFile(file: File | Response): Promise<kml.Feature | kml.NetworkLinkControl | media.StaticImage | null>;
+export function parseXML(txt: string): kml.KMLFile | null;
+/**
+ * Parse file into data.ParsedObject
+ * @param file file to be parsed
+ * @returns can be kml.KMLFile, media.StaticImage, cert.ASN1Data, null if failed
+ */
+export function parseFile(file: File | Response): Promise<data.ParsedObject | null>;