@sswroom/sswr 1.4.1 → 1.5.1

package/Changelog

@@ -1,3 +1,34 @@
+1.5.1
+-Fixed AngleUnit problem
+
+1.5.0
+-Change unit.AngleUnit and unit.DistanceUnit to unit.Angle.Unit and unit.Distance.Unit
+-Added unit.Acceleration
+-Added unit.ApparentPower
+-Added unit.Count
+-Added unit.ElectricCurrent
+-Added unit.ElectricPotential
+-Added unit.Energy
+-Added unit.Force
+-Added unit.Frequency
+-Added unit.MagneticField
+-Added unit.Mass
+-Added unit.Power
+-Added unit.Pressure
+-Added unit.Ratio
+-Added unit.ReactiveEnergy
+-Added unit.ReactivePower
+-Added unit.Speed
+-Added unit.Temperature
+-Added osm.scale2Level
+-Adding leaflet.LeafletMap
+-Adding cesium.CesiumMap
+-Added web.appendUrl
+-Added parser.js
+-Added text.arrayToNumbers
+-Added leaflet.createFromKMLFeature
+-Added leaflet.createGeometry
+
 1.4.1
 -Fixed problems in Chrome
 

package/cesium.d.ts

@@ -1,6 +1,8 @@
 import { Cartesian3, Ellipsoid, Viewer } from "cesium";
-import { Coord2D } from "./math";
 import { Polygon } from "./geometry";
+import * as kml from "./kml";
+import * as map from "./map";
+import { Coord2D } from "./math";
 
 export function screenToLatLon(viewer: Viewer, x: number, y: number, ellipsoid: Ellipsoid) : Coord2D;
 export function fromCXYZArray(arr: any[]): Cartesian3[];
@@ -9,3 +11,36 @@ export function newObjFromGeoJSON(geoJSON: object) : object;
 export function addGeoJSON(viewer: Viewer, geoJSON: object, color: any, extSize: number): void;
 export function fromCartesian3Array(viewer: Viewer, arr: Cartesian3[]): object[];
 export function fromPolygonGraphics(viewer: Viewer, pg: any): Polygon;
+
+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;
+	addLayer(layer: any): void;
+	addKMLFeature(feature: kml.Feature): void;
+	uninit(): void;
+	zoomIn(): void;
+	zoomOut(): void;
+	zoomScale(scale: number): void;
+	panTo(pos: math.Coord2D): void;
+	panZoomScale(pos: math.Coord2D, scale: number): void;
+	zoomToExtent(extent: math.RectArea): void;
+	handleMouseLClick(clickFunc: (mapPos: math.Coord2D, scnPos: math.Coord2D)=>void): void;
+	handleMouseMove(moveFunc: (mapPos: math.Coord2D)=>void): void;
+	handlePosChange(posFunc: (mapPos: math.Coord2D)=>void): void;
+	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;
+	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;
+	layerAddGeometry(geometryLayer: any, geom: any): void;
+	layerRemoveGeometry(geometryLayer: any, geom: any): void;
+	layerClearGeometries(geometryLayer: any): void;
+}

package/cesium.js

@@ -1,3 +1,4 @@
+import * as map from "./map.js";
 import { Coord2D } from "./math.js";
 import { Polygon } from "./geometry.js";
 
@@ -176,3 +177,87 @@ export function fromPolygonGraphics(viewer, pg)
 	var pg = new Cesium.PolygonGraphics(o);
 	return pg;
 }*/
