CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-19 23:14:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleaning up

Browse Source
This commit is contained in:
Kushan Joshi
2017-08-24 16:53:40 +05:30
parent 91a569985d
commit 909b72a39e
6 changed files with 26 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/renderer/map.js
+18 -97
View File
@@ -32,7 +32,6 @@ import { utilGetDimensions } from '../util/dimensions';
export function rendererMap(context) {
var dimensions = [1, 1],
@@ -58,20 +57,6 @@ export function rendererMap(context) {
mouse,
mousemove;
// var debouncedTransformStart = () => requestAnimationFrame(() => transformStart = projection.transform());
// var setProjectionTransformStart = () => debSetTransformStart(projection.transform());
// var debSetTransformStart = _.debounce((val) => transformStart = val, 50);
// const debouncedTransform
// var projectIdleCb;
var savedToDrawVertices;
var saveToDrawLines;
var saveToDrawArea;
var saveToDrawMidpoints;
var saveToDrawLabels;
var saveToDrawPoints;
var zoom = d3.zoom()
.scaleExtent([ztok(2), ztok(24)])
.interpolate(d3.interpolate)
@@ -79,25 +64,24 @@ export function rendererMap(context) {
.on('zoom', zoomPan);
var _selection = d3.select(null);
var isRenderScheduled = false;
var isRedrawScheduled = false;
var pendingRedrawCall;
function initiateRedraw() {
// Reset the boolean so future redraws can be set.
isRenderScheduled = false;
redraw.apply(this, arguments);
}
function scheduleRedraw() {
// Only schedule the redraw if one has not already been set.
if (isRenderScheduled) return;
isRenderScheduled = true;
pendingRedrawCall = requestIdleCallback(() => initiateRedraw.apply(this, arguments), { timeout: 1400 });
if (isRedrawScheduled) return;
isRedrawScheduled = true;
var that = this;
var args = arguments;
pendingRedrawCall = requestIdleCallback(function () {
// Reset the boolean so future redraws can be set.
isRedrawScheduled = false;
redraw.apply(that, args);
}, { timeout: 1400 });
}
function cancelPendingRedraw() {
isRenderScheduled = false;
isRedrawScheduled = false;
window.cancelIdleCallback(pendingRedrawCall);
}
@@ -301,67 +285,6 @@ export function rendererMap(context) {
.call(drawLabels, graph, data, filter, dimensions, !difference && !extent)
.call(drawPoints, graph, data, filter);
// var toDrawVertices = (selection) => {
// // window.cancelIdleCallback(savedToDrawVertices);
// savedToDrawVertices = requestIdleCallback(() => {
// drawVertices(selection, graph, data, filter, map.extent(), map.zoom());
// setProjectionTransformStart();
// toDrawLines(selection);
// }, {timeout: 150});
// };
// var toDrawLines = (selection) => {
// // window.cancelIdleCallback(saveToDrawLines);
// saveToDrawLines = requestIdleCallback(() => {
// drawLines(selection, graph, data, filter);
// // setProjectionTransformStart();
// toDrawAreas(selection);
// }, {timeout: 150});
// };
// var toDrawAreas = (selection) => {
// // window.cancelIdleCallback(saveToDrawArea);
// saveToDrawArea = requestIdleCallback(() => {
// drawAreas(selection, graph, data, filter);
// // setProjectionTransformStart();
// toDrawMidpoints(selection);
// }, {timeout: 150});
// };
// var toDrawMidpoints = (selection) => {
// // window.cancelIdleCallback(saveToDrawMidpoints);
// saveToDrawMidpoints = requestIdleCallback(() => {
// drawMidpoints(selection,graph, data, filter, map.trimmedExtent());
// // setProjectionTransformStart();
// toDrawLabels(selection);
// }, {timeout: 150});
// };
// var toDrawLabels = (selection) => {
// // window.cancelIdleCallback(saveToDrawLabels);
// saveToDrawLabels = requestIdleCallback(() => {
// drawLabels(selection, graph, data, filter, dimensions, !difference && !extent);
// // setProjectionTransformStart();
// toDrawPoints(selection);
// }, {timeout: 150});
// };
// var toDrawPoints = (selection) => {
// // window.cancelIdleCallback(saveToDrawPoints);
// saveToDrawPoints = requestIdleCallback(() => {
// drawPoints(selection, graph, data, filter);
// setProjectionTransformStart();
// }, {timeout: 150});
// };
// surface.selectAll('.data-layer-osm')
// .call(toDrawVertices)
// .call(toDrawLines)
// .call(toDrawAreas)
// .call(toDrawMidpoints)
// .call(toDrawLabels)
// .call(toDrawPoints);
dispatch.call('drawn', this, {full: true});
}
@@ -419,7 +342,7 @@ export function rendererMap(context) {
surface.interrupt();
uiFlash().text(t('cannot_zoom'));
setZoom(context.minEditableZoom(), true);
queueRedraw();
scheduleRedraw();
dispatch.call('move', this, map);
return;
}
@@ -442,7 +365,7 @@ export function rendererMap(context) {
transformed = true;
transformLast = eventTransform;
utilSetTransform(supersurface, tX, tY, scale);
queueRedraw();
scheduleRedraw();
dispatch.call('move', this, map);
}
@@ -499,8 +422,6 @@ export function rendererMap(context) {
}
var queueRedraw = scheduleRedraw;
var immediateRedraw = function(difference, extent) {
if (!difference && !extent) cancelPendingRedraw();
@@ -672,7 +593,7 @@ export function rendererMap(context) {
mouse = utilFastMouse(supersurface.node());
setCenter(center);
queueRedraw();
scheduleRedraw();
return map;
};
@@ -701,7 +622,7 @@ export function rendererMap(context) {
dispatch.call('move', this, map);
}
queueRedraw();
scheduleRedraw();
return map;
};
@@ -721,7 +642,7 @@ export function rendererMap(context) {
dispatch.call('move', this, map);
}
queueRedraw();
scheduleRedraw();
return map;
};
@@ -744,7 +665,7 @@ export function rendererMap(context) {
dispatch.call('move', this, map);
}
queueRedraw();
scheduleRedraw();
return map;
};