@sswroom/sswr 1.4.1 → 1.5.1

package/leaflet.js

@@ -3,6 +3,8 @@ import * as geometry from "./geometry.js";
 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 text from "./text.js";
 import * as web from "./web.js";
 
 export function fromLatLon(latLon)
@@ -51,6 +53,130 @@ export function createLayer(layer, options)
 	return null;
 }
 
+export function createFromKMLFeature(feature, options)
+{
+	options = data.mergeOptions(options, {noPopup: false});
+	if (feature instanceof kml.Container)
+	{
+		var i;
+		var layers = L.featureGroup();
+		for (i in feature.features)
+		{
+			createFromKMLFeature(feature.features[i], options).addTo(layers);
+		}
+		return layers;
+	}
+	else if (feature instanceof kml.Placemark)
+	{
+		var opt = {};
+		if (feature.name)
+			opt.name = feature.name;
+		if (feature.style)
+		{
+			var style = feature.style;
+			if (style instanceof kml.StyleMap)
+			{
+				style = style.normalStyle;
+			}
+			if (style instanceof kml.Style)
+			{
+				if (style.iconStyle)
+				{
+					var s = style.iconStyle;
+					if (s.leafletIcon == null)
+					{
+						var icon = {};
+						if (s.iconUrl)
+						{
+							icon.iconUrl = s.iconUrl;
+						}
+						if (s.hotSpotX && s.hotSpotY)
+						{
+							icon.iconAnchor = [s.hotSpotX, s.hotSpotY];
+						}
+						s.leafletIcon = L.icon(icon);
+					}
+					opt.icon = s.leafletIcon;
+				}
+				if (style.lineStyle)
+				{
+					var ls = style.lineStyle;
+					if (ls.color)
+						opt.lineColor = kml.toCSSColor(ls.color);
+					if (ls.width)
+						opt.lineWidth = ls.width;
+				}
+			}
+		}
+		var layer = createFromGeometry(feature.vec, opt);
+		if (layer && !options.noPopup)
+		{
+			if (feature.name && feature.description)
+			{
+				layer.bindPopup("<b>"+text.toHTMLText(feature.name)+"</b><br/>"+feature.description);
+			}
+			else if (feature.name)
+			{
+				layer.bindPopup("<b>"+text.toHTMLText(feature.name)+"</b>");
+			}
+			else if (feature.description)
+			{
+				layer.bindPopup(feature.description);
+			}
+		}
+		return layer;
+	}
+	else
+	{
+		console.log("Unknown KML feature type", feature);
+		return null;
+	}
+}
+
+export function createFromGeometry(geom, options)
+{
+	if (geom instanceof geometry.Point)
+	{
+		var opt = {};
+		if (options)
+		{
+			if (options.name)
+				opt.title = options.name;
+			if (options.icon)
+				opt.icon = options.icon;
+		}
+		return L.marker(L.latLng(geom.coordinates[1], geom.coordinates[0]), opt);
+	}
+	else if (geom instanceof geometry.LineString)
+	{
+		var opt = {};
+		var i;
+		var pts = [];
+		if (options.lineColor)
+			opt.color = options.lineColor;
+		if (options.lineWidth)
+			opt.weight = options.lineWidth;
+		for (i in geom.coordinates)
+		{
+			var latLng = L.latLng(geom.coordinates[i][1], geom.coordinates[i][0]);
+			if (latLng)
+			{
+				pts.push(latLng);
+			}
+			else
+			{
+				console.log("Error in LineString", geom.coordinates[i]);
+			}
+		}
+		return L.polyline(pts, opt);
+	}
+	else
+	{
+		console.log("Unknown geometry type", geom);
+		return null;
+	}
+}
+
 export function createKMLLookAt(map)
 {
 	var center = map.getCenter();
@@ -119,6 +245,36 @@ export function toKMLFeature(layer, doc)
 		{
 			feature.setDescription(layer._popup._content);
 		}
+		if (layer.options && layer.options.icon)
+		{
+			var opt = layer.options.icon.options;
+			if (opt)
+			{
+				var imgW = layer._icon.naturalWidth || layer._icon.offsetWidth;
+				var iconStyle = new kml.IconStyle();
+				if (opt.iconSize)
+				{
+					iconStyle.setScale(opt.iconSize[0] / imgW);
+					if (opt.iconAnchor)
+					{
+						iconStyle.setHotSpotX(opt.iconAnchor[0], kml.HotSpotUnit.Pixels);
+						iconStyle.setHotSpotY(opt.iconAnchor[1], kml.HotSpotUnit.InsetPixels);
+					}
+				}
+				if (opt.iconUrl)
+				{
+					if (opt.iconUrl == "marker-icon.png")
+					{
+						iconStyle.setIconUrl(web.appendUrl("../../leaflet/dist/images/marker-icon.png", import.meta.url));
+					}
+					else
+					{
+						iconStyle.setIconUrl(web.appendUrl(opt.iconUrl, document.location.href));
+					}
+				}
+				feature.setStyle(doc.getOrNewStyle(iconStyle, null, null, null, null, null));
+			}
+		}
 		return feature;
 	}
 	else if (layer instanceof L.Polyline)