+
+export class CesiumMap extends map.MapControl
+{
+	constructor(divId)
+	{
+		super();
+		this.viewer = new Cesium.Viewer(divId, {
+			timeline:false,
+			animation:false,
+			scene3DOnly:true,
+			baseLayerPicker: false,
+//			baseLayer: new Cesium.ImageryLayer(new Cesium.OpenStreetMapImageryProvider({
+//				url: "https://tile.openstreetmap.org/"
+//			  }))}
+		});
+	};
+
+	createLayer(layer, options)
+	{
+		if (layer.type == map.WebMapType.OSMTile)
+		{
+			var opt = {};
+			if (options && options.maxZoom)
+			{
+				opt.maximumLevel = options.maxZoom;
+			}
+			return new Cesium.ImageryLayer(new Cesium.UrlTemplateImageryProvider({
+				url: layer.url}, opt));
+		}
+	}
+
+	/*createMarkerLayer(name: string, options?: LayerOptions): any;
+	createGeometryLayer(name: string, options?: LayerOptions): any;*/
+	addLayer(layer)
+	{
+		if (layer instanceof Cesium.ImageryLayer)
+		{
+			this.viewer.imageryLayers.add(layer);
+		}
+	}
+
+//	uninit(): void;
+	zoomIn()
+	{
+		this.viewer.camera.moveForward();
+	}
+
+	zoomOut()
+	{
+		this.viewer.camera.moveBackward();
+	}
+
+	zoomScale(scale)
+	{
+		this.viewer.camera.flyTo({destination: Cesium.Cartesian3.fromDegrees(pos.x, pos.y, scale), duration:0});
+	}
+
+	panTo(pos)
+	{
+		this.viewer.camera.flyTo({destination: Cesium.Cartesian3.fromDegrees(pos.x, pos.y, 20000), duration:0});
+	}
+
+	panZoomScale(pos, scale)
+	{
+		this.viewer.camera.flyTo({destination: Cesium.Cartesian3.fromDegrees(pos.x, pos.y, scale), duration:0});
+	}
+/*	zoomToExtent(extent: math.RectArea): void;
+	handleMouseLClick(clickFunc: (mapPos: math.Coord2D, scnPos: math.Coord2D)=>void): void;
+	handleMouseMove(moveFunc: (mapPos: math.Coord2D)=>void): void;
+	handlePosChange(posFunc: (mapPos: math.Coord2D)=>void): void;
+	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;
+	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;
+	layerAddGeometry(geometryLayer: any, geom: any): void;
+	layerRemoveGeometry(geometryLayer: any, geom: any): void;
+	layerClearGeometries(geometryLayer: any): void;*/
+}

package/kml.d.ts

@@ -32,8 +32,16 @@ export enum ItemIconMode
 	Fetching2
 };
 
+export enum HotSpotUnit
+{
+	Fraction,
+	Pixels,
+	InsetPixels
+};
+
 export class Element
 {
+	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 }
 
@@ -67,6 +75,7 @@ export class LookAt extends Element
 	setTilt(tilt: number): void;
 	setAltitudeMode(altitudeMode: AltitudeMode): void;
 
+	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 };
 
@@ -79,6 +88,7 @@ export class ColorStyle extends Element
 	setRandomColor(randomColor: boolean): void;
 	fromARGB(a: number, r: number, g: number, b: number): void;
 	fromCSSColor(color: string): void;
+	setColor(color: string): void;
 
 	sameColor(c: ColorStyle): boolean;
 	appendInnerXML(strs: string[], level: number): void;
@@ -91,21 +101,26 @@ export class IconStyle extends ColorStyle
 	iconUrl: string;
 	hotSpotX: number;
 	hotSpotY: number;
+	hotSpotUnitX: HotSpotUnit;
+	hotSpotUnitY: HotSpotUnit;
 
 	constructor();
-	setScale(scale: number);
-	setHeading(heading: number);
-	setIconUrl(iconUrl: string);
-	setHotSpotX(hotSpotX: number);
-	setHotSpotY(hotSpotY: number);
+	setScale(scale: number): void;
+	setHeading(heading: number): void;
+	setIconUrl(iconUrl: string): void;
+	setHotSpotX(hotSpotX: number, hsUnit?: HotSpotUnit): void;
+	setHotSpotY(hotSpotY: number, hsUnit?: HotSpotUnit): void;
+	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 	equals(o: IconStyle): boolean;
 };
 
 export class LabelStyle extends ColorStyle
 {
-	
+	scale: number;	
 	constructor();
+	setScale(scale: number): void;
+	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 	equals(o: LabelStyle): boolean;
 };
@@ -113,8 +128,11 @@ export class LabelStyle extends ColorStyle
 export class LineStyle extends ColorStyle
 {
 	width: number;
+	labelVisibility: boolean;
 	constructor();
-	setWidth(width: number);
+	setWidth(width: number): void;
+	setLabelVisibility(labelVisibility: boolean): void;
+	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 	equals(o: LineStyle): boolean;
 };
