Widget:Ol10AlgalWeekMap

Nykyinen versio 16. heinäkuuta 2025 kello 14.28

@@ Rivi 1: / Rivi 1: @@
 <includeonly>
-	<link rel="stylesheet" href="/scripts/ol3/ol.css" type="text/css">
+	<link rel="stylesheet" href="/scripts/ol-10/ol.css" type="text/css">
-    	<script src="//cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"></script>
+ 	<script src="/scripts/ol-10/ol.js"></script>
-	<script src="/scripts/ol3/ol.js"></script>
-	<link rel="stylesheet" href="/scripts/ol-ext/dist/ol-ext.min.css" type="text/css">
+	<link rel="stylesheet" href="/scripts/ol-ext-10/dist/ol-ext.min.css" type="text/css">
-	<script src="/scripts/ol-ext/dist/ol-ext.min.js"></script>
+	<script src="/scripts/ol-ext-10/dist/ol-ext.min.js"></script>
-	<link rel="stylesheet" href="/scripts/ol-ext/overlay/popupoverlay.css" />
-	<link rel="stylesheet" href="/scripts/ol-ext/overlay/popupoverlay.anim.css" />
 	<script src="/scripts/proj4js/dist/proj4.js"></script>
-<script src="/scripts/jwol3js/jwol3.js"></script>
+	<script src="/scripts/jwol10js/jwol10.js"></script>
-	<div class="jwMapContainer" style="height:<!--{$height|default:500|escape:'html'}-->px" >
+	<div class="jwMapContainer" style="height:<!--{$height|default:500px|escape:'html'}-->" >
 		<div style="height: 100%; width: 100%; position: relative;" id="<!--{$id|default:AlgalWeekMap|escape:'html'}-->_container"></div>
 	</div>
@@ Rivi 43: / Rivi 40: @@
 			var baselayers = "<!--{$baselayers|default:x|escape:'html'}-->";
 			var baselayersA = baselayers.split( ',' );
+            var vesifi = ( "<!--{$vesifi|default:no|escape:'html'}-->" == "yes" );
 			var year = parseInt('<!--{$vuosi|default:4|escape:'html'}-->');
@@ Rivi 63: / Rivi 61: @@
 				layersArr.push( {
 					//'id': 'reagions',
-					'type': 'anyrest',
+					'type': 'anygeo',
 					'name': 'Maakunnat',
-					'restUrl': '//paikkatieto.ymparisto.fi/arcgis/rest/services/LAPIO/LAPIO_Hallrajat/MapServer/1/query',
+					'restUrl': '//geo.stat.fi/geoserver/tilastointialueet/',
-					'search': "MKuntaNimi LIKE '%'",
+					'layer': 'tilastointialueet:maakunta1000k',
+				//'cql_filter': "tilastointialueet:nimi = '" + short + "'",
 					'selectable': false,
 					//'zoomToExtent': true,
@@ Rivi 90: / Rivi 89: @@
 				'zoomToExtent': false
 			} );
+            var startDate = firstDayOfWeek (year, week);
+			var endDate = new Date( startDate.getTime() );
+			endDate.setDate( endDate.getDate() + 7 );
+			layersArr.push({
+				'type': 'coo311',
+				'name': 'Vesi.fi-havainnot',
+				'service_code': 'algaebloom_service_code_201808151546171',
+				'hashtags': '_VesiFiObservation',
+				'startDate': startDate,
+				'endDate': endDate,
+				'opacitySlider': false,
+				'selectable': true,
+				'clustered': false,
+				'pointRadius': 8,
+				'obsesColors': { type: 'cat', 'attribute': 'algaebloom_singlevaluelist_201808151546174', values: [ { key: 1, color: '#308fb3' }, { key: 2, color: '#8db335' }, { key: 3, color: '#f1cb00' }, { key: 4, color: '#ce0000' } ] },
+				'obstypebar': false,
+				'zoomToExtent': false,
+				'visible': true
+			});
+			layersArr.push({
+				'type': 'sitesNobses',
+				'name': 'Kansalaishavainnot',
+				'siteSearch': '',
+				'obsSearch': '[[Vuosi::' + year.toString() + ']][[Viikko::' + week.toString() + ']][[ObsCode::alg]][[Seuranta::!Valtakunnallinen leväseuranta]]',
+				'opacitySlider': false,
+				'selectable': true,
+				'clustered': false,
+				'obstypebar': false,
+				'zoomToExtent': false,
+'visible': true
+			});
 			layersArr.push({
 				'memo': memo.b,
@@ Rivi 142: / Rivi 175: @@
 				'zoomToExtent': false
 			});
-/*
-			layersArr.push({
-				'type': 'sitesNobses',
-				'name': 'Kansalaishavainnot pe-su',
-				'siteSearch': '',
-				'obsSearch': '[[Päivämäärä::>{{#time: Y-m-d|now - {{#expr: {{#time: w|now}} + 2 }} days }}]][[Päivämäärä::<{{#time: Y-m-d|now - {{#expr: {{#time: w|now}} + 0 }} days }}]][[ObsCode::alg]][[Seuranta::!Valtakunnallinen leväseuranta]]',
-				'opacitySlider': false,
-				'selectable': true,
-				'clustered': false,
-				'obstypebar': false,
-				'zoomToExtent': false,
-'visible': true
-			});
-*/
-			layersArr.push({
-				'type': 'sitesNobses',
-				'name': 'Kansalaishavainnot kuluva viikko',
-				'siteSearch': '',
-				'obsSearch': '[[Vuosi::' + year.toString() + ']][[Viikko::' + week.toString() + ']][[ObsCode::alg]][[Seuranta::!Valtakunnallinen leväseuranta]]',
-				'opacitySlider': false,
-				'selectable': true,
-				'clustered': false,
-				'obstypebar': false,
-				'zoomToExtent': false,
-'visible': true
-			});
-			//layersArr.push({ 'type': 'geoloc', 'name': 'Sijaintisi', 'show': true, 'center': false, 'zoom': 12, 'track': false });
 			// do the base map with these settings
-			var map = ol3_jwMakeMap({
+			var map = jwMakeMap({
 				'container': '<!--{$id|default:AlgalWeekMap|escape:'html'}-->_container',
 				'base': base,