diff --git a/ferramentas/identifica/twitter.php b/ferramentas/identifica/twitter.php
index e4e1a7b..b73f6df 100644
--- a/ferramentas/identifica/twitter.php
+++ b/ferramentas/identifica/twitter.php
@@ -4,66 +4,85 @@
 <link rel="stylesheet" type="text/css" href="../../css/i3geo45.css.php">
 <style>
 p {
-color:#2F4632;
-font-family:Verdana,Arial,Helvetica,sans-serif;
-font-size:12px;
-text-align:left;
+	color: #2F4632;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	text-align: left;
 }
 </style>
 </head>
-<body style="background-color:white;margin:10px">
-<?php
-if(empty($_GET["km"]))
-{$km = 5;}
-else
-{$km = $_GET["km"];}
-$par = $_GET["x"].",".$_GET["y"];
-echo "<p class=paragrafo >Raio de <input type=text size=4 value='$km' id=km onchange='recarrega($par,this.value)'> km</p>";
-include("../../classesphp/carrega_ext.php");
-$s = PHP_SHLIB_SUFFIX;
-if(!function_exists('curl_init'))
-{@dl( 'php_curl'.'.'.$s );}
-if(!function_exists('curl_init'))
-{echo "curl n&atilde;o instalado";return;}
-$curl = curl_init();
-curl_setopt ($curl, CURLOPT_URL, "http://search.twitter.com/search.json?geocode=".$_GET["y"].",".$_GET["x"].",".$km."km");
-//teste
-//curl_setopt ($curl, CURLOPT_URL, "http://search.twitter.com/search.json?geocode=37.781157,-122.398720,2km");
-curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-$result = curl_exec($curl);
-curl_close ($curl);
-$result = fixEncoding($result);
-$result = json_decode( $result, true );
+<body style="background-color: white; margin: 10px">
+	<?php
+	if(empty($_GET["km"]))
+	{
+		$km = 5;
+	}
+	else
+	{$km = $_GET["km"];
+	}
+	$par = $_GET["x"].",".$_GET["y"];
+	echo "<p class=paragrafo >Raio de <input type=text size=4 value='$km' id=km onchange='recarrega($par,this.value)'> km</p>";
+	include("../../classesphp/carrega_ext.php");
+	include("../../ms_configura.php");
+	$s = PHP_SHLIB_SUFFIX;
+	if(!function_exists('curl_init'))
+	{
+		@dl( 'php_curl'.'.'.$s );
+	}
+	if(!function_exists('curl_init'))
+	{
+		echo "curl n&atilde;o instalado";return;
+	}
 
-//echo "<pre>";
-//var_dump($result);
+	$ch = curl_init();
+	curl_setopt($ch,CURLOPT_URL, 'https://api.twitter.com/oauth2/token');
+	curl_setopt($ch,CURLOPT_POST, true);
+	$data = array();
+	$data['grant_type'] = "client_credentials";
+	curl_setopt($ch,CURLOPT_POSTFIELDS, $data);
+	$consumerKey = $twitteroauth["consumerkey"]; //add your app key
+	$consumerSecret = $twitteroauth["consumersecret"]; //add your app secret
+	curl_setopt($ch,CURLOPT_USERPWD, $consumerKey . ':' . $consumerSecret);
+	curl_setopt($ch,CURLOPT_RETURNTRANSFER, true);
+	$result = curl_exec($ch);
+	curl_close($ch);
+
+	$bearer_token = json_decode($result);
+	$bearer = $bearer_token->{'access_token'}; // this is your app token
+
+	$curl = curl_init();
+	curl_setopt($curl,CURLOPT_URL, "https://api.twitter.com/1.1/search/tweets.json?geocode=".$_GET["y"].",".$_GET["x"].",".$km."km");
+	curl_setopt($curl,CURLOPT_HTTPHEADER,array('Authorization: Bearer ' . $bearer));
+	curl_setopt($curl,CURLOPT_RETURNTRANSFER, true);
+
+	curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+	$result = curl_exec($curl);
+	curl_close ($curl);
+	$result = fixEncoding($result);
+	$result = json_decode( $result, true );
 
