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

Geojson react #40

Merged
merged 192 commits into from
Mar 18, 2019
Merged

Geojson react #40

merged 192 commits into from
Mar 18, 2019

Conversation

tomasmcm
Copy link
Member

@tomasmcm tomasmcm commented Mar 14, 2019 •
edited
Loading

Merges HSLdevcom#2685 into our fork

Adds back marker clusters
Limits number of markers in view for better performance

edit:
Updates fork with upstream
Fixes GeoJSONCluster tests

lapim and others added 30 commits January 11, 2019 10:55
@lapim
initial commit
c2dfad2
@lapim
Added more logic (wip)
484055d
@lapim
Merge branch 'master' of https://github.com/HSLdevcom/digitransit-ui …
80c3fdc 
…into DT-2831
@lapim
Added more functionality and banner for leg departure cancellations
c2aec9c
@lapim
Small css fix
38c9a6c
@lapim
Lint fix
d3b280d
@lapim
Removed the tertiary for testing
3c1f51f
@lapim
Merged to master
0aac133
@lapim
Merge branch 'master' of https://github.com/HSLdevcom/digitransit-ui …
e72d6d2 
…into DT-2831
@jolkkola
Merge branch 'master' into DT-2831
48c0b7c
@lapim
Added validation improvements
d0f553e
@lapim
Merge branch 'DT-2831' of https://github.com/HSLdevcom/digitransit-ui …
b6a2bb2 
…into DT-2831
@lapim
Validation switched to array length instead of boolean
d185a04
@jolkkola
Included support for highlighting the disruptions tab for routes.
fdfa34d 
Updated some remaining dependencies.
@jolkkola
Fixed lint.
37138b9
@jolkkola
Updated dependencies.
3eaf740
@jolkkola
Included a unit test for the caution mark highlight.
0b5014d
@jolkkola
Refactored the alerts functionality for routes and stops.
1385941 
Moved the common functionality into a new component. Improved prop typing.
@jolkkola
Included alert texts.
2ea5dc4
@jolkkola
Added unit tests for the AlertList component.
9f9c3b9 
Improved prop typing.
@jolkkola
Improved unit tests.
ecd4974
@jolkkola
Prefer destructuring.
c9a9566
@jolkkola
Refactored the old service alert translation logic.
79ae27c
@jolkkola
Removed a useless, failing visual test.
0cf905b
@jolkkola
Added handling for text with no language set.
f85125c 
Removed some unused components.
@lapim
Added store for banner handling
1e74fa1
@jolkkola
Fixed a bug in handling the expiration of alerts.
f35bc8a
@lapim
Added test, improved naming
1e65480
@jolkkola
Merge branch 'master' into DT-2831
a2e39cb
@jolkkola
Merge branch 'master' into DT-2835-cancelations
1ca2c0d
vesameskanen and others added 21 commits March 8, 2019 11:26
@vesameskanen
FIx parallel test conflicts
6bddb30
@vesameskanen
rememeber to build!
453ced2
@jolkkola
Fixed lint.
0d8d294
@optionsome
Merge pull request HSLdevcom#2700 from HSLdevcom/fix-tre-conf
1a39ccf 
Fix tre conf
@jolkkola
Improved unit tests.
b05d7a9
@jolkkola
Merge branch 'master' into DT-2943
43a6fdb
@vesameskanen
test
d853089
@vesameskanen
test more
48725f2
@vesameskanen
Remove localIdentifier. It seems impossible to get it working.
434f104
@vesameskanen
Test again parallel testing
b32f6cf
@vesameskanen
localIndetifier is now set but parallel tests still fail. Disable par…
75a9be5 
…allel testing.
@vesameskanen
Merge pull request HSLdevcom#2705 from HSLdevcom/DT-2943
9a79133 
DT-2943: apply stricter filtering to shown alerts
@vesameskanen
Merge pull request HSLdevcom#2708 from HSLdevcom/smoke
9a28198 
More reliable smoke testing
@tomasmcm
Merge HSLdevcom#2685
10733bf
@tomasmcm
use popupContent for marker description
843376c
@tomasmcm
add cluster to react markers
1a2a577
@tomasmcm
comment line that breaks popups inside cluster
281f4f0
@tomasmcm
only display up to X number of markers
5ac4221
@tomasmcm
save zoom to variable
57b69e2
@tomasmcm
use name if address is not defined
e154872
@tomasmcm
set default to include all markers
41ae2a6
@tomasmcm
Copy link
Member Author

@ruimagalhaes going to need your help, the leaflet.markercluster plugin runs and compiles fine, but when running tests there is an error because it extends L, but the plugin itself does not import leaflet (it is expected to be imported globally)
I found other people complaining about the same and tried the suggested fixes but with no luck Leaflet/Leaflet.markercluster#874
I think we need to find a way to ignore this file, have you got any idea how to do that?

tomasmcm added 6 commits March 15, 2019 15:14
@tomasmcm
show description instead of address if available
6e637c6
@tomasmcm
add fallback for user name
f0aca36
@tomasmcm
add new variables to tests
f459052
@tomasmcm
Merge branch 'HSLdevcom/master' into geojson-react
b57ad05 
# Conflicts:
#	app/component/AppBarSmall.js
#	app/component/ItineraryTab.js
#	app/component/TransitLeg.js
#	app/component/map/GeoJSON.js
#	app/component/map/MapWithTracking.js
#	app/component/map/PointFeatureMarker.js
#	app/config.js
#	package.json
#	test/unit/component/map/MapWithTracking.test.js
#	test/unit/helpers/init.js
#	yarn.lock
@tomasmcm
fix tests fail without correct locale
02e2790
@tomasmcm
fix geojson tests with cluster
abbe5a5
@lopesrb lopesrb merged commit 4d0263a into master Mar 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruimagalhaes ruimagalhaes ruimagalhaes approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@tomasmcm @ruimagalhaes @lopesrb @lapim @jolkkola @jussiviertola @optionsome @vesameskanen @pailakka