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

clean copy of #97 full resolution download #100

Merged
merged 16 commits into from
Feb 8, 2019
Merged

clean copy of #97 full resolution download #100

merged 16 commits into from
Feb 8, 2019

Conversation

jywarren
Copy link
Member

@jywarren jywarren commented Jun 17, 2018 •
edited
Loading

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

@ghost ghost assigned jywarren Jun 17, 2018
@ghost ghost added the in progress label Jun 17, 2018
@jywarren jywarren mentioned this pull request Jun 17, 2018
Closed
@jywarren
Copy link
Member Author

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.

This was referenced Jan 28, 2019
Closed
Open
@jywarren jywarren mentioned this pull request Feb 4, 2019
Open
13 tasks
@jywarren
Copy link
Member Author

jywarren commented Feb 7, 2019

Fixed this, I believe!

@jywarren
Copy link
Member 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
Copy link
Member 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
Copy link
Member

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

@rexagod rexagod mentioned this pull request Feb 8, 2019
Closed
@jywarren
Copy link
Member 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
@jywarren
Copy link
Member Author

jywarren commented Feb 8, 2019

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

@jywarren
Copy link
Member Author

jywarren commented Feb 8, 2019

Blog post coming soon!

@jywarren
Copy link
Member 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
@jywarren
clean copy of #97 full resolution download (#100)
5cb4c90 
* 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
@jywarren
clean copy of #97 full resolution download (#100)
e9a3e92 
* 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
@rexagod
Fix jshint/karma errors and duplicate code from publiclab#100
a9c57ff
@rexagod rexagod mentioned this pull request Feb 21, 2019
Merged
jywarren pushed a commit that referenced this pull request Feb 21, 2019
@rexagod @jywarren
Fix jshint/karma errors and duplicate code from #100 (#146)
e5d260e
@jywarren jywarren mentioned this pull request Feb 25, 2019
Closed
jywarren pushed a commit that referenced this pull request Mar 2, 2019
@rexagod @jywarren
Simplify menu API to add tools at runtime (#149)
dcd8ec9 
* 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 jywarren mentioned this pull request Mar 8, 2019
Open
jywarren pushed a commit that referenced this pull request Mar 8, 2019
@rexagod @jywarren
Add image ordering functionality (#150)
7d1dc5b 
* 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
Reviewers
No reviews
Assignees

@jywarren jywarren

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jywarren @sashadev-sky @rexagod