From fe535ac61bf1a51ca92b1ee48f04972675f33fb4 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Tue, 23 Jun 2015 01:08:02 +0000
Subject: [PATCH] 

---
 admin/admin.db                         | Bin 286720 -> 0 bytes
 ferramentas/storymap/default.php       | 21 ++++++++++++++++++++-
 ferramentas/storymap/index.js          |  4 ----
 ferramentas/storymap/template_mst.html |  3 ---
 js/interface.js                        | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------
 5 files changed, 76 insertions(+), 36 deletions(-)

diff --git a/admin/admin.db b/admin/admin.db
index 5135cb4..5479ddc 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/ferramentas/storymap/default.php b/ferramentas/storymap/default.php
index 40381f5..5da291f 100755
--- a/ferramentas/storymap/default.php
+++ b/ferramentas/storymap/default.php
@@ -52,6 +52,9 @@ html, body {
 	padding: 0px;
 	margin: 0px;
 }
+.vco-map-line{
+	display: none
+}
 </style>
 
 </head>
@@ -60,8 +63,24 @@ html, body {
 	<!-- JavaScript-->
 	<script src="../../pacotes/knightlab/StoryMapJS/compiled/js/storymap.js"></script>
 	<script>
+	VCO.Language = {
+    name: "Português",
+    lang: "pt",
+    messages: {
+        loading: "carregando",
+        wikipedia: "da Wikipedia, a enciclopédia livre",
+		start: 				"Explore"
+    },
+    buttons: {
+        map_overview:      "vista geral do mapa",
+		overview:          "vista geral",
+        backtostart:       "voltar ao começo",
+        collapse_toggle:   "ocultar o mapa",
+        uncollapse_toggle: "mostrar o mapa"
+    }
+};
 	var storymap = new VCO.StoryMap('storymap', '../../json.php?tema=<?php echo strip_tags($_GET["tema"]);?>&format=storymap&', {
-		show_lines: false
+		"show_lines": false
 	});
 	window.onresize = function(event) {
 		storymap.updateDisplay();
diff --git a/ferramentas/storymap/index.js b/ferramentas/storymap/index.js
index 48f79b8..e588ae1 100755
--- a/ferramentas/storymap/index.js
+++ b/ferramentas/storymap/index.js
@@ -139,7 +139,6 @@ i3GEOF.storymap =
 					combo(r.data.valores, "i3GEOstocolcabecalho");
 					combo(r.data.valores, "i3GEOstocoltexto");
 					combo(r.data.valores, "i3GEOstocollocal");
-					combo(r.data.valores, "i3GEOstocolicone");
 					combo(r.data.valores, "i3GEOstocolmedia");
 					combo(r.data.valores, "i3GEOstocollon");
 					combo(r.data.valores, "i3GEOstocollat");
@@ -150,7 +149,6 @@ i3GEOF.storymap =
 						$i("i3GEOstocolcabecalhoCombo").value = camada.ferramentas.storymap.colcabecalho;
 						$i("i3GEOstocoltextoCombo").value = camada.ferramentas.storymap.coltexto;
 						$i("i3GEOstocollocalCombo").value = camada.ferramentas.storymap.collocal;
-						$i("i3GEOstocoliconeCombo").value = camada.ferramentas.storymap.colicone;
 						$i("i3GEOstocolmediaCombo").value = camada.ferramentas.storymap.colmedia;
 						$i("i3GEOstocollonCombo").value = camada.ferramentas.storymap.collon;
 						$i("i3GEOstocollatCombo").value = camada.ferramentas.storymap.collat;
@@ -264,8 +262,6 @@ i3GEOF.storymap =
 					+ $i("i3GEOstocoltextoCombo").value
 					+ '","collocal":"'
 					+ $i("i3GEOstocollocalCombo").value
-					+ '","colicone":"'
-					+ $i("i3GEOstocoliconeCombo").value
 					+ '","colmedia":"'
 					+ $i("i3GEOstocolmediaCombo").value
 					+ '","collon":"'
diff --git a/ferramentas/storymap/template_mst.html b/ferramentas/storymap/template_mst.html
index 8c0f83f..db1ca43 100755
--- a/ferramentas/storymap/template_mst.html
+++ b/ferramentas/storymap/template_mst.html
@@ -18,9 +18,6 @@
 <p class='paragrafo'>{{{collocal}}}</p>
 <div class='styled-select' id='i3GEOstocollocal'></div>
 <br>
-<p class='paragrafo'>{{{colicone}}}</p>
-<div class='styled-select' id='i3GEOstocolicone'></div>
-<br>
 <p class='paragrafo'>{{{colmedia}}}</p>
 <div class='styled-select' id='i3GEOstocolmedia'></div>
 <br>
diff --git a/js/interface.js b/js/interface.js
index 2c020d1..f3f7b36 100755
--- a/js/interface.js
+++ b/js/interface.js
@@ -1298,11 +1298,6 @@ i3GEO.Interface =
 							i3GEO.pluginI3geo.inicia(camada);
 							continue;
 						} else {
-							if (camada.cache) {
-								urllayer = url + "&cache=" + camada.cache + "&layer=" + camada.name + "&r=" + Math.random();
-							} else {
-								urllayer = url + "&cache=&layer=" + camada.name + "&r=" + Math.random();
-							}
 							try {
 								// Layer types do mapserver
 								// MS_LAYER_POINT, MS_LAYER_LINE, MS_LAYER_POLYGON,
@@ -1311,7 +1306,6 @@ i3GEO.Interface =
 								// MS_LAYER_TILEINDEX, MS_LAYER_CHART
 								// temp = camada.type === 0 ? opcoes.gutter = 20 : opcoes.gutter = 0;
 								temp = camada.transitioneffect === "nao" ? opcoes.preload = 0 : opcoes.preload = Infinity;
-
 								//
 								// layers marcados com o metadata wmstile com valor
 								// 1 sao inseridos com Layer.TileCache
@@ -1361,6 +1355,13 @@ i3GEO.Interface =
 									if (camada.tiles === "sim" || camada.cache === "sim" || (camada.cortepixels && camada.cortepixels > 0)) {
 										opcoes.singleTile = false;
 									}
+									
+									if (camada.cache) {
+										urllayer = url + "&cache=" + camada.cache;
+									} else {
+										urllayer = url + "&cache=nao";
+									}
+									urllayer += "&layer=" + camada.name;
 									if (opcoes.singleTile === true) {
 										source = new ol.source.ImageWMS({
 											url : urllayer,
@@ -1370,6 +1371,7 @@ i3GEO.Interface =
 											},
 											projection : opcoes.projection
 										});
+										source.set("tipoServico", "ImageWMS");
 									} else {
 										source = new ol.source.WMTS({
 											url : urllayer,
@@ -1383,6 +1385,7 @@ i3GEO.Interface =
 											}),
 											wrapX : true
 										});
+										source.set("tipoServico", "WMTS");
 									}
 									source.set("name", camada.name);
 									opcoes.source = source;
