Change downloaded JSON to have "collection" key instead of "images"

[jywarren]

Leaflet.DistortableImage/examples/js/archive.js

Line 295 in 8922aeb

const jsonImages = map.imgGroup.generateExportJson(true).images;

// download JSON
saveMap.addEventListener('click', () => {
  const jsonImages = {
    collection: map.imgGroup.generateExportJson(true).images
  }

[jywarren]

This will be compatible with changes in #1345, for a full download/upload lifecycle!

[jywarren]

The changes would also occur in this function:

Leaflet.DistortableImage/dist/leaflet.distortableimage.js

Lines 503 to 541 in 8cca752

	generateExportJson: function generateExportJson() {
	var allImages = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
	var json = {};
	json.images = [];
	this.eachLayer(function (layer) {
	if (allImages || this.isCollected(layer)) {
	var sections = layer._image.src.split('/');
	var filename = sections[sections.length - 1];
	var zc = layer.getCorners();
	var corners = [{
	lat: zc[0].lat,
	lon: zc[0].lng
	}, {
	lat: zc[1].lat,
	lon: zc[1].lng
	}, {
	lat: zc[3].lat,
	lon: zc[3].lng
	}, {
	lat: zc[2].lat,
	lon: zc[2].lng
	}];
	json.images.push({
	id: layer._leaflet_id,
	src: layer._image.src,
	width: layer._image.width,
	height: layer._image.height,
	image_file_name: filename,
	nodes: corners,
	cm_per_pixel: L.ImageUtil.getCmPerPixel(layer)
	});
	}
	}, this);
	json.images = json.images.reverse();
	json.avg_cm_per_pixel = this._getAvgCmPerPixel(json.images);
	return json;
	}
	});

[segun-codes]

Leaflet.DistortableImage/examples/js/archive.js

Line 295 in 8922aeb

const jsonImages = map.imgGroup.generateExportJson(true).images;

// download JSON
saveMap.addEventListener('click', () => {
  const jsonImages = {
    collection: map.imgGroup.generateExportJson(true).images
  }

The changes suggested here have been implemented through PR #1345. Key changed from "images" to "collection."

[segun-codes]

The changes would also occur in this function:

Leaflet.DistortableImage/dist/leaflet.distortableimage.js

Lines 503 to 541 in 8cca752

	generateExportJson: function generateExportJson() {
	var allImages = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
	var json = {};
	json.images = [];
	this.eachLayer(function (layer) {
	if (allImages || this.isCollected(layer)) {
	var sections = layer._image.src.split('/');
	var filename = sections[sections.length - 1];
	var zc = layer.getCorners();
	var corners = [{
	lat: zc[0].lat,
	lon: zc[0].lng
	}, {
	lat: zc[1].lat,
	lon: zc[1].lng
	}, {
	lat: zc[3].lat,
	lon: zc[3].lng
	}, {
	lat: zc[2].lat,
	lon: zc[2].lng
	}];
	json.images.push({
	id: layer._leaflet_id,
	src: layer._image.src,
	width: layer._image.width,
	height: layer._image.height,
	image_file_name: filename,
	nodes: corners,
	cm_per_pixel: L.ImageUtil.getCmPerPixel(layer)
	});
	}
	}, this);
	json.images = json.images.reverse();
	json.avg_cm_per_pixel = this._getAvgCmPerPixel(json.images);
	return json;
	}
	});

Hi @jywarren, my understanding is that we agreed not to alter this code but repackage the return json into a format where key images is changed to "collection" within /example/archive.js. For this purpose, I had created such adapter in archive.js (see #1345) without altering the generateExportJson() in this light. Or is there a change of plan now?

[jywarren]

No, that's fine, that's what we decided for that PR! This issue is for if we decide later to completely rework things. I just think that if we do, it should be done separately from the purpose of the PR, and we shouldn't try to do them both together.

[jywarren]

This is also completed then, i think! isn't that right @segun-codes?