@sswroom/sswr 1.5.1 → 1.5.2

package/leaflet.js

@@ -24,7 +24,7 @@ export function fromLatLngBounds(b)
 
 export function createLayer(layer, options)
 {
-	var lyrOpts;
+	let lyrOpts;
 	if (options == null)
 		options = {};
 	switch (layer.type)
@@ -58,8 +58,8 @@ export function createFromKMLFeature(feature, options)
 	options = data.mergeOptions(options, {noPopup: false});
 	if (feature instanceof kml.Container)
 	{
-		var i;
-		var layers = L.featureGroup();
+		let i;
+		let layers = L.featureGroup();
 		for (i in feature.features)
 		{
 			createFromKMLFeature(feature.features[i], options).addTo(layers);
@@ -68,12 +68,12 @@ export function createFromKMLFeature(feature, options)
 	}
 	else if (feature instanceof kml.Placemark)
 	{
-		var opt = {};
+		let opt = {};
 		if (feature.name)
 			opt.name = feature.name;
 		if (feature.style)
 		{
-			var style = feature.style;
+			let style = feature.style;
 			if (style instanceof kml.StyleMap)
 			{
 				style = style.normalStyle;
@@ -82,10 +82,10 @@ export function createFromKMLFeature(feature, options)
 			{
 				if (style.iconStyle)
 				{
-					var s = style.iconStyle;
+					let s = style.iconStyle;
 					if (s.leafletIcon == null)
 					{
-						var icon = {};
+						let icon = {};
 						if (s.iconUrl)
 						{
 							icon.iconUrl = s.iconUrl;
@@ -100,15 +100,21 @@ export function createFromKMLFeature(feature, options)
 				}
 				if (style.lineStyle)
 				{
-					var ls = style.lineStyle;
+					let ls = style.lineStyle;
 					if (ls.color)
 						opt.lineColor = kml.toCSSColor(ls.color);
 					if (ls.width)
 						opt.lineWidth = ls.width;
 				}
+				if (style.polyStyle)
+				{
+					let ps = style.polyStyle;
+					if (ps.color)
+						opt.fillColor = kml.toCSSColor(ps.color);
+				}
 			}
 		}
-		var layer = createFromGeometry(feature.vec, opt);
+		let layer = createFromGeometry(feature.vec, opt);
 		if (layer && !options.noPopup)
 		{
 			if (feature.name && feature.description)
@@ -137,7 +143,7 @@ export function createFromGeometry(geom, options)
 {
 	if (geom instanceof geometry.Point)
 	{
-		var opt = {};
+		let opt = {};
 		if (options)
 		{
 			if (options.name)
@@ -149,16 +155,16 @@ export function createFromGeometry(geom, options)
 	}
 	else if (geom instanceof geometry.LineString)
 	{
-		var opt = {};
-		var i;
-		var pts = [];
+		let opt = {};
+		let i;
+		let 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]);
+			let latLng = L.latLng(geom.coordinates[i][1], geom.coordinates[i][0]);
 			if (latLng)
 			{
 				pts.push(latLng);
@@ -170,6 +176,120 @@ export function createFromGeometry(geom, options)
 		}
 		return L.polyline(pts, opt);
 	}
+	else if (geom instanceof geometry.LinearRing)
+	{
+		let opt = {};
+		let k;
+		let pts = [];
+		if (options.lineColor)
+			opt.color = options.lineColor;
+		if (options.lineWidth)
+			opt.weight = options.lineWidth;
+		if (options.fillColor)
+		{
+			opt.fillColor = options.fillColor;
+			opt.fillOpacity = 1.0;
+		}
+		
+		for (k in geom.coordinates)
+		{
+			let latLng = L.latLng(geom.coordinates[k][1], geom.coordinates[k][0]);
+			if (latLng)
+			{
+				pts.push(latLng);
+			}
+			else
+			{
+				console.log("Error in LinearRing", geom.coordinates[k]);
+			}
+		}
+		return L.polygon(pts, opt);		
+	}
+	else if (geom instanceof geometry.Polygon)
+	{
+		let opt = {};
+		let i;
+		let j;
+		let pts = [];
+		let pts2;
+		let lr;
+		if (options.lineColor)
+			opt.color = options.lineColor;
+		if (options.lineWidth)
+			opt.weight = options.lineWidth;
+		if (options.fillColor)
+		{
+			opt.fillColor = options.fillColor;
+			opt.fillOpacity = 1.0;
+		}
+		
+		for (i in geom.geometries)
+		{
+			pts2 = [];
+			lr = geom.geometries[i];
+			for (j in lr.coordinates)
+			{
+				let latLng = L.latLng(lr.coordinates[j][1], lr.coordinates[j][0]);
+				if (latLng)
+				{
+					pts2.push(latLng);
+				}
+				else
+				{
+					console.log("Error in Polygon", lr.coordinates[j]);
+				}
+			}
+			pts.push(pts2);
+		}
+		return L.polygon(pts, opt);
+	}
+	else if (geom instanceof geometry.MultiPolygon)
+	{
+		let opt = {};
+		let i;
+		let j;
+		let k;
+		let pts = [];
+		let pts2;
+		let pts3;
+		let pg;
+		let lr;
+		if (options.lineColor)
+			opt.color = options.lineColor;
+		if (options.lineWidth)
+			opt.weight = options.lineWidth;
+		if (options.fillColor)
+		{
+			opt.fillColor = options.fillColor;
+			opt.fillOpacity = 1.0;
+		}
+		
+		for (i in geom.geometries)
+		{
+			pts2 = [];
+			pg = geom.geometries[i];
+			for (j in pg.geometries)
+			{
+				pts3 = [];
+				lr = pg.geometries[j];
+				for (k in lr.coordinates)
+				{
+					let latLng = L.latLng(lr.coordinates[k][1], lr.coordinates[k][0]);
+					if (latLng)
+					{
+						pts3.push(latLng);
+					}
+					else
+					{
+						console.log("Error in MultiPolygon", lr.coordinates[k]);
+					}
+				}
+				pts2.push(pts3);
+			}
+			pts.push(pts2);
+		}
+		return L.polygon(pts, opt);
+	}
 	else
 	{
 		console.log("Unknown geometry type", geom);
@@ -179,9 +299,9 @@ export function createFromGeometry(geom, options)
 
 export function createKMLLookAt(map)
 {
-	var center = map.getCenter();
-	var zoom = map.getZoom();
-	var range = 100000 * Math.pow(2, 11 - zoom);
+	let center = map.getCenter();
+	let zoom = map.getZoom();
+	let range = 100000 * Math.pow(2, 11 - zoom);
 	return new kml.LookAt(center.lng, center.lat, 0, range);
 }
 
@@ -198,8 +318,8 @@ export function toLineString(layer)
 {
 	if (layer instanceof L.Polyline)
 	{
-		var coords = [];
-		var i;
+		let coords = [];
+		let i;
 		for (i in layer._latlngs)
 		{
 			coords.push([layer._latlngs[i].lng,layer._latlngs[i].lat]);
@@ -211,7 +331,7 @@ export function toLineString(layer)
 
 export function toKMLFeature(layer, doc)
 {
-	var feature;
+	let feature;
 	if (doc == null)
 	{
 		doc = new kml.Document();
@@ -225,9 +345,9 @@ export function toKMLFeature(layer, doc)
 	}
 	if (layer instanceof L.FeatureGroup)
 	{
-		var featureGroup = new kml.Folder();
+		let featureGroup = new kml.Folder();
 		featureGroup.setName("FeatureGroup");
-		var i;
+		let i;
 		for (i in layer._layers)
 		{
 			feature = toKMLFeature(layer._layers[i], doc);
@@ -247,19 +367,19 @@ export function toKMLFeature(layer, doc)
 		}
 		if (layer.options && layer.options.icon)
 		{
-			var opt = layer.options.icon.options;
+			let opt = layer.options.icon.options;
 			if (opt)
 			{
-				var imgW = layer._icon.naturalWidth || layer._icon.offsetWidth;
-				var iconStyle = new kml.IconStyle();
-				if (opt.iconSize)
+				let iconStyle = new kml.IconStyle();
+				if (opt.iconSize && layer._icon)
 				{
+					let imgW = layer._icon.naturalWidth || layer._icon.offsetWidth;
 					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.iconAnchor)
+				{
+					iconStyle.setHotSpotX(opt.iconAnchor[0], kml.HotSpotUnit.Pixels);
+					iconStyle.setHotSpotY(opt.iconAnchor[1], kml.HotSpotUnit.InsetPixels);
 				}
 				if (opt.iconUrl)
 				{
@@ -283,10 +403,10 @@ export function toKMLFeature(layer, doc)
 		feature.setName("Polyline");
 		if (layer.options.color || layer.options.weight)
 		{
-			var lineStyle = new kml.LineStyle();
+			let lineStyle = new kml.LineStyle();
 			if (layer.options.color)
 			{
-				var c = web.parseCSSColor(layer.options.color);
+				let c = web.parseCSSColor(layer.options.color);
 				if (layer.options.opacity)
 				{
 					c.a = c.a * layer.options.opacity;
@@ -308,7 +428,7 @@ export function toKMLFeature(layer, doc)
 
 export function toKMLString(layer)
 {
-	var feature = toKMLFeature(layer);
+	let feature = toKMLFeature(layer);
 	if (feature)
 	{
 		return kml.toString(feature);

package/map.js

@@ -33,8 +33,8 @@ export const GeometryType = {
 
 export function calcDistance(srid, geom, x, y)
 {
-	var pt = geom.calBoundaryPoint(new math.Coord2D(x, y));
-	var csys = math.CoordinateSystemManager.srCreateCsys(srid);
+	let pt = geom.calBoundaryPoint(new math.Coord2D(x, y));
+	let csys = math.CoordinateSystemManager.srCreateCsys(srid);
 	return csys.calcSurfaceDistance(x, y, pt.x, pt.y, unit.Distance.Unit.METER);
 }
 
@@ -57,9 +57,9 @@ export class GPSTrack
 
 	createLineString()
 	{
-		var coordinates = new Array();
-		var i = 0;
-		var j = this.recs.length;
+		let coordinates = new Array();
+		let i = 0;
+		let j = this.recs.length;
 		while (i < j)
 		{
 			coordinates.push([this.recs[i].lon, this.recs[i].lat, this.recs[i].a]);
@@ -77,10 +77,10 @@ export class GPSTrack
 	{
 		if (ticks >= this.recs[0].t && ticks <= this.recs[this.recs.length - 1].t)
 		{
-			var i = 0;
-			var j = this.recs.length - 1;
-			var k;
-			var l;
+			let i = 0;
+			let j = this.recs.length - 1;
+			let k;
+			let l;
 			while (i <= j)
 			{
 				k = (i + j) >> 1;
@@ -98,9 +98,9 @@ export class GPSTrack
 					return new math.Vector3(this.recs[k].lon, this.recs[k].lat, this.recs[k].a);
 				}
 			}
-			var tDiff;
-			var rec1 = this.recs[i - 1];
-			var rec2 = this.recs[i];
+			let tDiff;
+			let rec1 = this.recs[i - 1];
+			let rec2 = this.recs[i];
 			tDiff = rec2.t - rec1.t;
 			return new math.Vector3(
 				(rec1.lon * (rec2.t - ticks) + rec2.lon * (ticks - rec1.t)) / tDiff,
@@ -163,14 +163,14 @@ export class WMS
 	{
 		if (this.version == null)
 		{
-			var resp = await fetch(this.url + "?SERVICE=WMS&REQUEST=GetCapabilities");
-			var parser = new DOMParser();
-			var contentType = resp.headers.get("Content-Type") || "text/xml";
-			var doc = parser.parseFromString(await resp.text(), contentType);
-			var node = doc.childNodes[0];
+			let resp = await fetch(this.url + "?SERVICE=WMS&REQUEST=GetCapabilities");
+			let parser = new DOMParser();
+			let contentType = resp.headers.get("Content-Type") || "text/xml";
+			let doc = parser.parseFromString(await resp.text(), contentType);
+			let node = doc.childNodes[0];
 			if (node.nodeName == "WMS_Capabilities" || node.nodeName == "WMT_MS_Capabilities")
 			{
-				var attr = node.attributes.getNamedItem("version");
+				let attr = node.attributes.getNamedItem("version");
 				if (attr)
 				{
 					this.version = attr.value;
@@ -181,9 +181,9 @@ export class WMS
 				return null;
 			}
 		}
-		var x = (mapPos.x - bounds.min.x) * width / bounds.getWidth();
-		var y = (bounds.max.y - mapPos.y) * height / bounds.getHeight();
-		var url;
+		let x = (mapPos.x - bounds.min.x) * width / bounds.getWidth();
+		let y = (bounds.max.y - mapPos.y) * height / bounds.getHeight();
+		let url;
 	
 		if (this.version == "1.1.1")
 		{
@@ -204,7 +204,7 @@ export class WMS
 			console.log("WMS: Unsupported version", this.version);
 			return null;
 		}
-		var resp = await fetch(url);
+		let resp = await fetch(url);
 		if (resp.ok)
 		{
 			return await resp.json();