@@ -1617,21 +1620,32 @@ i3GEO.Interface =
 			 * Atualiza o mapa atual, forcando o redesenho dos layers
 			 */
 			atualizaMapa : function() {
-				var layers = i3geoOL.layers, nlayers = layers.length, i;
+				var layer, layers = i3geoOL.layers, nlayers = layers.length, i, servico, source;
 				for (i = 0; i < nlayers; i++) {
-					if (layers[i].url) {
-						layers[i].mergeNewParams({
-							r : Math.random()
-						});
-						if (layers[i].url.search("\\?") >= 0) {
-							layers[i].url = layers[i].url.replace("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", "&foo=");
-							layers[i].url = layers[i].url + "&&";
+					layer = layers[i];
+					if (layer && layer != undefined) {
+						source = layer.getSource();
+						servico = source.getProperties().tipoServico;
+						if(servico === "WMTS"){
+							funcaoLoad = layer.getSource().getTileUrlFunction();
+							if(funcaoLoad){
+								layer.getSource().setTileUrlFunction(function() {
+									var url = funcaoLoad.apply(this, arguments);
+									url = url.replace("&cache=sim", "&cache=nao");
+									//console.info(layer.getSource().getProperties().tipoServico)
+									return url + '&r=' + Math.random();
+								});
+							}
 						}
-						// cache e um parametro especifico do i3geo
-						// utilizado por mapa_openlayers.php e mapa_googlemaps.php
-						layers[i].url = layers[i].url.replace("&cache=sim", "&cache=nao");
-						if (layers[i].visibility === true) {
-							layers[i].redraw();
+						if(servico === "ImageWMS"){
+							funcaoLoad = layer.getSource().getImageLoadFunction();
+							if(funcaoLoad){
+								layer.getSource().setImageLoadFunction(function(image,src) {
+									src = src.replace("&cache=sim", "&cache=nao");
+									src += '&r=' + Math.random();
+									image.getImage().src = src;
+								});
+							}
 						}
 					}
 				}
@@ -1641,16 +1655,30 @@ i3GEO.Interface =
 			 * Forca o redesenho de um layer especifico
 			 */
 			atualizaTema : function(retorno, tema) {
-				var layer = i3geoOL.getLayersByName(tema)[0], objtemas;
+				var layer = i3geoOL.getLayersByName(tema)[0], objtemas, funcaoLoad, servico, source;
 				if (layer && layer != undefined) {
-					if (layer.url) {
-						layer.mergeNewParams({
-							r : Math.random()
-						});
-						layer.url = layer.url.replace("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&", "&foo=");
-						layer.url = layer.url + "&&";
-						layer.url = layer.url.replace("&cache=sim", "&cache=nao");
-						layer.redraw();
+					source = layer.getSource();
+					servico = source.getProperties().tipoServico;
+					if(servico === "WMTS"){
+						funcaoLoad = layer.getSource().getTileUrlFunction();
+						if(funcaoLoad){
+							layer.getSource().setTileUrlFunction(function() {
+								var url = funcaoLoad.apply(this, arguments);
+								url = url.replace("&cache=sim", "&cache=nao");
+								//console.info(layer.getSource().getProperties().tipoServico)
+								return url + '&r=' + Math.random();
+							});
+						}
+					}
+					if(servico === "ImageWMS"){
+						funcaoLoad = layer.getSource().getImageLoadFunction();
+						if(funcaoLoad){
+							layer.getSource().setImageLoadFunction(function(image,src) {
+								src = src.replace("&cache=sim", "&cache=nao");
+								src += '&r=' + Math.random();
+								image.getImage().src = src;
+							});
+						}
 					}
 				}
 				if (retorno === "") {
--
libgit2 0.21.2