diff --git a/files/stops.txt b/files/stops.txt
index 9fd58ac..e3a1ec5 100644
--- a/files/stops.txt
+++ b/files/stops.txt
@@ -6,7 +6,7 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 010008,ALCOCHETE (R LEITE CUNHA) BIBLIOTECA,38.753271,-8.963504,010008,R. Prof. Leite Cunha 151,Alcochete ( Rua Leite Cunha ) Biblioteca,44,active,PT170,AML,15,Setúbal,1502,Alcochete,,,Alcochete,,0,,,https://on.carrismetropolitana.pt/stops/010008,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 010009,ALCOCHETE (AV RESTAURAÇÃO) EB MANUEL I,38.750706,-8.962749,010009,Escola Básica El Rei D. Manuel I,Alcochete ( Avenida Restauração ) Escola Básica Manuel Primeiro,44,active,PT170,AML,15,Setúbal,1502,Alcochete,,,Alcochete,,0,,,https://on.carrismetropolitana.pt/stops/010009,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 010010,ALCOCHETE (AV RESTAURAÇÃO) EB MANUEL I,38.751002,-8.962783,010010,Escola Básica El Rei D. Manuel I,Alcochete ( Avenida Restauração ) Escola Básica Manuel Primeiro,44,active,PT170,AML,15,Setúbal,1502,Alcochete,,,Alcochete,,0,,,https://on.carrismetropolitana.pt/stops/010010,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-010011,ALCOCHETE (R JOSÉ GRILO EVANGELISTA),38.748855,-8.962159,010011,R. da Escola Secundária (X) Rua Artur Garrett,Alcochete ( Rua José Grilo Evangelista ),44,active,PT170,AML,15,Setúbal,1502,Alcochete,,,Alcochete,,0,,,https://on.carrismetropolitana.pt/stops/010011,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+010011,ALCOCHETE (R JOSÉ GRILO EVANGELISTA),38.748855,-8.962159,010011,R. da Escola Secundária (X) R. Artur Garrett,Alcochete ( Rua José Grilo Evangelista ),44,active,PT170,AML,15,Setúbal,1502,Alcochete,,,Alcochete,,0,,,https://on.carrismetropolitana.pt/stops/010011,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 010012,ALCOCHETE (R JOSÉ GRILO EVANGELISTA),38.748866,-8.961929,010012,R. da Escola Secundária (X) R. Manuel Gomes da Mestra,Alcochete ( Rua José Grilo Evangelista ),44,active,PT170,AML,15,Setúbal,1502,Alcochete,,,Alcochete,,0,,,https://on.carrismetropolitana.pt/stops/010012,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 010013,ALCOCHETE (R COOPERAÇÃO 27),38.748733,-8.966155,010013,R. da Cooperação L11,Alcochete ( Rua Cooperação 27 ),44,active,PT170,AML,15,Setúbal,1502,Alcochete,,,Alcochete,,0,,,https://on.carrismetropolitana.pt/stops/010013,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 010014,ALCOCHETE (R COOPERAÇÃO 27),38.748700,-8.965973,010014,R. da Cooperação L27,Alcochete ( Rua Cooperação 27 ),44,active,PT170,AML,15,Setúbal,1502,Alcochete,,,Alcochete,,0,,,https://on.carrismetropolitana.pt/stops/010014,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -367,7 +367,7 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 020304,MONTE CAPARICA R CON M FERNANDES 62,38.667590,-9.194780,020304,a definir,Monte De Caparíca Rua Conselheiro M Fernandes 62,43,active,PT170,AML,15,Setúbal,1503,Almada,,,Almada,,0,,,https://on.carrismetropolitana.pt/stops/020304,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020305,MTE CAP R CON MAN LUIS FERN (X) R FACHO,38.666200,-9.194640,020305,a definir,Monte De Caparíca ( Cruzamento Entre ( Rua Conselheiro Manuel Luis Fernando ) E Rua Facho ),43,active,PT170,AML,15,Setúbal,1503,Almada,,,Monte da Caparica,,0,,,https://on.carrismetropolitana.pt/stops/020305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020306,MTE CAP R CON MAN LUIS FERN (X) R FACHO,38.666200,-9.194600,020306,a definir,Monte De Caparíca ( Cruzamento Entre ( Rua Conselheiro Manuel Luis Fernando ) E Rua Facho ),43,active,PT170,AML,15,Setúbal,1503,Almada,,,Monte da Caparica,,0,,,https://on.carrismetropolitana.pt/stops/020306,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-020308,MTE CAPARICAAV TORRADO SILVA (X) FOMEGA,38.665640,-9.195120,020308,a definir,Cruzamento Entre ( Monte Caparicaav Torrado Silva ) E Fómega . ( Há correspondência ) com o métro ligeiro,43,active,PT170,AML,15,Setúbal,1503,Almada,,,Monte da Caparica,,0,,,https://on.carrismetropolitana.pt/stops/020308,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0
+020308,MTE CAPARICA AV TORRADO SILVA (X) FOMEGA,38.665640,-9.195120,020308,a definir,Monte De Caparíca ( Cruzamento Entre ( Avenida Torrado Silva ) E Fómega ) . ( Há correspondência ) com o métro ligeiro,43,active,PT170,AML,15,Setúbal,1503,Almada,,,Monte da Caparica,,0,,,https://on.carrismetropolitana.pt/stops/020308,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0
 020309,MTE CAP R TRAB RURAIS (ROTUNDA),38.664400,-9.197050,020309,a definir,Monte De Caparíca Rua Trabalhadores Rurais ( Rotunda ),43,active,PT170,AML,15,Setúbal,1503,Almada,,,Monte da Caparica,,0,,,https://on.carrismetropolitana.pt/stops/020309,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020310,MTE CAP R TRAB RURAIS (ROTUNDA),38.664510,-9.196980,020310,a definir,Monte De Caparíca Rua Trabalhadores Rurais ( Rotunda ),43,active,PT170,AML,15,Setúbal,1503,Almada,,,Monte da Caparica,,0,,,https://on.carrismetropolitana.pt/stops/020310,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020311,MTE CAPARICA (LARGO CANDIDO REIS 76),38.663800,-9.198310,020311,a definir,Monte De Caparíca ( Largo Candido Reis 76 ),43,active,PT170,AML,15,Setúbal,1503,Almada,,,Monte da Caparica,,0,,,https://on.carrismetropolitana.pt/stops/020311,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -794,10 +794,10 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 020914,MARISOL (R LOBITOS 57),38.595280,-9.179020,020914,a definir,Marisol ( Rua Lobitos 57 ),43,active,PT170,AML,15,Setúbal,1503,Almada,,,Marisol,,0,,,https://on.carrismetropolitana.pt/stops/020914,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020915,VL FIGUEIRA (EN10-1 KM 1 700),38.642400,-9.169450,020915,a definir,Vale Figueira ( Estrada Nacional 10 - - Um Quilómetro - Um 700 ),43,active,PT170,AML,15,Setúbal,1503,Almada,,,Almada,,0,,,https://on.carrismetropolitana.pt/stops/020915,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 020916,VL FIGUEIRA (EN10-1 KM 1 700),38.642500,-9.169420,020916,a definir,Vale Figueira ( Estrada Nacional 10 - - Um Quilómetro - Um 700 ),43,active,PT170,AML,15,Setúbal,1503,Almada,,,Almada,,0,,,https://on.carrismetropolitana.pt/stops/020916,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-020917,SOBREDA (ESP CIDADÃO) JARDIM ZAGALOS,38.650300,-9.189480,020917,a definir,Sobreda ( Espaço Cidadão ) Jardim Zagalos,43,active,PT170,AML,15,Setúbal,1503,Almada,,,Sobreda,,0,,,https://on.carrismetropolitana.pt/stops/020917,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-020918,SOBREDA (ESP CIDADÃO) JARDIM ZAGALOS,38.650310,-9.189580,020918,a definir,Sobreda ( Espaço Cidadão ) Jardim Zagalos,43,active,PT170,AML,15,Setúbal,1503,Almada,,,Sobreda,,0,,,https://on.carrismetropolitana.pt/stops/020918,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-020919,SOBREDA (R LIBERDADE 23) IGREJA,38.648700,-9.189600,020919,a definir,Sobreda ( Rua Liberdade 23 ) Igreja,43,active,PT170,AML,15,Setúbal,1503,Almada,,,Sobreda,,0,,,https://on.carrismetropolitana.pt/stops/020919,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-020920,SOBREDA (R LIBERDADE 23) IGREJA,38.648710,-9.189670,020920,a definir,Sobreda ( Rua Liberdade 23 ) Igreja,43,active,PT170,AML,15,Setúbal,1503,Almada,,,Sobreda,,0,,,https://on.carrismetropolitana.pt/stops/020920,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+020917,SOBREDA (ESP CIDADÃO) JARDIM ZAGALOS,38.650300,-9.189480,020917,a definir,Sobreda ( Espaço Cidadão ) Jardim Zagalos,43,inactive,PT170,AML,15,Setúbal,1503,Almada,,,Sobreda,,0,,,https://on.carrismetropolitana.pt/stops/020917,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+020918,SOBREDA (ESP CIDADÃO) JARDIM ZAGALOS,38.650310,-9.189580,020918,a definir,Sobreda ( Espaço Cidadão ) Jardim Zagalos,43,inactive,PT170,AML,15,Setúbal,1503,Almada,,,Sobreda,,0,,,https://on.carrismetropolitana.pt/stops/020918,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+020919,SOBREDA (R LIBERDADE 23) IGREJA,38.648700,-9.189600,020919,a definir,Sobreda ( Rua Liberdade 23 ) Igreja,43,inactive,PT170,AML,15,Setúbal,1503,Almada,,,Sobreda,,0,,,https://on.carrismetropolitana.pt/stops/020919,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+020920,SOBREDA (R LIBERDADE 23) IGREJA,38.648710,-9.189670,020920,a definir,Sobreda ( Rua Liberdade 23 ) Igreja,43,inactive,PT170,AML,15,Setúbal,1503,Almada,,,Sobreda,,0,,,https://on.carrismetropolitana.pt/stops/020920,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020923,QTA CERIEIRA R QTA CERIEIRA 52(ESCOLA),38.639900,-9.181960,020923,a definir,Quinta Cerieira Rua Quinta Cerieira 52 ( Escola ),43,active,PT170,AML,15,Setúbal,1503,Almada,,,Almada,,0,,,https://on.carrismetropolitana.pt/stops/020923,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020925,R QUINTA DA GRAÇA 25,38.638200,-9.182940,020925,a definir,Rua Quinta Da Graça 25,43,active,PT170,AML,15,Setúbal,1503,Almada,,,Almada,,0,,,https://on.carrismetropolitana.pt/stops/020925,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 020926,R QUINTA DA GRAÇA 25,38.638200,-9.182890,020926,a definir,Rua Quinta Da Graça 25,43,active,PT170,AML,15,Setúbal,1503,Almada,,,Almada,,0,,,https://on.carrismetropolitana.pt/stops/020926,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1288,7 +1288,7 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 030577,Av Conde São Marçal Fte 3,38.735683,-9.218818,030577,a definir,Avenida Conde São Marçal ( Frente Ao Número 3,41,active,PT170,AML,11,Lisboa,1115,Amadora,,,Amadora,,0,,,https://on.carrismetropolitana.pt/stops/030577,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 030578,Av Conde São Marçal 3,38.735504,-9.218941,030578,a definir,Avenida Conde São Marçal 3,41,active,PT170,AML,11,Lisboa,1115,Amadora,,,Amadora,,0,,,https://on.carrismetropolitana.pt/stops/030578,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 030579,Av Almeida Garrett 76,38.738281,-9.218164,030579,a definir,Avenida Almeida Garrett 76,41,active,PT170,AML,11,Lisboa,1115,Amadora,,,Amadora,,0,,,https://on.carrismetropolitana.pt/stops/030579,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-030580,Av Alm Garrett (X) Pct Raúl Brandão,38.738351,-9.217711,030580,a definir,Cruzamento Entre ( Avenida Almeida Garret ) E Praceta Raúl Brandão,41,active,PT170,AML,11,Lisboa,1115,Amadora,,,Amadora,,0,,,https://on.carrismetropolitana.pt/stops/030580,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+030580,Av Alm Garrett (X) Pct Raúl Brandão,38.738351,-9.217711,030580,a definir,Cruzamento Entre ( Avenida Almeida Garrett ) E Praceta Raúl Brandão,41,active,PT170,AML,11,Lisboa,1115,Amadora,,,Amadora,,0,,,https://on.carrismetropolitana.pt/stops/030580,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 030581,R Faustino Fonseca 2,38.736911,-9.216441,030581,a definir,Rua Faustino Fonseca 2,41,active,PT170,AML,11,Lisboa,1115,Amadora,,,Amadora,,0,,,https://on.carrismetropolitana.pt/stops/030581,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 030583,Reboleira (Estação) P4,38.749975,-9.221134,030583,a definir,Reboleira ( - Estaçaão ) ( P 4 ) . ( Há correspondência ) com o combóio,41,active,PT170,AML,11,Lisboa,1115,Amadora,,,Reboleira,,0,,,https://on.carrismetropolitana.pt/stops/030583,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0
 030585,Av D Pedro V 3,38.748082,-9.215356,030585,a definir,Avenida Dom Pedro Quinto 3,41,active,PT170,AML,11,Lisboa,1115,Amadora,,,Amadora,,0,,,https://on.carrismetropolitana.pt/stops/030585,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1823,8 +1823,8 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 050223,R das Padarias Fte Escola,38.717794,-9.424013,050223,a definir,Rua Das Padarias ( Frente Escola,41,active,PT170,AML,11,Lisboa,1105,Cascais,,,Cascais,,0,,,https://on.carrismetropolitana.pt/stops/050223,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 050225,Estr das Tojas Lt 101,38.719234,-9.424111,050225,a definir,Estrada Das Tojas - Lóte 101,41,active,PT170,AML,11,Lisboa,1105,Cascais,,,Cascais,,0,,,https://on.carrismetropolitana.pt/stops/050225,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 050226,Estr das Tojas Lt 101,38.719335,-9.424278,050226,a definir,Estrada Das Tojas - Lóte 101,41,active,PT170,AML,11,Lisboa,1105,Cascais,,,Cascais,,0,,,https://on.carrismetropolitana.pt/stops/050226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-050227,R das Tojas Fte 2 (X) R Bocage,38.721730,-9.424646,050227,a definir,Rua Das Tojas ( Cruzamento Entre ( Frente Ao Número 2 ) E Rua Bocage,41,active,PT170,AML,11,Lisboa,1105,Cascais,,,Cascais,,0,,,https://on.carrismetropolitana.pt/stops/050227,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-050228,R das Tojas Fte 2 (X) R Bocage,38.721951,-9.424667,050228,a definir,Rua Das Tojas ( Cruzamento Entre ( Frente Ao Número 2 ) E Rua Bocage,41,active,PT170,AML,11,Lisboa,1105,Cascais,,,Cascais,,0,,,https://on.carrismetropolitana.pt/stops/050228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+050227,R das Tojas Fte 2 (X) R Bocage,38.721730,-9.424646,050227,a definir,Cruzamento Entre ( Rua Das Tojas ( Frente Ao Número 2 ) E Rua Bocage,41,active,PT170,AML,11,Lisboa,1105,Cascais,,,Cascais,,0,,,https://on.carrismetropolitana.pt/stops/050227,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+050228,R das Tojas Fte 2 (X) R Bocage,38.721951,-9.424667,050228,a definir,Cruzamento Entre ( Rua Das Tojas ( Frente Ao Número 2 ) E Rua Bocage,41,active,PT170,AML,11,Lisboa,1105,Cascais,,,Cascais,,0,,,https://on.carrismetropolitana.pt/stops/050228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 050229,R das Tojas 548,38.723079,-9.424051,050229,a definir,Rua Das Tojas 548,41,active,PT170,AML,11,Lisboa,1105,Cascais,,,Cascais,,0,,,https://on.carrismetropolitana.pt/stops/050229,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 050230,R das Tojas 548,38.722864,-9.424271,050230,a definir,Rua Das Tojas 548,41,active,PT170,AML,11,Lisboa,1105,Cascais,,,Cascais,,0,,,https://on.carrismetropolitana.pt/stops/050230,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 050231,R das Tojas (Restaurante),38.724154,-9.424938,050231,a definir,Rua Das Tojas ( Restaurante ),41,active,PT170,AML,11,Lisboa,1105,Cascais,,,Cascais,,0,,,https://on.carrismetropolitana.pt/stops/050231,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -2323,7 +2323,7 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 061220,Lisboa (Av Berna 31A),38.739483,-9.151748,061220,a definir,Lisboa ( Avenida Berna 31 Á ),43,active,PT170,AML,11,Lisboa,1106,Lisboa,,,Campo Pequeno,,0,,,https://on.carrismetropolitana.pt/stops/061220,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 061221,Av. Gago Coutinho / Av. D. Rodrigo Cunha,38.753856,-9.130610,061221,a definir,Avenida Gago Coutinho / Avenida Dom Rodrigo Cunha,42,active,PT170,AML,11,Lisboa,1106,Lisboa,,,Campo Pequeno,,0,,,https://on.carrismetropolitana.pt/stops/061221,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 061222,Qta. Sto. António,38.752605,-9.130435,061222,a definir,Quinta Santo António,42,active,PT170,AML,11,Lisboa,1106,Lisboa,,,Campo Pequeno,,0,,,https://on.carrismetropolitana.pt/stops/061222,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-062000,Cais do Sodré,38.705330,-9.143940,062000,a definir,Cais Do Sodré . ( Há correspondência ) com o métro o combóio e o barco,41|44,active,PT170,AML,11,Lisboa,1106,Lisboa,,,Cais do Sodré,,0,,,https://on.carrismetropolitana.pt/stops/062000,0,0,0,0,0,0,0,0,0,0,1,0,1,1,0,0,0,0
