Commit 31cb18f8 authored by Noel Alonso's avatar Noel Alonso
Browse files

Añade nuevos destinos y comprueba semenjanzas 

De esta manera, destinos que contengan la raiz de los destinos añadidos,
se tendrán en cuenta
parent 62ce6e26

src/main/java/es/redmic/ais/service/AISService.java

+9 −1
Original line number Diff line number Diff line
@@ -213,9 +213,12 @@ public class AISService { 
		aisTemplate.send(AIS_TOPIC, vesselId, aisTracking).addCallback(new SendListener());



		// Si el punto está en la zona de interés

		if (destFilter.contains(aisTracking.getDest())



		if ((aisTracking.getDest() != null && destFilter.stream().anyMatch(str -> isDest(aisTracking, str)))

				|| pointInBbox(aisTracking.getLongitude(), aisTracking.getLatitude())) {



			if (aisTracking.getDest() != null)

				destFilter.stream().anyMatch(str -> isDest(aisTracking, str));

			VesselTrackingDTO tracking = VesselTrackingUtil.convertTrackToVesselTracking(aisTracking, QFLAG_DEFAULT,

					VFLAG_DEFAULT, activityId);
@@ -230,6 +233,11 @@ public class AISService { 
		}

	}



	private boolean isDest(AISTrackingDTO aisTracking, String dest) {



		return aisTracking.getDest().toLowerCase().contains(dest.toLowerCase());

	}



	private boolean pointInBbox(Double x, Double y) {

		return envelopeJts.contains(new Coordinate(x, y));

	}

src/main/resources/application.properties

+5 −1
Original line number Diff line number Diff line
@@ -30,7 +30,11 @@ bboxFilter.bottomRightLon=-10 
bboxFilter.topLeftLat=30

bboxFilter.topLeftLon=-21



destFilter=TENERIFE,SANTA CRUZ TENERIFE,LAS PALMAS,S/C TENERIFE,TCI-AGA-TCI,GRANADILLA,PUERTO GRANADILLA,STA CRUZ DE TENERIFE,ES SCT,ESSCT

destFilter=TENERIFE,LAS PALMAS,TCI-AGA-TCI,GRANADILLA,ES SCT,ESSCT,\

	LPA ,SANTA CR,STCI,LPA-,TCI-AGA,LAS PALMAS,ARRECIFE,ESACE,ESLPA,ES TFE,\

	ES LPA,PUERTO DEL ROSARIO,ESFUE,GUACIMETA,CANARY,LA PALMA,EL HIERRO,\

	ES FUE,ARRECCIFE,LASPALMAS,GRAN CANARIA,PBLANCACORRALEJO,ES ACE,\

	LAS_PALMAS,PLAYA BLANCA,CORRA



aishub.service.username=aishub.service.username

aishub.service.url=${aishub.service.url}

src/test/java/es/redmic/test/ais/integration/service/AISServiceTest.java

+3 −3
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public class AISServiceTest extends KafkaBaseIntegrationTest { 
		// @formatter:off



		int numOfItems = 41998, // Debería procesar 41976 pero repite 36 elementos que llegan en el segundo

				numOfItemsInBbox = 91; 

				numOfItemsToProccess = 94; 

		// @formatter:on



		// fichero con el mismo tstamp
@@ -117,10 +117,10 @@ public class AISServiceTest extends KafkaBaseIntegrationTest { 
		assertEquals(numOfItems, blockingQueueAIS.size());



		// Espera que se publiquen numOfItemsInBbox registros al topic de vesselTracking

		assertEquals(numOfItemsInBbox, blockingQueueVesselTracking.size());

		assertEquals(numOfItemsToProccess, blockingQueueVesselTracking.size());



		// Espera que se publiquen numOfItemsInBbox registros al topic de vessel

		assertEquals(numOfItemsInBbox, blockingQueueVessel.size());

		assertEquals(numOfItemsToProccess, blockingQueueVessel.size());

	}



	@Test(expected = InvalidUsernameException.class)