fix: using the person analysis filter in PublicTransportLegReaderFromPopulation (#203)

tkchouaki · web-flow · commit 3acf8836b748 · 2024-03-12T09:52:45.000+01:00
diff --git a/core/src/main/java/org/eqasim/core/analysis/pt/PublicTransportLegReaderFromPopulation.java b/core/src/main/java/org/eqasim/core/analysis/pt/PublicTransportLegReaderFromPopulation.java
@@ -38,7 +38,10 @@ public Collection<PublicTransportLegItem> readPublicTransportLegs(String populat
     }
 
     public Collection<PublicTransportLegItem> readPublicTransportLegs(Population population) {
-        return population.getPersons().values().stream().flatMap(person -> getPublicTransportLegs(person).stream()).collect(Collectors.toList());
+        return population.getPersons().values().stream()
+                .filter(person -> personAnalysisFilter.analyzePerson(person.getId()))
+                .flatMap(person -> getPublicTransportLegs(person).stream())
+                .collect(Collectors.toList());
     }
 
     public Collection<PublicTransportLegItem> getPublicTransportLegs(Person person) {

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,10 @@ public Collection<PublicTransportLegItem> readPublicTransportLegs(String populat`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public Collection<PublicTransportLegItem> readPublicTransportLegs(Population population) {`
`41`		`- return population.getPersons().values().stream().flatMap(person -> getPublicTransportLegs(person).stream()).collect(Collectors.toList());`
	`41`	`+ return population.getPersons().values().stream()`
	`42`	`+ .filter(person -> personAnalysisFilter.analyzePerson(person.getId()))`
	`43`	`+ .flatMap(person -> getPublicTransportLegs(person).stream())`
	`44`	`+ .collect(Collectors.toList());`
`42`	`45`	`}`
`43`	`46`
`44`	`47`	`public Collection<PublicTransportLegItem> getPublicTransportLegs(Person person) {`