Cloud Export integration, saving & display #1192
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,10 @@ | ||
| //(function() { | ||
| MapKnitter.Map = MapKnitter.Class.extend({ | ||
|
|
||
| initialize: function (options) { | ||
| this._zoom = options.zoom || 0; | ||
| this._latlng = L.latLng(options.latlng); | ||
| this.map_id = options.map_id || 0; | ||
| this.readOnly = options.readOnly; | ||
| this.logged_in = options.logged_in; | ||
| this.anonymous = options.anonymous; | ||
|
|
@@ -45,6 +46,7 @@ MapKnitter.Map = MapKnitter.Class.extend({ | |
| var downloadEl = $('.img-download-' + warpable.id), | ||
| imgEl = $('#full-img-' + warpable.id); | ||
|
|
||
| // this 'download' section can likely be dropped as Leaflet.DistortableImage now provides for such download itself | ||
| downloadEl.click(function () { | ||
| downloadEl.html('<i class="fa fa-circle-o-notch fa-spin"></i>'); | ||
|
|
||
|
|
@@ -418,6 +420,7 @@ MapKnitter.Map = MapKnitter.Class.extend({ | |
| var downloadEl = $('.img-download-' + warpable.id), | ||
| imgEl = $('#full-img-' + warpable.id); | ||
|
|
||
| // this 'download' section can likely be dropped as Leaflet.DistortableImage now provides for such download itself | ||
| downloadEl.click(function () { | ||
| downloadEl.html('<i class="fa fa-circle-o-notch fa-spin"></i>'); | ||
|
|
||
|
|
@@ -468,10 +471,7 @@ MapKnitter.Map = MapKnitter.Class.extend({ | |
| mode: 'lock', | ||
| }).addTo(map); | ||
|
|
||
| var imgGroup = L.distortableCollection({}).addTo(map); | ||
|
|
||
| imgGroup.addLayer(img); | ||
|
|
||
|
|
@@ -617,9 +617,81 @@ MapKnitter.Map = MapKnitter.Class.extend({ | |
| setupCollection: function() { | ||
|
|
||
| map._imgGroup = L.distortableCollection({ | ||
| editable: !mapknitter.readOnly, | ||
| exportOpts: { | ||
| // exportUrl: 'http://34.74.118.242/api/v2/export/', // to swap to JS exporter | ||
| // exportStartUrl: 'http://34.74.118.242/api/v2/export/', // to swap to JS exporter | ||
| fetchStatusUrl: fetchStatusUrl | ||
| } | ||
| }).addTo(map); | ||
|
|
||
| // customize the function that starts up the export | ||
| function fetchStatusUrl(opts) { | ||
| console.log('fetch status json', opts); | ||
|
|
||
| var scale = 0; | ||
| opts.collection.forEach(function(img) { | ||
| scale += img.cm_per_pixel; | ||
| }); | ||
| // average of scales of each image | ||
| scale = parseInt(scale/opts.collection.length); | ||
|
|
||
| $.ajax({ | ||
| url: 'https://export.mapknitter.org/export', | ||
| crossDomain: true, | ||
| type: 'POST', | ||
| data: { | ||
| collection: JSON.stringify(opts.collection), | ||
| scale: prompt("Choose a scale in 'centimeters per pixel' (where a smaller 50cm pixel is higher resolution - comparable to Google Maps - or a larger 200cm pixel is lower resolution):", scale) || opts.scale, | ||
| upload: true, | ||
| }, | ||
| success: handleStatusResponse | ||
| }); | ||
| // show exports | ||
| $('.export-tab').click(); | ||
| $('.exports-tab').click(); | ||
| window.location.hash = "#cloud-exports"; | ||
| } | ||
|
|
||
| // receives the URL of status.json, and starts running the updater to repeatedly fetch from status.json; | ||
| // this may be overridden to integrate with any UI | ||
| function handleStatusResponse(status_url, opts) { | ||
| alert("Export has begun: leave this window open to be notified of completion. Due to a known issue, please refresh the page if you'd like to start another."); // https://github.com/publiclab/Leaflet.DistortableImage/issues/522 | ||
| // this is for the JS exporter: | ||
| // var statusUrl = data.split('please visit, ')[1]; | ||
|
|
||
| // save the location of the status URL | ||
| $.ajax({ | ||
| url: "/export", | ||
| type: 'POST', | ||
| data: { | ||
| status_url: 'https://export.mapknitter.org' + status_url, | ||
| map_id: mapknitter.map_id | ||
| } | ||
| }).done(function (data) { | ||
| console.log('saved status.json URL to MapKnitter', data); | ||
| }); | ||
|
|
||
| // repeatedly fetch the status.json | ||
| var updateInterval = setInterval(function intervalUpdater() { | ||
| $.ajax('https://export.mapknitter.org/' + status_url + '?' + Date.now(), { // bust cache with timestamp | ||
| type: 'GET', | ||
| crossDomain: true, | ||
| }).done(function(data) { | ||
| // update the progress bar or spinner | ||
| // opts.updater(data); | ||
| data = JSON.parse(data); | ||
| console.log(data, data.status, data.jpg); | ||
| if (data && data.status == "complete") { | ||
| alert("Export completed at " + data.cm_per_pixel + " cm/px. JPG available at https://mapknitter-exports-warps.storage.googleapis.com/" + data.jpg.split('public/warps')[1] + " -- Please refresh page to view completed exports."); | ||
|
There was a problem hiding this comment. Here I set the alert to show the JPG and direct towards a reload. then cleared the interval. Wooo! |
||
| clearInterval(updateInterval); | ||
| } | ||
| }); | ||
| }, 3000); // frequency of updating | ||
|
|
||
| opts.resolve(); // stop the spinner | ||
|
There was a problem hiding this comment. But maybe we're not passing There was a problem hiding this comment. Maybe if I do this, it'll work? @VladimirMikulic are you able to review this: publiclab/Leaflet.DistortableImage#528 Thank you! There was a problem hiding this comment. @jywarren sorry for not being available earlier. I am glad that you've managed to fix it 👍 |
||
| } | ||
|
|
||
| var sidebar = document.querySelector('body > div.sidebar'); | ||
|
|
||
| if (!mapknitter.readOnly) { | ||
|
|
@@ -668,4 +740,4 @@ MapKnitter.Map = MapKnitter.Class.extend({ | |
| } | ||
|
|
||
| }); | ||
| //})(); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,11 +35,3 @@ | |
| <% end %> | ||
| </p> | ||
| </form> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| <p><a href="https://publiclab.org/wiki/mapknitter-cloud-exporter">Using the Cloud Exporter »</a></p> | ||
| <div class="mapknitter-cloud-exports" id="cloud-exports"> | ||
| <% exports.order(created_at: :desc).each_with_index do |export, i| %> | ||
| <p class="export mapknitter-cloud-export" style="font-size:11px;"> | ||
| <b>Export <%= i %>:</b> | ||
| (<a href="<%= export.export_url %>">status</a>) | ||
| </p> | ||
| <% end %> | ||
| </div> | ||
| <script> | ||
| (function() { | ||
| $('.mapknitter-cloud-exports .mapknitter-cloud-export').each(function collectExportUrls() { | ||
| var export_el = $(this); | ||
| var export_url = export_el.find('a').attr('href'); | ||
| $.ajax(export_url).done(function displayExportStatus(response) { | ||
| response = JSON.parse(response); | ||
| console.log(response, response.status); | ||
|
|
||
| if (response.status) export_el.append(' <i class="status">' + response.status + '</i>'); | ||
| if (response.jpg) export_el.append(' <span class="file"><a href="https://mapknitter-exports-warps.storage.googleapis.com/' + response.jpg.split('public/warps/')[1] + '">JPG</span>'); | ||
| if (response.geotiff) export_el.append(' <span class="file"><a href="https://mapknitter-exports-warps.storage.googleapis.com/' + response.geotiff.split('public/warps/')[1] + '">GeoTiff</span>'); | ||
|
|
||
| export_el.append('<br />'); | ||
|
|
||
| if (response.height && response.width) export_el.append(' <span class="meta">' + response.height + 'x' + response.width + '</span>'); | ||
| if (response.size) export_el.append(' <span class="meta">' + (response.size.split('B')[0]/1000000) + 'MB</span>'); | ||
| if (response.zip) export_el.append(' <span class="file"><a href="https://mapknitter-exports-warps.storage.googleapis.com/' + response.zip.split('public/tms/')[1] + '">TMS (zip)</span>'); | ||
| if (response.start_time) export_el.append(' <i class="start_time">' + response.start_time + '</i>'); | ||
| }); | ||
| }) | ||
| })() | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See how here, I am now passing the
optsobject through each function, so that the functions don't need to have access to internal scope from the Collection; I had hoped that at the end of this function theopts.resolve()would work.