diff --git a/admin/php/editortexto.php b/admin/php/editortexto.php
index 458fa5f..aa43a1a 100755
--- a/admin/php/editortexto.php
+++ b/admin/php/editortexto.php
@@ -226,10 +226,10 @@ Alt-left - In&iacute;cio da linha<br>
 			<?php
 			$mapfile = str_replace("\\","/",$mapfile);
 			if(!empty($extensao)){
-				echo "<iframe id='mapaPreview' src='../../mashups/openlayers.php?mapext=".$extensao."&servidor=../admin/php/preview.php&fundo=e_wsm&nocache=sim&DESLIGACACHE=sim&controles=navigation,panzoombar,scaleline,mouseposition&botoes=identifica&largura=550&altura=400&temas=".$mapfile."' style='position:relative;top:2px;overflow:hidden;width:100%;height:450px;border:0px solid gray;'>";
+				echo "<iframe id='mapaPreview' src='../../mashups/openlayers3.php?mapext=".$extensao."&servidor=../admin/php/preview.php&fundo=e_wsm&nocache=sim&DESLIGACACHE=sim&controles=navigation,panzoombar,scaleline,mouseposition&botoes=identifica&largura=550&altura=400&temas=".$mapfile."' style='position:relative;top:2px;overflow:hidden;width:100%;height:450px;border:0px solid gray;'>";
 			}
 			else{
-				echo "<iframe id='mapaPreview' src='../../mashups/openlayers.php?servidor=../admin/php/preview.php&fundo=e_wsm&nocache=sim&DESLIGACACHE=sim&controles=navigation,panzoombar,scaleline,mouseposition&botoes=identifica&largura=550&altura=400&temas=".$mapfile."' style='position:relative;top:2px;overflow:hidden;width:100%;height:450px;border:0px solid gray;'>";
+				echo "<iframe id='mapaPreview' src='../../mashups/openlayers3.php?servidor=../admin/php/preview.php&fundo=e_wsm&nocache=sim&DESLIGACACHE=sim&controles=navigation,panzoombar,scaleline,mouseposition&botoes=identifica&largura=550&altura=400&temas=".$mapfile."' style='position:relative;top:2px;overflow:hidden;width:100%;height:450px;border:0px solid gray;'>";
 			}
 			echo "</iframe>";
 			echo "<input type=hidden name=tipo value=gravar />";