@@ -158,4 +314,76 @@ export function toKMLString(layer)
 		return kml.toString(feature);
 	}
 	return null;
-}
+}
+
+export class LeafletMap extends map.MapControl
+{
+	constructor(divId)
+	{
+		super();
+		this.mapObj = L.map(divId);
+	}
+
+	createLayer(layer, options)
+	{
+		return createLayer(layer, options);
+	}
+
+//	createMarkerLayer(name: string, options?: LayerOptions): any;
+//	createGeometryLayer(name: string, options?: LayerOptions): any;
+
+	addLayer(layer)
+	{
+		layer.addTo(this.mapObj);
+	}
+
+	addKMLFeature(feature)
+	{
+		createFromKMLFeature(feature).addTo(this.mapObj);
+	}
+
+//	uninit(): void;
+	zoomIn()
+	{
+		this.mapObj.zoomIn();
+	}
+
+	zoomOut()
+	{
+		this.mapObj.zoomOut();
+	}
+
+	zoomScale(scale)
+	{
+		this.mapObj.setZoom(osm.scale2Level(scale));
+	}
+
+	panTo(pos)
+	{
+		this.mapObj.setView(L.latLng(pos.y, pos.x));
+	}
+
+	panZoomScale(pos, scale)
+	{
+		this.mapObj.setView(L.latLng(pos.y, pos.x), osm.scale2Level(scale));
+	}
+
+	//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/map.d.ts

@@ -131,7 +131,8 @@ export class MapControl
 	createLayer(layer: map.LayerInfo, options?: LayerOptions): any;
 	createMarkerLayer(name: string, options?: LayerOptions): any;
 	createGeometryLayer(name: string, options?: LayerOptions): any;
-	addLayer(layer: any);
+	addLayer(layer: any): void;
+	addKMLFeature(feature: kml.Feature): void;
 	uninit(): void;
 	zoomIn(): void;
 	zoomOut(): void;

package/map.js

@@ -1,7 +1,7 @@
 import * as geometry from "./geometry.js";
 import * as math from "./math.js";
 import * as web from "./web.js";
-import { DistanceUnit } from "./unit.js";
+import * as unit from "./unit.js";
 
 export const DataFormat = {
 	Cesium: "cesium",
@@ -35,7 +35,7 @@ export function calcDistance(srid, geom, x, y)
 {
 	var pt = geom.calBoundaryPoint(new math.Coord2D(x, y));
 	var csys = math.CoordinateSystemManager.srCreateCsys(srid);
-	return csys.calcSurfaceDistance(x, y, pt.x, pt.y, DistanceUnit.METER);
+	return csys.calcSurfaceDistance(x, y, pt.x, pt.y, unit.Distance.Unit.METER);
 }
 
 export function getLayers(svcUrl, onResultFunc)
@@ -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, DistanceUnit.METER) < this.minDistMeter)
+			if (this.csys.calcSurfaceDistance(pos.coords.longitude, pos.coords.latitude, this.lastPos.longitude, this.lastPos.latitude, unit.Distance.Unit.METER) < this.minDistMeter)
 				return false;
 		}
 

package/math.js

@@ -250,9 +250,9 @@ export class EarthEllipsoid
 		var d = Math.acos(cLat1 * Math.cos(rLon1) * cLat2 * Math.cos(rLon2) + cLat1 * Math.sin(rLon1) * cLat2 * Math.sin(rLon2) + Math.sin(rLat1) * Math.sin(rLat2)) * r;
 		if (d > 0 || d < 0)
 		{
-			if (distUnit != null && distUnit != unit.DistanceUnit.METER)
+			if (distUnit != null && distUnit != unit.Distance.Unit.METER)
 			{
-				d = unit.Distance.convert(unit.DistanceUnit.METER, distUnit, d);
+				d = unit.Distance.convert(unit.Distance.Unit.METER, distUnit, d);
 			}
 		}
 		else if (d != 0)
@@ -472,7 +472,7 @@ export class DatumData
 		this.yAngle = yAngle * aratio;
 		this.zAngle = zAngle * aratio;
 		this.scale = scale;
-		this.aunit = unit.AngleUnit.RADIAN;
+		this.aunit = unit.Angle.Unit.RADIAN;
 	}
 }
 
@@ -740,9 +740,9 @@ export class ProjectedCoordinateSystem extends CoordinateSystem
 		diffX = diffX * diffX;
 		diffY = diffY * diffY;
 		var d = Math.sqrt(diffX + diffY);