-if(isset($result["error"]) || count($result["results"]) == 0)
-{
-	echo "Nada encontrado";
-}
-else
-{
 	$html = "<table class='lista4'>";
-	foreach($result["results"] as $r)
-	{ 
-		
-		$html .= "<tr><td><img src='".$r["profile_image_url"]."' /></td>";
-		$html .= "<td><a href='http://twitter.com/".$r["from_user"]."' target=_blank '>".$r["from_user"]."</a><br>";
+	foreach($result["statuses"] as $r)
+	{
+		$usuario = $r["user"];
+		$html .= "<tr><td><img src='".$usuario["profile_image_url"]."' /></td>";
+		$html .= "<td><a href='http://twitter.com/".$usuario["screen_name"]."' target=_blank '>".$usuario["screen_name"]."</a><br>";
 		$html .= "<span style=color:gray >".$r["created_at"]."</span><br>";
 		$html .= $r["text"]."<br></td></tr>";
 	}
 	echo $html."</table>";
-}
-function fixEncoding($in_str)
-{
-	$cur_encoding = mb_detect_encoding($in_str) ;
-	if($cur_encoding == "UTF-8" && mb_check_encoding($in_str,"UTF-8"))
-	{return $in_str;}
-	else
-	{return utf8_encode($in_str);}
-} 
-?>
+	function fixEncoding($in_str)
+	{
+		$cur_encoding = mb_detect_encoding($in_str) ;
+		if($cur_encoding == "UTF-8" && mb_check_encoding($in_str,"UTF-8"))
+		{
+			return $in_str;
+		}
+		else
+		{return utf8_encode($in_str);
+		}
+	}
+	?>
 </body>
 <script>
 function recarrega(x,y,km){
diff --git a/ferramentas/identifica/twitterplaces.php b/ferramentas/identifica/twitterplaces.php
index f27cc3d..abcc219 100644
--- a/ferramentas/identifica/twitterplaces.php
+++ b/ferramentas/identifica/twitterplaces.php
@@ -19,19 +19,34 @@ if(!function_exists('curl_init'))
 {@dl( 'php_curl'.'.'.$s );}
 if(!function_exists('curl_init'))
 {echo "curl n&atilde;o instalado";}
-$curl = curl_init();
-//lista de places
-curl_setopt ($curl, CURLOPT_URL, "http://api.twitter.com/1/geo/nearby_places.json?lat=".$_GET["y"]."&long=".$_GET["x"]."&accuracy=0&granularity=neighborhood");
-curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-$result = curl_exec($curl);
-curl_close ($curl);
+include("../../ms_configura.php");
+
+
+$ch = curl_init();
+curl_setopt($ch,CURLOPT_URL, 'https://api.twitter.com/oauth2/token');
+curl_setopt($ch,CURLOPT_POST, true);
+$data = array();
+$data['grant_type'] = "client_credentials";
+curl_setopt($ch,CURLOPT_POSTFIELDS, $data);
+$consumerKey = $twitteroauth["consumerkey"]; //add your app key
+$consumerSecret = $twitteroauth["consumersecret"]; //add your app secret
+curl_setopt($ch,CURLOPT_USERPWD, $consumerKey . ':' . $consumerSecret);
+curl_setopt($ch,CURLOPT_RETURNTRANSFER, true);
+$result = curl_exec($ch);
+curl_close($ch);
+
+$bearer_token = json_decode($result);
+$bearer = $bearer_token->{'access_token'}; // this is your app token
+
+$curl = curl_init();
+curl_setopt($curl,CURLOPT_URL, "https://api.twitter.com/1.1/geo/reverse_geocode.json?lat=".$_GET["y"]."&long=".$_GET["x"]."&accuracy=0&granularity=neighborhood");
+curl_setopt($curl,CURLOPT_HTTPHEADER,array('Authorization: Bearer ' . $bearer));
+curl_setopt($curl,CURLOPT_RETURNTRANSFER, true);
+$result = curl_exec($curl);
+curl_close ($curl);
 $result = fixEncoding($result);
 $result = json_decode( $result, true );
-/*
-echo "<pre>";
-var_dump($result);
-exit;
-*/
+
 if(isset($result["error"]) || count($result["result"]["places"]) == 0)
 {
 	echo "Nada encontrado";
@@ -41,8 +56,8 @@ else
 	$html = "<table class='lista4'>";
 	$places = $result["result"]["places"];
 	foreach($places as $p)
-	{ 
-		
+	{
+
 		$html .= "<tr>";
 		$html .= "<td><a href='http://search.twitter.com/search?q=place:".$p["id"]."' target=_self '>".$p["full_name"]."</a><br>";
 		$html .= "<span style=color:gray >".$p["place_type"]."</span>";
@@ -57,6 +72,6 @@ function fixEncoding($in_str)
 	{return $in_str;}
 	else
 	{return utf8_encode($in_str);}
-} 
+}
 ?>
 </body>
\ No newline at end of file
diff --git a/temas/_lubs.map b/temas/_lubs.map
index 20df220..f2be158 100755
--- a/temas/_lubs.map
+++ b/temas/_lubs.map
@@ -2,17 +2,19 @@ MAP
   FONTSET "../symbols/fontes.txt"
   SYMBOLSET "../symbols/simbolos.sym"
   LAYER
-    CONNECTION "user=guest_sala password= dbname=dbspo host= port=5432"
+    CONNECTION "user=guest_sala password= dbname=dbspo host=10.1.2.25 port=5432"
     CONNECTIONTYPE POSTGIS
     DATA "the_geom from (
 		SELECT
-		st_geomfromtext('POINT(' || dbgeral.tb_estab_geo.long || ' ' || dbgeral.tb_estab_geo.lat || ')', 4326)as the_geom,
-		dbsismob.tb_sismob_unid_func.no_unidade,
-		tb_sismob_unid_func.co_cnes as gid,
-		dbgeral.tb_ibge.uf,
-		dbgeral.tb_ibge.cidade,
-		dbacoes_saude.tb_cnes_estabelecimento.no_logradouro,
-		dbacoes_saude.tb_cnes_estabelecimento.no_bairro
+		st_geomfromtext('POINT(' || dbgeral.tb_estab_geo.long || ' ' || dbgeral.tb_estab_geo.lat || ')', 4326) as the_geom,
+		'UBS - '||dbsismob.tb_sismob_unid_func.no_unidade||' - cnes:'||tb_sismob_unid_func.co_cnes as nome,
+		dbgeral.tb_ibge.uf
+		||' ,'
+		||dbgeral.tb_ibge.cidade
+		||' ,'
+		||dbacoes_saude.tb_cnes_estabelecimento.no_logradouro
+		||' ,'||dbacoes_saude.tb_cnes_estabelecimento.no_bairro as desc,
+		tb_sismob_unid_func.co_cnes as cnes
 		FROM
 		dbsismob.tb_sismob_unid_func
 		INNER JOIN dbacoes_saude.tb_cnes_estabelecimento ON
@@ -21,8 +23,8 @@ MAP
 			ON dbsismob.tb_sismob_unid_func.co_ibge = dbgeral.tb_ibge.ibge
 		INNER JOIN dbgeral.tb_estab_geo
 			ON dbsismob.tb_sismob_unid_func.co_cnes = dbgeral.tb_estab_geo.co_cnes
-				WHERE dbsismob.tb_sismob_unid_func.co_sismob_programa = 1	limit 100
-		) as foo using unique gid using srid=4326"
+				WHERE dbsismob.tb_sismob_unid_func.co_sismob_programa = 1 limit 500
+		) as foo using unique cnes using srid=4326"
     METADATA
       "METAESTAT_ID_MEDIDA_VARIAVEL"	""
       "CLASSE"	"SIM"
--
libgit2 0.21.2
	".$r["from_user"]." "; + foreach($result["statuses"] as $r) + { + $usuario = $r["user"]; + $html .= "
	".$usuario["screen_name"]." "; $html .= "".$r["created_at"]." "; $html .= $r["text"]."