+062000,Cais do Sodré,38.705330,-9.143940,062000,a definir,Cais Do Sodré . ( Há correspondência ) com o métro o combóio e o barco,41|44,provisional,PT170,AML,11,Lisboa,1106,Lisboa,,,Cais do Sodré,,0,,,https://on.carrismetropolitana.pt/stops/062000,0,0,0,0,0,0,0,0,0,0,1,0,1,1,0,0,0,0
 062001,Santos (Estação),38.706222,-9.156000,062001,a definir,Santos ( - Estaçaão ),43|41|44,active,PT170,AML,11,Lisboa,1106,Lisboa,,,Santos,,0,,,https://on.carrismetropolitana.pt/stops/062001,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 062002,Alcântara Mar (Hospital),38.703058,-9.173386,062002,a definir,Alcântara Mar ( Hospital ),41|44,active,PT170,AML,11,Lisboa,1106,Lisboa,,,Alcântara,,0,,,https://on.carrismetropolitana.pt/stops/062002,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 062003,Alcântara Mar (Estação),38.702868,-9.173238,062003,a definir,Alcântara Mar ( - Estaçaão ) . ( Há correspondência ) com o combóio,41|44,active,PT170,AML,11,Lisboa,1106,Lisboa,,,Alcântara,,0,,,https://on.carrismetropolitana.pt/stops/062003,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