@@ -123,6 +141,7 @@ export class PolyStyle extends ColorStyle
 {
 
 	constructor();
+	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 	equals(o: PolyStyle): boolean;
 };
@@ -135,6 +154,7 @@ export class BalloonStyle extends Element
 	displayMode: DisplayMode;
 
 	constructor();
+	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 	equals(o: BalloonStyle): boolean;
 };
@@ -145,13 +165,18 @@ export class ListStyle extends Element
 	bgColor: string;
 
 	constructor();
+	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 	equals(o: ListStyle): boolean;
 };
 
-export class Style extends Element
+export class StyleSelector extends Element
 {
 	id: string;
+	constructor(id: string);
+}
+export class Style extends StyleSelector
+{
 	iconStyle: IconStyle;
 	labelStyle: LabelStyle;
 	lineStyle: LineStyle;
@@ -167,9 +192,20 @@ export class Style extends Element
 	setBalloonStyle(style: BalloonStyle): void;
 	setListStyle(style: ListStyle): void;
 	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
+{
+	normalStyle: Style;
+	highlightStyle: Style;
+
+	constructor(id: string, normalStyle: Style, highlightStyle: Style);
+	getUsedNS(ns: object): void;
+	appendOuterXML(strs: string[], level: number): void;
+}
+
 export class Feature extends Element
 {
 	name: string;
@@ -183,7 +219,7 @@ export class Feature extends Element
 	snippet: string;
 	description: string;
 	lookAt: LookAt;
-	style: Style;
+	style: StyleSelector;
 
 	constructor();
 	setName(name: string): void;
@@ -196,7 +232,7 @@ export class Feature extends Element
 	setSnippet(snippet: string): void;
 	setDescription(description: string): void;
 	setLookAt(lookAt: LookAt): void;
-	setStyle(style: Style): void;
+	setStyle(style: StyleSelector): void;
 
 	appendInnerXML(strs: string[], level: number): void;
 }
@@ -205,30 +241,34 @@ export class Container extends Feature
 {
 	eleName: string;
 	features: Feature[];
+	styleList: Style[];
+	styleMapList: StyleMap[];
 
 	constructor(eleName: string);
 	addFeature(feature: Feature): void;
+	addStyle(style: Style): void;
+	addStyleMap(styleMap: StyleMap): void;
+	getOrNewStyle(iconStyle: IconStyle, labelStyle: LabelStyle, lineStyle: LineStyle, polyStyle: PolyStyle, balloonStyle: BalloonStyle, listStyle: ListStyle): Style;
+	getStyleById(id: string): Style | StyleMap | null;
+	getUsedNS(ns: object): void;
+	appendOuterXML(strs: string[], level: number): void;
 }
 
 export class Document extends Container
 {
-	styleList: Style[];
-
 	constructor();
-	getOrNewStyle(iconStyle: IconStyle, labelStyle: LabelStyle, lineStyle: LineStyle, polyStyle: PolyStyle, balloonStyle: BalloonStyle, listStyle: ListStyle): Style;
-	appendOuterXML(strs: string[], level: number): void;
 }
 
 export class Folder extends Container
 {
 	constructor();
-	appendOuterXML(strs: string[], level: number): void;
 }
 
 export class NetworkLink extends Feature
 {
 	constructor();
 
+	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 }
 
@@ -238,6 +278,7 @@ export class Placemark extends Feature
 	constructor(vec: geometry.Vector2D);
 
 	appendGeometry(strs: string[], level: number, vec: geometry.Vector2D, subGeom?: boolean): void;
+	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 }
 
@@ -245,6 +286,7 @@ export class GroundOverlay extends Feature
 {
 	constructor();
 
+	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 }
 
@@ -252,6 +294,7 @@ export class PhotoOverlay extends Feature
 {
 	constructor();
 
+	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 }
 
@@ -259,7 +302,9 @@ export class ScreenOverlay extends Feature
 {
 	constructor();
 
+	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 }
 
 export function toString(item: Feature | NetworkLinkControl): string;
+export function toCSSColor(color: string): string;