@sswroom/sswr 1.5.4 → 1.6.0

package/kml.d.ts

@@ -8,13 +8,13 @@ export enum AltitudeMode
 	ClampToGround,
 	RelativeToGround,
 	Absolute
-};
+}
 
 export enum DisplayMode
 {
 	Default,
 	Hide
-};
+}
 
 export enum ListItemType
 {
@@ -22,7 +22,7 @@ export enum ListItemType
 	RadioFolder,
 	CheckOffOnly,
 	CheckHideChildren
-};
+}
 
 export enum ItemIconMode
 {
@@ -32,14 +32,29 @@ export enum ItemIconMode
 	Fetching0,
 	Fetching1,
 	Fetching2
-};
+}
 
 export enum HotSpotUnit
 {
 	Fraction,
 	Pixels,
 	InsetPixels
-};
+}
+
+export enum RefreshMode
+{
+	OnChange,
+	OnInterval,
+	OnExpire
+}
+
+export enum ViewRefreshMode
+{
+	Never,
+	OnStop,
+	OnRequest,
+	OnRegion
+}
 
 export class Element
 {
@@ -60,7 +75,7 @@ export class NetworkLinkControl extends Element
 
 	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
-};
+}
 
 export class LookAt extends Element
 {
@@ -79,7 +94,7 @@ export class LookAt extends Element
 
 	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
-};
+}
 
 export class ColorStyle extends Element
 {
@@ -94,7 +109,7 @@ export class ColorStyle extends Element
 
 	sameColor(c: ColorStyle): boolean;
 	appendInnerXML(strs: string[], level: number): void;
-};
+}
 
 export class IconStyle extends ColorStyle
 {
@@ -115,7 +130,7 @@ export class IconStyle extends ColorStyle
 	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 	equals(o: IconStyle): boolean;
-};
+}
 
 export class LabelStyle extends ColorStyle
 {
@@ -125,7 +140,7 @@ export class LabelStyle extends ColorStyle
 	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 	equals(o: LabelStyle): boolean;
-};
+}
 
 export class LineStyle extends ColorStyle
 {
@@ -137,7 +152,7 @@ export class LineStyle extends ColorStyle
 	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 	equals(o: LineStyle): boolean;
-};
+}
 
 export class PolyStyle extends ColorStyle
 {
@@ -147,7 +162,7 @@ export class PolyStyle extends ColorStyle
 	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 	equals(o: PolyStyle): boolean;
-};
+}
 
 export class BalloonStyle extends Element
 {
@@ -160,7 +175,7 @@ export class BalloonStyle extends Element
 	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 	equals(o: BalloonStyle): boolean;
-};
+}
 
 export class ListStyle extends Element
 {
@@ -171,13 +186,14 @@ export class ListStyle extends Element
 	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 	equals(o: ListStyle): boolean;
-};
+}
 
 export class StyleSelector extends Element
 {
 	id: string;
 	constructor(id: string);
 }
+
 export class Style extends StyleSelector
 {
 	iconStyle: IconStyle;
@@ -197,7 +213,7 @@ export class Style extends StyleSelector
 	isStyle(iconStyle: IconStyle, labelStyle: LabelStyle, lineStyle: LineStyle, polyStyle: PolyStyle, balloonStyle: BalloonStyle, listStyle: ListStyle): boolean;
 	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
-};
+}
 
 export class StyleMap extends StyleSelector
 {
@@ -215,6 +231,7 @@ export class Feature extends Element
 	visibility: boolean;
 	open: boolean;
 	author: string;
+	authorName: string;
 	link: string;
 	address: string;
 	//AddressDetails: ?;
@@ -229,6 +246,7 @@ export class Feature extends Element
 	setVisibility(visibility: boolean): void;
 	setOpen(open: boolean): void;
 	setAuthor(author: string): void;
+	setAuthorName(authorName: string): void;
 	setLink(link: string): void;
 	setAddress(address: string): void;
 	setPhoneNumber(phoneNumber: string): void;
@@ -271,7 +289,19 @@ export class Folder extends Container
 
 export class NetworkLink extends Feature
 {
-	constructor();
+	networkLink: string;
+	refreshVisibility: boolean;
+	flyToView: boolean;
+	refreshMode: RefreshMode;
+	refreshInterval: number;
+	viewRefreshMode: ViewRefreshMode;
+
+	constructor(networkLink: string);
+	setRefreshVisibility(refreshVisibility: boolean): void;
+	setFlyToView(flyToView: boolean): void;
+	setRefreshMode(refreshMode: RefreshMode): void;
+	setRefreshInterval(refreshInterval: number): void;
+	setViewRefreshMode(viewRefreshMode: ViewRefreshMode): void;
 
 	getBounds(): math.RectArea | null;
 	getUsedNS(ns: object): void;
@@ -313,6 +343,13 @@ export class ScreenOverlay extends Feature
 	appendOuterXML(strs: string[], level: number): void;
 }
 
+export class KMLFile extends data.ParsedObject
+{
+	root: Feature | NetworkLinkControl;
+	constructor(root: Feature | NetworkLinkControl, sourceName: string);
+	toString():string;
+}
+
 export function toString(item: Feature | NetworkLinkControl): string;
 export function toColor(color: string): web.Color;
 export function toCSSColor(color: string): string;

package/kml.js

@@ -1,3 +1,4 @@
+import * as data from "./data.js";
 import * as geometry from "./geometry.js";
 import * as text from "./text.js";
 import * as web from "./web.js";
@@ -35,6 +36,19 @@ export const HotSpotUnit = {
 	InsetPixels: "insetPixels"
 }
 
+export const RefreshMode = {
+	OnChange: "onChange",
+	OnInterval: "onInterval",
+	OnExpire: "onExpire"
+};
+
+export const ViewRefreshMode = {
+	Never: "never",
+	OnStop: "onStop",
+	OnRequest: "onRequest",
+	OnRegion: "onRegion"
+};
+
 export class Element
 {
 }
@@ -655,6 +669,11 @@ export class Feature extends Element
 		this.author = author;
 	}
 