diff --git a/ferramentas/editorol/editorol.js b/ferramentas/editorol/editorol.js
index 79adab7..375de7f 100755
--- a/ferramentas/editorol/editorol.js
+++ b/ferramentas/editorol/editorol.js
@@ -243,14 +243,6 @@ i3GEO.editorOL =
 		matrixIds : [],
 		//utilizado pelo mashup
 		inicia : function() {
-			/*
-			var temp = i3GEO.editorOL.minresolution,
-				r = [ i3GEO.editorOL.minresolution ];
-			for (var j = 0; j < (i3GEO.editorOL.numzoom - 1); j++) {
-				temp = temp / 2;
-				r.push(temp);
-			}
-			*/
 			var projectionExtent, size,resolutions,matrixIds,z;
 			if (i3GEO.Interface.openlayers.googleLike === true) {
 				projectionExtent = ol.proj.get('EPSG:3857').getExtent();
@@ -352,16 +344,8 @@ i3GEO.editorOL =
 			if (i3GEO.editorOL.fundo != "") {
 				for (i = nfundo - 1; i >= 0; i--) {
 					if (fundo[i] != "") {
-						try {
-							i3GEO.editorOL[fundo[i]].transitionEffect = 'resize';
-							i3GEO.editorOL[fundo[i]].setVisibility(false);
-							i3GEO.editorOL[fundo[i]].singleTile = false;
-							alayers.push(i3GEO.editorOL[fundo[i]]);
-						} catch (e) {
-							if (alayers[0]) {
-								alayers[0].setVisibility(true);
-							}
-						}
+						alayers.push(i3GEO.editorOL[fundo[i]]);
+						i3GEO.editorOL[fundo[i]].setVisibility(true);
 					}
 				}
 			}
@@ -518,7 +502,7 @@ i3GEO.editorOL =
 			var layers = i3GEO.editorOL.layersLigados(), nlayers = layers.length, i, ins, combo =
 				"<select id=i3GEOOLlistaTemasBusca ><option value=''>----</option>";
 			for (i = 0; i < nlayers; i++) {
-				combo += "<option value='" + i + "' >" + layers[i].name + "</option>";
+				combo += "<option value='" + i + "' >" + layers[i].getProperties().name + "</option>";
 			}
 			combo += "</select>";
 			ins = "<div class=paragrafo >" + $trad("a7") + ":<br>" + combo;
diff --git a/mashups/openlayers3.php b/mashups/openlayers3.php
index bf7af74..e7ca5f9 100755
--- a/mashups/openlayers3.php
+++ b/mashups/openlayers3.php
@@ -118,26 +118,19 @@ if(isset($controles)){
 	$controles = strtolower($controles);
 	$controles = explode(",",$controles);
 	if(in_array("navigation",$controles)){
-		$objControles[] = "new OpenLayers.Control.Navigation()";
+		$objControles[] = "new ol.control.Zoom()";
 	}
 	if(in_array("panzoombar",$controles)){
-		$objControles[] = "new OpenLayers.Control.PanZoomBar()";
-	}
-	if(in_array("layerswitcher",$controles)){
-		$objControles[] = "new OpenLayers.Control.LayerSwitcher({'ascending':false})";
+		$objControles[] = "new ol.control.ZoomSlider()";
 	}
 	if(in_array("scaleline",$controles)){
-		$objControles[] = "new OpenLayers.Control.ScaleLine()";
+		$objControles[] = "new ol.control.ScaleLine()";
 	}
-	if(in_array("mouseposition",$controles))
-	{
-		$objControles[] = "new OpenLayers.Control.MousePosition({'separator':' '})";
+	if(in_array("mouseposition",$controles)){
+		$objControles[] = "new ol.control.MousePosition({coordinateFormat : function(c){return ol.coordinate.toStringHDMS(c);}})";
 	}
 	if(in_array("overviewmap",$controles)){
-		$objControles[] = "new OpenLayers.Control.OverviewMap()";
-	}
-	if(in_array("keyboarddefaults",$controles)){
-		$objControles[] = "new OpenLayers.Control.KeyboardDefaults()";
+		$objControles[] = "new ol.control.OverviewMap()";
 	}
 }
 //
@@ -385,6 +378,8 @@ if($temas != ""){
 							projection : "EPSG:4326",
 							ferramentas :'.$ferramentas.',
 							extent :'.$e.',
+							title: "'. $tituloLayer .'",
+							name: "'. $tema .'",
 							source: new ol.source.WMTS({
 								url : "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&tms=",
 								tileGrid : new ol.tilegrid.WMTS({
@@ -426,10 +421,19 @@ if($temas != ""){
 								$teffect = 'transitionEffect: null,';
 							}
 							if($tituloLayer != ""){
-								$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{opacity:'.$opacidade.',layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{'.$teffect.' singleTile:'.$singleTile.',visibility:'.$visivel.',isBaseLayer:'.$ebase.', ferramentas :'.$ferramentas.'})';
-							}
-							else{
-								$objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "'.$servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{opacity:'.$opacidade.',layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{'.$teffect.' displayInLayerSwitcher:false,singleTile:'.$singleTile.',visibility:'.$visivel.',isBaseLayer:'.$ebase.', ferramentas :'.$ferramentas.'})';
+								$url = $servidor.'?'.$nocache.'tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&';
+								$objOpenLayers[] = 'new ol.layer.Image({
+									extent: ['. $mapext .'],
+									source: new ol.source.ImageWMS({
+										url: "'. $url .'",
+										params: {
+											opacity:'.$opacidade.',layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"
+										},
+										serverType: "geoserver"
+									}),
+									title: "'. $tituloLayer .'",
+									name: "'. $tema .'"
+								})';
 							}
 						}
 					}
@@ -648,6 +652,16 @@ if(count($temasPluginI3Geo) > 0){
 	top: 2px;
 	font-size: 13px;
 }
+.ol-mouse-position {
+    margin: auto;
+    position: absolute;
+    right: 0;
+    top: 0;
+}
+.ol-overlaycontainer-stopevent .olControlEditingToolbar1 {
+	top: 15px;
+}
+
 </style>
 </head>
 <body class=" yui-skin-sam">
--
libgit2 0.21.2