From c7b320587e01b90a76a545a46f1afff94f58d589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6kay=20=C5=9Eat=C4=B1r?= Date: Tue, 5 Jan 2021 14:20:47 +0300 Subject: [PATCH] CanvasSectionContainer: Rename drawing order to processing order. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gökay Şatır Change-Id: I3061b9ffa56cbd455d7834ab76a953189c0b6dd3 --- .../src/layer/tile/CanvasSectionContainer.ts | 16 ++++++++-------- loleaflet/src/layer/tile/CanvasTileLayer.js | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/loleaflet/src/layer/tile/CanvasSectionContainer.ts b/loleaflet/src/layer/tile/CanvasSectionContainer.ts index cddf07d16..2b6ce5fc8 100644 --- a/loleaflet/src/layer/tile/CanvasSectionContainer.ts +++ b/loleaflet/src/layer/tile/CanvasSectionContainer.ts @@ -15,9 +15,9 @@ zIndex: Elements with highest zIndex will be drawn on top. expand: '' | 'right' | 'left' | 'top' | 'bottom' | 'left right top bottom' (any combination) interactable: true | false // If false, only general events will be fired (onDraw, newDocumentTopLeft, onResize). Example: editing mode, background drawings etc. - drawingOrder: + processingOrder: - Drawing order feature is tricky, let's say you want something like this: + Processing order feature is tricky, let's say you want something like this: -------------------- | top bar | @@ -30,7 +30,7 @@ Top bar's height will be static most probably. It needs to be drawn first, so it can be expanded to right. If top bar is drawn after tiles area, since "tiles area" will most probably be expanded to all directions, it will leave no space for top bar. So, tiles area will be drawn last. - For above situation, drawing orders would be (with the same zIndex): + For above situation, processing orders would be (with the same zIndex): * top bar -> 1 * left bar -> 2 * tiles area -> 3 @@ -69,7 +69,7 @@ class CanvasSectionObject { position: Array = new Array(0); size: Array = new Array(0); expand: Array = new Array(0); - drawingOrder: number = null; + processingOrder: number = null; zIndex: number = null; interactable: boolean = true; myProperties: any = {}; @@ -94,7 +94,7 @@ class CanvasSectionObject { this.position = options.position; this.size = options.size; this.expand = options.expand.split(' '); - this.drawingOrder = options.drawingOrder; + this.processingOrder = options.processingOrder; this.zIndex = options.zIndex; this.interactable = options.interactable; this.myProperties = options.myProperties ? options.myProperties: {}; @@ -651,11 +651,11 @@ class CanvasSectionContainer { } } - // According to drawing order. Section with the highest drawing order will be drawn last. + // According to processing order. Section with the highest processing order will be calculated last. for (var i: number = 0; i < this.sections.length - 1; i++) { var zIndex = this.sections[i].zIndex; while (i < this.sections.length - 1 && zIndex === this.sections[i + 1].zIndex) { - if (this.sections[i].drawingOrder > this.sections[i + 1].drawingOrder) { + if (this.sections[i].processingOrder > this.sections[i + 1].processingOrder) { var temp = this.sections[i + 1]; this.sections[i + 1] = this.sections[i]; this.sections[i] = temp; @@ -741,7 +741,7 @@ class CanvasSectionContainer { || options.position === undefined || options.size === undefined || options.expand === undefined - || options.drawingOrder === undefined + || options.processingOrder === undefined || options.zIndex === undefined || options.interactable === undefined ) { diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js b/loleaflet/src/layer/tile/CanvasTileLayer.js index f33a500a1..05cbe5340 100644 --- a/loleaflet/src/layer/tile/CanvasTileLayer.js +++ b/loleaflet/src/layer/tile/CanvasTileLayer.js @@ -241,7 +241,7 @@ L.TileSectionManager = L.Class.extend({ position: [250 * that._dpiScale, 250 * that._dpiScale], // Set its initial position to somewhere blank. Other sections shouldn't cover this point after initializing. size: [0, 0], // Going to be expanded, no initial width or height is necessary. expand: 'top left bottom right', // Expand to all directions. - drawingOrder: 1, + processingOrder: 1, zIndex: 5, interactable: true, myProperties: { @@ -274,7 +274,7 @@ L.TileSectionManager = L.Class.extend({ position: [0, 0], size: [0, 0], expand: '', - drawingOrder: 1, + processingOrder: 1, zIndex: 4, // Even if this one is drawn on top, won't be able to catch events. // Sections with "interactable: true" can catch events even if they are under a section with property "interactable: false". @@ -355,7 +355,7 @@ L.TileSectionManager = L.Class.extend({ position: [0, 0], size: [0, 0], expand: '', - drawingOrder: 1, + processingOrder: 1, zIndex: 8, // Above all. // Even if this one is drawn on top, won't be able to catch events. // Sections with "interactable: true" can catch events even if they are under a section with property "interactable: false". @@ -389,7 +389,7 @@ L.TileSectionManager = L.Class.extend({ position: [0, 0], size: [0, 0], expand: '', - drawingOrder: 1, + processingOrder: 1, zIndex: 6, // Above tile layer. interactable: false, myProperties: {},