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

Fixes, and new features #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
d32be3f
move to 'netbeans maven' instead of ant project
tenzap Jul 15, 2023
039cdcb
add local maven repo with swingx-beaninfo 1.6 and use it + add other …
tenzap Jul 16, 2023
7ca53fb
remove now useless swingx-ws-1.0-bin dir
tenzap Jul 16, 2023
5af4ab5
fix form block guard error
tenzap Jul 16, 2023
5565a25
remove line that causes problems when editing form in netbeans
tenzap Jul 16, 2023
6c6fca8
fix ReportViewer form to work again on Netbeans
tenzap Jul 16, 2023
b0a4ed6
ReportViewer: replace Stop by Route in label for count of Routes
tenzap Jul 28, 2023
7a21ed0
ReportView: Bus Tab: update radiobutton labels & nextbutton label
tenzap Jul 28, 2023
b1e364e
use default selection colors in dataTables
tenzap Jul 28, 2023
c6ec103
update MainForm to be able to edit it in Netbeans again
tenzap Jul 21, 2023
76c62e0
fix crash when arr is null
tenzap Jul 12, 2023
c55b132
support zip file of content type application/x-zip-compressed
tenzap Jul 15, 2023
1d175b6
add action='modify' to .dsc file
tenzap Jul 21, 2023
73f6fc4
trim & remove duplicate spaces in values read from Gtfs when storing …
tenzap Jul 21, 2023
6cc3dd3
rename some tag_defs and add others
tenzap Jul 21, 2023
5b0b097
replace gtfs_route_id by gtfs:route_id (through tag_defs.OSM_ROUTE_ID…
tenzap Jul 10, 2023
851cbf3
write gtfs route name to tag_defs.OSM_ROUTE_NAME_KEY (ie. gtfs:name) …
tenzap Jul 15, 2023
010c91f
Small simplification when parsing gtfs routes
tenzap Jul 21, 2023
f3526f3
fix modeType on stops based on public_transport value
tenzap Jul 10, 2023
f1b5f8d
convert HashSet to LinkedHashSet for relation members
tenzap Jul 15, 2023
e8e89ed
Stops: permit to add a new stop if the potential osm matches are not …
tenzap Jul 29, 2023
66ab3db
query also 'ways' being platforms
tenzap Jul 12, 2023
2ae9d73
when adding platform to route, set member type to 'platform' instead …
tenzap Jul 12, 2023
4865066
add support for 'way' primitives that hold plaforms
tenzap Jul 12, 2023
ec38980
CompareData: Stops: when at the same position, only consider equal wh…
tenzap Jul 12, 2023
ec942b1
OperatorInfo: add regex support (part1: hardcoded regex)
tenzap Jul 21, 2023
3c2f303
add ProcessingOptions enum (empty for now)
tenzap Jul 23, 2023
38cda4d
use names & altnames from Netex
tenzap Jul 10, 2023
e404811
Support Netex selection from UI
tenzap Jul 21, 2023
14d045f
OperatorInfo: permit to set regex in GUI (part2: when set from GUI)
tenzap Jul 21, 2023
d81888a
MainForm: move options to stopOptionsPanel & routeOptionsPanel
tenzap Jul 23, 2023
3c8ed4d
Routes: add support for route variants - part1
tenzap Jul 15, 2023
0ce2753
Routes: routevariant: add gtfsTripIdToRouteVariantMap & allRouteVaria…
tenzap Jul 17, 2023
1c88772
Routes: compareRouteData: migrate to tripId as key
tenzap Jul 23, 2023
b37882d
Routes: migrate to tripId as key in ReportViewer
tenzap Jul 23, 2023
ec33934
MainFrom for Routes: add checkboxes for options
tenzap Jul 23, 2023
232e5cc
Routes: take into account the selected new route options from UI
tenzap Jul 23, 2023
b503c90
Routes: don't add gtfs_route_text_color gtfs_agency_id to the routes
tenzap Jul 21, 2023
9eb2661
consider FFFFFF route color as not set
tenzap Jul 31, 2023
eb49e82
MainForm: fix width of option panels
tenzap Jul 23, 2023
4b1fe3e
MainForm: split route options in route & member options
tenzap Jul 23, 2023
f3f66ca
fix merge of multiple osm values for a key (separated by ';')
tenzap Jul 28, 2023
a90b844
Stops: skip GTFS stations - part1
tenzap Jul 28, 2023
b0064d9
MainForm: left align StopOptions components
tenzap Jul 28, 2023
4fd20d1
Stops: skip GTFS stations - part2 (ui)
tenzap Jul 28, 2023
fe7ef26
Stops & Netex: don't prefix station name with TOWN for some cities - …
tenzap Jul 28, 2023
61748d6
Stops & Netex: don't prefix station name with TOWN for some cities - …
tenzap Jul 28, 2023
e61b6ca
Routes: save stop name with town prefix
tenzap Jul 28, 2023
50399e7
MainForm: allow to filter boundingbox for OSM query
tenzap Jul 28, 2023
145582c
ReportViewer: give focus to GtfsRoutesCombobox when accepting a route
tenzap Jul 28, 2023
9d77c9a
CompareData Routes: improve detection of gtfsId of members
tenzap Jul 29, 2023
0abe23a
RouteMemberTableCellRenderer: set different bg color if identical values
tenzap Jul 29, 2023
6bb5a88
Routes: Don't add gtfs stops as members if they are not in OSM (don't…
tenzap Jul 29, 2023
b9ba99f
Routes: permit to choose between PTv2 or PTv1
tenzap Jul 30, 2023
918edaa
in dataTable, when both gtfs/osm values are empty, set new value as e…
tenzap Jul 30, 2023
880dadd
Routes: group stop_positions & platforms in the routes/relations for …
tenzap Jul 31, 2023
d7bbe31
ReportViewer: Route: add warning that stops must be added before upda…
tenzap Jul 31, 2023
b2d9888
netex: Support format provided by Mobigo (FR), throw exception if uns…
tenzap Aug 2, 2023
e9eb268
Routes: fix gtfs:route_id which was incorrectly set to trip_id:sample
tenzap Aug 5, 2023
499b6c8
Routes: add OSM tags also to existing routes
tenzap Aug 5, 2023
257b5ab
Routes: detect if members differ, in which case display it in ReportView
tenzap Aug 5, 2023
8b476e9
Stops: fix regression where last edited info wan't displayed anymore
tenzap Aug 6, 2023
0482fe8
Stops: ReportViewer: display location of OSM & Gtfs stop for 'MODIFY'…
tenzap Aug 6, 2023
c7a22e6
Stops: Netex: Improve alt_name & name, fix œ detection
tenzap Aug 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/GO_Sync/nbproject.bak/private/
/GO_Sync/build/
/GO_Sync/target/
0 GO_Sync/build.xml → GO_Sync/build.xml.bak
View file
Open in desktop
File renamed without changes.
0 GO_Sync/nbproject/build-impl.xml → GO_Sync/nbproject.bak/build-impl.xml
View file
Open in desktop
File renamed without changes.
0 GO_Sync/nbproject/genfiles.properties → GO_Sync/nbproject.bak/genfiles.properties
View file
Open in desktop
File renamed without changes.
0 GO_Sync/nbproject/profiler-build-impl.xml → ...ync/nbproject.bak/profiler-build-impl.xml
View file
Open in desktop
File renamed without changes.
0 GO_Sync/nbproject/project.properties → GO_Sync/nbproject.bak/project.properties
View file
Open in desktop
File renamed without changes.
0 GO_Sync/nbproject/project.xml → GO_Sync/nbproject.bak/project.xml
View file
Open in desktop
File renamed without changes.
25 changes: 23 additions & 2 deletions GO_Sync/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@
<version>1.0.1-SNAPSHOT</version>
<name>GO_Sync</name>
<url>https://github.com/CUTR-at-USF/gtfs-osm-sync/</url>
<repositories>
<!--other repositories if any-->
<repository>
<id>project.local</id>
<name>project</name>
<url>file:${project.basedir}/repo</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -45,8 +53,21 @@
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
</dependency>


<dependency>
<groupId>org.swinglabs</groupId>
<artifactId>swingx-ws</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.swinglabs</groupId>
<artifactId>swingx-beaninfo</artifactId>
<version>1.6</version>
</dependency>
<dependency>
<groupId>org.swinglabs</groupId>
<artifactId>swingx</artifactId>
<version>1.6</version>
</dependency>
</dependencies>

<build>
Expand Down
0 ...-bin/lib/cobundle/swingx-beaninfo-1.6.jar → ...ingx-beaninfo/1.6/swingx-beaninfo-1.6.jar
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions GO_Sync/repo/org/swinglabs/swingx-beaninfo/1.6/swingx-beaninfo-1.6.jar.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2a8c493c38892e406739a32e0f0c89ff
1 change: 1 addition & 0 deletions GO_Sync/repo/org/swinglabs/swingx-beaninfo/1.6/swingx-beaninfo-1.6.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b3bc755a37ecb8aab573ab65a98f64ea57d09946
8 changes: 8 additions & 0 deletions GO_Sync/repo/org/swinglabs/swingx-beaninfo/1.6/swingx-beaninfo-1.6.pom
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.swinglabs</groupId>
<artifactId>swingx-beaninfo</artifactId>
<version>1.6</version>
</project>
1 change: 1 addition & 0 deletions GO_Sync/repo/org/swinglabs/swingx-beaninfo/1.6/swingx-beaninfo-1.6.pom.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5536f631248e5e6c7fe9b5acad1f5cac
1 change: 1 addition & 0 deletions GO_Sync/repo/org/swinglabs/swingx-beaninfo/1.6/swingx-beaninfo-1.6.pom.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
97e7138fdfa658441a5de42438c857c94a25926f
12 changes: 12 additions & 0 deletions GO_Sync/repo/org/swinglabs/swingx-beaninfo/maven-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>org.swinglabs</groupId>
<artifactId>swingx-beaninfo</artifactId>
<versioning>
<release>1.6</release>
<versions>
<version>1.6</version>
</versions>
<lastUpdated>20230716102207</lastUpdated>
</versioning>
</metadata>
1 change: 1 addition & 0 deletions GO_Sync/repo/org/swinglabs/swingx-beaninfo/maven-metadata.xml.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
928051a2812fa68cb49bf3a709e1627e
1 change: 1 addition & 0 deletions GO_Sync/repo/org/swinglabs/swingx-beaninfo/maven-metadata.xml.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c62572c98e00bd8827eb6d90f7df4cb405bdf80f
3,232 changes: 3,046 additions & 186 deletions GO_Sync/src/main/java/edu/usf/cutr/go_sync/gui/MainForm.form
View file
Open in desktop

Large diffs are not rendered by default.

Loading