X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=js%2Fsrc%2Fgeo%2FOpenLayersMapPart.js;h=6fedd7a2a382f9f6d8b77de9cbfae761a96b72cb;hb=6e13b9416a5fd1f5477eb7233f86d3eacbb88c55;hp=0e32e8832c410226de3e2c56fd9e6df105f671d1;hpb=2e08c3d9f69332161101e1bdda35054ae953748f;p=gpl%2Fargeo-suite.git

diff --git a/js/src/geo/OpenLayersMapPart.js b/js/src/geo/OpenLayersMapPart.js
index 0e32e88..6fedd7a 100644
--- a/js/src/geo/OpenLayersMapPart.js
+++ b/js/src/geo/OpenLayersMapPart.js
@@ -2,19 +2,26 @@
  * @module OpenLayersMapPart
  */
 
-import Map from 'ol/Map.js';
-import View from 'ol/View.js';
 import { fromLonLat, getPointResolution } from 'ol/proj.js';
-import VectorSource from 'ol/source/Vector.js';
 import Feature from 'ol/Feature.js';
 import { Point } from 'ol/geom.js';
+import { transformExtent } from 'ol/proj.js';
+
 import VectorLayer from 'ol/layer/Vector.js';
+import TileLayer from 'ol/layer/Tile.js';
+
+import VectorSource from 'ol/source/Vector.js';
 import GeoJSON from 'ol/format/GeoJSON.js';
 import GPX from 'ol/format/GPX.js';
+import OSM from 'ol/source/OSM.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 Map from 'ol/Map.js';
+import View from 'ol/View.js';
+import { OverviewMap, ScaleLine, defaults as defaultControls } from 'ol/control.js';
 
 import * as SLDReader from '@nieuwlandgeo/sldreader';
 
@@ -25,6 +32,10 @@ export default class OpenLayersMapPart extends MapPart {
 	/** The OpenLayers Map. */
 	#map;
 
+	#overviewMap;
+
+	select;
+
 	/** Styled layer descriptor */
 	#sld;
 
@@ -34,7 +45,25 @@ export default class OpenLayersMapPart extends MapPart {
 	/** Constructor taking the mapName as an argument. */
 	constructor(mapName) {
 		super(mapName);
+		this.#overviewMap = new OverviewMap({
+			layers: [
+				new TileLayer({
+					source: new OSM(),
+				}),
+			],
+		});
+		this.select = new Select();
 		this.#map = new Map({
+			controls: defaultControls({
+				attribution: false,
+				rotate: false,
+			}).extend([this.#overviewMap, new ScaleLine({
+				bar: false,
+				steps: 2,
+				text: false,
+				minWidth: 150,
+				maxWidth: 200,
+			})]),
 			layers: [
 			],
 			//						view: new View({
@@ -44,6 +73,7 @@ export default class OpenLayersMapPart extends MapPart {
 			//						}),
 			target: this.getMapName(),
 		});
+		this.#map.addInteraction(this.select);
 		//this.#map.getView().set('projection', 'EPSG:4326', true);
 	}
 
@@ -134,7 +164,7 @@ export default class OpenLayersMapPart extends MapPart {
 				return true;
 			});
 			if (feature !== null)
-				mapPart.callbacks['onFeatureSingleClick'](feature.get('path'));
+				mapPart.callbacks['onFeatureSingleClick'](feature.get('cr:path'));
 		});
 	}
 
@@ -146,7 +176,7 @@ export default class OpenLayersMapPart extends MapPart {
 		select.on('select', function(e) {
 			if (e.selected.length > 0) {
 				let feature = e.selected[0];
-				mapPart.callbacks['onFeatureSelected'](feature.get('path'));
+				mapPart.callbacks['onFeatureSelected'](feature.get('cr:path'));
 			}
 		});
 	}
@@ -190,7 +220,7 @@ export default class OpenLayersMapPart extends MapPart {
 				return;
 			}
 			const coordinate = e.coordinate;
-			const path = selected.get('path');
+			const path = selected.get('cr:path');
 			if (path === null)
 				return true;
 			const res = mapPart.callbacks['onFeaturePopup'](path);
@@ -210,6 +240,26 @@ export default class OpenLayersMapPart extends MapPart {
 		return 'map';
 	}
 
+	selectFeatures(layerName, featureIds) {
+		// we cannot use 'this' in the function provided to OpenLayers
+		let mapPart = this;
+		this.select.getFeatures().clear();
+		const layer = this.getLayerByName(layerName);
+		const source = layer.getSource();
+		for (const featureId of featureIds) {
+			let feature = source.getFeatureById(featureId);
+			if (feature === null) {
+				source.on('featuresloadend', function(e) {
+					feature = source.getFeatureById(featureId);
+					if (feature !== null)
+						mapPart.select.getFeatures().push(feature);
+				});
+			} else {
+				this.select.getFeatures().push(feature);
+			}
+		}
+	}
+
 	//
 	// STATIC FOR EXTENSION
 	//