Skip to content
This repository has been archived by the owner on May 27, 2024. It is now read-only.

Fixes, and new features #62

Open
wants to merge 64 commits into
base: master
Choose a base branch
from
Open

Conversation

tenzap
Copy link

@tenzap tenzap commented Jul 31, 2023

It would be nice if this could be merged before other PRs appear since there are many changes (in order to prevent conflicts).

The state of the code in the PR was used to submit to OSM the "Fluo Grand Est 68" bus network in France.

  • Permit to open & build again on Netbeans
  • GUI fixes & new processing options (see screenshot)
  • Support zip files on windows (with content type application/x-zip-compressed
  • Support also regex for operator alias
  • Stops:
    • Permit to add a new Stop if there is no satisfactory match (closes Can't import a new GTFS stop close to an existing OSM stop #24)
    • Support also platforms stored as ways in OSM (until now, only nodes were supported)
    • Support using stop names & altnames from a Netex export if it is given as input. When this is used, the name of the stop will be prefixed by the name of the town, and the simple name is put to alt_names. It is possible to skip this for the citied given in the UI which is useful in large cities where we don't want the stops to be prefixed by the town.
  • Routes:
    • set role of GTFS stops/platforms to platform instead of stop (which was incorrect)
    • replace gtfs_route_id by gtfs:route_id (gtfs:route_id is much more common in OSM)
    • Add support for PTv2 on routes (possible to switch between ptv1 / ptv2 by a processing option)
    • Create a single route for each GTFS trip (a trip is known as a route variant or route in OSM)
  • Various small fixes.

Capture d'écran 2023-07-31 200932

tenzap added 13 commits July 15, 2023 10:57
Error was:
Error in loading component property: [JFrame]->jTabbedPane1->jPanel1->mapJXMapKit->scrollableTracksViewportWidth
No such property exists in the component.
Some older commits broke the possibility to update the gui in netbeans
and the autogeneration of that code.

This will restore it.

Tested on netbeans 18
This is required so that when opening the DSC file in JOSM it is possible to
send the changeset (especially when there are no modifications but only
creations in the dsc)
@CLAassistant
Copy link

CLAassistant commented Jul 31, 2023

CLA assistant check
All committers have signed the CLA.

@reubot
Copy link
Contributor

reubot commented Aug 1, 2023

I will have a look at this on the weekend. I have a private wip branch where I am working paralelling the readin peformance., I will see If can cherry pick onto this.

…as Osm value

If values are not trimmed or have duplicate spaces, jsom will warn on upload
of the osc file
…and not name

in OSM, 'name' tag has a specific format which is not equivalent to the
route name in GTFS
Possible now that we have updated tag_defs.java
Because order is important in ptv2
…en both gtfs & osm have the same type

Same type means either both are platforms, or both are stations

Otherwise, we may match a GTFS station with a OSM platform/stop, or a GTFS platform/stop with an OSM station
which would be wrong.

This was especially a problem when the GTFS station & GTFS stop/platform are
at the exact gps position.
This will avoid duplicate values, and also trim the individual values
Useful to build the route name with the name of the town for 'from' & 'to'
Sometimes there are stops which are on an abnormal location which would
increase the boudingbox for the osm query, which could become too large,
For example if the stop if on another continent...
@reubot
Copy link
Contributor

reubot commented Aug 2, 2023

Looks good!
Btw I am currently working getting full way/relation support going

@tenzap
Copy link
Author

tenzap commented Aug 2, 2023

What do you mean by full way/relation support? Is it in addition to what's in this MR?

@reubot
Copy link
Contributor

reubot commented Aug 5, 2023

What do you mean by full way/relation support? Is it in addition to what's in this MR?

Yes,- adding support for stop_area relations, and railway platforms ways,,

Otherwise, in the reportview the osm tags are not copied to the 'new value' column
In some cases, town with "œ" were not considered same as when it has "oe"
There were also problems where alt_names had too much values (duplicates because
of accent or œ character)
@reubot
Copy link
Contributor

reubot commented Aug 10, 2023

@barbeau this can be merged when you are ready

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't import a new GTFS stop close to an existing OSM stop
3 participants