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 ui #153

Merged
merged 113 commits into from
Oct 13, 2019
Merged

New ui #153

merged 113 commits into from
Oct 13, 2019

Conversation

mvanlaar
Copy link

@mvanlaar mvanlaar commented Oct 3, 2019

I here by create a pull request for a new ui. It's based on the version 3.4.3. And adds new features and fixes some bugs allong the way.

Fixes:
#152
#145 (Added tooltip)
#144
#120 (shapes.html can be used to generate shapes based on online and drawing)
#92
#32 (partly allow delete stop in trip)
#8 (It works in edge, Firefox and chrome)
#5

New:
#110
#88 (Based on Openstreetmap)
#64 (Possible to set your own layers as background)
#52 (Possible to import in shapes.html based on gpx, kml and geojson)
#14

Feature:
#90 (Possibility to create config page with json backend)
#21 (Allow importing stops from csv, openstreetmap and kml files)
#15 (see shapes.html)

It will contain bugs. But it would like to submit it now.
@answerquest

first page v1
update agency v0.1
stops update v0.5
update stops page v1
update easybutton to use fontawesome 5
update routes and stops last bit
add calendar and stops search
update today
support for timezone selet via select2
update colorpicker
update tips and stoptimes
add support for kml, have to fix reverse files
fixed reverse add gpx support
update for new nav index, stops, agency
automate the nav menu once again
updae layout for various files
update v1 fares
fix viewing tabulator tables and tabs
simplified pivot code. fixed few things
convert everything to polyline and parse the polyline to tabulator table. Wip for saving the tabulator table
wip shapes.html saving bugfixes
add shapes.html to menu
add code to save the shape
online routing is moved to shapes.html
with upport for the following providers:
OSRM, Mapbox, Here, TomTom, Graphhopper
this is not optimized.
Not full of design but working
maps are not perfect working but for now goof.
wip for first pull request
@answerquest
Copy link
Collaborator

answerquest commented Oct 4, 2019 via email

@answerquest
Copy link
Collaborator

@answerquest
Copy link
Collaborator

@mvanlaar I don't have experience with merging changes, can you help? See this:

https://github.com/WRI-Cities/static-GTFS-manager/pull/153/files#diff-5f1e81a3a8ca836b2760104dab928c50

But I had already done that change, it's coming here again because your PR is relative to an older version?

@answerquest
Copy link
Collaborator

@mvanlaar ok I'm realising you probably saw and reflected the change at your end too.

I finally figured how to download your branch to my laptop and give it a spin. Sharing the command line for others...

git clone -b new-ui --single-branch https://github.com/mvanlaar/static-GTFS-manager.git

I want to create a new branch in this repo with this PR and work on things further (as you mentioned, there's some places needing attention). Instead of merging it with master branch right away. Would you know how to go about that?

@mvanlaar
Copy link
Author

mvanlaar commented Oct 8, 2019

I think you have to create new branch and pull in my branch.

@answerquest answerquest changed the base branch from master to v4.0.0 October 11, 2019 18:49
@answerquest answerquest merged commit 4a2b17c into WRI-Cities:v4.0.0 Oct 13, 2019
@answerquest
Copy link
Collaborator

Whew, finally did it! Had a snafu 2 days ago : I resolved all the conflicts, then wanted to check something out and forgot to press the big green button to commit all the changes. Had to do it all over again. I've pushed this PR into a newly created branch "v4.0.0" instead of master. So we can work further on this branch and resolve the loose ends before making it the master.

mvanlaar added a commit to mvanlaar/static-GTFS-manager that referenced this pull request Oct 14, 2019
Merge pull request WRI-Cities#153 from mvanlaar/new-ui
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants