Skip to content

Enable pinch zoom on mobile#440

Merged
subdavis merged 4 commits intomasterfrom
enable-pinch-zoom
Nov 13, 2020
Merged

Enable pinch zoom on mobile#440
subdavis merged 4 commits intomasterfrom
enable-pinch-zoom

Conversation

@zachmullen
Copy link
Copy Markdown
Contributor

No description provided.

@subdavis
Copy link
Copy Markdown
Contributor

subdavis commented Nov 12, 2020

I just noticed a few lines above, there are several mistakes:

        {
          action: 'geo_action_select',
          input: { right: true },
          name: 'button edit',
          owner: 'geo.MapIteractor',
        },
  • correct action is geo_action.select (., not _)
  • owner is misspelled.

What is the impact of these?

@zachmullen
Copy link
Copy Markdown
Contributor Author

🤷

@BryonLewis
Copy link
Copy Markdown
Collaborator

BryonLewis commented Nov 12, 2020

What is the impact of these?

geo_action_select is the same as geo_action.select - we should probably update it (note that would be the value of that object, not a string called 'geo_action.select')
https://github.com/OpenGeoscience/geojs/blob/fe0b1399af1787f1d038be460bfa5ea0d2f1e67a/src/action.js#L13
The owner is a reference that can be used when intercepting actions. Doesn't really affect us at the moment but should be updated.

@zachmullen
Copy link
Copy Markdown
Contributor Author

@BryonLewis are you wanting me to try to also make those changes? I feel like that is probably better on a separate PR

@BryonLewis
Copy link
Copy Markdown
Collaborator

@BryonLewis are you wanting me to try to also make those changes? I feel like that is probably better on a separate PR

I'm making a note of those items to be in a different PR. I haven't had time yet to pull and do testing of this PR, but will be able to later.

Copy link
Copy Markdown
Contributor

@subdavis subdavis left a comment

Choose a reason for hiding this comment

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

approved by accident. I haven't been able to test this yet, sorry

@subdavis subdavis self-requested a review November 12, 2020 20:23
Copy link
Copy Markdown
Collaborator

@BryonLewis BryonLewis left a comment

Choose a reason for hiding this comment

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

Pulled and tested on laptop and no adverse effects with zooming/panning or selecting and moving edit handles.

Tested on a Lenovo Duet Chromebook (both touchscreen and mouse). Seems to work well. I actually enjoy the zooming using touch more than the mouse. Selection works, but things like selecting edit handles and moving them don't work with touch but will work with mouse. It doesn't appear like having touch enabled will adversely impact anything either.

Observations:

  • No effect on mouse controls when system doesn't have touch controls
  • Selection using touch works for tracks
  • Touch and mouse controls can exist side by side
  • Editing of boxes requires mouse controls
  • Would need to modify logic to enable editing using touch controls (Not a now worry)

@subdavis subdavis merged commit 9439bac into master Nov 13, 2020
@subdavis subdavis deleted the enable-pinch-zoom branch November 13, 2020 21:13
BryonLewis added a commit that referenced this pull request Nov 16, 2020
Trying to get the styling and layout setup

Updating some styling

Updated styling a bit and added toggling

Started updating the editor and connecting it to the attributes endpoint

Updating styling and fixing various issues

mend

mend

Electron (#397)

* add electron

* Add missing api methods

* Fix build errors for electron, add to CI

* Address comments

Update deploy to only Thursday

Update base image for girder worker

Fixes FPS issue and image caching (#419)

* fixing fps and modifying cache

* mend

Update docker docs (#379)

Co-authored-by: Brandon Davis <git@subdavis.com>

Update blank.yml (#415)

Upgrade to node LTS

Co-authored-by: Jacob Nesbitt <jjnesbitt2@gmail.com>

Add checkbuild.sh (#425)

Add load and save for JSON annotations (#414)

* Add load and save for JSON annotations

* Relax json file name requirement

* SIP

* Implement settings, sanity checks, separate loading of datasets

* WIP

* remove settings page

Fix deploy.yml

Update day strings (#430)

Fix typo in library README

Allow setting of arbitrary attributes on video player (#435)

* Mute video prop

* Allow setting arbitrary attributes

Downgrade urllib3 (#439)

Fix inverse interpolation (#433)

Run pipelines enabled incorrectly (#441)

Minor fix to attributes

Minor ui fixes

Addressing changes

Enable pinch zoom on mobile (#440)

Co-authored-by: Brandon Davis <git@subdavis.com>

Add dummy generators (#438)

conversion to using api for attributes editing

converted attribute editor and added in additional editing

Updating UI interactions
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.

3 participants