@sswroom/sswr 1.5.3 → 1.5.4

package/Changelog

@@ -1,3 +1,10 @@
+1.5.4
+-Added geometry.Vector2D.getBounds
+-Added kml.Feature.getBounds
+-Added leaflet.toLatLngBounds
+-Added math.RectArea.unionInPlace
+-Added math.RectArea.unionPointInPlace
+
 1.5.3
 -Fixed parser file type handling
 

package/cesium.js

@@ -462,8 +462,21 @@ export class CesiumMap extends map.MapControl
 	{
 		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;
+
+	zoomToExtent(extent)
+	{
+		const zoomRatio = 500000000;
+		let center = extent.getCenter();
+		let xScale = (extent.max.x - extent.min.x) / this.viewer.canvas.width * zoomRatio;
+		let yScale = (extent.max.y - extent.min.y) / this.viewer.canvas.height * zoomRatio;
+		if (yScale > xScale)
+		{
+			xScale = yScale;
+		}
+		this.viewer.camera.flyTo({destination: Cesium.Cartesian3.fromDegrees(center.x, center.y, xScale), duration:0});
+	}
+
+/*	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;

package/geometry.d.ts

@@ -40,6 +40,7 @@ export class Vector2D {
 	type: VectorType;
 	constructor(srid: number);
 	insideOrTouch(coord: math.Coord2D): boolean;
+	getBounds(): math.RectArea;
 };
 
 export class Point extends Vector2D
@@ -47,6 +48,7 @@ export class Point extends Vector2D
 	coordinates: number[];
 	constructor(srid: number, coordinates: number[] | math.Coord2D | math.Vector3);
 	insideOrTouch(coord: math.Coord2D): boolean;
+	getBounds(): math.RectArea;
 }
 
 
@@ -56,6 +58,7 @@ export class LineString extends Vector2D
 	constructor(srid: number, coordinates: number[][]);
 	calBoundaryPoint(coord: math.Coord2D): BoundaryPointResult;
 	insideOrTouch(coord: math.Coord2D): boolean;
+	getBounds(): math.RectArea;
 }
 
 export class LinearRing extends LineString
@@ -76,6 +79,7 @@ export class MultiGeometry<VecType> extends Vector2D
 	constructor(srid: number);
 	calBoundaryPoint(coord: math.Coord2D): BoundaryPointResult;
 	insideOrTouch(coord: math.Coord2D): boolean;
+	getBounds(): math.RectArea;
 }
 
 export class Polygon extends MultiGeometry<LinearRing>

package/geometry.js

@@ -52,6 +52,11 @@ export class Point extends Vector2D
 	{
 		return this.coordinates[0] == coord.x && this.coordinates[1] == coord.y;
 	}
+
+	getBounds()
+	{
+		return new math.RectArea(this.coordinates[0], this.coordinates[1], this.coordinates[0], this.coordinates[1]);
+	}
 }
 
 export class LineString extends Vector2D
@@ -226,6 +231,17 @@ export class LineString extends Vector2D
 		}
 		return false;
 	}
+
+	getBounds()
+	{
+		let bounds = new math.RectArea(this.coordinates[0][0], this.coordinates[0][1], this.coordinates[0][0], this.coordinates[0][1]);
+		let i;
+		for (i in this.coordinates)
+		{
+			bounds.unionPointInPlace(this.coordinates[i][0], this.coordinates[i][1]);
+		}
+		return bounds;
+	}
 }
 
 export class LinearRing extends LineString
@@ -364,6 +380,29 @@ export class MultiGeometry extends Vector2D
 		}
 		return false;
 	}
+
+	getBounds()
+	{
+		if (this.geometries.length == 0)
+		{
+			return null;
+		}
+		let bounds;
+		let thisBounds;
+		let i;
+		for (i in this.geometries)
+		{
+			thisBounds = this.geometries[i].getBounds();
+			if (thisBounds)
+			{
+				if (bounds)
+					bounds.unionInPlace(thisBounds);
+				else
+					bounds = thisBounds;
+			}
+		}
+		return bounds;
+	}
 }
 
 export class Polygon extends MultiGeometry

package/kml.d.ts

@@ -1,5 +1,6 @@
 import * as data from "./data";
 import * as geometry from "./geometry";
+import * as math from "./math";
 import * as web from "./web";
 
 export enum AltitudeMode
@@ -235,6 +236,7 @@ export class Feature extends Element
 	setDescription(description: string): void;
 	setLookAt(lookAt: LookAt): void;
 	setStyle(style: StyleSelector): void;
+	getBounds(): math.RectArea | null;
 
 	appendInnerXML(strs: string[], level: number): void;
 }
@@ -252,6 +254,7 @@ export class Container extends Feature
 	addStyleMap(styleMap: StyleMap): void;
 	getOrNewStyle(iconStyle: IconStyle, labelStyle: LabelStyle, lineStyle: LineStyle, polyStyle: PolyStyle, balloonStyle: BalloonStyle, listStyle: ListStyle): Style;
 	getStyleById(id: string): Style | StyleMap | null;
+	getBounds(): math.RectArea | null;
 	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 }
@@ -270,6 +273,7 @@ export class NetworkLink extends Feature
 {
 	constructor();
 
+	getBounds(): math.RectArea | null;
 	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 }
@@ -280,6 +284,7 @@ export class Placemark extends Feature
 	constructor(vec: geometry.Vector2D);
 
 	appendGeometry(strs: string[], level: number, vec: geometry.Vector2D, subGeom?: boolean): void;
+	getBounds(): math.RectArea | null;
 	getUsedNS(ns: object): void;
 	appendOuterXML(strs: string[], level: number): void;
 }

package/kml.js

@@ -790,6 +790,29 @@ export class Container extends Feature
 		return null;
 	}
 
+	getBounds()
+	{
+		let bounds = null;
+		let thisBounds;
+		let i;
+		for (i in this.features)
+		{
+			thisBounds = this.features[i].getBounds();
+			if (thisBounds)
+			{
+				if (bounds)
+				{
+					bounds = bounds.unionInPlace(thisBounds);
+				}
+				else
+				{
+					bounds = thisBounds;
+				}
+			}
+		}
+		return bounds;
+	}
+
 	getUsedNS(ns)
 	{
 		if (this.styleList)
@@ -977,6 +1000,15 @@ export class Placemark extends Feature
 		}
 	}
 
+	getBounds()
+	{
+		if (this.vec)
+		{
+			return this.vec.getBounds();
+		}
+		return null;
+	}
+
 	getUsedNS(ns)
 	{
 	}

package/leaflet.d.ts

@@ -1,7 +1,7 @@
 import * as L from "./node_modules/leaflet/src/Leaflet";
 import * as geometry from "./geometry";
 import * as kml from "./kml";
-import { Coord2D, RectArea } from "./math";
+import * as math from "./math";
 import * as map from "./map";
 
 declare class GeometryOptions
@@ -15,9 +15,11 @@ declare class KMLFeatureOptions
 	noPopup: boolean;
 }
 
-export function fromLatLon(latLon: L.LatLng): Coord2D;
-export function fromLatLng(latLng: L.LatLng): Coord2D;
-export function fromLatLngBounds(b: L.LatLngBounds): RectArea;
+export function fromLatLon(latLon: L.LatLng): math.Coord2D;
+export function fromLatLng(latLng: L.LatLng): math.Coord2D;
+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 createFromGeometry(geom: geometry.Vector2D, options: GeometryOptions): L.Layer;

package/leaflet.js

@@ -22,6 +22,11 @@ export function fromLatLngBounds(b)
 	return new math.RectArea(b.getWest(), b.getSouth(), b.getEast(), b.getNorth());
 }
 
+export function toLatLngBounds(rect)
+{
+	return L.latLngBounds(L.latLng(rect.min.y, rect.min.x), L.latLng(rect.max.y, rect.max.x));
+}
+
 export function createLayer(layer, options)
 {
 	let lyrOpts;
@@ -488,7 +493,10 @@ export class LeafletMap extends map.MapControl
 		this.mapObj.setView(L.latLng(pos.y, pos.x), osm.scale2Level(scale));
 	}
 
-	//zoomToExtent(extent: math.RectArea): void;
+	zoomToExtent(extent)
+	{
+		this.mapObj.fitBounds(toLatLngBounds(extent));
+	}
 
 /*	handleMouseLClick(clickFunc: (mapPos: math.Coord2D, scnPos: math.Coord2D)=>void): void;
 	handleMouseMove(moveFunc: (mapPos: math.Coord2D)=>void): void;

package/math.d.ts

@@ -34,6 +34,8 @@ export class RectArea
 	getWidth(): number;
 	getHeight(): number;
 	getArea(): number;
+	unionInPlace(rect: RectArea): RectArea;
+	unionPointInPlace(x: number, y: number): RectArea;
 };
 
 export class Vector3 extends Coord2D

package/math.js

@@ -149,6 +149,32 @@ export class RectArea
 	{
 		return this.getWidth() * this.getHeight();
 	}
+
+	unionInPlace(rect)
+	{
+		if (this.min.x > rect.min.x)
+			this.min.x = rect.min.x;
+		if (this.min.y > rect.min.y)
+			this.min.y = rect.min.y;
+		if (this.max.x < rect.max.x)
+			this.max.x = rect.max.x;
+		if (this.max.y < rect.max.y)
+			this.max.y = rect.max.y;
+		return this;
+	}
+
+	unionPointInPlace(x, y)
+	{
+		if (this.min.x > x)
+			this.min.x = x;
+		if (this.min.y > y)
+			this.min.y = y;
+		if (this.max.x < x)
+			this.max.x = x;
+		if (this.max.y < y)
+			this.max.y = y;
+		return this;
+	}
 };
 
 export class Vector3 extends Coord2D

package/package.json

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