Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New strategy : Retain up from polygon #310

Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions docs/onebusaway-gtfs-transformer-cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
* [Path Expressions](#path-expressions-)
* [Retain an Entity](#retain-an-entity)
* [Remove an Entity](#remove-an-entity)
* [Retain Up From Polygon](#retain-up-from-polygon)
* [Trim a Trip](#trim-a-trip)
* [Generate Stop Times](#generate-stop-times)
* [Extend Service Calendars](#extend-service-calendars)
Expand Down Expand Up @@ -270,6 +271,26 @@ You can remove a specific entity from a feed.

Note that removing an entity has a cascading effect. If you remove a trip, all the stop times that depend on that
trip will also be removed. If you remove a route, all the trips and stop times for that route will be removed.

#### Retain Up From Polygon
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I must admit that I find the terminology of "retaining up" and "retaining down" confusing. What do you mean by that?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We did'nt found a better term. This one is direct from the existing retain algotithm that seems very stable.
"Up" means that the algorithm will traverse up the entity dependency tree by applying retainUp to each of them. Starting from the stop, retainUp will be applied to the stop_times referencing this stop, then to the trips, and so on.
Then, when the base of the tree is reached, it applies retainDown to all the traversed entities. Therefore, all the trips of the route and then all the stop_times of each trip will be tagged as "retain".
Entities not marked as "retain" will be deleted.
The goal of the strategy is to retain all entities that are directly or indirectly linked to the area.

We will add this brief explanation to the documentation.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay, that's fine.


Retain Up From Polygon is an operation that filters GTFS input data based on a specified geographic area, using a polygon defined in WKT (Well-Known Text) format, which is configurable in the JSON transformer snippet.

This strategy applies two main functions:

* **Retain Function**: retains **up** all stops, trips, and routes that are located inside the defined polygon, then the algorithm automatically applies a retain **down** to these entities.

* **Remove Function**: any entities not retained within the polygon are removed.

This strategy ensures that the GTFS output only contains data relevant to the geographical area concerned.

**Parameters**:

* **polygon**: a required argument, which accepts the polygon in WKT format using the WGS84 coordinate system (SRID: 4326). This polygon defines the area of interest for filtering.

```
{"op":"transform","class":"org.onebusaway.gtfs_transformer.impl.RetainUpFromPolygon","polygon":"POLYGON ((-123.0 37.0, -123.0 38.0, -122.0 38.0, -122.0 37.0, -123.0 37.0))"}
```

#### Trim a Trip

Expand Down
5 changes: 5 additions & 0 deletions onebusaway-gtfs-transformer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.19.0</version>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
package org.onebusaway.gtfs_transformer.impl;

import java.util.ArrayList;
import java.util.List;

import java.io.Serializable;

import org.locationtech.jts.io.ParseException;
import org.locationtech.jts.io.WKTReader;
import org.locationtech.jts.geom.*;

import org.onebusaway.csv_entities.schema.annotations.CsvField;
import org.onebusaway.gtfs.model.IdentityBean;
import org.onebusaway.gtfs.model.Stop;
import org.onebusaway.gtfs.serialization.GtfsEntitySchemaFactory;
import org.onebusaway.gtfs.services.GtfsMutableRelationalDao;
import org.onebusaway.gtfs_transformer.factory.EntityRetentionGraph;
import org.onebusaway.gtfs_transformer.services.GtfsTransformStrategy;
import org.onebusaway.gtfs_transformer.services.TransformContext;
import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

public class RetainUpFromPolygon implements GtfsTransformStrategy {
private final Logger log = LoggerFactory.getLogger(RetainUpFromPolygon.class);

@CsvField(optional = false)
private String polygon;

public void setPolygon(String polygon) {
this.polygon = polygon;
}

@Override
public String getName() {
return this.getClass().getSimpleName();
}

@Override
public void run(TransformContext transformContext, GtfsMutableRelationalDao gtfsMutableRelationalDao) {
Geometry geometry = buildPolygon(polygon);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move this into the setter and check if it's valid and non-empty there. Throw an exception immediately if it isn't.

EntityRetentionGraph graph = new EntityRetentionGraph(gtfsMutableRelationalDao);
graph.setRetainBlocks(false);
// browse all stops and retain only those inside polygon/multipolygon
if (geometry.isValid() && !geometry.isEmpty()){
for (Stop stop : gtfsMutableRelationalDao.getAllStops()) {
if (insidePolygon(geometry,stop.getLon(),stop.getLat())){
graph.retain(stop, true);
}
}
}

// remove non retained objects
for (Class<?> entityClass : GtfsEntitySchemaFactory.getEntityClasses()) {
List<Object> objectsToRemove = new ArrayList<Object>();
for (Object entity : gtfsMutableRelationalDao.getAllEntitiesForType(entityClass)) {
if (!graph.isRetained(entity)){
objectsToRemove.add(entity);
}
}
for (Object toRemove : objectsToRemove){
gtfsMutableRelationalDao.removeEntity((IdentityBean<Serializable>) toRemove);
}
}
}

/*
* create polygon/multiPolygon from 'polygon' variable in json file
* return Geometry variable
* return null if an exception is encountered when parsing the wkt string
*/
private Geometry buildPolygon(String polygonWKT) {
WKTReader reader = new WKTReader();
try{
return reader.read(polygonWKT);
} catch (ParseException e){
String message = String.format("Error parsing WKT string : %s", e.getMessage());
log.error(message);
return null;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't cover up a bad input string and re-throw as a RuntimeException. The program should fail as soon as possible.

}

}
/*
* insidePolygon returns boolean variable
* true: if polygon contains point
* false if point is outside polygon
*/
private boolean insidePolygon(Geometry geometry, double lon, double lat) {
GeometryFactory geometryFactory = new GeometryFactory();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wil merge this in and then make this an instance of the class instead.

Point point = geometryFactory.createPoint(new Coordinate(lon, lat));
return geometry.contains(point);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
package org.onebusaway.gtfs_transformer.impl;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.onebusaway.gtfs.services.GtfsMutableRelationalDao;
import org.onebusaway.gtfs.services.MockGtfs;
import org.onebusaway.gtfs_transformer.services.TransformContext;

public class RetainUpFromPolygonTest {

private RetainUpFromPolygon retainUpFromPolygon = new RetainUpFromPolygon();
private TransformContext _context = new TransformContext();
private MockGtfs _gtfs;

@BeforeEach
public void setup() throws IOException{

_gtfs = MockGtfs.create();
// Insert mock data into the GTFS for testing:
// 1 agency
_gtfs.putAgencies(1);
// 4 routes
_gtfs.putRoutes(4);
// 4 trips
_gtfs.putTrips(4, "r$0","sid$0");
// 8 stops
_gtfs.putStops(8);
// 13 stop times
_gtfs.putLines("stop_times.txt",
"trip_id,arrival_time,departure_time,stop_id,stop_sequence,stop_headsign,pickup_type,drop_off_type,shape_dist_traveled",
// Trip t0: sequence of stops s0,s1,s2,s3
"t0,08:00:00,08:25:00,s0,0,,,,",
"t0,08:30:00,08:55:00,s1,1,,,,",
"t0,09:00:00,09:55:00,s2,2,,,,",
"t0,10:00:00,10:30:00,s3,3,,,,",
// Trip t1: reverse sequence of stops s3,s2,s1,s0
"t1,08:00:00,08:25:00,s3,0,,,,",
"t1,08:30:00,08:55:00,s2,1,,,,",
"t1,09:00:00,09:55:00,s1,2,,,,",
"t1,10:00:00,10:00:00,s0,3,,,,",
// Trip t2: sequence of stops s3,s4,s5
"t2,10:00:00,10:55:00,s3,0,,,,",
"t2,11:00:00,11:25:00,s4,1,,,,",
"t2,11:30:00,11:55:00,s5,2,,,,",
// Trip t3: Additional stops
"t3,12:00:00,12:25:00,s6,0,,,,",
"t3,12:30:00,12:55:00,s7,1,,,,");
}

@Test
public void testRetainUpFromPolygonTest() throws IOException {
GtfsMutableRelationalDao dao = _gtfs.read();

// Define a polygon in WKT (Well-Known Text) format
// This polygon is designed to include only the first 4 stops (S0 to S4)
String polygonWKT = "POLYGON ((-122.308 47.653, -122.308 47.666, -122.307 47.666, -122.307 47.665, -122.307 47.661, -122.307 47.657, -122.307 47.653, -122.308 47.653))";
retainUpFromPolygon.setPolygon(polygonWKT);

// Execute the retainUpFromPolygon strategy based on the polygon
retainUpFromPolygon.run(_context, dao);

// Verify that the number of routes is reduced to 3
assertEquals(3,dao.getAllRoutes().size());

// Verify that the number of trips is reduced to 3
assertEquals(3,dao.getAllTrips().size());

// Verify that the number of stops is reduced to 6
assertEquals(6,dao.getAllStops().size());

// Verify that the number of stop times is reduced to 11
assertEquals(11,dao.getAllStopTimes().size());
}
}
Loading