commit 4cd10172fc6e2990d1d8c3149a1b8e159e583c84
parent 1fae2a0fd02003f6a4d5b47b1536856e5d63b809
Author: Sergej Orlov <wladimirych@gmail.com>
Date: Sun, 5 Jan 2020 23:09:09 +0100
fix lint errors (no-use-before-define)
Diffstat:
5 files changed, 52 insertions(+), 55 deletions(-)
diff --git a/src/lib/leaflet.control.printPages/map-render.js b/src/lib/leaflet.control.printPages/map-render.js
@@ -17,10 +17,6 @@ function getLayersForPrint(map, xhrQueue) {
return 0;
}
- function compareLayersOrder(layer1, layer2) {
- return compareArrays(getLayerZOrder(layer1), getLayerZOrder(layer2));
- }
-
function getLayerZOrder(layer) {
let el = layer._container || layer._path;
if (!el) {
@@ -34,7 +30,6 @@ function getLayersForPrint(map, xhrQueue) {
return order.reverse();
}
-
function compareArrays(ar1, ar2) {
const len = Math.min(ar1.length, ar2.length);
for (let i = 0; i < len; i++) {
@@ -46,6 +41,10 @@ function getLayersForPrint(map, xhrQueue) {
return compare(ar1.length, ar2.length);
}
+ function compareLayersOrder(layer1, layer2) {
+ return compareArrays(getLayerZOrder(layer1), getLayerZOrder(layer2));
+ }
+
let layers = [];
map.eachLayer((layer) => {
if (layer.options.print) {
diff --git a/src/lib/leaflet.control.track-list/lib/parsers/nktk.js b/src/lib/leaflet.control.track-list/lib/parsers/nktk.js
@@ -11,18 +11,6 @@ function PackedStreamReader(s) {
this.position = 0;
}
-PackedStreamReader.prototype.readNumber = function() {
- var n = unpackNumber(this._string, this.position);
- this.position += n[1];
- return n[0];
-};
-
-PackedStreamReader.prototype.readString = function(size) {
- var s = this._string.slice(this.position, this.position + size);
- this.position += size;
- return s;
-};
-
function unpackNumber(s, position) {
var x,
n = 0;
@@ -64,6 +52,18 @@ function unpackNumber(s, position) {
return [n, 4];
}
+PackedStreamReader.prototype.readNumber = function() {
+ var n = unpackNumber(this._string, this.position);
+ this.position += n[1];
+ return n[0];
+};
+
+PackedStreamReader.prototype.readString = function(size) {
+ var s = this._string.slice(this.position, this.position + size);
+ this.position += size;
+ return s;
+};
+
function deltaEncodeSegment(points) {
let deltaLats = [],
deltaLons = [];
@@ -144,14 +144,6 @@ function saveNktk(segments, name, color, measureTicksShown, waypoints, trackHidd
return urlSafeBase64.encode(s);
}
-function parseTrackUrlData(s) {
- s = urlSafeBase64.decode(s);
- if (!s) {
- return [{name: 'Text encoded track', error: ['CORRUPT']}];
- }
- return parseNktkOld(s, 0);
-}
-
function parseNktkOld(s, version) {
var name,
n,
@@ -262,6 +254,14 @@ function parseNktkOld(s, version) {
return [geoData];
}
+function parseTrackUrlData(s) {
+ s = urlSafeBase64.decode(s);
+ if (!s) {
+ return [{name: 'Text encoded track', error: ['CORRUPT']}];
+ }
+ return parseNktkOld(s, 0);
+}
+
function parseNktkProtobuf(s) {
const pbf = new Pbf(stringToArrayBuffer(s));
let trackView;
diff --git a/src/lib/leaflet.control.track-list/lib/services/nakarte/index.js b/src/lib/leaflet.control.track-list/lib/services/nakarte/index.js
@@ -14,6 +14,20 @@ function flattenArray(ar) {
}
+function parsePointFromHashValues(values) {
+ if (values.length < 2) {
+ return [{name: 'Point in url', error: 'CORRUPT'}];
+ }
+ const lat = parseFloat(values[0]);
+ const lng = parseFloat(values[1]);
+ if (isNaN(lat) || isNaN(lng) || lat < -90 || lat > 90 || lng < -180 || lng > 180) {
+ return [{name: 'Point in url', error: 'CORRUPT'}];
+ }
+ const name = ((values[2] || '').trim()) || 'Point';
+ return [{name, points: [{name, lat, lng}]}];
+
+}
+
class NakarteTrack extends BaseService {
isOurUrl() {
return this.origUrl.indexOf('track://') > -1;
@@ -101,20 +115,4 @@ class NakarteUrl {
}
}
-
-function parsePointFromHashValues(values) {
- if (values.length < 2) {
- return [{name: 'Point in url', error: 'CORRUPT'}];
- }
- const lat = parseFloat(values[0]);
- const lng = parseFloat(values[1]);
- if (isNaN(lat) || isNaN(lng) || lat < -90 || lat > 90 || lng < -180 || lng > 180) {
- return [{name: 'Point in url', error: 'CORRUPT'}];
- }
- const name = ((values[2] || '').trim()) || 'Point';
- return [{name, points: [{name, lat, lng}]}];
-
-}
-
-
export {NakarteTrack, NakarteUrl, NakarteUrlLoader};
diff --git a/src/lib/leaflet.fixes/index.js b/src/lib/leaflet.fixes/index.js
@@ -2,16 +2,6 @@ import L from 'leaflet';
import './style.css';
import {fixVectorMarkerWorldJump} from './fixWorldCopyJump';
-function fixAll() {
- fixPanAnimationBug();
- fixTouchDetection();
- fixMapKeypressEvent();
- fixVectorDrawWhileAnimation();
- fixVectorMarkerWorldJump();
- allowControlHorizontalStacking();
- addTooltipDelay();
-}
-
// https://github.com/Leaflet/Leaflet/issues/3575
function fixPanAnimationBug() {
if (!L.Browser.chrome) {
@@ -111,4 +101,14 @@ function addTooltipDelay() {
};
}
+function fixAll() {
+ fixPanAnimationBug();
+ fixTouchDetection();
+ fixMapKeypressEvent();
+ fixVectorDrawWhileAnimation();
+ fixVectorMarkerWorldJump();
+ allowControlHorizontalStacking();
+ addTooltipDelay();
+}
+
export {fixAll};
diff --git a/src/lib/leaflet.layer.rasterize/TileLayer.js b/src/lib/leaflet.layer.rasterize/TileLayer.js
@@ -2,6 +2,10 @@ import L from 'leaflet';
import urlViaCorsProxy from '~/lib/CORSProxy';
import {imgFromDataString} from './imgFromDataString';
+function noop() {
+ // dummy function
+}
+
const GridLayerGrabMixin = {
tileImagePromiseFromCoords: function(_unused_coords) {
throw new Error('Method not implemented');
@@ -76,10 +80,6 @@ const TileLayerGrabMixin = L.Util.extend({}, GridLayerGrabMixin, {
}
);
-function noop() {
- // dummy function
-}
-
const CanvasLayerGrabMixin = L.Util.extend({}, GridLayerGrabMixin, {
getCanvasFromTile: function(tile) {
return tile;