@@ -5271,14 +5271,12 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 100392,FAIAS (EN 4) ESC PRIMÁRIA,38.690349,-8.746421,100392,a definir,Faias ( Estrada Nacional 4 ) Escola Primária,44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Faias,,0,,,https://on.carrismetropolitana.pt/stops/100392,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 100393,CASA TIMÓTEO (EN 4) R DEOLINDA MARIA,38.691586,-8.755502,100393,a definir,Casa Timóteo ( Estrada Nacional 4 ) Rua Deolinda Maria,44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Montijo,,0,,,https://on.carrismetropolitana.pt/stops/100393,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 100395,FAIAS (N4)PARAGEM PEREIRAS (PST COMBUST),38.693673,-8.768563,100395,a definir,Faias ( Estrada Nacional 4 ) Paragem Pereiras ( Posto De Combustível ),44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Faias,,0,,,https://on.carrismetropolitana.pt/stops/100395,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-100397,MONTIJO (R JOAQ ALMEIDA X R ALM GARRET,38.706966,-8.960601,100397,a definir,Montijo ( Cruzamento Entre ( Rua Joaquim Almeida ) E Rua Almeida Garret,44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Montijo,,0,,,https://on.carrismetropolitana.pt/stops/100397,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-100398,MONTIJO (R JOAQ ALMEIDA X R ALM GARRET,38.706853,-8.960561,100398,a definir,Montijo ( Cruzamento Entre ( Rua Joaquim Almeida ) E Rua Almeida Garret,44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Montijo,,0,,,https://on.carrismetropolitana.pt/stops/100398,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+100397,MONTIJO (R JOAQ ALMEIDA X R ALM GARRET,38.706966,-8.960601,100397,a definir,Montijo ( Cruzamento Entre ( Rua Joaquim Almeida ) E Rua Almeida Garrett,44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Montijo,,0,,,https://on.carrismetropolitana.pt/stops/100397,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+100398,MONTIJO (R JOAQ ALMEIDA X R ALM GARRET,38.706853,-8.960561,100398,a definir,Montijo ( Cruzamento Entre ( Rua Joaquim Almeida ) E Rua Almeida Garrett,44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Montijo,,0,,,https://on.carrismetropolitana.pt/stops/100398,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 100399,MONTIJO (EN 4) ROTUNDA SANTA,38.706832,-8.957670,100399,a definir,Montijo ( Estrada Nacional 4 ) Rotunda Santa,44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Montijo,,0,,,https://on.carrismetropolitana.pt/stops/100399,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 100401,PEGÕES VELHOS (EN 4) X FERNANDO PÓ,38.684792,-8.664636,100401,a definir,Cruzamento Entre ( Pé-gões Velhos ( Estrada Nacional 4 ) ) E Fernando Pó,44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Pegões,,0,,,https://on.carrismetropolitana.pt/stops/100401,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 100403,CANHA (EM 533) FÁBRICA CORTIÇA,38.745768,-8.673261,100403,a definir,Canha ( Estrada Municipal 533 ) Fábrica Cortiça,44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Canha,,0,,,https://on.carrismetropolitana.pt/stops/100403,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-100404,CANHA (EM 533) FÁBRICA CORTIÇA,38.745690,-8.673227,100404,a definir,Canha ( Estrada Municipal 533 ) Fábrica Cortiça,,active,PT170,AML,15,Setúbal,1507,Montijo,,,Canha,,0,,,https://on.carrismetropolitana.pt/stops/100404,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 100405,COLARES PERDIZES (EM 533) HERDADE,38.729946,-8.702469,100405,a definir,Colares Perdizes ( Estrada Municipal 533 ) Herdade,44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Montijo,,0,,,https://on.carrismetropolitana.pt/stops/100405,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-100406,COLARES PERDIZES (EM 533) HERDADE,38.729897,-8.702370,100406,a definir,Colares Perdizes ( Estrada Municipal 533 ) Herdade,,active,PT170,AML,15,Setúbal,1507,Montijo,,,Montijo,,0,,,https://on.carrismetropolitana.pt/stops/100406,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 100407,AFONSOEIRO X Bº BELA VISTA (SEMÁFOROS),38.698600,-8.955410,100407,a definir,Cruzamento Entre ( Afonso-eiro ) E Bairro Bela Vista ( Semáforos ),44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Afonsoeiro,,0,,,https://on.carrismetropolitana.pt/stops/100407,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 100408,AFONSOEIRO X Bº BELA VISTA (SEMÁFOROS),38.698521,-8.955372,100408,a definir,Cruzamento Entre ( Afonso-eiro ) E Bairro Bela Vista ( Semáforos ),44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Afonsoeiro,,0,,,https://on.carrismetropolitana.pt/stops/100408,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 100409,JARDIA (RUA DAS ROLAS) BAIRRO MIRANDA,38.673890,-8.925137,100409,a definir,Jardia ( Rua Das Rolas ) Bairro Miranda,44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Jardia,,0,,,https://on.carrismetropolitana.pt/stops/100409,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -5314,7 +5312,7 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 100447,MONTIJO (R DAMIÃO GOIS - SUPERMERCADO),38.710990,-8.963941,100447,a definir,Montijo ( Rua Damião Gois - Supermercado ),44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Montijo,,0,,,https://on.carrismetropolitana.pt/stops/100447,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 100448,AFONSOEIRO (AV PEDRO NUNES -SUPERMERC,38.704553,-8.957423,100448,a definir,Afonso-eiro ( Avenida Pedro Nunes -súper-mercádo,44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Afonsoeiro,,0,,,https://on.carrismetropolitana.pt/stops/100448,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 100449,AFONSOEIRO (AV PEDRO NUNES -SUPERMERC,38.704223,-8.956665,100449,a definir,Afonso-eiro ( Avenida Pedro Nunes -súper-mercádo,44,active,PT170,AML,15,Setúbal,1507,Montijo,,,Afonsoeiro,,0,,,https://on.carrismetropolitana.pt/stops/100449,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-110001,R Almeida Garret (X) A Silva Porto,38.786972,-9.217250,110001,a definir,Cruzamento Entre ( Rua Almeida Garret ) E Á Silva Porto,42,active,PT170,AML,11,Lisboa,1116,Odivelas,,,Odivelas,,0,,,https://on.carrismetropolitana.pt/stops/110001,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+110001,R Almeida Garret (X) A Silva Porto,38.786972,-9.217250,110001,a definir,Cruzamento Entre ( Rua Almeida Garrett ) E Á Silva Porto,42,active,PT170,AML,11,Lisboa,1116,Odivelas,,,Odivelas,,0,,,https://on.carrismetropolitana.pt/stops/110001,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 110003,R Major Rosa Bastos (X) R Vitor Hugo,38.810310,-9.233790,110003,a definir,Cruzamento Entre ( Rua Major Rosa Bastos ) E Rua Vitor Hugo,41|42,active,PT170,AML,11,Lisboa,1116,Odivelas,,,Odivelas,,0,,,https://on.carrismetropolitana.pt/stops/110003,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 110004,R M Rosa Bastos (P Combust),38.810310,-9.234350,110004,a definir,Rua M Rosa Bastos ( Posto De Combustível ),41|42,active,PT170,AML,11,Lisboa,1116,Odivelas,,,Odivelas,,0,,,https://on.carrismetropolitana.pt/stops/110004,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 110005,Azinhaga Canhamato 7A (Qta Bretão),38.812823,-9.234295,110005,a definir,Azinhaga Canhamato 7 Á ( Quinta Bretão ),41,active,PT170,AML,11,Lisboa,1116,Odivelas,,,Odivelas,,0,,,https://on.carrismetropolitana.pt/stops/110005,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -6125,7 +6123,7 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 120239,R Ceuta 33,38.714719,-9.236771,120239,a definir,Rua Ceuta 33,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120239,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 120240,R Ceuta 33,38.714586,-9.236871,120240,a definir,Rua Ceuta 33,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120240,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 120241,Av 25 de Abril - Central Park,38.716867,-9.238174,120241,a definir,Avenida 25 De Abril - Central Park,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120241,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-120243,R Almeida Garret 17,38.717574,-9.240376,120243,a definir,Rua Almeida Garret 17,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120243,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+120243,R Almeida Garret 17,38.717574,-9.240376,120243,a definir,Rua Almeida Garrett 17,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120243,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 120245,R Moçambique 16A,38.717773,-9.242168,120245,a definir,Rua Moçambique 16 Á,,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120245,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 120247,R Dona Joana Pedroso Simões Alves 32,38.716305,-9.243764,120247,a definir,Rua Dona Joana Pedroso Simões Alves 32,,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120247,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 120249,Av 25 de Abril Fte 22,38.714632,-9.242100,120249,a definir,Avenida 25 De Abril ( Frente Ao Número 22,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120249,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -6331,9 +6329,9 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 120543,R Mouzinho Silveira (X) Açores,38.723493,-9.263602,120543,a definir,Cruzamento Entre ( Rua Mouzinho Silveira ) E Açores,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120543,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 120545,R J Iteperano Duarte 16,38.720050,-9.260361,120545,a definir,Rua J Iteperano Duarte 16,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120545,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 120546,R J Iteperano Duarte 11,38.720122,-9.260461,120546,a definir,Rua J Iteperano Duarte 11,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120546,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-120547,R Camilo C Branco (X) R Fel Castilho,38.716217,-9.259026,120547,a definir,Cruzamento Entre ( Rua Camilo Cása Branco ) E Rua Fel Castilho,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120547,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-120548,R Camilo C Branco (X) R Fel Castilho,38.716143,-9.258976,120548,a definir,Cruzamento Entre ( Rua Camilo Cása Branco ) E Rua Fel Castilho,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120548,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-120549,R Camilo C Branco (X) Rua Alves Crespo,38.715912,-9.261934,120549,a definir,Cruzamento Entre ( Rua Camilo Cása Branco ) E Rua Alves Crespo,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120549,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+120547,R Camilo C Branco (X) R Fel Castilho,38.716217,-9.259026,120547,a definir,Cruzamento Entre ( Rua Camilo Castelo Branco ) E Rua Feliciano De Castilho,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120547,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+120548,R Camilo C Branco (X) R Fel Castilho,38.716143,-9.258976,120548,a definir,Cruzamento Entre ( Rua Camilo Castelo Branco ) E Rua Feliciano De Castilho,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120548,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+120549,R Camilo C Branco (X) Rua Alves Crespo,38.715912,-9.261934,120549,a definir,Cruzamento Entre ( Rua Camilo Castelo Branco ) E Rua Alves Crespo,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/120549,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 120553,Barcarena (Cemitério),38.730201,-9.276500,120553,a definir,Barcarena ( Cemitério ),41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Barcarena,,0,,,https://on.carrismetropolitana.pt/stops/120553,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 120554,Barcarena (Cemitério),38.729989,-9.276490,120554,a definir,Barcarena ( Cemitério ),41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Barcarena,,0,,,https://on.carrismetropolitana.pt/stops/120554,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 120555,Barcarena (Bombeiros),38.731767,-9.278150,120555,a definir,Barcarena ( Bombeiros ),41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Barcarena,,0,,,https://on.carrismetropolitana.pt/stops/120555,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -6680,7 +6678,7 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 121031,Tv Escondidinho,38.717592,-9.302444,121031,a definir,Travessa Escondidinho,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121031,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 121033,R Casal do Deserto,38.716988,-9.303580,121033,a definir,Rua Casal Do Deserto,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121033,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 121035,R Dr José da Cunha 23,38.702026,-9.307645,121035,a definir,Rua Doutor José Da Cunha 23,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121035,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-121037,Clube Desportivo de Vila Fria,38.720787,-9.292826,121037,a definir,Clube Desportivo De Vila Fria,,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121037,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+121037,Clube Desportivo de Vila Fria,38.720787,-9.292826,121037,a definir,Clube Desportivo De Vila Fria,,voided,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121037,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 121039,Estr S Marcos (BES),38.750690,-9.308897,121039,Taguspark (Novo Banco),Estrada São Marcos ( Bes ),41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Taguspark,,0,,,https://on.carrismetropolitana.pt/stops/121039,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 121041,Estr de Alfragide (Cimpor),38.734831,-9.232549,121041,a definir,Estrada De Alfragide ( Cimpor ),41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121041,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 121043,Estr Alfragide 17,38.734490,-9.227391,121043,a definir,Estrada Alfragide 17,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121043,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -6725,10 +6723,10 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 121104,Av Prof Dr Cavaco Silva 19,38.739124,-9.304781,121104,Taguspark (Ft. Segurança Social),Avenida Professor Doutor Cavaco Silva 19,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Taguspark,,0,,,https://on.carrismetropolitana.pt/stops/121104,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 121105,Taguspark (Rotunda SEF),38.735836,-9.299677,121105,Taguspark (Rot. do SEF),Taguspark ( Rotunda Sef ),41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Taguspark,,0,,,https://on.carrismetropolitana.pt/stops/121105,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 121106,Taguspark (Rotunda SEF),38.736033,-9.299921,121106,Taguspark (Ft. Rot. do SEF),Taguspark ( Rotunda Sef ),41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Taguspark,,0,,,https://on.carrismetropolitana.pt/stops/121106,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-121107,Av Sta Casa Miseric (X) Estr Oeiras,38.714131,-9.304854,121107,a definir,Cruzamento Entre ( Avenida Santa Cása Miseric ) E Estrada Oeiras,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121107,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-121108,Av Sta Casa Miseric (X) Estr Oeiras,38.713978,-9.304841,121108,a definir,Cruzamento Entre ( Avenida Santa Cása Miseric ) E Estrada Oeiras,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121108,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-121109,Av Sta Casa Miseric Oei (Estr Oeiras),38.714529,-9.307894,121109,a definir,Avenida Santa Cása Miseric Óeiras( Estrada Oeiras ),41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121109,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-121110,Av Sta Casa Misericórd (Saída Lagoas),38.714449,-9.308051,121110,a definir,Avenida Santa Cása Misericórd ( Saída Lagoas ),41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121110,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+121107,Av Sta Casa Miseric (X) Estr Oeiras,38.714131,-9.304854,121107,a definir,Cruzamento Entre ( Avenida Santa Cása Misericórdia ) E Estrada Oeiras,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121107,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+121108,Av Sta Casa Miseric (X) Estr Oeiras,38.713978,-9.304841,121108,a definir,Cruzamento Entre ( Avenida Santa Cása Misericórdia ) E Estrada Oeiras,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121108,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+121109,Av Sta Casa Miseric Oei (Estr Oeiras),38.714529,-9.307894,121109,a definir,Avenida Santa Cása Misericórdia Óeiras( Estrada Oeiras ),41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121109,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+121110,Av Sta Casa Misericórd (Saída Lagoas),38.714449,-9.308051,121110,a definir,Avenida Santa Cása Misericórdia ( Saída Lagoas ),41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121110,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 121111,Av Rio Janeiro (X) R Franc Manuel Melo,38.697664,-9.311361,121111,a definir,Cruzamento Entre ( Avenida Rio Janeiro ) E Rua Francisco Manuel Melo,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121111,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 121112,Av Rio Janeiro (X) R Gaspar Lemos,38.697791,-9.311384,121112,a definir,Cruzamento Entre ( Avenida Rio Janeiro ) E Rua Gaspar Lemos,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121112,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 121113,Pça Com Henrique Moreira Rato,38.697411,-9.309616,121113,a definir,Práça Comandante Henrique Moreira Rato,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121113,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -6860,7 +6858,7 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 121293,R Gazeta Oeiras 64,38.702431,-9.299943,121293,a definir,Rua Gazeta Oeiras 64,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121293,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 121294,R Quinta Pinheiro 4,38.726479,-9.216346,121294,a definir,Rua Quinta Pinheiro 4,,voided,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121294,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 121295,Av Eng Maria de Lurdes Pintassilgo,38.718980,-9.222508,121295,a definir,Avenida Engenheira Maria De Lurdes Pintassilgo,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121295,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-121296,R Camilo C Branco 31,38.715800,-9.261651,121296,a definir,Rua Camilo Cása Branco 31,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121296,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+121296,R Camilo C Branco 31,38.715800,-9.261651,121296,a definir,Rua Camilo Castelo Branco 31,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121296,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 121297,Oeiras (Estação) P3 Entrada Norte,38.688624,-9.317120,121297,a definir,Oeiras ( - Estaçaão ) ( P 3 ) Entrada Norte . ( Há correspondência ) com o combóio,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121297,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
 121298,Rua Mina Grande 7,38.730861,-9.239198,121298,a definir,Rua Mina Grande 7,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121298,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 121299,Estr Ribeira Lage,38.709221,-9.312956,121299,a definir,Estrada Ribeira Lage,41,active,PT170,AML,11,Lisboa,1110,Oeiras,,,Oeiras,,0,,,https://on.carrismetropolitana.pt/stops/121299,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -7714,7 +7712,7 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 140235,AV JOSÉ AFONSO (ROT) ECOM NÚCLEO NAVAL,38.630700,-9.105180,140235,a definir,Avenida José Afonso ( Rotunda ) Ecomuseu Núcleo Naval,43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Seixal,,0,,,https://on.carrismetropolitana.pt/stops/140235,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 140237,SEIXALAV REP (POSTO ABAST/QTA FIDALGA),38.634490,-9.105920,140237,a definir,Seixalav República ( Posto De Abastecimento Fidalga ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Seixal,,0,,,https://on.carrismetropolitana.pt/stops/140237,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 140241,SEIXAL (AV REPÚBLICA) STA C MISERICÓRDIA,38.641150,-9.105840,140241,a definir,Seixal ( Avenida República ) Santa Cása Misericórdia,43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Seixal,,0,,,https://on.carrismetropolitana.pt/stops/140241,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-140243,SEIXAL R PAIVA COE (PÇA REP) CM SEIXAL,38.643200,-9.106290,140243,a definir,Seixal Rua Paiva Coe ( Práça República ) Câmara Municipal Seixal,43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Seixal,,0,,,https://on.carrismetropolitana.pt/stops/140243,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+140243,SEIXAL R PAIVA COE (PÇA REP) CM SEIXAL,38.643200,-9.106290,140243,a definir,Seixal Rua Paiva Coelho ( Práça República ) Câmara Municipal Seixal,43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Seixal,,0,,,https://on.carrismetropolitana.pt/stops/140243,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 140245,SEIXAL (LARGO RESTAURADORES) PSP,38.644000,-9.101220,140245,a definir,Seixal ( Largo Restauradores ) Polícia,43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Seixal,,0,,,https://on.carrismetropolitana.pt/stops/140245,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 140247,SEIXAL AV DR ANT BABO (MERCADO MUNICIP),38.643400,-9.098900,140247,a definir,Seixal Avenida Doutor António Babo ( Mercado Municipal ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Seixal,,0,,,https://on.carrismetropolitana.pt/stops/140247,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 140249,SEIXAL (AV METALÚRGICOS N10),38.638800,-9.097140,140249,a definir,Seixal ( Avenida Metalúrgicos ( Número 10 ) ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Seixal,,0,,,https://on.carrismetropolitana.pt/stops/140249,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -8100,12 +8098,12 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 140774,QTA MARIALVA (AV AMÉLIA REY COLAÇO 11),38.633964,-9.153177,140774,a definir,Quinta Marialva ( Avenida Amélia Rey Colaço 11 ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Seixal,,0,,,https://on.carrismetropolitana.pt/stops/140774,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 140775,QTA MARIALVA (AV AMÉLIA REY COLAÇO 22),38.632600,-9.154390,140775,a definir,Quinta Marialva ( Avenida Amélia Rey Colaço 22 ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Seixal,,0,,,https://on.carrismetropolitana.pt/stops/140775,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 140776,QTA MARIALVA (AV AMÉLIA REY COLAÇO 22),38.632698,-9.154443,140776,a definir,Quinta Marialva ( Avenida Amélia Rey Colaço 22 ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Seixal,,0,,,https://on.carrismetropolitana.pt/stops/140776,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-140777,VALE MILHAÇOS R VITÓRIA (X) R ALM GARRET,38.630795,-9.156766,140777,a definir,Vale Milhaços ( Cruzamento Entre ( Rua Vitória ) E Rua Almeida Garret ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Vale de Milhaços,,0,,,https://on.carrismetropolitana.pt/stops/140777,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+140777,VALE MILHAÇOS R VITÓRIA (X) R ALM GARRET,38.630795,-9.156766,140777,a definir,Vale Milhaços ( Cruzamento Entre ( Rua Vitória ) E Rua Almeida Garrett ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Vale de Milhaços,,0,,,https://on.carrismetropolitana.pt/stops/140777,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 140779,QTA QUEIMADA (R CHAVES VALADARES 10),38.608750,-9.172400,140779,a definir,Quinta Queimada ( Rua Chaves Valadares 10 ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Seixal,,0,,,https://on.carrismetropolitana.pt/stops/140779,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 140780,QTA QUEIMADA (R CHAVES VALADARES 10),38.608840,-9.172270,140780,a definir,Quinta Queimada ( Rua Chaves Valadares 10 ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Seixal,,0,,,https://on.carrismetropolitana.pt/stops/140780,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 140781,QTA QUEIMADA (R CHAVES VALADARES 45),38.610220,-9.175250,140781,a definir,Quinta Queimada ( Rua Chaves Valadares 45 ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Seixal,,0,,,https://on.carrismetropolitana.pt/stops/140781,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 140782,QTA QUEIMADA (R CHAVES VALADARES 45),38.610150,-9.175410,140782,a definir,Quinta Queimada ( Rua Chaves Valadares 45 ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Seixal,,0,,,https://on.carrismetropolitana.pt/stops/140782,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-140785,VALE MILHAÇOS R VITÓRIA (X) R ALM GARRET,38.630789,-9.156524,140785,a definir,Vale Milhaços ( Cruzamento Entre ( Rua Vitória ) E Rua Almeida Garret ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Vale de Milhaços,,0,,,https://on.carrismetropolitana.pt/stops/140785,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+140785,VALE MILHAÇOS R VITÓRIA (X) R ALM GARRET,38.630789,-9.156524,140785,a definir,Vale Milhaços ( Cruzamento Entre ( Rua Vitória ) E Rua Almeida Garrett ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Vale de Milhaços,,0,,,https://on.carrismetropolitana.pt/stops/140785,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 140787,PAIO PIRES (X) Bº CUCENA (R DESEMBARG),38.611800,-9.074360,140787,a definir,Cruzamento Entre ( Paio Pires ) E Bairro Cucena ( Rua Desembargador ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Paio Pires,,0,,,https://on.carrismetropolitana.pt/stops/140787,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 140791,REDONDOS (R AGOSTINHO SILVA LTE 78),38.565200,-9.077930,140791,a definir,Redondos ( Rua Agostinho Silva - Lóte 78 ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Redondos,,0,,,https://on.carrismetropolitana.pt/stops/140791,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 140792,REDONDOS (R AGOSTINHO SILVA LTE 78),38.565190,-9.078060,140792,a definir,Redondos ( Rua Agostinho Silva - Lóte 78 ),43,active,PT170,AML,15,Setúbal,1510,Seixal,,,Redondos,,0,,,https://on.carrismetropolitana.pt/stops/140792,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -8903,7 +8901,6 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 160301,SETÚBAL (AV JOAQUIM CAMPOS),38.520070,-8.861890,160301,a definir,Setúbal ( Avenida Joaquim Campos ),44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160301,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 160303,SETÚBAL (AV JÚLIO SANTOS),38.522300,-8.859780,160303,a definir,Setúbal ( Avenida Júlio Santos ),44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160303,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 160305,MORGADA,38.520961,-8.792252,160305,a definir,Morgada,44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-160306,MORGADA _,38.520870,-8.792150,160306,a definir,"Morgada ",,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160307,ESTR MORGADA ( 42),38.521000,-8.795730,160307,a definir,Estrada Morgada ( 42 ),44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160308,ESTR MORGADA ( 42),38.521100,-8.795720,160308,a definir,Estrada Morgada ( 42 ),44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160308,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160309,ESTR MORGADA (96),38.521200,-8.799480,160309,a definir,Estrada Morgada ( 96 ),44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160309,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -9302,8 +9299,8 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 160798,CASAIS DA SERRA,38.475600,-9.029780,160798,a definir,Casais Da Serra,44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160798,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160799,X ARRÁBIDA,38.470300,-8.992060,160799,a definir,Cruzamento Arrábida,44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160799,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160800,X ARRÁBIDA,38.470300,-8.992010,160800,a definir,Cruzamento Arrábida,44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-160801,PRAIA DO CREIRO _,38.484800,-8.973370,160801,a definir,"Praia Do Creiro ",44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160801,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-160802,PRAIA DO CREIRO,38.484700,-8.973350,160802,a definir,Praia Do Creiro,44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160802,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+160801,PRAIA DO CREIRO,38.484800,-8.973370,160801,a definir,Praia Do Creiro,44,seasonal,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160801,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+160802,PRAIA DO CREIRO,38.484700,-8.973350,160802,a definir,Praia Do Creiro,44,seasonal,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160802,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160803,BREJOS AZEITÃO (EN10 KM24 500) P COMB,38.530900,-9.020990,160803,a definir,Brejos De Azeitão ( Estrada Nacional 10 Quilómetro 24 500 ) Posto De Combustível,43|44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Brejos de Azeitão,,0,,,https://on.carrismetropolitana.pt/stops/160803,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160805,BREJOS AZEITÃO (EN10KM234),38.539900,-9.026230,160805,a definir,Brejos De Azeitão ( Estrada Nacional 10 Quilómetro 234 ),43|44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Brejos de Azeitão,,0,,,https://on.carrismetropolitana.pt/stops/160805,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 160807,BRJ AZEITÃO (EN10 KM22 800) PARQUE,38.544300,-9.028800,160807,a definir,Brejos De Azeitão ( Estrada Nacional 10 Quilómetro 22 800 ) Parque,43|44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160807,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -9374,8 +9371,6 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 160924,BREJOS AZEITÃO (R EÇA QUEIROZ 15),38.531200,-9.027180,160924,a definir,Brejos De Azeitão ( Rua Eça Queiroz 15 ),44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Brejos de Azeitão,,0,,,https://on.carrismetropolitana.pt/stops/160924,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160925,VILA NOGUEIRA AZEITÃO (ESC C+S),38.523000,-9.021800,160925,a definir,Vila Nogueira De Azeitão ( Escola Básica E Secundária ),44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Vila Nogueira de Azeitão,,0,,,https://on.carrismetropolitana.pt/stops/160925,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160926,VILA NOGUEIRA AZEITÃO (ESC C+S),38.523000,-9.021740,160926,a definir,Vila Nogueira De Azeitão ( Escola Básica E Secundária ),,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Vila Nogueira de Azeitão,,0,,,https://on.carrismetropolitana.pt/stops/160926,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-160931,R DA SOLIDARIEDADE 13,38.532900,-9.030510,160931,a definir,Rua Da Solidariedade 13,,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160931,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-160932,R DA SOLIDARIEDADE 13,38.532900,-9.030470,160932,a definir,Rua Da Solidariedade 13,,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160932,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160936,VILA NOGUEIRA AZEITÃO (ESC C+S),38.522900,-9.023200,160936,a definir,Vila Nogueira De Azeitão ( Escola Básica E Secundária ),44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Vila Nogueira de Azeitão,,0,,,https://on.carrismetropolitana.pt/stops/160936,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160937,QTA CONDE EN 10 NEGREIROS - PONTE,38.554970,-9.035281,160937,a definir,Quinta Do Conde Estrada Nacional 10 Negreiros - Ponte,43|44,active,PT170,AML,15,Setúbal,1511,Sesimbra,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160937,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160938,QTA CONDE EN 10 NEGREIROS - PONTE,38.553500,-9.034130,160938,a definir,Quinta Do Conde Estrada Nacional 10 Negreiros - Ponte,43|44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160938,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -9394,7 +9389,6 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 160959,ALDEIA PIEDADE (ESTR ARCOS) QTA S AMARO,38.495870,-9.043540,160959,a definir,Aldeia Piedade ( Estrada Arcos ) Quinta Santo Amaro,43|44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Aldeia da Piedade,,0,,,https://on.carrismetropolitana.pt/stops/160959,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160960,ALDEIA PIEDADE (ESTR ARCOS) QTA S AMARO,38.495970,-9.043500,160960,a definir,Aldeia Piedade ( Estrada Arcos ) Quinta Santo Amaro,43|44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Aldeia da Piedade,,0,,,https://on.carrismetropolitana.pt/stops/160960,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160961,AV MARIANA DE CARVALHO,38.526100,-8.891290,160961,a definir,Avenida Mariana De Carvalho,44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160961,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-160963,R JOSÉ SACRAMENTO 16,38.517300,-9.029170,160963,a definir,Rua José Sacramento 16,,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160963,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160964,SETÚBAL (R CELESTINO ALVES 22A),38.527140,-8.870270,160964,a definir,Setúbal ( Rua Celestino Alves 22 Á ),44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Setúbal,,0,,,https://on.carrismetropolitana.pt/stops/160964,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 160965,VILA NOG AZEITÃO (AV 25 ABR) (MERCADO),38.525910,-9.021540,160965,a definir,Vila Nogueira De Azeitão ( Avenida 25 De Abril ) ( Mercado ),43|44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Vila Nogueira de Azeitão,,0,,,https://on.carrismetropolitana.pt/stops/160965,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160966,VILA NOG AZEITÃO (AV 25 ABR) (MERCADO),38.525880,-9.021620,160966,a definir,Vila Nogueira De Azeitão ( Avenida 25 De Abril ) ( Mercado ),43|44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Vila Nogueira de Azeitão,,0,,,https://on.carrismetropolitana.pt/stops/160966,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -9419,7 +9413,7 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 160990,VENDAS AZEITÃO (R GEN HUMB DELGADO 35),38.534770,-8.990267,160990,a definir,Vendas De Azeitão ( Rua General Humberto Delgado 35 ),44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Vendas de Azeitão,,0,,,https://on.carrismetropolitana.pt/stops/160990,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160991,V N AZEITÃO (CENTRO SAUDE),38.520912,-9.017450,160991,a definir,Vila Nogueira De Azeitão ( Centro Saude ),44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Vila Nogueira de Azeitão,,0,,,https://on.carrismetropolitana.pt/stops/160991,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 160993,V N AZEITÃO (R ADELINO P CARL X R 9 ABR),38.517769,-9.020239,160993,a definir,Vila Nogueira De Azeitão ( Cruzamento Entre ( Rua Adelino P Carl ) E Rua 9 De Abril ),44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Vila Nogueira de Azeitão,,0,,,https://on.carrismetropolitana.pt/stops/160993,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-160994,SETÚBAL (ESTACIONAMENTO FÁBRICA OUTÃO),38.493514,-8.936445,160994,a definir,Setúbal ( Estacionamento Fábrica Outão ),44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Outão,,0,,,https://on.carrismetropolitana.pt/stops/160994,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+160994,SETÚBAL (ESTACIONAMENTO FÁBRICA OUTÃO),38.493514,-8.936445,160994,a definir,Setúbal ( Estacionamento Fábrica Outão ),44,seasonal,PT170,AML,15,Setúbal,1512,Setúbal,,,Outão,,0,,,https://on.carrismetropolitana.pt/stops/160994,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160995,ESTR MITRENA X PARQUE INDUSTRIAL,38.491913,-8.800715,160995,a definir,Cruzamento Entre ( Estrada Mitrena ) E Parque Industrial,44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Mitrena,,0,,,https://on.carrismetropolitana.pt/stops/160995,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 160996,V N AZEITÃO (EB CASAL BOLINHOS),38.539053,-9.027880,160996,a definir,Vila Nogueira De Azeitão ( Escola Básica Casal Bolinhos ),44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Vila Nogueira de Azeitão,,0,,,https://on.carrismetropolitana.pt/stops/160996,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 160997,V N AZEITÃO (EB BREJOEIRA),38.547675,-9.024619,160997,a definir,Vila Nogueira De Azeitão ( Escola Básica Brejoeira ),44,active,PT170,AML,15,Setúbal,1512,Setúbal,,,Vila Nogueira de Azeitão,,0,,,https://on.carrismetropolitana.pt/stops/160997,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -10039,8 +10033,8 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 170746,R José Almada Negreiros 22,38.768800,-9.289890,170746,a definir,Rua José Almada Negreiros 22,41,active,PT170,AML,11,Lisboa,1111,Sintra,,,Sintra,,0,,,https://on.carrismetropolitana.pt/stops/170746,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 170747,R Fernando Pessoa (X) Av Monte Tapada,38.768100,-9.291350,170747,a definir,Cruzamento Entre ( Rua Fernando Pessoa ) E Avenida Monte Tapada,41,active,PT170,AML,11,Lisboa,1111,Sintra,,,Sintra,,0,,,https://on.carrismetropolitana.pt/stops/170747,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 170748,R Fernando Pessoa (X) Av Monte Tapada,38.768100,-9.291310,170748,a definir,Cruzamento Entre ( Rua Fernando Pessoa ) E Avenida Monte Tapada,41,active,PT170,AML,11,Lisboa,1111,Sintra,,,Sintra,,0,,,https://on.carrismetropolitana.pt/stops/170748,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-170749,R Camilo C Branco,38.767341,-9.293025,170749,a definir,Rua Camilo Cása Branco,41,active,PT170,AML,11,Lisboa,1111,Sintra,,,Sintra,,0,,,https://on.carrismetropolitana.pt/stops/170749,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-170750,R Camilo C Branco,38.767300,-9.292900,170750,a definir,Rua Camilo Cása Branco,41,active,PT170,AML,11,Lisboa,1111,Sintra,,,Sintra,,0,,,https://on.carrismetropolitana.pt/stops/170750,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+170749,R Camilo C Branco,38.767341,-9.293025,170749,a definir,Rua Camilo Castelo Branco,41,active,PT170,AML,11,Lisboa,1111,Sintra,,,Sintra,,0,,,https://on.carrismetropolitana.pt/stops/170749,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+170750,R Camilo C Branco,38.767300,-9.292900,170750,a definir,Rua Camilo Castelo Branco,41,active,PT170,AML,11,Lisboa,1111,Sintra,,,Sintra,,0,,,https://on.carrismetropolitana.pt/stops/170750,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 170751,Colaride (Mte Tapada),38.767400,-9.295030,170751,a definir,Colaride ( Monte Tapada ),41,active,PT170,AML,11,Lisboa,1111,Sintra,,,Sintra,,0,,,https://on.carrismetropolitana.pt/stops/170751,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 170753,R Guerra Junqueiro (X) R J Al Negreiro,38.767000,-9.290610,170753,a definir,Cruzamento Entre ( Rua Guerra Junqueiro ) E Rua J Alameda Negreiro,41,active,PT170,AML,11,Lisboa,1111,Sintra,,,Sintra,,0,,,https://on.carrismetropolitana.pt/stops/170753,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 170754,R Guerra Junqueiro (X) R J Al Negreiro,38.767100,-9.290590,170754,a definir,Cruzamento Entre ( Rua Guerra Junqueiro ) E Rua J Alameda Negreiro,41,active,PT170,AML,11,Lisboa,1111,Sintra,,,Sintra,,0,,,https://on.carrismetropolitana.pt/stops/170754,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -11566,7 +11560,7 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 172653,Av Luís Augusto Colares (X) Lgo Chitas,38.837386,-9.459754,172653,a definir,Cruzamento Entre ( Avenida Luís Augusto Colares ) E Largo Chitas,41,active,PT170,AML,11,Lisboa,1111,Sintra,,,Sintra,,0,,,https://on.carrismetropolitana.pt/stops/172653,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 172654,R Marquês Pombal 32,38.850048,-9.440654,172654,a definir,Rua Marquês De Pombal 32,41,active,PT170,AML,11,Lisboa,1111,Sintra,,,Sintra,,0,,,https://on.carrismetropolitana.pt/stops/172654,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 172655,Estr da Ribeira (Lgo do Parque Infantil),38.856718,-9.397408,172655,a definir,Estrada Da Ribeira ( Largo Do Parque Infantil ),41,active,PT170,AML,11,Lisboa,1111,Sintra,,,São João das Lampas,,0,,,https://on.carrismetropolitana.pt/stops/172655,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-172656,Estr da Ribeira 51,38.860095,-9.396608,172656,a definir,Estrada Da Ribeira 51,41,active,PT170,AML,11,Lisboa,1111,Sintra,,,São João das Lampas,,0,,,https://on.carrismetropolitana.pt/stops/172656,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+172656,Estrada da Ribeira 51,38.860088,-9.396729,172656,Estr. da Ribeira 51,Estrada Da Ribeira 51,41,active,PT170,AML,11,Lisboa,1111,Sintra,,,São João das Lampas,,0,,,https://on.carrismetropolitana.pt/stops/172656,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 172657,R Cruzeiro (Escola),38.849619,-9.377478,172657,a definir,Rua Cruzeiro ( Escola ),41,active,PT170,AML,11,Lisboa,1111,Sintra,,,Terrugem,,0,,,https://on.carrismetropolitana.pt/stops/172657,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 172658,Terrugem (Centro de Saúde),38.849762,-9.377514,172658,a definir,Terrugem ( Centro De Saúde ),41,active,PT170,AML,11,Lisboa,1111,Sintra,,,Terrugem,,0,,,https://on.carrismetropolitana.pt/stops/172658,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 172659,Estr da Ribeira 87,38.859733,-9.391857,172659,a definir,Estrada Da Ribeira 87,41,active,PT170,AML,11,Lisboa,1111,Sintra,,,São João das Lampas,,0,,,https://on.carrismetropolitana.pt/stops/172659,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -12173,8 +12167,8 @@ stop_id,stop_name,stop_lat,stop_lon,stop_code,stop_short_name,tts_stop_name,area
 180782,R Calouste Gulbenkian 17 (Povos),38.973820,-8.983230,180782,a definir,Rua Calouste Gulbenkian 17 ( Povos ),42,active,PT170,AML,11,Lisboa,1114,Vila Franca de Xira,,,Vila Franca de Xira,,0,,,https://on.carrismetropolitana.pt/stops/180782,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 180783,R José Carlos Ary Santos 62,38.974690,-8.981270,180783,a definir,Rua José Carlos Ary Santos 62,42,active,PT170,AML,11,Lisboa,1114,Vila Franca de Xira,,,Vila Franca de Xira,,0,,,https://on.carrismetropolitana.pt/stops/180783,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 180784,R José Carlos Ary Santos 62,38.974700,-8.981380,180784,a definir,Rua José Carlos Ary Santos 62,42,active,PT170,AML,11,Lisboa,1114,Vila Franca de Xira,,,Vila Franca de Xira,,0,,,https://on.carrismetropolitana.pt/stops/180784,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-180785,R José Carlos Ary Santos 63,38.975170,-8.980950,180785,a definir,Rua José Carlos Ary Santos 63,42,active,PT170,AML,11,Lisboa,1114,Vila Franca de Xira,,,Vila Franca de Xira,,0,,,https://on.carrismetropolitana.pt/stops/180785,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
