nakarte

commit 50afc3095768a22d7e9bc2d7211963e5db062b18
parent baf621ac8086b3f633e0867ab9fc6a0b0636cfc4
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Wed, 29 Mar 2017 01:38:45 +0300

[print/grid] dark lines with light border

Diffstat:
M
src/lib/leaflet.control.printPages/decoration.grid.js
 | 
61
++++++++++++++++++++++++++++++++-----------------------------

1 file changed, 32 insertions(+), 29 deletions(-)
diff --git a/src/lib/leaflet.control.printPages/decoration.grid.js b/src/lib/leaflet.control.printPages/decoration.grid.js
@@ -7,9 +7,7 @@ function radians(degrees) {
 }
 
 class Grid extends PrintStaticLayer {
-    lineThicknessMm = 0.2;
     minGridIntervalMm = 15;
-    lineColor = '#cccccc';
 
     fontSizeMm = 3;
     font = 'verdana';
@@ -54,9 +52,6 @@ class Grid extends PrintStaticLayer {
         ctx.beginPath();
         const pixelsPerMm = 1 / 25.4 * printOptions.resolution;
         const lineThickness = this.lineThicknessMm * pixelsPerMm;
-        ctx.lineWidth = lineThickness;
-        ctx.strokeStyle = this.lineColor;
-
         const intervalM = this.getGridInterval(printOptions);
         const width = printOptions.destPixelSize.x;
         const height = printOptions.destPixelSize.y;
@@ -78,35 +73,43 @@ class Grid extends PrintStaticLayer {
             let yMerc2 = L.Projection.SphericalMercator.project(L.latLng(lat2, 0)).y;
             y = (mercatorBounds.max.y - yMerc2) / canvasToMercatorScale.y;
         }
-        for ({y} of rows) {
-            ctx.moveTo(0, y);
-            ctx.lineTo(width, y);
-        }
-        const pageCanvasCenterX = printOptions.destPixelSize.x / 2;
-        for (let direction of [-1, 1]) {
-            let colN = 0;
-            while (true) {
-                let firstRow = true;
-                let hasPointInPage = false;
-                for (let {lat, y} of rows) {
-                    let dx = colN * intervalM / Math.cos(radians(lat)) / canvasToMercatorScale.x;
-                    if (dx < pageCanvasCenterX) {
-                        hasPointInPage = true;
+        for (let {lineWidth, color} of [{lineWidth: 0.25, color: '#cccccc'}, {lineWidth: 0.1, color: '#8C8C8C'}]) {
+            ctx.beginPath();
+            let lineThickness = lineWidth * pixelsPerMm;
+            ctx.lineWidth = lineThickness;
+            ctx.strokeStyle = color;
+
+            for ({y} of rows) {
+                ctx.moveTo(0, y);
+                ctx.lineTo(width, y);
+            }
+            const pageCanvasCenterX = printOptions.destPixelSize.x / 2;
+            for (let direction of [-1, 1]) {
+                let colN = 0;
+                while (true) {
+                    let firstRow = true;
+                    let hasPointInPage = false;
+                    for (let {lat, y} of rows) {
+                        let dx = colN * intervalM / Math.cos(radians(lat)) / canvasToMercatorScale.x;
+                        if (dx < pageCanvasCenterX) {
+                            hasPointInPage = true;
+                        }
+                        if (firstRow) {
+                            ctx.moveTo(pageCanvasCenterX + dx * direction, y);
+                        } else {
+                            ctx.lineTo(pageCanvasCenterX + dx * direction, y);
+                        }
+                        firstRow = false;
                     }
-                    if (firstRow) {
-                        ctx.moveTo(pageCanvasCenterX + dx * direction, y);
-                    } else {
-                        ctx.lineTo(pageCanvasCenterX + dx * direction, y);
+                    if (!hasPointInPage) {
+                        break
                     }
-                    firstRow = false;
+                    colN += 1;
                 }
-                if (!hasPointInPage) {
-                    break
-                }
-                colN += 1;
             }
+            ctx.stroke();
         }
-        ctx.stroke();
+
     }
     _drawLabel(canvas, printOptions) {
         const intervalM = this.getGridInterval(printOptions);