Alteração na função que retorna a lista de indicadores para o catálogo do mapa d…

…a saúde, para melhorar a performance

Alteração na função que retorna a lista de indicadores para o catálogo do mapa d…
…a saúde, para melhorar a performance
Edmar Moretti
1 parent 5e50a90d
Showing 4 changed files with 102 additions and 7 deletions Show diff stats
classesphp/classe_metaestatinfo.php
classesphp/classe_temas.php
classesphp/funcoes_gerais.php
classesphp/metaestat_controle.php
@@ -1889,16 +1889,25 @@ class MetaestatInfo{
         else{
             $vs = $this->listaVariavel();
         }
+
+        $lista = $this->listaMedidaVariavel();
+        $lista = array_group_by($lista, "codigo_variavel");
+
         foreach($vs as $v){
             $nivel1["id"] = $v["codigo_variavel"];
             $nivel1["titulo"] = $v["nome"];
             $nivel1["descricao"] = $v["descricao"];
-            $ms = $this->listaMedidaVariavel($v["codigo_variavel"]);
+            //$ms = $this->listaMedidaVariavel($v["codigo_variavel"]);
+
+            $ms = $lista[$v["codigo_variavel"]];
+
             $nivel1["filhos"] = array();
             foreach($ms as $m){
                 $nivel2["id"] = $m["id_medida_variavel"];
                 $nivel2["titulo"] = $m["nomemedida"];
-                $unidade = $this->listaUnidadeMedida($m["codigo_unidade_medida"]);
+                //$unidade = $this->listaUnidadeMedida($m["codigo_unidade_medida"]);
+
+                $unidade = $lista[$m["codigo_unidade_medida"]];
                 $unidade = "Unidade de medida: ".$unidade["nome"];
                 $periodo = $this->listaTipoPeriodo($m["codigo_tipo_periodo"]);
                 $periodo = "Per&iacute;odo de tempo: ".$periodo["nome"];
@@ -959,18 +959,22 @@ $wkt - boolean indicando se $xy e um WKT
 		}
 		$pinlayer->addfeature($shp);
-		if($nomeTema != ""){
-			$pinlayer->setmetadata("tema",$nomeTema);
-		}
+
 		//verifica a projecao
 		$c = $shp->getCentroid();
-		$c = $c->x;
-		if($c > -181 && $c < 181){
+		if($c->x > -181 && $c->x < 181){
 			$pinlayer->setprojection(pegaProjecaoDefault("proj4"));
+			$extensao = ($c->x - 0.01)." ".($c->y - 0.01)." ".($c->x + 0.01)." ".($c->y + 0.01);
 		}
 		else{
 			$pinlayer->setprojection($this->mapa->getProjection());
+			$extensao = ($c->x - 50000)." ".($c->y - 50000)." ".($c->x + 50000)." ".($c->y + 50000);
 		}
+		$pinlayer->setmetadata("extensao",$extensao);
+		if($nomeTema != ""){
+		    $pinlayer->setmetadata("tema",$nomeTema);
+		}
+
 		return("ok");
 	}
 /*
@@ -3556,4 +3556,70 @@ function pegaDadosAdmin($sql,$dbh=&quot;&quot;){
         throw new Exception("pegaDadosAdmin");
     }
 }
+/**
+ * Groups an array by a given key.
+ *
+ * Groups an array into arrays by a given key, or set of keys, shared between all array members.
+ *
+ * Based on {@author Jake Zatecky}'s {@link https://github.com/jakezatecky/array_group_by array_group_by()} function.
+ * This variant allows $key to be closures.
+ *
+ * @param array $array   The array to have grouping performed on.
+ * @param mixed $key,... The key to group or split by. Can be a _string_,
+ *                       an _integer_, a _float_, or a _callable_.
+ *
+ *                       If the key is a callback, it must return
+ *                       a valid key from the array.
+ *
+ *                       If the key is _NULL_, the iterated element is skipped.
+ *
+ *                       ```
+ *                       string|int callback ( mixed $item )
+ *                       ```
+ *
+ * @return array|null Returns a multidimensional array or `null` if `$key` is invalid.
+ */
+function array_group_by(array $array, $key)
+{
+    if (!is_string($key) && !is_int($key) && !is_float($key) && !is_callable($key) ) {
+        //trigger_error('array_group_by(): The key should be a string, an integer, or a callback', E_USER_ERROR);
+        return null;
+    }
+
+    $func = (!is_string($key) && is_callable($key) ? $key : null);
+    $_key = $key;
+
+    // Load the new array, splitting by the target key
+    $grouped = [];
+    foreach ($array as $value) {
+        $key = null;
+
+        if (is_callable($func)) {
+            $key = call_user_func($func, $value);
+        } elseif (is_object($value) && isset($value->{$_key})) {
+            $key = $value->{$_key};
+        } elseif (isset($value[$_key])) {
+            $key = $value[$_key];
+        }
+
+        if ($key === null) {
+            continue;
+        }
+
+        $grouped[$key][] = $value;
+    }
+
+    // Recursively build a nested grouping if more parameters are supplied
+    // Each grouped array value is grouped according to the next sequential key
+    if (func_num_args() > 2) {
+        $args = func_get_args();
+
+        foreach ($grouped as $key => $value) {
+            $params = array_merge([ $value ], array_slice($args, 2, func_num_args()));
+            $grouped[$key] = call_user_func_array('array_group_by', $params);
+        }
+    }
+
+    return $grouped;
+}
 ?>
@@ -38,6 +38,22 @@ switch (strtoupper($funcao)) {
         $layers = explode(",", $_pg["layers"]);
         $map = ms_newMapObj($map_file);
         break;
+    case "LISTACOMPLETA":
+        $arq = $dir_tmp."/listaDeVariaveis.json";
+        if (file_exists($arq)){
+            $dados = unserialize(file_get_contents($arq));
+            retornaJSON($dados);
+            exit;
+        }
+        $m = new MetaestatInfo();
+        $dados = $m->relatorioCompleto();
+        if(empty($_pg["cache"]) || $_pg["cache"] == "false" || $_pg["cache"] == false){
+            if (!file_exists($arq)){
+                gravaDados([serialize($dados)], $arq);
+            }
+        }
+        retornaJSON($dados);
+        break;
     case "RELATORIOCOMPLETO":
         $m = new MetaestatInfo();
         if (empty($_pg["codigo_variavel"])) {
	@@ -3556,4 +3556,70 @@ function pegaDadosAdmin($sql,$dbh=""){		@@ -3556,4 +3556,70 @@ function pegaDadosAdmin($sql,$dbh=""){
3556	throw new Exception("pegaDadosAdmin");	3556	throw new Exception("pegaDadosAdmin");
3557	}	3557	}
3558	}	3558	}
		3559	+/**
		3560	+ * Groups an array by a given key.
		3561	+ *
		3562	+ * Groups an array into arrays by a given key, or set of keys, shared between all array members.
		3563	+ *
		3564	+ * Based on {@author Jake Zatecky}'s {@link https://github.com/jakezatecky/array_group_by array_group_by()} function.
		3565	+ * This variant allows $key to be closures.
		3566	+ *
		3567	+ * @param array $array The array to have grouping performed on.
		3568	+ * @param mixed $key,... The key to group or split by. Can be a _string_,
		3569	+ * an _integer_, a _float_, or a _callable_.
		3570	+ *
		3571	+ * If the key is a callback, it must return
		3572	+ * a valid key from the array.
		3573	+ *
		3574	+ * If the key is _NULL_, the iterated element is skipped.
		3575	+ *
		3576	+ * ```
		3577	+ * string\|int callback ( mixed $item )
		3578	+ * ```
		3579	+ *
		3580	+ * @return array\|null Returns a multidimensional array or `null` if `$key` is invalid.
		3581	+ */
		3582	+function array_group_by(array $array, $key)
		3583	+{
		3584	+ if (!is_string($key) && !is_int($key) && !is_float($key) && !is_callable($key) ) {
		3585	+ //trigger_error('array_group_by(): The key should be a string, an integer, or a callback', E_USER_ERROR);
		3586	+ return null;
		3587	+ }
		3588	+
		3589	+ $func = (!is_string($key) && is_callable($key) ? $key : null);
		3590	+ $_key = $key;
		3591	+
		3592	+ // Load the new array, splitting by the target key
		3593	+ $grouped = [];
		3594	+ foreach ($array as $value) {
		3595	+ $key = null;
		3596	+
		3597	+ if (is_callable($func)) {
		3598	+ $key = call_user_func($func, $value);
		3599	+ } elseif (is_object($value) && isset($value->{$_key})) {
		3600	+ $key = $value->{$_key};
		3601	+ } elseif (isset($value[$_key])) {
		3602	+ $key = $value[$_key];
		3603	+ }
		3604	+
		3605	+ if ($key === null) {
		3606	+ continue;
		3607	+ }
		3608	+
		3609	+ $grouped[$key][] = $value;
		3610	+ }
		3611	+
		3612	+ // Recursively build a nested grouping if more parameters are supplied
		3613	+ // Each grouped array value is grouped according to the next sequential key
		3614	+ if (func_num_args() > 2) {
		3615	+ $args = func_get_args();
		3616	+
		3617	+ foreach ($grouped as $key => $value) {
		3618	+ $params = array_merge([ $value ], array_slice($args, 2, func_num_args()));
		3619	+ $grouped[$key] = call_user_func_array('array_group_by', $params);
		3620	+ }
		3621	+ }
		3622	+
		3623	+ return $grouped;
		3624	+}
3559	?>	3625	?>
	@@ -38,6 +38,22 @@ switch (strtoupper($funcao)) {		@@ -38,6 +38,22 @@ switch (strtoupper($funcao)) {
38	$layers = explode(",", $_pg["layers"]);	38	$layers = explode(",", $_pg["layers"]);
39	$map = ms_newMapObj($map_file);	39	$map = ms_newMapObj($map_file);
40	break;	40	break;
		41	+ case "LISTACOMPLETA":
		42	+ $arq = $dir_tmp."/listaDeVariaveis.json";
		43	+ if (file_exists($arq)){
		44	+ $dados = unserialize(file_get_contents($arq));
		45	+ retornaJSON($dados);
		46	+ exit;
		47	+ }
		48	+ $m = new MetaestatInfo();
		49	+ $dados = $m->relatorioCompleto();
		50	+ if(empty($_pg["cache"]) \|\| $_pg["cache"] == "false" \|\| $_pg["cache"] == false){
		51	+ if (!file_exists($arq)){
		52	+ gravaDados([serialize($dados)], $arq);
		53	+ }
		54	+ }
		55	+ retornaJSON($dados);
		56	+ break;
41	case "RELATORIOCOMPLETO":	57	case "RELATORIOCOMPLETO":
42	$m = new MetaestatInfo();	58	$m = new MetaestatInfo();
43	if (empty($_pg["codigo_variavel"])) {	59	if (empty($_pg["codigo_variavel"])) {