Merge pull request #38 from Pedrazl/master

Fix cell size issue on ScalarField

.gitignore

@@ -42,3 +42,4 @@ jspm_packages
 
 # Linked library (/dist)
 # /docs/dist/leaflet.canvaslayer.field.js
+.vscode/settings.json

CHANGELOG.md

@@ -70,3 +70,8 @@
 
 * Added new method `multipleFromGeoTIFF` to `ScalarField` to return all bands from a GeoTIFF raster file as an array of `ScalarField`, thanks to @santiquetzal (#16).
 * Added compatibility with ASCII Grid files using XLLCENTER and YLLCENTER, as suggested in #17
+
+#v1.4.2
+
+* Fix Cell Size issue pointed by @nzahasan in #29
+* Update some dependencies (security updates)

package.json

@@ -1,8 +1,7 @@
 {
     "name": "leaflet-canvaslayer-field",
-    "version": "1.4.1",
-    "description":
-        "A set of layers using canvas to draw ASCIIGrid or GeoTIFF files. This includes a basic raster layer (*ScalaField*) and an animated layer for vector fields, such as wind or currents (*VectorFieldAnim*)",
+    "version": "1.4.2",
+    "description": "A set of layers using canvas to draw ASCIIGrid or GeoTIFF files. This includes a basic raster layer (*ScalaField*) and an animated layer for vector fields, such as wind or currents (*VectorFieldAnim*)",
     "main": "index.js",
     "dependencies": {
         "npm": "^3.10.7",
@@ -13,7 +12,7 @@
         "@turf/inside": "^4.7.3"
     },
     "devDependencies": {
-        "babel-core": "^6.24.1",
+        "babel-core": "^6.26.3",
         "babel-loader": "^7.0.0",
         "babel-preset-es2015": "^6.24.1",
         "eslint": "^3.19.0",

src/ScalarField.js

@@ -27,9 +27,9 @@ export default class ScalarField extends Field {
             items.forEach(it => {
                 let floatItem = parseFloat(it);
                 let v =
-                    floatItem !== header.noDataValue
-                        ? floatItem * scaleFactor
-                        : null;
+                    floatItem !== header.noDataValue ?
+                    floatItem * scaleFactor :
+                    null;
                 zs.push(v);
             });
         }
@@ -51,7 +51,9 @@ export default class ScalarField extends Field {
                 var items = line.split(' ').filter(i => i != '');
                 var param = items[0].trim().toUpperCase();
                 var value = parseFloat(items[1].trim());
-                return { [param]: value };
+                return {
+                    [param]: value
+                };
             });
 
             const usesCorner = 'XLLCORNER' in headerItems[2];
@@ -60,12 +62,12 @@ export default class ScalarField extends Field {
             const header = {
                 nCols: parseInt(headerItems[0]['NCOLS']),
                 nRows: parseInt(headerItems[1]['NROWS']),
-                xllCorner: usesCorner
-                    ? headerItems[2]['XLLCORNER']
-                    : headerItems[2]['XLLCENTER'] - cellSize,
-                yllCorner: usesCorner
-                    ? headerItems[3]['YLLCORNER']
-                    : headerItems[3]['YLLCENTER'] - cellSize,
+                xllCorner: usesCorner ?
+                    headerItems[2]['XLLCORNER'] :
+                    headerItems[2]['XLLCENTER'] - cellSize / 2,
+                yllCorner: usesCorner ?
+                    headerItems[3]['YLLCORNER'] :
+                    headerItems[3]['YLLCENTER'] - cellSize / 2,
                 cellXSize: cellSize,
                 cellYSize: cellSize,
                 noDataValue: headerItems[5]['NODATA_VALUE']
@@ -107,14 +109,14 @@ export default class ScalarField extends Field {
         }
 
         let scalarFields = [];
-        scalarFields = bandIndexes.map(function(bandIndex) {
+        scalarFields = bandIndexes.map(function (bandIndex) {
             let zs = rasters[bandIndex]; // left-right and top-down order
 
             if (fileDirectory.GDAL_NODATA) {
                 let noData = parseFloat(fileDirectory.GDAL_NODATA);
                 // console.log(noData);
                 let simpleZS = Array.from(zs); // to simple array, so null is allowed | TODO efficiency??
-                zs = simpleZS.map(function(z) {
+                zs = simpleZS.map(function (z) {
                     return z === noData ? null : z;
                 });
             }
@@ -211,4 +213,4 @@ export default class ScalarField extends Field {
         var ry = 1 - y;
         return g00 * rx * ry + g10 * x * ry + g01 * rx * y + g11 * x * y;
     }
-}
+}

src/_main.js

@@ -22,8 +22,4 @@ require('./layer/L.CanvasLayer.ScalarField.js');
 require('./layer/L.CanvasLayer.VectorFieldAnim.js');
 
 // control
-require('./control/L.Control.ColorBar.js');
-
-/* eslint-disable no-console */
-console.log('leaflet.canvaslayer.field v1.4.1');
-/* eslint-enable no-console */
+require('./control/L.Control.ColorBar.js');