Widget:Ol10TagObsMap

Nykyinen versio 28. huhtikuuta 2026 kello 15.15

@@ Rivi 43: / Rivi 43: @@
 if (siteQuery == 'x') { siteQuery = ''; }
 var days = parseInt('<!--{$days|default:365|escape:'html'}-->');
-var pointradius = parseInt('<!--{$pointradius|default:6|escape:'html'}-->');
+var curdays = parseInt('<!--{$curdays|default:7|escape:'html'}-->');
+var pointsize = parseInt('<!--{$pointsize|default:6|escape:'html'}-->');
 var obstypebar = ( "<!--{$obstypebar|default:yes|escape:'html'}-->" == "yes" );
 var zoomto = ("<!--{$zoomto|default:false|escape:'html'}-->" == "true");
@@ Rivi 51: / Rivi 52: @@
 var mapbg = "<!--{$mapbg|default:x|escape:'html'}-->";
 var muni = "<!--{$muni|default:x|escape:'html'}-->";
+var regs = "<!--{$regs|default:x|escape:'html'}-->";
+var lakes = "<!--{$lakes|default:x|escape:'html'}-->";
 var muniA = muni.split( ',' );
 for ( var mi in muniA ) {
 	muniA[mi] = 'nationalCode=%27' + muniNameToNumber( muniA[mi].trim() ) + '%27';
+}
+var regsA = []; if ( regs != 'x' ) { regsA = regs.split( ',' ); }
+for ( var ri in regsA ) {
+	regsA[ri] = 'tilastointialueet:nimi=%27' + regsA[ri] + '%27';
+}
+var lakesA = []; if ( lakes != 'x' ) { lakesA = lakes.split( ',' ); }
+for ( var li in lakesA ) {
+	lakesA[li] = 'JarviTunnus=%27' + lakesA[li] + '%27';
 }
 			var layersArr = [];
+if ( regsA.length > 0 ) {
+				layersArr.push( {
+					'id': 'region',
+					'type': 'anygeo',
+					'name': 'Maakunta',
+					'restUrl': '//geo.stat.fi/geoserver/tilastointialueet/',
+					'layer': 'tilastointialueet:maakunta1000k',
+					'cql_filter': regsA.join( '%20OR%20' ),
+					'selectable': false,
+					'zoomToExtent': true,
+					'bbox': false,
+					'fillColor': 'rgba( 0, 0, 0, 0 )',
+					'strokeColor': 'rgba( 200, 100, 100, 0.5 )',
+					'strokeWidth': 5,
+					'attribution': 'Maakuntarajat: Tilastokeskus',
+				});
+}
 if ( mapbg == 'muni' ) {
-console.log( muniA );
 				layersArr.push( {
 					'id': 'muni',
@@ Rivi 77: / Rivi 107: @@
 }
-//console.log( "<!--{$obstypebar|default:yes|escape:'html'}-->" );
+if ( lakesA.length > 0 ) {
-//console.log( obstypebar );
+				layersArr.push( {
+					'type': 'lake',
+					'name': 'Järvi',
+					'search':  lakesA.join( '%20OR%20' ),
+					//'attribution': '<a href="//wwwp2.ymparisto.fi/kayttoehdot.html">Ympäristöhallinnon paikkatietoaineistot</a>',
+					'visible': true,
+					'opacitySlider': true,
+					'showLabels': false,
+					'selectable': true,
+					'zoomToExtent': false
+				});
+}
 			layersArr.push({
@@ Rivi 86: / Rivi 127: @@
 				'obsSearch': obsQuery,
 				'obsDays': days,
+				'curDays': curdays,
 				//'attribution': 'Paikat ja havainnot: Järvi-meriwiki',
 				'opacitySlider': false,
@@ Rivi 91: / Rivi 133: @@
 'obstypebar': obstypebar,
 'clustered': cluster,
-'pointRadius': pointradius,
+'pointSize': pointsize,
 'simplepoints': simplepoints,
 'vesifi': vesifi,