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

clean copy of #97 full resolution download #100

Merged
merged 16 commits into from Feb 8, 2019

Conversation

Projects
None yet
3 participants
@jywarren
Copy link
Contributor

jywarren commented Jun 17, 2018

Noting that we're moving to the main branch, so this'll need to be merged with that.

Based on #97 by @John905

This needs some way to pass in an fullResolutionSrc so that we can warp an original image and not the preview, for example on MapKnitter.

Fixes #124 too!

Fixes #83

@wafflebot wafflebot bot added the in progress label Jun 17, 2018

@jywarren jywarren referenced this pull request Jun 17, 2018

Closed

Full res out john905 #97

@jywarren

This comment has been minimized.

Copy link
Contributor Author

jywarren commented Jun 25, 2018

Error is:

   src/edit/DistortableImage.Edit.js
    295 |            if (window && window.hasOwnProperty('warpWebGl')) warpWebGl(
                                                                       ^ Expected '{' and instead saw 'warpWebGl'.
    302 |        }
                  ^ Missing semicolon.
    255 |        var image = overlay._image;
                     ^ 'image' is defined but never used.
    295 |            if (window && window.hasOwnProperty('warpWebGl')) warpWebGl(
                                                                       ^ 'warpWebGl' is not defined.

@jywarren jywarren force-pushed the jywarren:fullres-dl branch from 2fa4480 to 1a24cfc Feb 7, 2019

@jywarren

This comment has been minimized.

Copy link
Contributor Author

jywarren commented Feb 7, 2019

Fixed this, I believe!

jywarren added some commits Feb 7, 2019

@jywarren

This comment has been minimized.

Copy link
Contributor Author

jywarren commented Feb 7, 2019

Wow, we are /almost/ there! @rexagod this is a different build process and i'm less familiar with it (even though i'm an author of this lib! 😂 ) do you have an idea of how we can include the needed lib besides where i've done it here?

https://github.com/publiclab/Leaflet.DistortableImage/pull/100/files#diff-0be9d25d2ce091e16baef1e0d91d0cf7R28

Running "jshint:source" (jshint) task
   src/edit/DistortableImage.Edit.js
    298 |                warpWebGl(
                         ^ 'warpWebGl' is not defined.
@jywarren

This comment has been minimized.

Copy link
Contributor Author

jywarren commented Feb 7, 2019

@sashadev-sky are you at all familiar with Karma tests or with jshint? I'm not 100% sure but i think this is failing because we're not alerting it of the loading of warpWebGL in an external library. But it actually works locally. I'm just trying to problem solve here a bit, maybe you'd have an insight? Thanks!

@sashadev-sky

This comment has been minimized.

Copy link
Collaborator

sashadev-sky commented Feb 8, 2019

@jywarren not familiar with them but I’ll take a look today anyway!

@rexagod rexagod referenced this pull request Feb 8, 2019

Closed

Fix JSHint errors #129

@jywarren

This comment has been minimized.

Copy link
Contributor Author

jywarren commented Feb 8, 2019

Amazing work @rexagod -- thanks for the fixes in #129 - pulling them in here.

And i think i fixed the jpg/png error that i also introduced.

@jywarren jywarren merged commit 0bce3c4 into publiclab:master Feb 8, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@jywarren

This comment has been minimized.

Copy link
Contributor Author

jywarren commented Feb 8, 2019

Complete!!! Amazing work folks, this is a big one!

@jywarren

This comment has been minimized.

Copy link
Contributor Author

jywarren commented Feb 8, 2019

Blog post coming soon!

@jywarren

This comment has been minimized.

Copy link
Contributor Author

jywarren commented Feb 8, 2019

Added to MapKnitter here: publiclab/mapknitter@a5de9bd

jywarren added a commit that referenced this pull request Feb 18, 2019

clean copy of #97 full resolution download (#100)
* Fix CI

* clean copy of #97 full res output

* adjustments to changes by @John905

* mostly working

* Update DistortableImage.Edit.js

* working full-res distortion!

* moved file

* version bump

* README updates

* fixes

* build

* more docs

* Minor additional fixes

* jpg/png errors

jywarren added a commit that referenced this pull request Feb 20, 2019

clean copy of #97 full resolution download (#100)
* Fix CI

* clean copy of #97 full res output

* adjustments to changes by @John905

* mostly working

* Update DistortableImage.Edit.js

* working full-res distortion!

* moved file

* version bump

* README updates

* fixes

* build

* more docs

* Minor additional fixes

* jpg/png errors

rexagod added a commit to rexagod/Leaflet.DistortableImage that referenced this pull request Feb 21, 2019

jywarren added a commit that referenced this pull request Feb 21, 2019

jywarren added a commit that referenced this pull request Mar 2, 2019

Simplify menu API to add tools at runtime (#149)
* Fix jshint/karma errors and duplicate code from #100

* menu API abstractions

* add a user-friendly demo example

* Update index.html

* window->L.DI and document _demonstrator()

jywarren added a commit that referenced this pull request Mar 8, 2019

Add image ordering functionality (#150)
* Fix jshint/karma errors and duplicate code from #100

* Add image order functionality

* Add docs for image ordering

* Add leaflet links to docs

* jpg -> png

* Remove older switching technique

* Change mappings

* wire _toggleOrder to toolbar icon
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.