Commit 60f3c5d020479287152f960d8684789bd10c8804
1 parent
0cd386f5
Exists in
master
--no commit message
Showing
2 changed files
with
9 additions
and
3 deletions
Show diff stats
pacotes/tme/TME_i3geo.php
... | ... | @@ -84,7 +84,7 @@ $nomeFile = $dir_tmp."/tme".$nomeTemp.".kmz"; |
84 | 84 | $dataConnector = new DataConnector($_GET["sid"],$verificaSID); |
85 | 85 | |
86 | 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 | 89 | else{ |
90 | 90 | $dataStore = ""; | ... | ... |
pacotes/tme/TME_i3geo_DataConnector.php
... | ... | @@ -111,7 +111,7 @@ class DataConnector |
111 | 111 | } |
112 | 112 | |
113 | 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 | 115 | if(!function_exists("versao")){ |
116 | 116 | include(dirname(__FILE__)."/../../classesphp/funcoes_gerais.php"); |
117 | 117 | } |
... | ... | @@ -175,12 +175,18 @@ class DataConnector |
175 | 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 | 184 | $dataStore['features'][$i] = array( |
179 | 185 | "featureID"=>$i, |
180 | 186 | "name"=>$texto, |
181 | 187 | "lon"=>$pt->x, |
182 | 188 | "lat"=>$pt->y, |
183 | - "wkt"=>$shape->toWkt() | |
189 | + "wkt"=>$wkt | |
184 | 190 | ); |
185 | 191 | //[0] � o ano |
186 | 192 | foreach($colunasvalor as $colunavalor){ | ... | ... |