cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve variable naming

Browse source
This commit is contained in:
Tom Hughes 2018-10-11 18:51:45 +01:00
parent 1aa63d92bc
commit bdcc33ae7f
1 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/assets/javascripts/index/history.js
View file

@ -97,27 +97,24 @@ OSM.History = function(map) {
$("[data-changeset]").each(function () { $("[data-changeset]").each(function () {
var changeset = $(this).data('changeset'); var changeset = $(this).data('changeset');
if (changeset.bbox) { if (changeset.bbox) {
var minProjection = map.project(L.latLng(changeset.bbox.minlat, changeset.bbox.minlon)), var bottomLeft = map.project(L.latLng(changeset.bbox.minlat, changeset.bbox.minlon)),
maxProjection = map.project(L.latLng(changeset.bbox.maxlat, changeset.bbox.maxlon)), topRight = map.project(L.latLng(changeset.bbox.maxlat, changeset.bbox.maxlon)),
xGap = maxProjection.x - minProjection.x, width = topRight.x - bottomLeft.x,
yGap = minProjection.y - maxProjection.y, height = bottomLeft.y - topRight.y,
minXGap = 40, // Min width/height of changeset in pixels minSize = 40; // Min width/height of changeset in pixels
minYGap = 40;
if (xGap < minXGap) { if (width < minSize) {
minProjection.x -= ((minXGap - xGap) / 2); bottomLeft.x -= ((minSize - width) / 2);
maxProjection.x += ((minXGap - xGap) / 2); topRight.x += ((minSize - width) / 2);
} }
if (yGap < minYGap) { if (height < minSize) {
minProjection.y += ((minYGap - yGap) / 2); bottomLeft.y += ((minSize - height) / 2);
maxProjection.y -= ((minYGap - yGap) / 2); topRight.y -= ((minSize - height) / 2);
} }
var minUnProjection = map.unproject(minProjection), var bounds = [map.unproject(bottomLeft),
maxUnProjection = map.unproject(maxProjection), map.unproject(topRight)];
bounds = [minUnProjection,
maxUnProjection];
changeset.bounds = L.latLngBounds(bounds); changeset.bounds = L.latLngBounds(bounds);
changesets.push(changeset); changesets.push(changeset);