Ero sivun ”Widget:Ol10AnyObsMap” versioiden välillä

(24 välissä olevaa versiota 2 käyttäjän tekeminä ei näytetä)

Rivi 1:

~~<script src="//www.jarviwiki.fi~~/scripts/~~ol3~~/ol.js"></script>

~~<link rel="stylesheet" href="//www.jarviwiki.fi/scripts/ol-ext/overlay/popupoverlay.css" />~~

~~<link rel="stylesheet" href="//www.jarviwiki.fi/scripts/ol-ext/overlay/popupoverlay.anim.css" /~~>

<div style="height: 100%; width: 100%; position: relative;" id="_container"></div>

</div>

Rivi 23:

Rivi 20:

var _memo = { 'SitesO': {}, 'TypesO': {}, 'obsTypeToShow': '' };

~~jQuery~~(window)~~.load~~( function() { _func(); });

function _jQueryTest() {

if ( typeof window.jQuery == 'undefined' ) {

setTimeout( function(){ _jQueryTest() }, 300);

} else {

_func();

}

setTimeout( function(){ _jQueryTest() }, 300);

function _func() {

Rivi 39:

Rivi 43:

if (siteQuery == 'x') { siteQuery = ''; }

var days = parseInt('');

var pointradius = parseInt('');

var obstypebar = ("" == "yes" );

var zoomto = ("" == "true");

var simplepoints = ("" == "true");

var cluster = ( "" == "yes" );

var vesifi = ( "" == "yes" );

var layersArr = [];

var obslayer = {

'type': 'sitesNobses',

'name': 'Paikat ja havainnot',

'siteSearch': siteQuery,

'obsSearch': obsQuery,

//'attribution': 'Paikat ja havainnot: Järvi-meriwiki',

'opacitySlider': false,

'selectable': true,

'obstypebar': obstypebar,

'clustered': cluster,

'pointRadius': pointradius,

'simplepoints': simplepoints,

'vesifi': vesifi,

'zoomToExtent': zoomto

};

~~layersArr.push~~({

if ( days > 0 ) { obslayer[ 'obsDays' ] = days; }

~~'type': 'sitesNobses',~~

~~'name': 'Paikat ja havainnot',~~

~~'siteSearch': siteQuery,~~

~~'obsSearch': obsQuery,~~

'obsDays': days,

~~//'attribution': 'Paikat ja havainnot: Järvi-meriwiki',~~

~~'opacitySlider': false,~~

~~'selectable': true,~~

~~'obstypebar': obstypebar,~~

~~'clustered': cluster,~~

~~'zoomToExtent': zoomto~~

});

~~layersArr.push({ 'type': 'geoloc', 'name': 'Sijaintisi', 'show': true, 'center': false, 'zoom': 12, 'track': false~~ });

layersArr.push( obslayer );

console.log( obslayer );

// do the base map with these settings

var map = ~~ol3_jwMakeMap~~({

var map = jwMakeMap({

'container': '_container',

'base': base,

Rivi 69:

Rivi 78:

'lat': lat,

'zoom': zoom,

'geolocation': true,

'layers': layersArr,

'memo': memo

});

}

</script>

</includeonly>

@@ Rivi 1: / Rivi 1: @@
 <includeonly>
-	<link rel="stylesheet" href="//www.jarviwiki.fi/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="//www.jarviwiki.fi/scripts/ol3/ol.js"></script>
-	<link rel="stylesheet" href="//www.jarviwiki.fi/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="//www.jarviwiki.fi/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="//www.jarviwiki.fi/scripts/ol-ext/overlay/popupoverlay.css" />
-	<link rel="stylesheet" href="//www.jarviwiki.fi/scripts/ol-ext/overlay/popupoverlay.anim.css" />
-	<script src="//www.jarviwiki.fi/scripts/proj4js/dist/proj4.js"></script>
+	<script src="/scripts/proj4js/dist/proj4.js"></script>
-<script src="//www.jarviwiki.fi/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:CommonObsMap|escape:'html'}-->_container"></div>
 	</div>
@@ Rivi 23: / Rivi 20: @@
 		var <!--{$id|default:CommonObsMap|escape:'html'}-->_memo =  { 'SitesO': {}, 'TypesO': {}, 'obsTypeToShow': '' };
-		jQuery(window).load( function() { <!--{$id|default:CommonObsMap|escape:'html'}-->_func(); });
+		function <!--{$id|default:CommonObsMap|escape:'html'}-->_jQueryTest() {
+	if ( typeof window.jQuery == 'undefined' ) {
+    		setTimeout( function(){ <!--{$id|default:CommonObsMap|escape:'html'}-->_jQueryTest() }, 300);
+  	} else {
+  		<!--{$id|default:CommonObsMap|escape:'html'}-->_func();
+  	}
+}
+setTimeout( function(){ <!--{$id|default:CommonObsMap|escape:'html'}-->_jQueryTest() }, 300);
 		function <!--{$id|default:CommonObsMap|escape:'html'}-->_func() {
@@ Rivi 39: / Rivi 43: @@
 if (siteQuery == 'x') { siteQuery = ''; }
 var days = parseInt('<!--{$days|default:365|escape:'html'}-->');
+var pointradius = parseInt('<!--{$pointradius|default:6|escape:'html'}-->');
 var obstypebar = ("<!--{$obstypebar|default:yes|escape:'html'}-->" == "yes" );
 var zoomto = ("<!--{$zoomto|default:false|escape:'html'}-->" == "true");
+var simplepoints = ("<!--{$simplepoints|default:false|escape:'html'}-->" == "true");
 var cluster = ( "<!--{$cluster|default:yes|escape:'html'}-->" == "yes" );
+var vesifi = ( "<!--{$vesifi|default:yes|escape:'html'}-->" == "yes" );
-			var layersArr = [];
+		var layersArr = [];
+	var obslayer = {
+		'type': 'sitesNobses',
+		'name': 'Paikat ja havainnot',
+		'siteSearch': siteQuery,
+		'obsSearch': obsQuery,
+		//'attribution': 'Paikat ja havainnot: Järvi-meriwiki',
+		'opacitySlider': false,
+		'selectable': true,
+		'obstypebar': obstypebar,
+		'clustered': cluster,
+		'pointRadius': pointradius,
+		'simplepoints': simplepoints,
+		'vesifi': vesifi,
+		'zoomToExtent': zoomto
+	};
-			layersArr.push({
+if ( days > 0 ) { obslayer[ 'obsDays' ] = days; }
-				'type': 'sitesNobses',
-				'name': 'Paikat ja havainnot',
-				'siteSearch': siteQuery,
-				'obsSearch': obsQuery,
-				'obsDays': days,
-				//'attribution': 'Paikat ja havainnot: Järvi-meriwiki',
-				'opacitySlider': false,
-				'selectable': true,
-'obstypebar': obstypebar,
-'clustered': cluster,
-				'zoomToExtent': zoomto
-			});
-			layersArr.push({ 'type': 'geoloc', 'name': 'Sijaintisi', 'show': true, 'center': false, 'zoom': 12, 'track': false });
+			layersArr.push( obslayer );
+console.log( obslayer );
 			// do the base map with these settings
-			var map = ol3_jwMakeMap({
+			var map = jwMakeMap({
 				'container': '<!--{$id|default:CommonObsMap|escape:'html'}-->_container',
 				'base': base,
@@ Rivi 69: / Rivi 78: @@
 				'lat': lat,
 				'zoom': zoom,
+				'geolocation': true,
 				'layers': layersArr,
 				'memo': memo
 			});
 		}
 	</script>
 </includeonly>

Widget:Ol10AnyObsMap

Nykyinen versio 1. syyskuuta 2025 kello 14.51