cleaning up

openstreetmap · Aug 24, 2017 · 909b72a · 909b72a
1 parent 91a5699
commit 909b72a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 107 deletions.
diff --git a/modules/core/context.js b/modules/core/context.js
@@ -16,7 +16,6 @@ import { utilRebind } from '../util/rebind';
 import { utilCallWhenIdle } from '../util/index';
 
 
-
 export var areaKeys = {};
 
 export function setAreaKeys(value) {

diff --git a/modules/renderer/map.js b/modules/renderer/map.js
@@ -32,7 +32,6 @@ import { utilGetDimensions } from '../util/dimensions';
 
 
 
-
 export function rendererMap(context) {
 
     var dimensions = [1, 1],
@@ -58,46 +57,31 @@ 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)
             .filter(zoomEventFilter)
             .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;
     };
 

diff --git a/modules/svg/labels.js b/modules/svg/labels.js
@@ -18,7 +18,8 @@ import { utilDetect } from '../util/detect';
 import {
     utilDisplayName,
     utilDisplayNameForPath,
-    utilEntitySelector
+    utilEntitySelector,
+    utilCallWhenIdle
 } from '../util/index';
 
 
@@ -652,7 +653,7 @@ export function svgLabels(projection, context) {
     }
 
 
-    var throttleFilterLabels = _.throttle(filterLabels, 100);
+    var throttleFilterLabels = _.throttle(utilCallWhenIdle(filterLabels), 100);
 
 
     drawLabels.observe = function(selection) {

diff --git a/modules/ui/background.js b/modules/ui/background.js
@@ -4,7 +4,7 @@ import { d3keybinding } from '../lib/d3.keybinding.js';
 import { t, textDirection } from '../util/locale';
 import { geoMetersToOffset, geoOffsetToMeters } from '../geo/index';
 import { utilDetect } from '../util/detect';
-import { utilSetTransform } from '../util/index';
+import { utilSetTransform, utilCallWhenIdle } from '../util/index';
 import { svgIcon } from '../svg/index';
 import { uiMapInMap } from './map_in_map';
 import { uiCmd } from './cmd';
@@ -540,7 +540,7 @@ export function uiBackground(context) {
             );
 
         context.map()
-            .on('move.background-update', _.debounce(update, 1000));
+            .on('move.background-update', _.debounce(utilCallWhenIdle(update), 1000));
 
         context.background()
             .on('change.background-update', update);

diff --git a/modules/util/call_when_idle.js b/modules/util/call_when_idle.js
@@ -1,13 +1,11 @@
 // note the function should be of low priority
 // and should not be returning a value.
-export function utilCallWhenIdle(func, timeout, name) {
+export function utilCallWhenIdle(func, timeout) {
     return function() {
         var args = arguments;
         var that = this;
-        console.log('called ', name);
         window.requestIdleCallback(function() {
-        console.log('idle succeed  ', name);
             func.apply(that, args);
         }, {timeout: timeout});
     };
-}
+}
diff --git a/modules/util/index.js b/modules/util/index.js
@@ -23,4 +23,4 @@ export { utilTagText } from './util';
 export { utilTriggerEvent } from './trigger_event';
 export { utilWrap } from './util';
 export { utilIdleWorker} from './idle_worker';
-export { utilCallWhenIdle } from './call_when_idle';
+export { utilCallWhenIdle } from './call_when_idle';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,7 +16,6 @@ import { utilRebind } from '../util/rebind';
		import { utilCallWhenIdle } from '../util/index';



		export var areaKeys = {};

		export function setAreaKeys(value) {
Expand Down