+	setAuthorName(authorName)
+	{
+		this.authorName = authorName;
+	}
+
 	setLink(link)
 	{
 		this.link = link;
@@ -698,8 +717,12 @@ export class Feature extends Element
 			strs.push("\t".repeat(level)+"<visibility>"+(this.visibility?"1":"0")+"</visibility>");
 		if (this.open != null)
 			strs.push("\t".repeat(level)+"<open>"+(this.open?"1":"0")+"</open>");
-		if (this.author)
+		if (this.author && this.authorName)
+			strs.push("\t".repeat(level)+"<atom:author>"+text.toXMLText(this.author)+"<atom:name>"+text.toXMLText(this.authorName)+"</atom:name></atom:author>");
+		else if (this.author)
 			strs.push("\t".repeat(level)+"<atom:author>"+text.toXMLText(this.author)+"</atom:author>");
+		else if (this.authorName)
+			strs.push("\t".repeat(level)+"<atom:author><atom:name>"+text.toXMLText(this.authorName)+"</atom:name></atom:author>");
 		if (this.link)
 			strs.push("\t".repeat(level)+"<atom:link href="+text.toAttrText(this.link)+"/>");
 		if (this.address)
@@ -868,6 +891,70 @@ export class Folder extends Container
 	}
 }
 
+export class NetworkLink extends Feature
+{
+	constructor(networkLink)
+	{
+		super();
+		this.networkLink = networkLink;
+	}
+
+	setRefreshVisibility(refreshVisibility)
+	{
+		this.refreshVisibility = refreshVisibility;
+	}
+
+	setFlyToView(flyToView)
+	{
+		this.flyToView = flyToView;
+	}
+
+	setRefreshMode(refreshMode)
+	{
+		this.refreshMode = refreshMode;
+	}
+
+	setRefreshInterval(refreshInterval)
+	{
+		this.refreshInterval = refreshInterval;
+	}
+
+	setViewRefreshMode(viewRefreshMode)
+	{
+		this.viewRefreshMode = viewRefreshMode;
+	}
+
+	getBounds()
+	{
+		return null;
+	}
+
+	getUsedNS(ns)
+	{
+	}
+
+	appendOuterXML(strs, level)
+	{
+		strs.push("\t".repeat(level)+"<NetworkLink>");
+		this.appendInnerXML(strs, level + 1);
+		if (this.refreshVisibility != null)
+			strs.push("\t".repeat(level + 1)+"<refreshVisibility>"+(this.refreshVisibility?"1":"0")+"</refreshVisibility>");
+		if (this.flyToView != null)
+			strs.push("\t".repeat(level + 1)+"<flyToView>"+(this.flyToView?"1":"0")+"</flyToView>");
+
+		strs.push("\t".repeat(level + 1)+"<Link>");
+		strs.push("\t".repeat(level + 2)+"<href>"+text.toXMLText(this.networkLink)+"</href>");
+		if (this.refreshMode)
+			strs.push("\t".repeat(level + 2)+"<refreshMode>"+text.toXMLText(this.refreshMode)+"</refreshMode>");
+		if (this.refreshInterval)
+			strs.push("\t".repeat(level + 2)+"<refreshInterval>"+this.refreshInterval+"</refreshInterval>");
+		if (this.viewRefreshMode)
+			strs.push("\t".repeat(level + 2)+"<viewRefreshMode>"+text.toXMLText(this.viewRefreshMode)+"</viewRefreshMode>");
+		strs.push("\t".repeat(level + 1)+"</Link>");
+		strs.push("\t".repeat(level)+"</NetworkLink>");
+	}
+}
+
 export class Placemark extends Feature
 {
 	constructor(vec)
@@ -1011,6 +1098,10 @@ export class Placemark extends Feature
 
 	getUsedNS(ns)
 	{
+		if (this.author || this.link || this.authorName)
+		{
+			ns.atom = "http://www.w3.org/2005/Atom";
+		}
 	}
 
 	appendOuterXML(strs, level)
@@ -1025,13 +1116,35 @@ export class Placemark extends Feature
 	}
 }
 
