Download as
Browse Code »

Commit 0c1edb3a9baa7012c320c658f15ea3ef7f0a60f8

Authored by Edmar Moretti
1 parent 259fb1db
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

--no commit message

Showing 2 changed files with 9 additions and 3 deletions   Show diff stats
pacotes/tme/TME_i3geo.php
  Diff comments   View file @0c1edb3
@@ -84,7 +84,7 @@ $nomeFile = $dir_tmp."/tme".$nomeTemp.".kmz"; @@ -84,7 +84,7 @@ $nomeFile = $dir_tmp."/tme".$nomeTemp.".kmz";
84 $dataConnector = new DataConnector($_GET["sid"],$verificaSID); 84 $dataConnector = new DataConnector($_GET["sid"],$verificaSID);
85 85
86 if(!file_exists($nomeFile)){ 86 if(!file_exists($nomeFile)){
87 - $dataStore = $dataConnector->getDataStore($_GET["nomelayer"],$colunas,$_GET["colunanomeregiao"],$_GET["titulo"],$_GET["descricao"],""); 87 + $dataStore = $dataConnector->getDataStore($_GET["nomelayer"],$colunas,$_GET["colunanomeregiao"],$_GET["titulo"],$_GET["descricao"],"","bar");
88 } 88 }
89 else{ 89 else{
90 $dataStore = ""; 90 $dataStore = "";
pacotes/tme/TME_i3geo_DataConnector.php
  Diff comments   View file @0c1edb3
@@ -111,7 +111,7 @@ class DataConnector @@ -111,7 +111,7 @@ class DataConnector
111 } 111 }
112 112
113 // Make data store 113 // Make data store
114 - function getDataStore($nomelayer,$colunasvalor,$colunanomeregiao,$titulo,$descricao,$ext=""){ //$indicatorID, $year, $region){ 114 + function getDataStore($nomelayer,$colunasvalor,$colunanomeregiao,$titulo,$descricao,$ext="",$mapType=""){ //$indicatorID, $year, $region){
115 if(!function_exists("versao")){ 115 if(!function_exists("versao")){
116 include(dirname(__FILE__)."/../../classesphp/funcoes_gerais.php"); 116 include(dirname(__FILE__)."/../../classesphp/funcoes_gerais.php");
117 } 117 }
@@ -175,12 +175,18 @@ class DataConnector @@ -175,12 +175,18 @@ class DataConnector
175 $texto = mb_convert_encoding($texto,"ISO-8859-1","UTF-8"); 175 $texto = mb_convert_encoding($texto,"ISO-8859-1","UTF-8");
176 } 176 }
177 */ 177 */
  178 + if($mapType == "bar"){
  179 + $wkt = "";
  180 + }
  181 + else{
  182 + $wkt = $shape->toWkt();
  183 + }
178 $dataStore['features'][$i] = array( 184 $dataStore['features'][$i] = array(
179 "featureID"=>$i, 185 "featureID"=>$i,
180 "name"=>$texto, 186 "name"=>$texto,
181 "lon"=>$pt->x, 187 "lon"=>$pt->x,
182 "lat"=>$pt->y, 188 "lat"=>$pt->y,
183 - "wkt"=>$shape->toWkt() 189 + "wkt"=>$wkt
184 ); 190 );
185 //[0] � o ano 191 //[0] � o ano
186 foreach($colunasvalor as $colunavalor){ 192 foreach($colunasvalor as $colunavalor){