X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=js%2Fsrc%2Fgeo%2FOpenLayersMapPart.js;h=0e32e8832c410226de3e2c56fd9e6df105f671d1;hb=2e08c3d9f69332161101e1bdda35054ae953748f;hp=177ce33862919d750769ae9029e187d1467df6db;hpb=59da7271e876ca8a429beb86b67e7350eef1e1ca;p=gpl%2Fargeo-suite.git

diff --git a/js/src/geo/OpenLayersMapPart.js b/js/src/geo/OpenLayersMapPart.js
index 177ce33..0e32e88 100644
--- a/js/src/geo/OpenLayersMapPart.js
+++ b/js/src/geo/OpenLayersMapPart.js
@@ -4,8 +4,6 @@
 
 import Map from 'ol/Map.js';
 import View from 'ol/View.js';
-import OSM from 'ol/source/OSM.js';
-import TileLayer from 'ol/layer/Tile.js';
 import { fromLonLat, getPointResolution } from 'ol/proj.js';
 import VectorSource from 'ol/source/Vector.js';
 import Feature from 'ol/Feature.js';
@@ -16,6 +14,7 @@ import GPX from 'ol/format/GPX.js';
 import Select from 'ol/interaction/Select.js';
 import Overlay from 'ol/Overlay.js';
 import { Style, Icon } from 'ol/style.js';
+import { transformExtent } from 'ol/proj.js';
 
 import * as SLDReader from '@nieuwlandgeo/sldreader';
 
@@ -26,6 +25,9 @@ export default class OpenLayersMapPart extends MapPart {
 	/** The OpenLayers Map. */
 	#map;
 
+	/** Styled layer descriptor */
+	#sld;
+
 	/** Externally added callback functions. */
 	callbacks = {};
 
@@ -34,21 +36,15 @@ export default class OpenLayersMapPart extends MapPart {
 		super(mapName);
 		this.#map = new Map({
 			layers: [
-				//				new TileLayer({
-				//					source: new SentinelCloudless(),
-				//				}),
-//								new TileLayer({
-//									source: new OSM(),
-//									opacity: 0.4,
-//									transition: 0,
-//								}),
 			],
-//			view: new View({
-//				center: [0, 0],
-//				zoom: 2,
-//			}),
+			//						view: new View({
+			//							projection: 'EPSG:4326',
+			//							center: [0, 0],
+			//							zoom: 2,
+			//						}),
 			target: this.getMapName(),
 		});
+		//this.#map.getView().set('projection', 'EPSG:4326', true);
 	}
 
 	/* GEOGRAPHICAL METHODS */
@@ -57,8 +53,13 @@ export default class OpenLayersMapPart extends MapPart {
 		this.#map.getView().setZoom(zoom);
 	}
 
-	setCenter(lng, lat) {
-		this.#map.getView().setCenter(fromLonLat([lng, lat]));
+	setCenter(lat, lon) {
+		this.#map.getView().setCenter(fromLonLat([lon, lat]));
+	}
+
+	fit(extent, options) {
+		var transformed = transformExtent(extent, 'EPSG:4326', this.#map.getView().getProjection());
+		this.#map.getView().fit(transformed, options);
 	}
 
 	addPoint(lng, lat, style) {
@@ -108,6 +109,19 @@ export default class OpenLayersMapPart extends MapPart {
 		return this.#map;
 	}
 
+	getLayerByName(name) {
+		let layers = this.#map.getLayers();
+		for (let i = 0; i < layers.getLength(); i++) {
+			let layer = layers.item(i);
+			let n = layer.get('name');
+			if (n !== undefined) {
+				if (name === n)
+					return layer;
+			}
+		}
+		return undefined;
+	}
+
 	/* CALLBACKS */
 	enableFeatureSingleClick() {
 		// we cannot use 'this' in the function provided to OpenLayers
@@ -210,6 +224,40 @@ export default class OpenLayersMapPart extends MapPart {
 	//
 	// SLD STYLING
 	//
+
+	setSld(xml) {
+		this.#sld = SLDReader.Reader(xml);
+	}
+
+	/** Get a FeatureTypeStyle (https://nieuwlandgeo.github.io/SLDReader/api.html#FeatureTypeStyle).  */
+	getFeatureTypeStyle(styledLayerName, styleName) {
+		const sldLayer = SLDReader.getLayer(this.#sld, styledLayerName);
+		const style = styleName === undefined ? SLDReader.getStyle(sldLayer) : SLDReader.getStyle(sldLayer, styleName);
+		// OpenLayers can only use one definition
+		const featureTypeStyle = style.featuretypestyles[0];
+		return featureTypeStyle;
+	}
+
+	applyStyle(layerName, styledLayerName, styleName) {
+		const layer = this.getLayerByName(layerName);
+		const featureTypeStyle = this.getFeatureTypeStyle(styledLayerName, styleName);
+		const viewProjection = this.#map.getView().getProjection();
+		const olStyleFunction = SLDReader.createOlStyleFunction(featureTypeStyle, {
+			// Use the convertResolution option to calculate a more accurate resolution.
+			convertResolution: viewResolution => {
+				const viewCenter = this.#map.getView().getCenter();
+				return getPointResolution(viewProjection, viewResolution, viewCenter);
+			},
+			// If you use point icons with an ExternalGraphic, you have to use imageLoadCallback
+			// to update the vector layer when an image finishes loading.
+			// If you do not do this, the image will only be visible after next layer pan/zoom.
+			imageLoadedCallback: () => {
+				layer.changed();
+			},
+		});
+		layer.setStyle(olStyleFunction);
+	}
+
 	#applySLD(vectorLayer, text) {
 		const sldObject = SLDReader.Reader(text);
 		const sldLayer = SLDReader.getLayer(sldObject);
@@ -232,4 +280,4 @@ export default class OpenLayersMapPart extends MapPart {
 		});
 		vectorLayer.setStyle(olStyleFunction);
 	}
-}
\ No newline at end of file
+}