version 4.26.3 : prise en charge des balises MultiGeometry + gx:MultiTrack + gx:Track pour les KMLs (4f2bed3d) · Validations · spip-contrib-extensions / gis

lib/leaflet/plugins/KML.js

+116 −11

Numéro de ligne d'origine	Numéro de ligne de diff	Ligne de diff
		@@ -69,6 +69,11 @@ L.Util.extend(L.KML, {
		l = this.parsePlacemark(el[j], xml, style);
		if (l) { layers.push(l); }
		}
		el = xml.getElementsByTagName('GroundOverlay');
		for (var k = 0; k < el.length; k++) {
		l = this.parseGroundOverlay(el[k]);
		if (l) { layers.push(l); }
		}
		return layers;
		},

		@@ -180,13 +185,28 @@ L.Util.extend(L.KML, {
		l = this.parsePlacemark(el[j], xml, style);
		if (l) { layers.push(l); }
		}
		el = xml.getElementsByTagName('GroundOverlay');
		for (var k = 0; k < el.length; k++) {
		if (!this._check_folder(el[k], xml)) { continue; }
		l = this.parseGroundOverlay(el[k]);
		if (l) { layers.push(l); }
		}
		if (!layers.length) { return; }
		if (layers.length === 1) { return layers[0]; }
		return new L.FeatureGroup(layers);
		},

		parsePlacemark: function (place, xml, style) {
		var i, j, el, options = {};
		var h, i, j, el, options = {};

		var multi = ['MultiGeometry', 'gx:MultiTrack'];
		for (h in multi) {
		el = place.getElementsByTagName(multi[h]);
		for (i = 0; i < el.length; i++) {
		return this.parsePlacemark(el[i], xml, style);
		}
		}

		el = place.getElementsByTagName('styleUrl');
		for (i = 0; i < el.length; i++) {
		var url = el[i].childNodes[0].nodeValue;
		@@ -196,19 +216,15 @@ L.Util.extend(L.KML, {
		}
		var layers = [];

		var parse = ['LineString', 'Polygon', 'Point'];
		var parse = ['LineString', 'Polygon', 'Point', 'gx:Track'];
		for (j in parse) {
		// for jshint
		if (true)
		{
		var tag = parse[j];
		el = place.getElementsByTagName(tag);
		for (i = 0; i < el.length; i++) {
		var l = this['parse' + tag](el[i], xml, options);
		var l = this['parse' + tag.replace(/gx:/, '')](el[i], xml, options);
		if (l) { layers.push(l); }
		}
		}
		}

		if (!layers.length) {
		return;
		@@ -248,6 +264,16 @@ L.Util.extend(L.KML, {
		return new L.Polyline(coords, options);
		},

		parseTrack: function (line, xml, options) {
		var el = xml.getElementsByTagName('gx:coord');
		var coords = [];
		for (var j = 0; j < el.length; j++) {
		coords = coords.concat(this._read_gxcoords(el[j]));
		}
		if (!coords.length) { return; }
		return new L.Polyline(coords, options);
		},

		parsePoint: function (line, xml, options) {
		var el = line.getElementsByTagName('coordinates');
		if (!el.length) {
		@@ -309,6 +335,54 @@ L.Util.extend(L.KML, {
		coords.push(new L.LatLng(ll[1], ll[0]));
		}
		return coords;
		},

		_read_gxcoords: function (el) {
		var text = '', coords = [];
		text = el.firstChild.nodeValue.split(' ');
		coords.push(new L.LatLng(text[1], text[0]));
		return coords;
		},

		parseGroundOverlay: function (xml) {
		var latlonbox = xml.getElementsByTagName('LatLonBox')[0];
		var bounds = new L.LatLngBounds(
		[
		latlonbox.getElementsByTagName('south')[0].childNodes[0].nodeValue,
		latlonbox.getElementsByTagName('west')[0].childNodes[0].nodeValue
		],
		[
		latlonbox.getElementsByTagName('north')[0].childNodes[0].nodeValue,
		latlonbox.getElementsByTagName('east')[0].childNodes[0].nodeValue
		]
		);
		var attributes = {Icon: true, href: true, color: true};
		function _parse(xml) {
		var options = {}, ioptions = {};
		for (var i = 0; i < xml.childNodes.length; i++) {
		var e = xml.childNodes[i];
		var key = e.tagName;
		if (!attributes[key]) { continue; }
		var value = e.childNodes[0].nodeValue;
		if (key === 'Icon') {
		ioptions = _parse(e);
		if (ioptions.href) { options.href = ioptions.href; }
		} else if (key === 'href') {
		options.href = value;
		} else if (key === 'color') {
		options.opacity = parseInt(value.substring(0, 2), 16) / 255.0;
		options.color = '#' + value.substring(6, 8) + value.substring(4, 6) + value.substring(2, 4);
		}
		}
		return options;
		}
		var options = {};
		options = _parse(xml);
		if (latlonbox.getElementsByTagName('rotation')[0] !== undefined) {
		var rotation = latlonbox.getElementsByTagName('rotation')[0].childNodes[0].nodeValue;
		options.rotation = parseFloat(rotation);
		}
		return new L.RotatedImageOverlay(options.href, bounds, {opacity: options.opacity, angle: options.rotation});
		}

		});
		@@ -348,3 +422,34 @@ L.KMLMarker = L.Marker.extend({
		}
		});

		// Inspired by https://github.com/bbecquet/Leaflet.PolylineDecorator/tree/master/src
		L.RotatedImageOverlay = L.ImageOverlay.extend({
		options: {
		angle: 0
		},
		_reset: function () {
		L.ImageOverlay.prototype._reset.call(this);
		this._rotate();
		},
		_animateZoom: function (e) {
		L.ImageOverlay.prototype._animateZoom.call(this, e);
		this._rotate();
		},
		_rotate: function () {
		if (L.DomUtil.TRANSFORM) {
		// use the CSS transform rule if available
		this._image.style[L.DomUtil.TRANSFORM] += ' rotate(' + this.options.angle + 'deg)';
		} else if(L.Browser.ie) {
		// fallback for IE6, IE7, IE8
		var rad = this.options.angle * (Math.PI / 180),
		costheta = Math.cos(rad),
		sintheta = Math.sin(rad);
		this._image.style.filter += ' progid:DXImageTransform.Microsoft.Matrix(sizingMethod=\'auto expand\', M11=' +
		costheta + ', M12=' + (-sintheta) + ', M21=' + sintheta + ', M22=' + costheta + ')';
		}
		},
		getBounds: function() {
		return this._bounds;
		}
		});

paquet.xml

+1 −1

Numéro de ligne d'origine	Numéro de ligne de diff	Ligne de diff
		<paquet
		prefix="gis"
		categorie="divers"
		version="4.26.2"
		version="4.26.3"
		schema="2.0.7"
		etat="stable"
		compatibilite="[3.0.0;3.1.*]"