X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.geo.js%2Fsrc%2Forg.argeo.app.geo.js%2Findex.js;h=a665d9164c10df263ff721d0dd86ac34ab6d6e06;hb=be0d3b8c6d90256157ebf0ba9dd7a8703165ba6b;hp=a6f3c81c50ff4e6cd89f30a3fae4ef5ed081e4a5;hpb=37c5768d88096f4eb7be02f18770b6a40be5c110;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.geo.js/src/org.argeo.app.geo.js/index.js b/org.argeo.app.geo.js/src/org.argeo.app.geo.js/index.js
index a6f3c81..a665d91 100644
--- a/org.argeo.app.geo.js/src/org.argeo.app.geo.js/index.js
+++ b/org.argeo.app.geo.js/src/org.argeo.app.geo.js/index.js
@@ -2,18 +2,94 @@ import Map from 'ol/Map.js';
 import OSM from 'ol/source/OSM.js';
 import TileLayer from 'ol/layer/Tile.js';
 import View from 'ol/View.js';
+import { fromLonLat, toLonLat } from 'ol/proj.js';
 
 import 'ol/ol.css';
 
-const map = new Map({
-  layers: [
-    new TileLayer({
-      source: new OSM(),
-    }),
-  ],
-  target: 'map',
-  view: new View({
-    center: [0, 0],
-    zoom: 2,
-  }),
-});
+//window.map = new Map({
+//	layers: [
+//		new TileLayer({
+//			source: new OSM(),
+//		}),
+//	],
+//	target: 'mapTarget',
+//	view: new View({
+//		center: [0, 0],
+//		zoom: 2,
+//	}),
+//});
+//window.map.on('rendercomplete', e => {
+//	console.log('Render completed.');
+//	onRenderComplete();
+//});
+//map.getView().setZoom(4);
+
+if (typeof window.argeo === 'undefined')
+	window.argeo = {};
+if (typeof window.argeo.app === 'undefined')
+	window.argeo.app = {};
+if (typeof window.argeo.app.geo === 'undefined')
+	window.argeo.app.geo = {};
+
+
+
+window.argeo.app.geo.ArgeoMap = {
+	map: new Map({
+		layers: [
+			new TileLayer({
+				source: new OSM(),
+			}),
+		],
+		target: 'map',
+	}),
+
+	setZoom: function(zoom) {
+		this.map.getView().setZoom(zoom);
+	},
+
+	setCenter: function(lng, lat) {
+		this.map.getView().setCenter(fromLonLat([lng, lat]));
+	},
+
+};
+//window.argeoMap = Object.create(argeo.app.geo.ArgeoMap);
+//window.argeoMap.map.on('rendercomplete', e => {
+//	console.log('Render completed.');
+//	onRenderComplete();
+//});
+
+
+//function argeo_app_geo_Map() {
+//	console.log('Entered constructor');
+//	this.map = new Map({
+//		layers: [
+//			new TileLayer({
+//				source: new OSM(),
+//			}),
+//		],
+//		target: 'map',
+//		view: new View({
+//			center: [0, 0],
+//			zoom: 2,
+//		}),
+//	});
+//	this.map.on('rendercomplete', e => {
+//		console.log('Render completed.');
+//		onRenderComplete();
+//	});
+//
+//	this.setCenter = function(lng, lat) {
+//		console.log('Center set ');
+//		//this.map.getView().setCenter(ol.proj.fromLonLat([lng, lat]));
+//	}
+//
+//	this.setZoom = function(zoom) {
+//		this.map.getView().setZoom(zoom);
+//	}
+//}
+//
+//window.argeoMap = new argeo_app_geo_Map();
+//argeoMap.setCenter(13.404954, 52.520008);
+//function setCenter(lng, lat) {
+//	map.getView().setCenter(lng, lat);
+//}
\ No newline at end of file