-		if (distUnit != unit.DistanceUnit.METER)
+		if (distUnit != unit.Distance.Unit.METER)
 		{
-			d = unit.Distance.convert(unit.DistanceUnit.METER, distUnit, d);
+			d = unit.Distance.convert(unit.Distance.Unit.METER, distUnit, d);
 		}
 		return d;
 	}
@@ -1014,17 +1014,17 @@ export class CoordinateSystemManager
 		switch (srid)
 		{
 		case 6326:
-			return new DatumData(6326, this.srGetSpheroid(7030), "WGS_1984", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, unit.AngleUnit.RADIAN);
+			return new DatumData(6326, this.srGetSpheroid(7030), "WGS_1984", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, unit.Angle.Unit.RADIAN);
 		case 6600:
-			return new DatumData(6600, this.srGetSpheroid(7012), "Anguilla_1957", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, unit.AngleUnit.RADIAN);
+			return new DatumData(6600, this.srGetSpheroid(7012), "Anguilla_1957", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, unit.Angle.Unit.RADIAN);
 		case 6601:
-			return new DatumData(6601, this.srGetSpheroid(7012), "Antigua_1943", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, unit.AngleUnit.RADIAN);
+			return new DatumData(6601, this.srGetSpheroid(7012), "Antigua_1943", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, unit.Angle.Unit.RADIAN);
 		case 6602:
-			return new DatumData(6602, this.srGetSpheroid(7012), "Dominica_1945", 0, 0, 0, 725, 685, 536, 0, 0, 0, 0, unit.AngleUnit.ARCSECOND);
+			return new DatumData(6602, this.srGetSpheroid(7012), "Dominica_1945", 0, 0, 0, 725, 685, 536, 0, 0, 0, 0, unit.Angle.Unit.ARCSECOND);
 		case 6603:
-			return new DatumData(6603, this.srGetSpheroid(7012), "Grenada_1953", 0, 0, 0, 72, 213.7, 93, 0, 0, 0, 0, unit.AngleUnit.ARCSECOND);
+			return new DatumData(6603, this.srGetSpheroid(7012), "Grenada_1953", 0, 0, 0, 72, 213.7, 93, 0, 0, 0, 0, unit.Angle.Unit.ARCSECOND);
 		case 6611:
-			return new DatumData(6611, this.srGetSpheroid(7022), "Hong_Kong_1980", 0, 0, 0, -162.619, -276.959, -161.764, 0.067753, -2.24365, -1.15883, -1.09425, unit.AngleUnit.ARCSECOND);
+			return new DatumData(6611, this.srGetSpheroid(7022), "Hong_Kong_1980", 0, 0, 0, -162.619, -276.959, -161.764, 0.067753, -2.24365, -1.15883, -1.09425, unit.Angle.Unit.ARCSECOND);
 		}
 		return null;
 	}

package/olayer2.d.ts

@@ -21,7 +21,8 @@ export class Olayer2Map extends map.MapControl
 	createLayer(layer: map.LayerInfo, options?: LayerOptions): any;
 	createMarkerLayer(name: string, options?: LayerOptions): any;
 	createGeometryLayer(name: string, options?: LayerOptions): any;
-	addLayer(layer: any);
+	addLayer(layer: any): void;
+	addKMLFeature(feature: kml.Feature): void;
 	uninit(): void;
 	zoomIn(): void;
 	zoomOut(): void;

package/olayer2.js

@@ -104,6 +104,11 @@ export class Olayer2Map extends map.MapControl
 		}
 	}
 
+	addKMLFeature(feature)
+	{
+		///////////////////////////////
+	}
+
 	uninit()
 	{
 		this.map.destroy();

package/osm.d.ts

@@ -6,3 +6,4 @@ export function pixelX2Lon(x: number, level: number, tileSize: number): number;
 export function pixelY2Lat(y: number, level: number, tileSize: number): number;
 export function tileUrls(osmUrl: string, minCoord: math.Coord2D, maxCoord: math.Coord2D, minLev: number, maxLev: number): string[];
 export function removeTileUrls(urls: string[], osmUrl: string, minLev: number, maxLev: number, areaList: math.RectArea[]): void;
+export function scale2Level(scale: number): number;

package/osm.js

@@ -104,3 +104,8 @@ export function removeTileUrls(urls, osmUrl, minLev, maxLev, areaList)
 		urls.push(i);
 	}
 }
+
+export function scale2Level(scale)
+{
+	return Math.round(Math.log10(204094080000.0 / scale / 256) / Math.log10(2));
+}

package/package.json

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

package/parser.d.ts

@@ -0,0 +1,4 @@
+import * as kml from "./kml";
+
+export function parseXML(txt: string): kml.Feature | kml.NetworkLinkControl | null;
+export function parseFile(file: File): Promise<kml.Feature | kml.NetworkLinkControl | null>;