--no commit message

Edmar Moretti
1 parent 41f53b94
Showing 2 changed files with 57 additions and 38 deletions Show diff stats
ferramentas/cesium/kml3d.php
ferramentas/tme/index.js
@@ -4,45 +4,55 @@ include(&quot;../../classesphp/pega_variaveis.php&quot;);
 include("../../classesphp/funcoes_gerais.php");
 //define o centro, pegando as coordenadas do mapa de inicializacao
 $versao = versao();
-$versao = $versao["principal"];
-if(isset($base) && $base != ""){
-	if(file_exists($base)){
-		$f = $base;
-	}
-	else{
-		$f = $locaplic."/aplicmap/".$base.".map";
-	}
-}
-else
-{
-	$f = "";
-	if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')){
-		$f = $locaplic."/aplicmap/geral1windowsv".$versao.".map";
-	}
-	else{
-		if($f == "" && file_exists('/var/www/i3geo/aplicmap/geral1debianv'.$versao.'.map')){
-			$f = "/var/www/i3geo/aplicmap/geral1debianv".$versao.".map";
+$versao = $versao["principal"];
+$centroX = -55;
+$centroY = -13;
+$extensao = "-180,-90,180,90";
+if(!isset($mapext)){
+	if(isset($base) && $base != ""){
+		if(file_exists($base)){
+			$f = $base;
 		}
-		if($f == "" && file_exists('/var/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){
-			$f = "/var/www/html/i3geo/aplicmap/geral1fedorav".$versao.".map";
+		else{
+			$f = $locaplic."/aplicmap/".$base.".map";
 		}
-		if($f == "" && file_exists('/opt/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){
-			$f = "/opt/www/html/i3geo/aplicmap/geral1v".$versao.".map";
+	}
+	else
+	{
+		$f = "";
+		if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')){
+			$f = $locaplic."/aplicmap/geral1windowsv".$versao.".map";
 		}
-		if($f == "")
-		{
-			$f = $locaplic."/aplicmap/geral1v".$versao.".map";
+		else{
+			if($f == "" && file_exists('/var/www/i3geo/aplicmap/geral1debianv'.$versao.'.map')){
+				$f = "/var/www/i3geo/aplicmap/geral1debianv".$versao.".map";
+			}
+			if($f == "" && file_exists('/var/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){
+				$f = "/var/www/html/i3geo/aplicmap/geral1fedorav".$versao.".map";
+			}
+			if($f == "" && file_exists('/opt/www/html/i3geo/aplicmap/geral1fedorav'.$versao.'.map')){
+				$f = "/opt/www/html/i3geo/aplicmap/geral1v".$versao.".map";
+			}
+			if($f == "")
+			{
+				$f = $locaplic."/aplicmap/geral1v".$versao.".map";
+			}
 		}
-	}
-}
-$centroX = -55;
-$centroY = -13;
-if(@ms_newMapObj($f)){
-	$mapa = ms_newMapObj($f);
+	}
-	$c = $mapa->extent;
-	$centroX = $c->maxx - ($c->maxx - $c->minx) / 2;
-	$centroY = $c->maxy - ($c->maxy - $c->miny) / 2;
+	if(@ms_newMapObj($f)){
+		$mapa = ms_newMapObj($f);
+		$c = $mapa->extent;
+		$centroX = $c->maxx - ($c->maxx - $c->minx) / 2;
+		$centroY = $c->maxy - ($c->maxy - $c->miny) / 2;
+		$extensao = $c->minx.",".$c->miny.",".$c->maxx.",".$c->maxy;
+	}
+}
+else{
+	$c = explode(" ",$mapext);
+	$centroX = $c[2] - ($c[2] - $c[0]) / 2;
+	$centroY = $c[3] - ($c[3] - $c[1]) / 2;
+	$extensao = $c[0].",".$c[1].",".$c[2].",".$c[3];	
 }
 ?>
 <!DOCTYPE html>
@@ -101,6 +111,10 @@ body {
 		<img src='<?php echo strip_tags($legenda);?>' />
 	</div>
 	<script>
+	var extent = Cesium.Rectangle.fromDegrees(<?php echo $extensao;?>);
+
+	Cesium.Camera.DEFAULT_VIEW_RECTANGLE = extent;
+	Cesium.Camera.DEFAULT_VIEW_FACTOR = 0;
 	var viewer = new Cesium.Viewer(
 		'cesiumContainer',
 		{
@@ -113,11 +127,13 @@ body {
 	if('<?php echo $kmlurl;?>' != ''){
 		viewer.dataSources.add(Cesium.KmlDataSource.load('<?php echo strip_tags($kmlurl);?>'))
 	}
+	/*
 	var center = Cesium.Cartesian3.fromDegrees(<?php echo $centroX.",".$centroY;?>);
     var transform = Cesium.Transforms.eastNorthUpToFixedFrame(center);
     var camera = viewer.camera;
     camera.constrainedAxis = Cesium.Cartesian3.UNIT_Z;
-    camera.lookAtTransform(transform, new Cesium.Cartesian3(-120000.0, -120000.0, 120000.0));
+    camera.lookAtTransform(transform, new Cesium.Cartesian3(0,0, 12000000.0));
+    */
 </script>
 </body>
 </html>
@@ -422,13 +422,15 @@ i3GEOF.tme =
 				temp =
 					function(retorno) {
 						i3GEOF.tme.aguarde.visibility = "hidden";
-						var url, ins =
+						var ext, url, ins =
 							"<p class=paragrafo >" + $trad('arquivoDownload', i3GEOF.tme.dicionario)
 								+ "<br><a href='"
 								+ retorno.data.url
 								+ "' target=new >"
 								+ retorno.data.url
 								+ "</a><br>";
+						ext = i3GEO.parametros.mapexten;
+						ext = i3GEO.util.extOSM2Geo(ext);
 						url = i3GEO.configura.locaplic + "/ms_criamapa.php?interface=googleearth.phtml&kmlurl=" + retorno.data.url;
 						ins +=
 							"<br>" + $trad('abreNoI3geo', i3GEOF.tme.dicionario)
@@ -441,7 +443,8 @@ i3GEOF.tme =
 							i3GEO.configura.locaplic + "/ferramentas/cesium/kml3d.php?kmlurl="
 								+ retorno.data.url
 								+ "&legenda="
-								+ retorno.data.legenda;
+								+ retorno.data.legenda
+								+ "&mapext=" + ext;
 						ins +=
 							"<br>" + $trad('abreNoCesium', i3GEOF.tme.dicionario)
 								+ "<br><a href='"
@@ -482,4 +485,4 @@ i3GEOF.tme =
 				i3GEOF.tme.aguarde.visibility = "hidden";
 			}
 		}
-	};
 \ No newline at end of file
+	};