diff --git a/files/stops.txt b/files/stops.txt
index 9066d78..4403c2b 100644
--- a/files/stops.txt
+++ b/files/stops.txt
@@ -197,8 +197,8 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 020085,ALMADA (PÇA S JOÃO BAPTISTA) JUNTO CGD,38.679000,-9.157770,0,0,1,0,,,Almada ( Práça São João Baptista ) Junto Banco . ( Há correspondência ) com o métro ligeiro ,0,,,020085,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0
 020087,FEIJÓ (ALMADA FÓRUM),38.659320,-9.173050,0,0,1,0,,,Feijó ( Almada Fórum ),0,,,020087,,1,,,,Feijó,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020088,FEIJÓ (ALMADA FÓRUM),38.659227,-9.173274,0,0,1,0,,,Feijó ( Almada Fórum ),0,,,020088,,1,,,,Feijó,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,1,109,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-020089,R António Aleixo 2c,38.656751,-9.162570,0,0,1,0,,,Feijó ( Rua António Aleixo ( Número 6 ) ),0,,,020089,,1,,,,Feijó,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-020090,R António Aleixo Fte 6,38.656870,-9.163080,0,0,1,0,,,Feijó ( Rua António Aleixo ( Número 6 ) ),0,,,020090,,1,,,,Feijó,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+020089,R António Aleixo 2c,38.656751,-9.162570,0,0,1,0,,,Rua António Aleixo 2 Cê,0,,,020089,,1,,,,Feijó,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+020090,R António Aleixo Fte 6,38.656870,-9.163080,0,0,1,0,,,Rua António Aleixo ( Frente Ao Número 6,0,,,020090,,1,,,,Feijó,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020091,R ARY SANTOS 16 - C.COMERCIAL,38.658330,-9.161730,0,0,1,0,,,Rua Ary Santos 16 - Centro Comercial,0,,,020091,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020092,R ARY SANTOS 16 - C.COMERCIAL,38.658250,-9.161830,0,0,1,0,,,Rua Ary Santos 16 - Centro Comercial,0,,,020092,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020093,Bº B GONÇALVES (R ARY SANTOS 4B),38.659950,-9.161970,0,0,1,0,,,Bairro B Gonçalves ( Rua Ary Santos 4 B ),0,,,020093,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -298,9 +298,9 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 020211,R DOM JOSÉ DE MASCARENHAS N65,38.683862,-9.154900,0,0,1,0,,,Rua Dom José De Mascarenhas ( Número 65 ),0,,,020211,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020213,R FRANCISCO DE ANDRADE 1,38.683541,-9.153309,0,0,1,0,,,Rua Francisco De Andrade - Um,0,,,020213,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020215,R INFANTA DONA BEATRIZ 1,38.684818,-9.152425,0,0,1,0,,,Rua Infanta Dona Beatriz - Um,0,,,020215,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-020217,R Elias Garcia 11,38.685292,-9.150579,0,0,1,0,,,Rua Elias Garcia 36 Á . ( Há correspondência ) com o métro ligeiro ,0,,,020217,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0
+020217,R Elias Garcia 11,38.685292,-9.150579,0,0,1,0,,,Rua Elias Garcia 11 . ( Há correspondência ) com o métro ligeiro ,0,,,020217,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0
 020219,CACILHAS (LARGO ALF DINIS ALEX) TER P3 _,38.687363,-9.147796,0,0,1,0,,,Cacilhas ( Largo Alfredo Dinis Alex) Terminál ( P 3 ) . ( Há correspondência ) com o métro ligeiro ,0,,,020219,,1,,,,Cacilhas,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0
-020221,R Comandante António Feio 10,38.685031,-9.150392,0,0,1,0,,,25 De Abril,0,,,020221,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+020221,R Comandante António Feio 10,38.685031,-9.150392,0,0,1,0,,,Rua Comandante António Feio 10,0,,,020221,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020223,AROEIRA (AV BELVERDE 1),38.585360,-9.167430,0,0,1,0,,,Aroeira ( Avenida Belverde - Um ),0,,,020223,,1,,,,Aroeira,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020224,AROEIRA (AV BELVERDE 1),38.585476,-9.167538,0,0,1,0,,,Aroeira ( Avenida Belverde - Um ),0,,,020224,,1,,,,Aroeira,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020225,AV DOM AFONSO HENRIQUES N28,38.586300,-9.173860,0,0,1,0,,,Avenida Dom Afonso Henriques ( Número 28 ),0,,,020225,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -426,7 +426,7 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 020380,EN10-1 (23A),38.668010,-9.229200,0,0,1,0,,,Estrada Nacional 10 - - Um ( 23 Á ),0,,,020380,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020381,TRAFARIA (AV BULHÃO PATO N67),38.670900,-9.231030,0,0,1,0,,,Trafaria ( Avenida Bulhão Pato ( Número 67 ) ),0,,,020381,,1,,,,Trafaria,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020383,TRAFARIA (AV BULHÃO PATO N29),38.672500,-9.231110,0,0,1,0,,,Trafaria ( Avenida Bulhão Pato ( Número 29 ) ),0,,,020383,,1,,,,Trafaria,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-020385,Trafaria (Terminal) P1,38.673839,-9.231582,0,0,1,0,,,Trafaria ( Largo Porto Lisboa ) Terminal . ( Há correspondência ) com o barco ,0,,,020385,,1,,,,Trafaria,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,1,124,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0
+020385,Trafaria (Terminal) P1,38.673839,-9.231582,0,0,1,0,,,Trafaria ( Terminal ) ( P 1 ) . ( Há correspondência ) com o barco ,0,,,020385,,1,,,,Trafaria,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,1,124,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0
 020387,TRAFARIA (R LIBERDADE N10),38.672800,-9.232260,0,0,1,0,,,Trafaria ( Rua Liberdade ( Número 10 ) ),0,,,020387,,1,,,,Trafaria,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020389,TRAFARIA (R LIBERDADE N46),38.671020,-9.231760,0,0,1,0,,,Trafaria ( Rua Liberdade ( Número 46 ) ),0,,,020389,,1,,,,Trafaria,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020391,EN10-1 (QTA GUEDES),38.665100,-9.218930,0,0,1,0,,,Estrada Nacional 10 - - Um ( Quinta Guedes ),0,,,020391,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -655,8 +655,8 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 020703,COSTA CAPARICA (AV D SEBASTIÃO 10),38.642990,-9.232630,0,0,1,0,,,Costa Da Caparíca ( Avenida Dom Sebastião 10 ),0,,,020703,,1,,,,Costa da Caparica,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0
 020705,COSTA CAPARICA (TORRE DAS ARGOLAS) TER P5,38.640496,-9.230573,0,0,1,0,,,Costa Da Caparíca ( Torre Das Argolas ) Terminál ( P 5 ),0,,,020705,,1,,,,Costa da Caparica,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020707,LAZARIM (R AREEIRO) ROTUNDA CAMPO FLORES,38.647320,-9.202410,0,0,1,0,,,Lazarim ( Rua Areeiro ) Rotunda Campo Flores,0,,,020707,,1,,,,Lazarim,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-020709,R Movimento das Forças Armadas Fte 85,38.644735,-9.195711,0,0,1,0,,,Morgadinha ( Quinta Quinta Grou ) Rua Movimento Das Forças Armadas 85,0,,,020709,,1,,,,Morgadinha,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-020710,R Movimento das Forças Armadas 81,38.644440,-9.195944,0,0,1,0,,,Morgadinha ( Quinta Quinta Grou ) Rua Movimento Das Forças Armadas 85,0,,,020710,,1,,,,Morgadinha,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+020709,R Movimento das Forças Armadas Fte 85,38.644735,-9.195711,0,0,1,0,,,Rua Movimento Das Forças Armadas ( Frente Ao Número 85,0,,,020709,,1,,,,Morgadinha,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+020710,R Movimento das Forças Armadas 81,38.644440,-9.195944,0,0,1,0,,,Rua Movimento Das Forças Armadas 81,0,,,020710,,1,,,,Morgadinha,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020711,VALE GROU (R MOV F ARMADAS) CENTRO SAÚDE,38.642125,-9.192910,0,0,1,0,,,Vale Grou ( Rua Movimento Das Forças Armadas ) Centro Saúde,0,,,020711,,1,,,,Vale Grou,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020712,VALE GROU (R MOV F ARMADAS) CENTRO SAÚDE,38.642090,-9.193020,0,0,1,0,,,Vale Grou ( Rua Movimento Das Forças Armadas ) Centro Saúde,0,,,020712,,1,,,,Vale Grou,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020713,QTA CERIEIRA (R MOV F ARMADAS 120),38.641280,-9.187810,0,0,1,0,,,Quinta Cerieira ( Rua Movimento Das Forças Armadas 120 ),0,,,020713,,1,,,,Quinta da Cerieira,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -853,7 +853,7 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 020963,FEIJÓ (R FRANCISCO ALMEIDA N50),38.649190,-9.159460,0,0,1,0,,,Feijó ( Rua Francisco Almeida ( Número 50 ) ),0,,,020963,,1,,,,Feijó,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020965,CORROIOS (R CIDADE LUANDA 86),38.646020,-9.159680,0,0,1,0,,,Corroios ( Rua Cidade Luanda 86 ),0,,,020965,,1,,,,Corroios,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020966,CORROIOS (R CIDADE LUANDA 86),38.646090,-9.159880,0,0,1,0,,,Corroios ( Rua Cidade Luanda 86 ),0,,,020966,,1,,,,Corroios,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-020967,R Nuno Tristão (Escola),38.645705,-9.205427,0,0,1,0,,,Pilotos ( Rua Nuno Tristão ) Escola Básica,0,,,020967,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+020967,R Nuno Tristão (Escola),38.645705,-9.205427,0,0,1,0,,,Rua Nuno Tristão ( Escola ),0,,,020967,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020969,FEIJÓ (R MÁRIO A GOMES 64),38.648400,-9.160200,0,0,1,0,,,Feijó ( Rua Mário Á Gomes 64 ),0,,,020969,,1,,,,Feijó,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020971,FEIJÓ (R VILA SEIXAL 13),38.649300,-9.161110,0,0,1,0,,,Feijó ( Rua Vila Seixal 13 ),0,,,020971,,1,,,,Feijó,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020973,Cacilhas (Terminal) P3,38.687450,-9.146762,0,0,1,0,,,Cacilhas ( Terminal ) ( P 3 ) . ( Há correspondência ) com o métro ligeiro e o barco ,0,,,020973,,1,,,,Cacilhas,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,1,123,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0
@@ -867,8 +867,8 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 020987,VALE FIGUEIRA (R CATARINA EUFÉMIA 5),38.635000,-9.172590,0,0,1,0,,,Vale Figueira ( Rua Catarina Eufémi-a 5 ),0,,,020987,,1,,,,Vale Figueira,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020988,VALE FIGUEIRA (R CATARINA EUFÉMIA 5),38.635000,-9.172630,0,0,1,0,,,Vale Figueira ( Rua Catarina Eufémi-a 5 ),0,,,020988,,1,,,,Vale Figueira,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020992,Costa da Caparica (Terminal) P1,38.644908,-9.241073,0,0,1,0,,,Costa Da Caparica ( Terminal ) ( P 1 ),0,,,020992,,1,,,,Costa da Caparica,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-020993,Av do Mar (X) R Amadeu de Sousa Cardoso,38.582174,-9.175557,0,0,1,0,,,Aroeira ( Avenida Mar ( Número 121 ) ),0,,,020993,,1,,,,Aroeira,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-020994,Av do Mar Fte 121,38.581941,-9.176407,0,0,1,0,,,Aroeira ( Avenida Mar ( Número 121 ) ),0,,,020994,,1,,,,Aroeira,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+020993,Av do Mar (X) R Amadeu de Sousa Cardoso,38.582174,-9.175557,0,0,1,0,,,Cruzamento Entre ( Avenida Do Mar ) E Rua Amadeu De Sousa Cardoso,0,,,020993,,1,,,,Aroeira,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+020994,Av do Mar Fte 121,38.581941,-9.176407,0,0,1,0,,,Avenida Do Mar ( Frente Ao Número 121,0,,,020994,,1,,,,Aroeira,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020995,AROEIRA (AV MAR 168),38.578942,-9.183921,0,0,1,0,,,Aroeira ( Avenida Mar 168 ),0,,,020995,,1,,,,Aroeira,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020996,AROEIRA (AV MAR 168),38.578974,-9.183604,0,0,1,0,,,Aroeira ( Avenida Mar 168 ),0,,,020996,,1,,,,Aroeira,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020997,F TELHA (AV MAR 223 (X) AV E MONIZ(GOLF),38.577840,-9.186260,0,0,1,0,,,Fonte Da Telha ( Cruzamento Entre ( Avenida Mar 223 ) E Avenida Égas Moniz ( Golf ),0,,,020997,,1,,,,Fonte da Telha,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -901,7 +901,7 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 021060,R MAGALHÃES LIMA 1,38.614364,-9.196843,0,0,1,0,,,Rua Magalhães Lima - Um,0,,,021060,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 021061,R MAGALHÃES LIMA 220,38.614412,-9.196803,0,0,1,0,,,Rua Magalhães Lima 220,0,,,021061,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 021062,R Cidade de Ostrava 30,38.670916,-9.167059,0,0,1,0,,,Rua Cidade De Ostrava 30,0,,,021062,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-021063,R Cidade de Ostrava Fte 30,38.671014,-9.167150,0,0,1,0,,,Rua Cidade De Ostrava 30,0,,,021063,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+021063,R Cidade de Ostrava Fte 30,38.671014,-9.167150,0,0,1,0,,,Rua Cidade De Ostrava ( Frente Ao Número 30,0,,,021063,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 021064,Hosp. Garcia de Orta (Cons. Externas),38.673331,-9.175877,0,0,1,0,,,Hospital Garcia De Orta ( Cons. Externas ),0,,,021064,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 021065,Av Rainha D Leonor (C. Saude Almada),38.677631,-9.154111,0,0,1,0,,,Avenida Rainha Dona Leonor ( Centro De Saúde Almada ),0,,,021065,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 021066,Av Rainha D Leonor (C. Saude Almada),38.677558,-9.154141,0,0,1,0,,,Avenida Rainha Dona Leonor ( Centro De Saúde Almada ),0,,,021066,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -915,12 +915,12 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 021074,Rua Dom José de Mascarenhas 33,38.683165,-9.157373,0,0,1,0,,,Rua Dom José De Mascarenhas 33,0,,,021074,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 021075,Rua Maria Beatriz Mexia 61 +,38.643943,-9.203041,0,0,1,0,,,Rua Maria Beatriz Mexia 61 +,0,,,021075,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 021706,Rua Quinta do Lagar 97 +,38.646576,-9.194489,0,0,1,0,,,Rua Quinta Do Lagar 97 +,0,,,021706,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-024855,Trafaria (Terminal) P2,38.673960,-9.231779,0,0,1,0,,,#N/A,0,,,024855,,1,,,,Trafaria,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+024855,Trafaria (Terminal) P2,38.673960,-9.231779,0,0,1,0,,,Trafaria ( Terminal ) ( P 2 ),0,,,024855,,1,,,,Trafaria,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 027997,PRAGAL (AV JOSE C PIRES) ESTAÇÃO,38.666777,-9.179291,0,0,1,0,,,Pragal ( Avenida Jose Cê Pires ) - Estaçaão . ( Há correspondência ) com o métro ligeiro e o combóio ,0,,,027997,,1,,,,Pragal,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0
 027998,PRAGAL (AV TORRADO SILVA) ESTAÇÃO,38.666711,-9.180311,0,0,1,0,,,Pragal ( Avenida Torrado Silva ) - Estaçaão . ( Há correspondência ) com o métro ligeiro e o combóio ,0,,,027998,,1,,,,Pragal,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,1,125,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0
 027999,PRAGAL (AV TORRADO SILVA) ESTAÇÃO,38.666619,-9.179919,0,0,1,0,,,Pragal ( Avenida Torrado Silva ) - Estaçaão . ( Há correspondência ) com o métro ligeiro e o combóio ,0,,,027999,,1,,,,Pragal,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,1,115,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0
-029001,R Movimento das Forças Armadas (Rotunda),38.646537,-9.198270,0,0,1,0,,,Lazarim ( Rua Do Movimento Das Forças Armadas ),0,,,029001,,1,,,,Lazarim,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-029002,R Movimento das Forças Armadas (Rotunda),38.646684,-9.198381,0,0,1,0,,,Lazarim ( Rua Do Movimento Das Forças Armadas ),0,,,029002,,1,,,,Lazarim,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+029001,R Movimento das Forças Armadas (Rotunda),38.646537,-9.198270,0,0,1,0,,,Rua Movimento Das Forças Armadas ( Rotunda ),0,,,029001,,1,,,,Lazarim,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+029002,R Movimento das Forças Armadas (Rotunda),38.646684,-9.198381,0,0,1,0,,,Rua Movimento Das Forças Armadas ( Rotunda ),0,,,029002,,1,,,,Lazarim,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 029004,Cova Piedade (R Cooperativa Piedense 71),38.670312,-9.159142,0,0,1,0,,,Cova Piedade ( Rua Cooperativa Piédense 71 ),0,,,029004,,1,,,,Cova da Piedade,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 029005,COSTA CAPARICA (R MANUEL AGRO FAR N50),38.648446,-9.236093,0,0,1,0,,,Costa Da Caparíca ( Rua Manuel Agro Far ( Número 50 ) ),0,,,029005,,1,,,,Costa da Caparica,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 029006,CENTRO SAÚDE PRAGAL,38.670410,-9.170638,0,0,1,0,,,Centro Saúde Pragal,0,,,029006,,1,,,,Almada,,,1503,Almada,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -2393,19 +2393,19 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 070031,Rua Dr. Alberto Alves de Oliveira,38.828364,-9.163389,0,1,0,0,,,Rua Doutor Alberto Alves De Oliveira,0,,,070031,,1,,,,Loures,,,1107,Loures,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 070032,Lg Marcos Romão Reis Junior,38.828820,-9.166880,0,1,0,0,,,Largo Marcos Romão Reis Junior,0,,,070032,,1,,,,Loures,,,1107,Loures,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 070033,Hospital Beatriz Ângelo (Consultas),38.822056,-9.176611,0,1,0,0,,,Hospital Beatriz Ângelo ( Consultas ),0,,,070033,,1,,,,Loures,,,1107,Loures,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-070034,Av Capitão Salgueiro Maia (X) R Dr Filipe Araújo,38.777081,-9.107274,0,1,0,0,,,#N/A,0,,,070034,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+070034,Av Capitão Salgueiro Maia (X) R Dr Filipe Araújo,38.777081,-9.107274,0,1,0,0,,,Cruzamento Entre ( Avenida Capitão Salgueiro Maia ) E Rua Doutor Filipe Araújo,0,,,070034,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 070035,R República 14 (Escola),38.828030,-9.164310,0,1,0,0,,,Rua República 14 ( Escola ),0,,,070035,,1,,,,Loures,,,1107,Loures,11,Lisboa,PT170,AML,,0,,4,,,4,4,4,4,1,,,,2,,0,,0,0,0,5,0,,,,,,3,0,0,0,0,0,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-070036,Av Capitão Salgueiro Maia Fte 7,38.777192,-9.107062,0,1,0,0,,,#N/A,0,,,070036,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+070036,Av Capitão Salgueiro Maia Fte 7,38.777192,-9.107062,0,1,0,0,,,Avenida Capitão Salgueiro Maia ( Frente Ao Número 7,0,,,070036,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 070037,R República 76 (Câmara),38.830968,-9.168100,0,1,0,0,,,Rua República 76 ( Câmara ),0,,,070037,,1,,,,Loures,,,1107,Loures,11,Lisboa,PT170,AML,,3,,0,,,0,0,4,0,0,,,,2,,0,,0,0,0,5,0,,,,,,3,0,0,0,0,0,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-070038,R Prof Dr António Luciano Pacheco de Sousa Franco,38.776001,-9.105974,0,1,0,0,,,#N/A,0,,,070038,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+070038,R Prof Dr António Luciano Pacheco de Sousa Franco,38.776001,-9.105974,0,1,0,0,,,Rua Professor Doutor António Luciano Pacheco De Sousa Franco,0,,,070038,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 070039,Em 539-3 26 (A-dos-Cãos),38.843300,-9.224670,0,1,0,0,,,Estrada Municipal 539 - 3 26 ( A-dos-cãos ),0,,,070039,,1,,,,Loures,,,1107,Loures,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 070040,Em 539-3 26 (A-dos-Cãos),38.843220,-9.224670,0,1,0,0,,,Estrada Municipal 539 - 3 26 ( A-dos-cãos ),0,,,070040,,1,,,,Loures,,,1107,Loures,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 070041,R Avelar Brotero 12A (Cemitério),38.831850,-9.174300,0,1,0,0,,,Rua Avelar Brotero 12 Á ( Cemitério ),0,,,070041,,1,,,,Loures,,,1107,Loures,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 070042,R Avelar Brotero 12A (Cemitério),38.831800,-9.174570,0,1,0,0,,,Rua Avelar Brotero 12 Á ( Cemitério ),0,,,070042,,1,,,,Loures,,,1107,Loures,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 070043,R Egas Moniz (Centro Saúde),38.825400,-9.163040,0,1,0,0,,,Rua Egas Moniz ( Centro Saúde ),0,,,070043,,1,,,,Loures,,,1107,Loures,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-070044,Av Capitão Salgueiro Maia Fte 28,38.777276,-9.108996,0,1,0,0,,,#N/A,0,,,070044,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+070044,Av Capitão Salgueiro Maia Fte 28,38.777276,-9.108996,0,1,0,0,,,Avenida Capitão Salgueiro Maia ( Frente Ao Número 28,0,,,070044,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 070045,Lgo dos Autocarros (Moninhos),38.850600,-9.210370,0,1,0,0,,,Largo Dos Autocarros ( Moninhos ),0,,,070045,,1,,,,Loures,,,1107,Loures,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-070046,Av Capitão Salgueiro Maia Fte 26,38.777388,-9.108863,0,1,0,0,,,#N/A,0,,,070046,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+070046,Av Capitão Salgueiro Maia Fte 26,38.777388,-9.108863,0,1,0,0,,,Avenida Capitão Salgueiro Maia ( Frente Ao Número 26,0,,,070046,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 070047,Alameda Poder Local 13 (Moninhos),38.853100,-9.211260,0,1,0,0,,,Alameda Poder Local 13 ( Moninhos ),0,,,070047,,1,,,,Loures,,,1107,Loures,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 070050,R das Dálias (Moninhos),38.855400,-9.214150,0,1,0,0,,,Rua Das Dálias ( Moninhos ),0,,,070050,,1,,,,Loures,,,1107,Loures,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 070051,R das Gipsófilas 165 (Moninhos),38.854500,-9.212960,0,1,0,0,,,Rua Das Gipsófilas 165 ( Moninhos ),0,,,070051,,1,,,,Loures,,,1107,Loures,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -4845,8 +4845,8 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 090149,CARVALHINHO (EM 533-1) X IC 13,38.642736,-8.970817,0,0,0,1,,,Carvalhinho ( Cruzamento Entre ( Estrada Municipal 533 - - Um ) ) E I. C. 13 ),0,,,090149,,1,,,,Carvalhinho,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 090150,CARVALHINHO (EM 533-1) X IC 13,38.642905,-8.971008,0,0,0,1,,,Carvalhinho ( Cruzamento Entre ( Estrada Municipal 533 - - Um ) ) E I. C. 13 ),0,,,090150,,1,,,,Carvalhinho,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 090151,CARVALHINHO (EM 533-1) VIV ROQUE,38.642486,-8.969176,0,0,0,1,,,Carvalhinho ( Estrada Municipal 533 - - Um ) Vivenda Roque,0,,,090151,,1,,,,Carvalhinho,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-090153,Bairro da Liberdade (EM533-1),38.640546,-8.963781,0,0,0,1,,,Carvalhinho ( Cruzamento Entre ( Estrada Municipal 533 - - Um ) ) E Junto Rua Bl Vista ),0,,,090153,,1,,,,Carvalhinho,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-090154,Bairro da Liberdade (EM533-1),38.640168,-8.961073,0,0,0,1,,,Carvalhinho ( Cruzamento Entre ( Estrada Municipal 533 - - Um ) ) E Junto Rua Bl Vista ),0,,,090154,,1,,,,Carvalhinho,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+090153,Bairro da Liberdade (EM533-1),38.640546,-8.963781,0,0,0,1,,,Bairro Da Liberdade ( Estrada Municipal 533 - - Um ),0,,,090153,,1,,,,Carvalhinho,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+090154,Bairro da Liberdade (EM533-1),38.640168,-8.961073,0,0,0,1,,,Bairro Da Liberdade ( Estrada Municipal 533 - - Um ),0,,,090154,,1,,,,Carvalhinho,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 090155,PENTEADO (EM 533-1) VIV MIZÉ GUERREIRO,38.639624,-8.956704,0,0,0,1,,,Penteado ( Estrada Municipal 533 - - Um ) Vivenda Mizé Guerreiro,0,,,090155,,1,,,,Penteado,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 090156,PENTEADO (EM 533-1) VIV MIZÉ GUERREIRO,38.639710,-8.956574,0,0,0,1,,,Penteado ( Estrada Municipal 533 - - Um ) Vivenda Mizé Guerreiro,0,,,090156,,1,,,,Penteado,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 090157,PENTEADO (EM 1025) ESC PRIMÁRIA,38.636004,-8.957611,0,0,0,1,,,Penteado ( Estrada Municipal 1025 ) Escola Primária,0,,,090157,,1,,,,Penteado,,,1506,Moita,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -6138,7 +6138,7 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 120190,Calçada Rio 43,38.705722,-9.228695,1,0,0,0,,,Calçada Rio 43,0,,,120190,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 120191,R Luís de Camões 84a,38.704215,-9.228669,1,0,0,0,,,Rua Luís De Camões 84 Á,0,,,120191,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 120193,R Luís de Camões 50a,38.702914,-9.228751,1,0,0,0,,,Rua Luís De Camões 50 Á,0,,,120193,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-120195,R Luís de Camões 19C,38.701618,-9.228840,1,0,0,0,,,Avenida Bombeiros Voluntários ( Mercado Algés ),0,,,120195,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+120195,R Luís de Camões 19C,38.701618,-9.228840,1,0,0,0,,,Rua Luís De Camões 19 Cê,0,,,120195,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 120197,Av Combatentes Grande Guerra 48B,38.700286,-9.229680,1,0,0,0,,,Avenida Combatentes Da Grande Guerra 48 B,0,,,120197,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 120199,R Eduardo Augusto Pedroso 18C,38.700632,-9.230600,1,0,0,0,,,Rua Eduardo Augusto Pedroso 18 Cê,0,,,120199,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 120201,R João Chagas - Biblioteca Mun Algés,38.700070,-9.231931,1,0,0,0,,,Rua João Chagas - Biblioteca Municipal Algés,0,,,120201,,1,,,,Oeiras,,,1110,Oeiras,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -7019,7 +7019,7 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 130107,ALGERUZ (M542 POSTO COMBUSTIVEL),38.581380,-8.831160,0,0,0,1,,,Algeruz ( Estrada Municipal 542 Posto De Combustivel ),0,,,130107,,1,,,,Algeruz,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130108,ALGERUZ (M542 POSTO COMBUSTIVEL),38.581410,-8.831010,0,0,0,1,,,Algeruz ( Estrada Municipal 542 Posto De Combustivel ),0,,,130108,,1,,,,Algeruz,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130109,ALGERUZ (R PRINCIPAL) FÁBRICA MARCÔA,38.590420,-8.838340,0,0,0,1,,,Algeruz ( Rua Principal ) Fábrica Marcôa,0,,,130109,,1,,,,Algeruz,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-130110,R Florbela Espanca,38.590000,-9.013806,0,0,0,1,,,#N/A,0,,,130110,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+130110,R Florbela Espanca,38.590000,-9.013806,0,0,0,1,,,Rua Florbela Espanca,0,,,130110,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130111,ALGERUZ (ESTR LAGAMEÇAS X R 5 OUTUBRO),38.590980,-8.847140,0,0,0,1,,,Algeruz ( Cruzamento Entre ( Estrada Lagameças ) E Rua 5 De Outubro ),0,,,130111,,1,,,,Algeruz,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130112,ALGERUZ (ESTR LAGAMEÇAS X R 5 OUTUBRO),38.590800,-8.847180,0,0,0,1,,,Algeruz ( Cruzamento Entre ( Estrada Lagameças ) E Rua 5 De Outubro ),0,,,130112,,1,,,,Algeruz,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130113,PALMELA (ESTR LAGAMEÇAS CCI6805),38.588250,-8.855140,0,0,0,1,,,Palmela ( Estrada Lagameças Cci 6805 ),0,,,130113,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -7060,7 +7060,7 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 130149,LAGOA CALVO (EM 533) SOC RECREATIVA,38.666200,-8.737230,0,0,0,1,,,Lagoa Calvo ( Estrada Municipal 533 ) Sociedade Recreativa,0,,,130149,,1,,,,Lagoa do Calvo,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 130150,LAGOA CALVO (EM 533) SOC RECREATIVA,38.666200,-8.737160,0,0,0,1,,,Lagoa Calvo ( Estrada Municipal 533 ) Sociedade Recreativa,0,,,130150,,1,,,,Lagoa do Calvo,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 130151,LAGOA CALVO (EM 533) X FORNINHO,38.663200,-8.738370,0,0,0,1,,,Lagoa Calvo ( Cruzamento Entre ( Estrada Municipal 533 ) ) E Forninho ),0,,,130151,,1,,,,Lagoa do Calvo,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-130152,R Florbela Espanca,38.590251,-9.014074,0,0,0,1,,,#N/A,0,,,130152,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+130152,R Florbela Espanca,38.590251,-9.014074,0,0,0,1,,,Rua Florbela Espanca,0,,,130152,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130153,LAGOA CALVO (EM 533) X R JOAO COSTA,38.656510,-8.741090,0,0,0,1,,,Lagoa Calvo ( Cruzamento Entre ( Estrada Municipal 533 ) ) E Rua Joao Costa ),0,,,130153,,1,,,,Lagoa do Calvo,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130154,LAGOA CALVO (EM 533) X R JOAO COSTA,38.656500,-8.740930,0,0,0,1,,,Lagoa Calvo ( Cruzamento Entre ( Estrada Municipal 533 ) ) E Rua Joao Costa ),0,,,130154,,1,,,,Lagoa do Calvo,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130155,LAGOA CALVO (EM 533) X R PERALTAS,38.648120,-8.744640,0,0,0,1,,,Lagoa Calvo ( Cruzamento Entre ( Estrada Municipal 533 ) ) E Rua Peraltas ),0,,,130155,,1,,,,Lagoa do Calvo,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -7070,7 +7070,7 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 130161,POCEIRÃO (AV PALMELA) X R 5 OUTUBRO,38.633410,-8.743240,0,0,0,1,,,Cruzamento Entre ( Poceirão ( Avenida Palmela ) ) E Rua 5 De Outubro,0,,,130161,,1,,,,Poceirão,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130162,POCEIRÃO (AV PALMELA) X R 5 OUTUBRO,38.633270,-8.743470,0,0,0,1,,,Cruzamento Entre ( Poceirão ( Avenida Palmela ) ) E Rua 5 De Outubro,0,,,130162,,1,,,,Poceirão,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130163,POCEIRÃO (EM 533) DEPOIS VIADUTO C FERRO,38.622200,-8.746640,0,0,0,1,,,Poceirão ( Estrada Municipal 533 ) Depois Viaduto Cê Ferro,0,,,130163,,1,,,,Poceirão,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-130164,R Florbela Espanca (X) R Luís Vaz de Camões,38.588431,-9.011078,0,0,0,1,,,#N/A,0,,,130164,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+130164,R Florbela Espanca (X) R Luís Vaz de Camões,38.588431,-9.011078,0,0,0,1,,,Cruzamento Entre ( Rua Florbela Espanca ) E Rua Luís Vaz De Camões,0,,,130164,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130165,POCEIRÃO (EM 533) X R GASPAR SILVA,38.616700,-8.755290,0,0,0,1,,,Cruzamento Entre ( Poceirão ( Estrada Municipal 533 ) ) E Rua Gaspar Silva,0,,,130165,,1,,,,Poceirão,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130166,POCEIRÃO (EM 533) X R GASPAR SILVA,38.616600,-8.755260,0,0,0,1,,,Cruzamento Entre ( Poceirão ( Estrada Municipal 533 ) ) E Rua Gaspar Silva,0,,,130166,,1,,,,Poceirão,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130167,LAGAMEÇAS (EM 533) X R CARDOSOS,38.614000,-8.761700,0,0,0,1,,,Cruzamento Entre ( Lagameças ( Estrada Municipal 533 ) ) E Rua Cardosos,0,,,130167,,1,,,,Lagameças,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -7102,9 +7102,9 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 130193,ALGERUZ (ESTR LAGAMEÇAS X R CACARINO),38.594200,-8.840810,0,0,0,1,,,Algeruz ( Cruzamento Entre ( Estrada Lagameças ) E Rua Cacarino ),0,,,130193,,1,,,,Algeruz,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130194,ALGERUZ (ESTR LAGAMEÇAS X R CACARINO),38.594000,-8.840720,0,0,0,1,,,Algeruz ( Cruzamento Entre ( Estrada Lagameças ) E Rua Cacarino ),0,,,130194,,1,,,,Algeruz,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130195,POCEIRÃO (EM 533) ANTES VIADUTO C FERRO,38.622200,-8.746430,0,0,0,1,,,Poceirão ( Estrada Municipal 533 ) Antes Viaduto Cê Ferro,0,,,130195,,1,,,,Poceirão,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-130196,R Florbela Espanca (X) Estr Circular Norte,38.588404,-9.010701,0,0,0,1,,,#N/A,0,,,130196,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+130196,R Florbela Espanca (X) Estr Circular Norte,38.588404,-9.010701,0,0,0,1,,,Cruzamento Entre ( Rua Florbela Espanca ) E Estrada Circular Norte,0,,,130196,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130197,LAGOA CALVO (EM 533) X FORNINHO,38.662500,-8.738580,0,0,0,1,,,Lagoa Calvo ( Cruzamento Entre ( Estrada Municipal 533 ) ) E Forninho ),0,,,130197,,1,,,,Lagoa do Calvo,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-130198,Estr Circular Norte Fte 113,38.58932,-9.007144,0,0,0,1,,,#N/A,0,,,130198,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+130198,Estr Circular Norte Fte 113,38.58932,-9.007144,0,0,0,1,,,Estrada Circular Norte ( Frente Ao Número 113,0,,,130198,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130199,VOLTA PEDRA (AV ALBERTO VALENTE 72),38.579400,-8.890240,0,0,0,1,,,Volta Pedra ( Avenida Alberto Valente 72 ),0,,,130199,,1,,,,Volta da Pedra,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130200,VOLTA PEDRA (AV ALBERTO VALENTE 72),38.579400,-8.890170,0,0,0,1,,,Volta Pedra ( Avenida Alberto Valente 72 ),0,,,130200,,1,,,,Volta da Pedra,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130201,VOLTA PEDRA (EN 252 91),38.582300,-8.890250,0,0,0,1,,,Volta Pedra ( Estrada Nacional 252 91 ),0,,,130201,,1,,,,Volta da Pedra,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -7112,15 +7112,15 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 130203,ALEXANDRE HERCULANO,38.588900,-8.891420,0,0,0,1,,,Alexandre Herculano,0,,,130203,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130204,ALEXANDRE HERCULANO,38.588900,-8.891360,0,0,0,1,,,Alexandre Herculano,0,,,130204,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130205,ALEXANDRE HERCULANO,38.590700,-8.893010,0,0,0,1,,,Alexandre Herculano,0,,,130205,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-130206,Estr Circular Norte 114,38.589558,-9.006867,0,0,0,1,,,#N/A,0,,,130206,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+130206,Estr Circular Norte 114,38.589558,-9.006867,0,0,0,1,,,Estrada Circular Norte 114,0,,,130206,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130207,BATUDES (EN 252 KM 12),38.592720,-8.893840,0,0,0,1,,,Batudes ( Estrada Nacional 252 Quilómetro 12 ),0,,,130207,,1,,,,Batudes,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-130208,Estr Circular Norte Fte 219,38.590849,-9.00304,0,0,0,1,,,#N/A,0,,,130208,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+130208,Estr Circular Norte Fte 219,38.590849,-9.00304,0,0,0,1,,,Estrada Circular Norte ( Frente Ao Número 219,0,,,130208,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130209,BATUDES (EN252) XV ALCAIDE (SEMÁFOROS),38.599660,-8.898430,0,0,0,1,,,Batudes ( Cruzamento Entre ( Estrada Nacional 252 ) ) E V Alcaide ( Semáforos ) ),0,,,130209,,1,,,,Batudes,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 130210,BATUDES (EN252) XV ALCAIDE (SEMÁFOROS),38.599800,-8.898340,0,0,0,1,,,Batudes ( Cruzamento Entre ( Estrada Nacional 252 ) ) E V Alcaide ( Semáforos ) ),0,,,130210,,1,,,,Batudes,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 130211,ESTR VENDA DE ALCAIDE 48,38.606300,-8.891060,0,0,0,1,,,Estrada Venda De Alcaide 48,0,,,130211,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130212,ESTR VENDA DE ALCAIDE 48,38.606300,-8.891020,0,0,0,1,,,Estrada Venda De Alcaide 48,0,,,130212,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130213,ESTAÇÃO VENDA DO ALCAIDE,38.606700,-8.888600,0,0,0,1,,,- Estaçaão Venda Do Alcaide . ( Há correspondência ) com o combóio ,0,,,130213,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
-130214,Estr Circular Norte,38.592082,-8.999815,0,0,0,1,,,#N/A,0,,,130214,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+130214,Estr Circular Norte,38.592082,-8.999815,0,0,0,1,,,Estrada Circular Norte,0,,,130214,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130215,BATUDES (EN 252 21),38.601760,-8.901690,0,0,0,1,,,Batudes ( Estrada Nacional 252 21 ),0,,,130215,,1,,,,Batudes,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130216,BATUDES (EN 252 21),38.601930,-8.901650,0,0,0,1,,,Batudes ( Estrada Nacional 252 21 ),0,,,130216,,1,,,,Batudes,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 130217,R GAGO COUTINHO E SACADURA CABRAL 26,38.603660,-8.904590,0,0,0,1,,,Rua Gago Coutinho E Sacadura Cabral 26,0,,,130217,,1,,,,Palmela,,,1508,Palmela,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -8111,8 +8111,8 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 140720,QTA BRASILEIRO R TREVO (DEPÓSITO ÁGUA),38.648200,-9.150700,0,0,1,0,,,Quinta Brasileiro Rua Trevo ( Depósito Água ),0,,,140720,,1,,,,Seixal,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 140721,QTA BRASILEIRO R TREVO 19 (ESCOLA),38.646530,-9.149140,0,0,1,0,,,Quinta Brasileiro Rua Trevo 19 ( Escola ),0,,,140721,,1,,,,Seixal,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 140722,QTA BRASILEIRO R TREVO 19 (ESCOLA),38.646440,-9.149190,0,0,1,0,,,Quinta Brasileiro Rua Trevo 19 ( Escola ),0,,,140722,,1,,,,Seixal,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-140723,R das Flores (Centro Saúde),38.645208,-9.147021,0,0,1,0,,,Quinta Brasileiro ( Rua Flores 2 ) Centro Saúde,0,,,140723,,1,,,,Seixal,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-140724,R das Flores (Centro Saúde),38.645347,-9.147140,0,0,1,0,,,Quinta Brasileiro ( Rua Flores 2 ) Centro Saúde,0,,,140724,,1,,,,Seixal,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,1,346,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+140723,R das Flores (Centro Saúde),38.645208,-9.147021,0,0,1,0,,,Rua Das Flores ( Centro Saúde ),0,,,140723,,1,,,,Seixal,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+140724,R das Flores (Centro Saúde),38.645347,-9.147140,0,0,1,0,,,Rua Das Flores ( Centro Saúde ),0,,,140724,,1,,,,Seixal,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,1,346,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 140725,QTA BRASILEIRO (R ROUXINOL N13),38.642700,-9.147840,0,0,1,0,,,Quinta Brasileiro ( Rua Rouxinol ( Número 13 ) ),0,,,140725,,1,,,,Seixal,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 140726,QTA BRASILEIRO (R ROUXINOL N13),38.642700,-9.147800,0,0,1,0,,,Quinta Brasileiro ( Rua Rouxinol ( Número 13 ) ),0,,,140726,,1,,,,Seixal,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 140727,MIRATEJO (ALAMEDA 25 ABRIL) CENTRO COM,38.650580,-9.143250,0,0,1,0,,,Mira-tejo ( Alameda 25 De Abril ) Centro Comercial,0,,,140727,,1,,,,Miratejo,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,1,350,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -8133,7 +8133,7 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 140751,VALE MILHAÇOS (AV LIBERDADE 117),38.626080,-9.165630,0,0,1,0,,,Vale Milhaços ( Avenida Liberdade 117 ),0,,,140751,,1,,,,Vale de Milhaços,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 140752,VALE MILHAÇOS (AV LIBERDADE 117),38.626010,-9.165510,0,0,1,0,,,Vale Milhaços ( Avenida Liberdade 117 ),0,,,140752,,1,,,,Vale de Milhaços,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 140753,MIRATEJO (R EÇA QUEIROZ 4) CERCISA,38.653500,-9.145930,0,0,1,0,,,Mira-tejo ( Rua Eça Queiroz 4 ) Cercisa,0,,,140753,,1,,,,Miratejo,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-140755,R das Palmeiras 7,38.644763,-9.146708,0,0,1,0,,,Quinta Brasileiro ( Rua Palmeiras 12 ),0,,,140755,,1,,,,Seixal,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+140755,R das Palmeiras 7,38.644763,-9.146708,0,0,1,0,,,Rua Das Palmeiras 7,0,,,140755,,1,,,,Seixal,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 140757,CRUZ PAU R INF D AUG 82) C C BELSUL,38.628910,-9.125850,0,0,1,0,,,Cruz Pau Rua Infante Dom Augusto 82 ) Centro Comercial Belsul,0,,,140757,,1,,,,Seixal,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 140758,CRUZ PAU R INF D AUG 82) C C BELSUL,38.628890,-9.126000,0,0,1,0,,,Cruz Pau Rua Infante Dom Augusto 82 ) Centro Comercial Belsul,0,,,140758,,1,,,,Seixal,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 140759,QTA PRINCESA (QTA PAÇO N17A),38.630790,-9.126690,0,0,1,0,,,Quinta Princesa ( Quinta Paço ( Número 17 Á ) ),0,,,140759,,1,,,,Seixal,,,1510,Seixal,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -8648,8 +8648,8 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 150481,R AMÉLIA FRADE 26,38.444400,-9.098930,0,0,1,0,,,Rua Amélia Frade 26,0,,,150481,,1,,,,Sesimbra,,,1511,Sesimbra,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 150483,R MANUEL ARRIAGA - MERCADO,38.559000,-9.046120,0,0,1,0,,,Rua Manuel Arriaga - Mercado,0,,,150483,,1,,,,Sesimbra,,,1511,Sesimbra,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 150484,QTA CONDE (R MANUEL ARRIAGA) MERCADO,38.559036,-9.046162,0,0,1,0,,,Quinta Do Conde ( Rua Manuel Arriaga ) Mercado,0,,,150484,,1,,,,Quinta do Conde,,,1511,Sesimbra,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-150485,R Manuel Arriaga 1378,38.557657,-9.051082,0,0,1,0,,,Rua Manuel Arriaga - Lóte 1380,0,,,150485,,1,,,,Sesimbra,,,1511,Sesimbra,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-150486,R Manuel Arriaga 1389,38.557589,-9.051018,0,0,1,0,,,Rua Manuel Arriaga - Lóte 1380,0,,,150486,,1,,,,Sesimbra,,,1511,Sesimbra,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+150485,R Manuel Arriaga 1378,38.557657,-9.051082,0,0,1,0,,,Rua Manuel Arriaga 1378,0,,,150485,,1,,,,Sesimbra,,,1511,Sesimbra,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+150486,R Manuel Arriaga 1389,38.557589,-9.051018,0,0,1,0,,,Rua Manuel Arriaga 1389,0,,,150486,,1,,,,Sesimbra,,,1511,Sesimbra,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 150487,R SERRA ARRÁBIDA - ESCOLA,38.553060,-9.049590,0,0,1,0,,,Rua Serra Arrábida - Escola,0,,,150487,,1,,,,Sesimbra,,,1511,Sesimbra,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 150488,R SERRA ARRÁBIDA - ESCOLA,38.553130,-9.049680,0,0,1,0,,,Rua Serra Arrábida - Escola,0,,,150488,,1,,,,Sesimbra,,,1511,Sesimbra,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 150489,R SERRA DA ARRÁBIDA 1170,38.554180,-9.045620,0,0,1,0,,,Rua Serra Da Arrábida 1170,0,,,150489,,1,,,,Sesimbra,,,1511,Sesimbra,15,Setúbal,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -9687,8 +9687,8 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 170204,R D Coutinho Pais 19 (Escola),38.801080,-9.351180,1,0,0,0,,,Rua Dom Coutinho Pais 19 ( Escola ),0,,,170204,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 170205,R D Coutinho Pais 32,38.802570,-9.352250,1,0,0,0,,,Rua Dom Coutinho Pais 32,0,,,170205,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 170206,R D Coutinho Pais 79,38.802600,-9.352410,1,0,0,0,,,Rua Dom Coutinho Pais 79,0,,,170206,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-170207,R Varela Silva 24,38.804693,-9.352574,1,0,0,0,,,Rua Cidade De Olhão 24,0,,,170207,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-170208,R Varela Silva Fte 22,38.804543,-9.352589,1,0,0,0,,,Rua Cidade De Olhão 403,0,,,170208,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+170207,R Varela Silva 24,38.804693,-9.352574,1,0,0,0,,,Rua Varela Silva 24,0,,,170207,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+170208,R Varela Silva Fte 22,38.804543,-9.352589,1,0,0,0,,,Rua Varela Silva ( Frente Ao Número 22,0,,,170208,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 170209,R Cidade de Faro 489,38.805477,-9.353045,1,0,0,0,,,Rua Cidade De Faro 489,0,,,170209,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 170210,R Cidade de Faro 9,38.805616,-9.353124,1,0,0,0,,,Rua Cidade De Faro 9,0,,,170210,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 170211,R Cidade de Faro 512,38.806361,-9.352044,1,0,0,0,,,Rua Cidade De Faro 512,0,,,170211,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -11036,7 +11036,7 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 171885,Estr de Chão de Meninos 9,38.793223,-9.374051,1,0,0,0,,,Estrada De Chão De Meninos 9,0,,,171885,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 171886,Estr de Chão de Meninos 9,38.793198,-9.373802,1,0,0,0,,,Estrada De Chão De Meninos 9,0,,,171886,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 171887,R Escolas de Ranholas (Centro Emprego),38.782780,-9.368906,1,0,0,0,,,Rua Escolas De Ranholas ( Centro Emprego ),0,,,171887,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-171889,R das Cevadinhas (Escola Nacional de Bombeiros),38.781807,-9.370829,1,0,0,0,,,Rua Das Cevadinhas ( Escola Nac Bombeiros ),0,,,171889,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+171889,R das Cevadinhas (Escola Nacional de Bombeiros),38.781807,-9.370829,1,0,0,0,,,Rua Das Cevadinhas ( Escola Nacional De Bombeiros ),0,,,171889,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 171891,R Cevadinhas (Quinta das Túlipas),38.784464,-9.374419,1,0,0,0,,,Rua Cevadinhas ( Quinta Das Túlipas ),0,,,171891,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 171893,Av Alfredo César Torres (Col Ramalhão),38.786787,-9.373433,1,0,0,0,,,Avenida Alfredo Césár Torres ( Colégio Ramalhão ),0,,,171893,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 171895,Largo 1º Dezembro 1 (Chafariz),38.790334,-9.377177,1,0,0,0,,,Largo Primeiro De Dezembro Número - Um ( Chafariz ),0,,,171895,,1,,,,Sintra,,,1111,Sintra,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -11702,27 +11702,27 @@ stop_id,stop_name,stop_lat,stop_lon,A1,A2,A3,A4,stop_name_new,stop_short_name,tt
 180061,En 10 (X) R Duque Terceira (Sobralinho),38.913690,-9.023330,0,1,0,0,,,Cruzamento Entre ( Estrada Nacional 10 ) E Rua Duque Terceira ( Sobralinho ),0,,,180061,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180062,En 10 (X) R Duque Terceira (Sobralinho),38.913300,-9.023450,0,1,0,0,,,Cruzamento Entre ( Estrada Nacional 10 ) E Rua Duque Terceira ( Sobralinho ),0,,,180062,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180063,En 10 (X) Aldeia (Sobralinho),38.919000,-9.018210,0,1,0,0,,,Cruzamento Entre ( Estrada Nacional 10 ) E Aldeia ( Sobralinho ),0,,,180063,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-180064,Escola Secundária de Alves Redol,38.958082,-8.991165,0,1,0,0,,,#N/A,0,,,180064,,1,,,,Póvoa de Sta. Iria,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+180064,Escola Secundária de Alves Redol,38.958082,-8.991165,0,1,0,0,,,Escola Secundária De Alves Redol,0,,,180064,,1,,,,Póvoa de Sta. Iria,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180065,Alhandra,38.923400,-9.012720,0,1,0,0,,,Alhandra . ( Há correspondência ) com o combóio ,0,,,180065,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
-180066,Prct Movimento das Forças Armadas Fte 7,38.956667,-8.992668,0,1,0,0,,,#N/A,0,,,180066,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+180066,Prct Movimento das Forças Armadas Fte 7,38.956667,-8.992668,0,1,0,0,,,Praceta Movimento Das Forças Armadas ( Frente Ao Número 7,0,,,180066,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180067,En 10 (Viaduto AE),38.928000,-9.010520,0,1,0,0,,,Estrada Nacional 10 ( Viaduto Autóstrada ),0,,,180067,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180068,En 10 (Viaduto AE),38.927870,-9.010820,0,1,0,0,,,Estrada Nacional 10 ( Viaduto Autóstrada ),0,,,180068,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180069,Cortes Da Quintinha,38.934120,-9.004760,0,1,0,0,,,Cortes Da Quintinha,0,,,180069,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180070,Cortes Da Quintinha,38.934180,-9.004890,0,1,0,0,,,Cortes Da Quintinha,0,,,180070,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180071,Bairro Paraiso (X) EN10,38.941890,-8.997910,0,1,0,0,,,Cruzamento Entre ( Bairro Paraiso ) E Estrada Nacional 10,0,,,180071,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-180072,Prct Movimento das Forças Armadas (X) R da República,38.956693,-8.992333,0,1,0,0,,,#N/A,0,,,180072,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+180072,Prct Movimento das Forças Armadas (X) R da República,38.956693,-8.992333,0,1,0,0,,,Cruzamento Entre ( Praceta Movimento Das Forças Armadas ) E Rua Da República,0,,,180072,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180073,En 10 (C Futebol) (Vila Franca de Xira),38.945340,-8.995060,0,1,0,0,,,Estrada Nacional 10 ( Campo Futebol ) ( Vila Franca De Xira ),0,,,180073,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-180074,R 2 de Abril (Viaduto),38.955472,-8.992915,0,1,0,0,,,#N/A,0,,,180074,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+180074,R 2 de Abril (Viaduto),38.955472,-8.992915,0,1,0,0,,,Rua 2 De Abril ( Viaduto ),0,,,180074,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180075,R 1 Dezembro 707 (Cemitério),38.951000,-8.989840,0,1,0,0,,,Rua Primeiro De Dezembro Número 707 ( Cemitério ),0,,,180075,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-180076,R 2 de Abril 2,38.955780,-8.993610,0,1,0,0,,,#N/A,0,,,180076,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+180076,R 2 de Abril 2,38.955780,-8.993610,0,1,0,0,,,Rua 2 De Abril Número 2,0,,,180076,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180077,R 1 Dezembro 59,38.952900,-8.988010,0,1,0,0,,,Rua Primeiro De Dezembro Número 59,0,,,180077,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-180078,R 2 de Abril 30,38.956360,-8.995500,0,1,0,0,,,#N/A,0,,,180078,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+180078,R 2 de Abril 30,38.956360,-8.995500,0,1,0,0,,,Rua 2 De Abril Número 30,0,,,180078,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180079,R 25 Abril (Terminal),38.955364,-8.987080,0,1,0,0,,,Rua 25 De Abril ( Terminal ) . ( Há correspondência ) com o combóio ,0,,,180079,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,1,0,0,1,0,0,0,0,0
-180080,Estr Santa Sofia 20A,38.956859,-8.998713,0,1,0,0,,,#N/A,0,,,180080,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+180080,Estr Santa Sofia 20A,38.956859,-8.998713,0,1,0,0,,,Estrada Santa Sofia 20 Á,0,,,180080,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180081,R Luís De Camões (Correios),38.953600,-8.989740,0,1,0,0,,,Rua Luís De Camões ( Correios ),0,,,180081,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-180082,EM524 (X) Estr do Palácio de Farrobo,38.959581,-9.007302,0,1,0,0,,,#N/A,0,,,180082,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+180082,EM524 (X) Estr do Palácio de Farrobo,38.959581,-9.007302,0,1,0,0,,,Cruzamento Entre ( Estrada Municipal 524 ) E Estrada Do Palácio De Farrobo,0,,,180082,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180083,R 1 Dezembro 656,38.950800,-8.990600,0,1,0,0,,,Rua Primeiro De Dezembro Número 656,0,,,180083,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-180084,Alm Capitães de abril (Segurança Social),38.954141,-8.993668,0,1,0,0,,,#N/A,0,,,180084,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+180084,Alm Capitães de abril (Segurança Social),38.954141,-8.993668,0,1,0,0,,,Almirante Capitães De Abril ( Segurança Social ),0,,,180084,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180085,En 10 (C Futebol) (Vila Franca de Xira),38.945420,-8.995210,0,1,0,0,,,Estrada Nacional 10 ( Campo Futebol ) ( Vila Franca De Xira ),0,,,180085,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180087,Bairro Paraiso (X) EN10,38.941330,-8.998610,0,1,0,0,,,Cruzamento Entre ( Bairro Paraiso ) E Estrada Nacional 10,0,,,180087,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 180089,En 10 (Fábrica),38.936800,-9.002820,0,1,0,0,,,Estrada Nacional 10 ( Fábrica ),0,,,180089,,1,,,,Vila Franca de Xira,,,1114,Vila Franca de Xira,11,Lisboa,PT170,AML,,,,,,,,,,,,,,,,,,,0,,,,,,,,,,,,,,,,,,0,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0