+export class KMLFile extends data.ParsedObject
+{
+	constructor(root, sourceName)
+	{
+		super(sourceName, "application/vnd.google-earth.kml+xml");
+		this.root = root;
+	}
+
+	toString()
+	{
+		toString(this.root);
+	}
+}
+
 export function toString(item)
 {
 	let strs = [];
 	strs.push("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>");
 	let namespaces = {};
 	item.getUsedNS(namespaces);
-	strs.push("<kml xmlns=\"http://www.opengis.net/kml/2.2\">");
+	let ns;
+	let rootEle = [];
+	rootEle.push("<kml xmlns=\"http://www.opengis.net/kml/2.2\"");
+	for (ns in namespaces)
+	{
+		rootEle.push(" xmlns:"+ns+"="+text.toAttrText(namespaces[ns]));
+	}
+	rootEle.push(">");
+	strs.push(rootEle.join(""));
 	item.appendOuterXML(strs, 1);
 	strs.push("</kml>");
 	return strs.join("\r\n");

package/leaflet.d.ts

@@ -21,20 +21,30 @@ export function fromLatLngBounds(b: L.LatLngBounds): math.RectArea;
 export function toLatLngBounds(rect: math.RectArea): L.LatLngBounds;
 
 export function createLayer(layer: map.LayerInfo, options: object): L.Layer;
-export function createFromKMLFeature(feature: kml.Feature, options: KMLFeatureOptions): L.Layer;
+export function createFromKML(feature: kml.Feature | kml.KMLFile, options: KMLFeatureOptions): L.Layer;
 export function createFromGeometry(geom: geometry.Vector2D, options: GeometryOptions): L.Layer;
 export function createKMLLookAt(map: L.Map): kml.LookAt;
 export function toKMLFeature(layer: L.Layer, doc?: kml.Document): kml.Feature | null;
 export function toKMLString(layer: L.Layer): string | null;
 
+export class KMLNetworkLink
+{
+	feature: kml.NetworkLink;
+	container: L.FeatureGroup;
+
+	constructor(feature: kml.NetworkLink);
+	reload(): void;
+	addTo(container: L.FeatureGroup): KMLNetworkLink;
+}
+
 export class LeafletMap 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;
@@ -48,13 +58,13 @@ export class LeafletMap 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/leaflet.js

@@ -4,6 +4,7 @@ import * as kml from "./kml.js";
 import * as math from "./math.js";
 import * as map from "./map.js";
 import * as osm from "./osm.js";
+import * as parser from "./parser.js";
 import * as text from "./text.js";
 import * as web from "./web.js";
 
@@ -58,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)
 	{
@@ -67,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;
 	}
@@ -137,6 +142,10 @@ export function createFromKMLFeature(feature, options)
 		}
 		return layer;
 	}
+	else if (feature instanceof kml.NetworkLink)
+	{
+		return new KMLNetworkLink(feature);
+	}
 	else
 	{
 		console.log("Unknown KML feature type", feature);
@@ -441,6 +450,48 @@ export function toKMLString(layer)
 	return null;
 }
 
+export class KMLNetworkLink
+{
+	constructor(feature)
+	{
+		if (feature instanceof kml.NetworkLink)
+		{
+			this.feature = feature;
+			this.container = L.featureGroup();
+			this.reload();
+		}
+		else
+		{
+			throw new Error("Feature is not NetworkLink");
+		}
+	}
+
+	reload()
+	{
+		fetch(this.feature.networkLink).then((resp)=>{
+			console.log(resp);
+			if (resp.ok)
+			{
+				parser.parseFile(resp).then((val)=>{
+					console.log(val);
+					if (val instanceof kml.Feature)
+					{
+						this.container.clearLayers();
+						let layer = createFromKML(val);
+						if (layer)
+							layer.addTo(this.container);
+					}
+				})
+			}
+		})
+	}
+
+	addTo(container)
+	{
+		this.container.addTo(container);
+	}
+}
+
 export class LeafletMap extends map.MapControl
 {
 	constructor(divId)
@@ -462,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/map.js

@@ -134,7 +134,7 @@ export class GeolocationFilter
 		}
 		if (this.minDistMeter)
 		{
-			if (this.csys.calcSurfaceDistance(pos.coords.longitude, pos.coords.latitude, this.lastPos.longitude, this.lastPos.latitude, unit.Distance.Unit.METER) < this.minDistMeter)
+			if (this.csys.calcSurfaceDistance(pos.coords.longitude, pos.coords.latitude, this.lastPos.coords.longitude, this.lastPos.coords.latitude, unit.Distance.Unit.METER) < this.minDistMeter)
 				return false;
 		}