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.

Sign up for GitHub

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

Jump to bottom

fix Typescript delete must be on optional error #89

Merged
merged 4 commits into from
May 3, 2024
Merged

fix Typescript delete must be on optional error #89

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98b3c1a
fix Typescript delete must be on optional error
miklcct May 3, 2024
ffdb727
don't query dummy stop_lat and stop_lon
miklcct May 3, 2024
ec5c765
combine Object.assign with spread operation
miklcct May 3, 2024
4fd0ba7
Revert "combine Object.assign with spread operation"
miklcct May 3, 2024
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
13 changes: 4 additions & 9 deletions src/gtfs/repository/CIFRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,12 @@ export class CIFRepository {
* Return all the stops with some configurable long/lat applied
*/
public async getStops(): Promise<Stop[]> {
const [results] = await this.db.query<(Stop & {easting : number, northing : number})>(`
const [results] = await this.db.query<Omit<Stop, 'stop_lat' | 'stop_lon'> & {easting : number, northing : number}>(`
SELECT
crs_code AS stop_id,
tiploc_code AS stop_code,
station_name AS stop_name,
cate_interchange_status AS stop_desc,
0 AS stop_lat,
0 AS stop_lon,
NULL AS zone_id,
NULL AS stop_url,
NULL AS location_type,
Expand All @@ -67,12 +65,9 @@ export class CIFRepository {
`);

// overlay the long and latitude values from configuration
return results.map(stop => {
const [stop_lon, stop_lat] = proj4('EPSG:27700', 'EPSG:4326', [(stop.easting - 10000) * 100, (stop.northing - 60000) * 100]);
stop.stop_lon = stop_lon;
stop.stop_lat = stop_lat;
delete stop.easting;
delete stop.northing;
return results.map(row => {
const [stop_lon, stop_lat] = proj4('EPSG:27700', 'EPSG:4326', [(row.easting - 10000) * 100, (row.northing - 60000) * 100]);
const {easting, northing, ...stop} = {...row, stop_lon, stop_lat};
miklcct marked this conversation as resolved.
Show resolved Hide resolved
return Object.assign(stop, this.stationCoordinates[stop.stop_id]);
});
}
Expand Down
Loading