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

667 - Multiple selection in Query #4452

Merged
merged 2 commits into from Dec 12, 2018
Merged

667 - Multiple selection in Query #4452

merged 2 commits into from Dec 12, 2018

Conversation

adube
Copy link
Contributor

@adube adube commented Dec 10, 2018 •
edited

https://jira.camptocamp.com/browse/GSGMF-667

This patch introduces the concept of "actions" within the query tool (i.e. within the map and bbox querent components, the map querent and querent) using pressed keyboard keys.

  • on click - the results are replaced
  • on box query (ctrl) - the results are replaced
  • on click while holding the "a" key - the results are added to the existing ones
  • on bbox query while holding the "a" key (ctrl + a) - the results are added to the existing ones
  • on click while holding the "x" key - the results are removed from the existing ones
  • on bbox query while holding the "a" key (ctrl + x) - the results are removed from the existing ones

@adube adube force-pushed the v2_4-667-multiple-selection branch from 3b673f7 to 1dc256f Compare December 10, 2018 16:40
@adube adube changed the title [WIP] 667 - Multiple selection in Query 667 - Multiple selection in Query Dec 10, 2018
@adube adube requested a review from fredj December 10, 2018 16:44
@adube adube force-pushed the v2_4-667-multiple-selection branch 2 times, most recently from cbbe2fd to a86295b Compare December 10, 2018 18:11
@adube
Copy link
Contributor Author

adube commented Dec 11, 2018

@fredj Do I need to do anything about Travis?

@sbrunner
Copy link
Member

Yes, by removing all this blog:
https://github.com/camptocamp/ngeo/blob/master/karma-conf.js#L101-L112
I hope that Karma will not complain about required values.

@adube
Copy link
Contributor Author

adube commented Dec 11, 2018

Yes, by removing all this blog:
https://github.com/camptocamp/ngeo/blob/master/karma-conf.js#L101-L112
I hope that Karma will not complain about required values.

Would you please take care of it? I don't want my name to be associated to those lines being removed, as I don't know what they're for. Thanks.

@fredj
Copy link
Member

fredj commented Dec 11, 2018

Yes, by removing all this blog:
https://github.com/camptocamp/ngeo/blob/master/karma-conf.js#L101-L112
I hope that Karma will not complain about required values.

Would you please take care of it? I don't want my name to be associated to those lines being removed, as I don't know what they're for. Thanks.

@adube I'm on it

@adube adube force-pushed the v2_4-667-multiple-selection branch from a86295b to 63219e6 Compare December 11, 2018 19:56
@fredj fredj force-pushed the v2_4-667-multiple-selection branch from 63219e6 to 889ac7d Compare December 12, 2018 14:38
@fredj
Copy link
Member

fredj commented Dec 12, 2018

rebased

fredj
fredj reviewed Dec 12, 2018
View reviewed changes
options/ngeox.js Outdated Show resolved Hide resolved
@fredj @adube
Update options/ngeox.js
4cc495c 
Co-Authored-By: adube <adube@mapgears.com>
fredj
fredj approved these changes Dec 12, 2018
View reviewed changes
Copy link
Member

@fredj fredj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks ! please merge

@adube adube merged commit 3ac5902 into camptocamp:master Dec 12, 2018
@adube adube deleted the v2_4-667-multiple-selection branch December 12, 2018 15:17
@sbrunner sbrunner added this to the 2.4 milestone Jan 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fredj fredj fredj approved these changes

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@adube @sbrunner @fredj