-180786,R José Carlos Ary Santos 63,38.975030,-8.980990,180786,a definir,Rua José Carlos Ary Santos 63,42,active,PT170,AML,11,Lisboa,1114,Vila Franca de Xira,,,Vila Franca de Xira,,0,,,https://on.carrismetropolitana.pt/stops/180786,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+180785,R José Carlos Ary Santos 63,38.975170,-8.980950,180785,Estr. Carlos Lima (Hospital),Rua José Carlos Ary Santos 63,42,active,PT170,AML,11,Lisboa,1114,Vila Franca de Xira,,,Vila Franca de Xira,,0,,,https://on.carrismetropolitana.pt/stops/180785,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
+180786,R José Carlos Ary Santos 63,38.975030,-8.980990,180786,Estr. Carlos Lima (Hospital),Rua José Carlos Ary Santos 63,42,active,PT170,AML,11,Lisboa,1114,Vila Franca de Xira,,,Vila Franca de Xira,,0,,,https://on.carrismetropolitana.pt/stops/180786,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 180787,Hospital Vila Franca De Xira,38.977000,-8.985000,180787,a definir,Hospital Vila Franca De Xira,42,active,PT170,AML,11,Lisboa,1114,Vila Franca de Xira,,,Vila Franca de Xira,,0,,,https://on.carrismetropolitana.pt/stops/180787,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0
 180789,En 116 (Chasa),38.891350,-9.045620,180789,a definir,Estrada Nacional 116 ( Chasa ),42,active,PT170,AML,11,Lisboa,1114,Vila Franca de Xira,,,Vila Franca de Xira,,0,,,https://on.carrismetropolitana.pt/stops/180789,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 180790,En 116 (Chasa),38.891650,-9.045710,180790,a definir,Estrada Nacional 116 ( Chasa ),42,active,PT170,AML,11,Lisboa,1114,Vila Franca de Xira,,,Vila Franca de Xira,,0,,,https://on.carrismetropolitana.pt/stops/180790,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0