geojs 1.14.9 → 1.14.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/geo.js +58 -23
- package/geo.lean.js +58 -23
- package/geo.lean.min.js +3 -3
- package/geo.min.js +3 -3
- package/package.json +1 -1
- package/src/ui/colorLegendWidget.js +36 -0
- package/src/webgl/markerFeature.js +14 -15
package/geo.js
CHANGED
|
@@ -22394,14 +22394,15 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
|
|
|
22394
22394
|
*/
|
|
22395
22395
|
this.updateStyleFromArray = function (keyOrObject, styleArray, refresh) {
|
|
22396
22396
|
var bufferedKeys = {
|
|
22397
|
+
radius: 1,
|
|
22397
22398
|
fillColor: 3,
|
|
22398
22399
|
fillOpacity: 1,
|
|
22399
|
-
radius: 1,
|
|
22400
22400
|
strokeColor: 3,
|
|
22401
22401
|
strokeOpacity: 1,
|
|
22402
22402
|
strokeWidth: 1,
|
|
22403
22403
|
symbolComputed: 1,
|
|
22404
|
-
symbolValueComputed: 1
|
|
22404
|
+
symbolValueComputed: 1,
|
|
22405
|
+
rotation: 1
|
|
22405
22406
|
};
|
|
22406
22407
|
var needsRefresh, needsRender;
|
|
22407
22408
|
if (typeof keyOrObject === 'string') {
|
|
@@ -22410,12 +22411,12 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
|
|
|
22410
22411
|
keyOrObject = obj;
|
|
22411
22412
|
}
|
|
22412
22413
|
$.each(keyOrObject, function (key, styleArray) {
|
|
22414
|
+
var sbkey = key === 'symbolComputed' ? 'symbol' : key === 'symbolValueComputed' ? 'symbolValue' : key;
|
|
22413
22415
|
if (m_this.visible() && m_actor && bufferedKeys[key] && !needsRefresh && !m_this.clustering()) {
|
|
22414
|
-
var vpf, mapper, buffer, numPts, value, i, j, v, bpv
|
|
22416
|
+
var vpf, mapper, buffer, numPts, value, i, j, v, bpv;
|
|
22415
22417
|
bpv = bufferedKeys[key];
|
|
22416
22418
|
numPts = m_this.data().length;
|
|
22417
22419
|
mapper = m_actor.mapper();
|
|
22418
|
-
sbkey = key === 'symbolComputed' ? 'symbol' : key === 'symbolValueComputed' ? 'symbolValue' : key;
|
|
22419
22420
|
buffer = mapper.getSourceBuffer(sbkey);
|
|
22420
22421
|
vpf = m_this.verticesPerFeature();
|
|
22421
22422
|
if (!buffer || !numPts || numPts * vpf * bpv !== buffer.length) {
|
|
@@ -22451,15 +22452,13 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
|
|
|
22451
22452
|
} else {
|
|
22452
22453
|
needsRefresh = true;
|
|
22453
22454
|
}
|
|
22454
|
-
|
|
22455
|
-
|
|
22456
|
-
if
|
|
22457
|
-
|
|
22458
|
-
m_this.modified = function () {};
|
|
22459
|
-
}
|
|
22460
|
-
s_updateStyleFromArray(key, styleArray, false);
|
|
22461
|
-
m_this.modified = mod;
|
|
22455
|
+
var mod = m_this.modified;
|
|
22456
|
+
if (!needsRefresh && key === sbkey) {
|
|
22457
|
+
// don't allow modified to be adjusted if we don't need to refresh
|
|
22458
|
+
m_this.modified = function () {};
|
|
22462
22459
|
}
|
|
22460
|
+
s_updateStyleFromArray(key, styleArray, false);
|
|
22461
|
+
m_this.modified = mod;
|
|
22463
22462
|
});
|
|
22464
22463
|
if (refresh) {
|
|
22465
22464
|
if (m_this.visible() && needsRefresh) {
|
|
@@ -22505,15 +22504,15 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
|
|
|
22505
22504
|
name: 'pos'
|
|
22506
22505
|
}),
|
|
22507
22506
|
attr = {
|
|
22508
|
-
radius: 1,
|
|
22509
22507
|
fillColor: 3,
|
|
22510
22508
|
fillOpacity: 1,
|
|
22509
|
+
radius: 1,
|
|
22510
|
+
rotation: 1,
|
|
22511
22511
|
strokeColor: 3,
|
|
22512
22512
|
strokeOpacity: 1,
|
|
22513
22513
|
strokeWidth: 1,
|
|
22514
22514
|
symbol: 1,
|
|
22515
|
-
symbolValue: 1
|
|
22516
|
-
rotation: 1
|
|
22515
|
+
symbolValue: 1
|
|
22517
22516
|
},
|
|
22518
22517
|
uniforms = {
|
|
22519
22518
|
pixelWidth: vgl.GL.FLOAT,
|
|
@@ -26455,7 +26454,7 @@ module.exports = svg_tileLayer;
|
|
|
26455
26454
|
* @constant
|
|
26456
26455
|
* @type {string}
|
|
26457
26456
|
*/
|
|
26458
|
-
module.exports = "1.14.
|
|
26457
|
+
module.exports = "1.14.11";
|
|
26459
26458
|
|
|
26460
26459
|
/***/ }),
|
|
26461
26460
|
|
|
@@ -70266,6 +70265,42 @@ var _colorLegendWidget = function colorLegendWidget(arg) {
|
|
|
70266
70265
|
return d3.format('.' + precision + 'f')(number);
|
|
70267
70266
|
};
|
|
70268
70267
|
|
|
70268
|
+
/**
|
|
70269
|
+
* Get/Set width.
|
|
70270
|
+
*
|
|
70271
|
+
* @param {number} [width] If not specified, return the current width. If
|
|
70272
|
+
* specified, set a new width.
|
|
70273
|
+
* @returns {this|number}
|
|
70274
|
+
*/
|
|
70275
|
+
this.width = function (width) {
|
|
70276
|
+
if (width === undefined) {
|
|
70277
|
+
return m_width;
|
|
70278
|
+
} else if (width !== m_width) {
|
|
70279
|
+
m_width = width;
|
|
70280
|
+
m_this._prepareCategories(m_categories);
|
|
70281
|
+
m_this._draw();
|
|
70282
|
+
}
|
|
70283
|
+
return m_this;
|
|
70284
|
+
};
|
|
70285
|
+
|
|
70286
|
+
/**
|
|
70287
|
+
* Get/Set ticks.
|
|
70288
|
+
*
|
|
70289
|
+
* @param {number} [ticks] If not specified, return the current ticks. If
|
|
70290
|
+
* specified, set a new ticks.
|
|
70291
|
+
* @returns {this|number}
|
|
70292
|
+
*/
|
|
70293
|
+
this.ticks = function (ticks) {
|
|
70294
|
+
if (ticks === undefined) {
|
|
70295
|
+
return m_ticks;
|
|
70296
|
+
} else if (ticks !== m_ticks) {
|
|
70297
|
+
m_ticks = ticks;
|
|
70298
|
+
m_this._prepareCategories(m_categories);
|
|
70299
|
+
m_this._draw();
|
|
70300
|
+
}
|
|
70301
|
+
return m_this;
|
|
70302
|
+
};
|
|
70303
|
+
|
|
70269
70304
|
/**
|
|
70270
70305
|
* Show the popup based on current mouse event.
|
|
70271
70306
|
* @param {d3.event} event The triggering d3 event.
|
|
@@ -97873,7 +97908,7 @@ module.exports = "/* quadFeature Color fragment shader */\n\nvarying mediump vec
|
|
|
97873
97908
|
* @constant
|
|
97874
97909
|
* @type {string}
|
|
97875
97910
|
*/
|
|
97876
|
-
module.exports = "
|
|
97911
|
+
module.exports = "a43155ff2781340b3078647437dd1d136c744d7f";
|
|
97877
97912
|
|
|
97878
97913
|
/***/ }),
|
|
97879
97914
|
|
|
@@ -103020,10 +103055,10 @@ function earcut(data, holeIndices) {
|
|
|
103020
103055
|
|
|
103021
103056
|
// if the shape is not too simple, we'll use z-order curve hash later; calculate polygon bbox
|
|
103022
103057
|
if (data.length > 80 * dim) {
|
|
103023
|
-
minX =
|
|
103024
|
-
minY =
|
|
103025
|
-
var maxX =
|
|
103026
|
-
var maxY =
|
|
103058
|
+
minX = data[0];
|
|
103059
|
+
minY = data[1];
|
|
103060
|
+
var maxX = minX;
|
|
103061
|
+
var maxY = minY;
|
|
103027
103062
|
for (var i = dim; i < outerLen; i += dim) {
|
|
103028
103063
|
var x = data[i];
|
|
103029
103064
|
var y = data[i + 1];
|
|
@@ -103272,7 +103307,7 @@ function compareXYSlope(a, b) {
|
|
|
103272
103307
|
return result;
|
|
103273
103308
|
}
|
|
103274
103309
|
|
|
103275
|
-
// find a bridge between vertices that connects hole with an outer ring and
|
|
103310
|
+
// find a bridge between vertices that connects hole with an outer ring and link it
|
|
103276
103311
|
function eliminateHole(hole, outerNode) {
|
|
103277
103312
|
var bridge = findHoleBridge(hole, outerNode);
|
|
103278
103313
|
if (!bridge) {
|
|
@@ -103435,7 +103470,7 @@ function pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, px, py) {
|
|
|
103435
103470
|
// check if a diagonal between two polygon nodes is valid (lies in polygon interior)
|
|
103436
103471
|
function isValidDiagonal(a, b) {
|
|
103437
103472
|
return a.next.i !== b.i && a.prev.i !== b.i && !intersectsPolygon(a, b) && (
|
|
103438
|
-
//
|
|
103473
|
+
// doesn't intersect other edges
|
|
103439
103474
|
locallyInside(a, b) && locallyInside(b, a) && middleInside(a, b) && (
|
|
103440
103475
|
// locally visible
|
|
103441
103476
|
area(a.prev, a, b.prev) || area(a, b.prev, b)) ||
|
package/geo.lean.js
CHANGED
|
@@ -19393,14 +19393,15 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
|
|
|
19393
19393
|
*/
|
|
19394
19394
|
this.updateStyleFromArray = function (keyOrObject, styleArray, refresh) {
|
|
19395
19395
|
var bufferedKeys = {
|
|
19396
|
+
radius: 1,
|
|
19396
19397
|
fillColor: 3,
|
|
19397
19398
|
fillOpacity: 1,
|
|
19398
|
-
radius: 1,
|
|
19399
19399
|
strokeColor: 3,
|
|
19400
19400
|
strokeOpacity: 1,
|
|
19401
19401
|
strokeWidth: 1,
|
|
19402
19402
|
symbolComputed: 1,
|
|
19403
|
-
symbolValueComputed: 1
|
|
19403
|
+
symbolValueComputed: 1,
|
|
19404
|
+
rotation: 1
|
|
19404
19405
|
};
|
|
19405
19406
|
var needsRefresh, needsRender;
|
|
19406
19407
|
if (typeof keyOrObject === 'string') {
|
|
@@ -19409,12 +19410,12 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
|
|
|
19409
19410
|
keyOrObject = obj;
|
|
19410
19411
|
}
|
|
19411
19412
|
$.each(keyOrObject, function (key, styleArray) {
|
|
19413
|
+
var sbkey = key === 'symbolComputed' ? 'symbol' : key === 'symbolValueComputed' ? 'symbolValue' : key;
|
|
19412
19414
|
if (m_this.visible() && m_actor && bufferedKeys[key] && !needsRefresh && !m_this.clustering()) {
|
|
19413
|
-
var vpf, mapper, buffer, numPts, value, i, j, v, bpv
|
|
19415
|
+
var vpf, mapper, buffer, numPts, value, i, j, v, bpv;
|
|
19414
19416
|
bpv = bufferedKeys[key];
|
|
19415
19417
|
numPts = m_this.data().length;
|
|
19416
19418
|
mapper = m_actor.mapper();
|
|
19417
|
-
sbkey = key === 'symbolComputed' ? 'symbol' : key === 'symbolValueComputed' ? 'symbolValue' : key;
|
|
19418
19419
|
buffer = mapper.getSourceBuffer(sbkey);
|
|
19419
19420
|
vpf = m_this.verticesPerFeature();
|
|
19420
19421
|
if (!buffer || !numPts || numPts * vpf * bpv !== buffer.length) {
|
|
@@ -19450,15 +19451,13 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
|
|
|
19450
19451
|
} else {
|
|
19451
19452
|
needsRefresh = true;
|
|
19452
19453
|
}
|
|
19453
|
-
|
|
19454
|
-
|
|
19455
|
-
if
|
|
19456
|
-
|
|
19457
|
-
m_this.modified = function () {};
|
|
19458
|
-
}
|
|
19459
|
-
s_updateStyleFromArray(key, styleArray, false);
|
|
19460
|
-
m_this.modified = mod;
|
|
19454
|
+
var mod = m_this.modified;
|
|
19455
|
+
if (!needsRefresh && key === sbkey) {
|
|
19456
|
+
// don't allow modified to be adjusted if we don't need to refresh
|
|
19457
|
+
m_this.modified = function () {};
|
|
19461
19458
|
}
|
|
19459
|
+
s_updateStyleFromArray(key, styleArray, false);
|
|
19460
|
+
m_this.modified = mod;
|
|
19462
19461
|
});
|
|
19463
19462
|
if (refresh) {
|
|
19464
19463
|
if (m_this.visible() && needsRefresh) {
|
|
@@ -19504,15 +19503,15 @@ var _webgl_markerFeature = function webgl_markerFeature(arg) {
|
|
|
19504
19503
|
name: 'pos'
|
|
19505
19504
|
}),
|
|
19506
19505
|
attr = {
|
|
19507
|
-
radius: 1,
|
|
19508
19506
|
fillColor: 3,
|
|
19509
19507
|
fillOpacity: 1,
|
|
19508
|
+
radius: 1,
|
|
19509
|
+
rotation: 1,
|
|
19510
19510
|
strokeColor: 3,
|
|
19511
19511
|
strokeOpacity: 1,
|
|
19512
19512
|
strokeWidth: 1,
|
|
19513
19513
|
symbol: 1,
|
|
19514
|
-
symbolValue: 1
|
|
19515
|
-
rotation: 1
|
|
19514
|
+
symbolValue: 1
|
|
19516
19515
|
},
|
|
19517
19516
|
uniforms = {
|
|
19518
19517
|
pixelWidth: vgl.GL.FLOAT,
|
|
@@ -23464,7 +23463,7 @@ module.exports = svg_tileLayer;
|
|
|
23464
23463
|
* @constant
|
|
23465
23464
|
* @type {string}
|
|
23466
23465
|
*/
|
|
23467
|
-
module.exports = "1.14.
|
|
23466
|
+
module.exports = "1.14.11";
|
|
23468
23467
|
|
|
23469
23468
|
/***/ }),
|
|
23470
23469
|
|
|
@@ -42442,6 +42441,42 @@ var _colorLegendWidget = function colorLegendWidget(arg) {
|
|
|
42442
42441
|
return d3.format('.' + precision + 'f')(number);
|
|
42443
42442
|
};
|
|
42444
42443
|
|
|
42444
|
+
/**
|
|
42445
|
+
* Get/Set width.
|
|
42446
|
+
*
|
|
42447
|
+
* @param {number} [width] If not specified, return the current width. If
|
|
42448
|
+
* specified, set a new width.
|
|
42449
|
+
* @returns {this|number}
|
|
42450
|
+
*/
|
|
42451
|
+
this.width = function (width) {
|
|
42452
|
+
if (width === undefined) {
|
|
42453
|
+
return m_width;
|
|
42454
|
+
} else if (width !== m_width) {
|
|
42455
|
+
m_width = width;
|
|
42456
|
+
m_this._prepareCategories(m_categories);
|
|
42457
|
+
m_this._draw();
|
|
42458
|
+
}
|
|
42459
|
+
return m_this;
|
|
42460
|
+
};
|
|
42461
|
+
|
|
42462
|
+
/**
|
|
42463
|
+
* Get/Set ticks.
|
|
42464
|
+
*
|
|
42465
|
+
* @param {number} [ticks] If not specified, return the current ticks. If
|
|
42466
|
+
* specified, set a new ticks.
|
|
42467
|
+
* @returns {this|number}
|
|
42468
|
+
*/
|
|
42469
|
+
this.ticks = function (ticks) {
|
|
42470
|
+
if (ticks === undefined) {
|
|
42471
|
+
return m_ticks;
|
|
42472
|
+
} else if (ticks !== m_ticks) {
|
|
42473
|
+
m_ticks = ticks;
|
|
42474
|
+
m_this._prepareCategories(m_categories);
|
|
42475
|
+
m_this._draw();
|
|
42476
|
+
}
|
|
42477
|
+
return m_this;
|
|
42478
|
+
};
|
|
42479
|
+
|
|
42445
42480
|
/**
|
|
42446
42481
|
* Show the popup based on current mouse event.
|
|
42447
42482
|
* @param {d3.event} event The triggering d3 event.
|
|
@@ -70059,7 +70094,7 @@ module.exports = "/* quadFeature Color fragment shader */\n\nvarying mediump vec
|
|
|
70059
70094
|
* @constant
|
|
70060
70095
|
* @type {string}
|
|
70061
70096
|
*/
|
|
70062
|
-
module.exports = "
|
|
70097
|
+
module.exports = "a43155ff2781340b3078647437dd1d136c744d7f";
|
|
70063
70098
|
|
|
70064
70099
|
/***/ }),
|
|
70065
70100
|
|
|
@@ -75206,10 +75241,10 @@ function earcut(data, holeIndices) {
|
|
|
75206
75241
|
|
|
75207
75242
|
// if the shape is not too simple, we'll use z-order curve hash later; calculate polygon bbox
|
|
75208
75243
|
if (data.length > 80 * dim) {
|
|
75209
|
-
minX =
|
|
75210
|
-
minY =
|
|
75211
|
-
var maxX =
|
|
75212
|
-
var maxY =
|
|
75244
|
+
minX = data[0];
|
|
75245
|
+
minY = data[1];
|
|
75246
|
+
var maxX = minX;
|
|
75247
|
+
var maxY = minY;
|
|
75213
75248
|
for (var i = dim; i < outerLen; i += dim) {
|
|
75214
75249
|
var x = data[i];
|
|
75215
75250
|
var y = data[i + 1];
|
|
@@ -75458,7 +75493,7 @@ function compareXYSlope(a, b) {
|
|
|
75458
75493
|
return result;
|
|
75459
75494
|
}
|
|
75460
75495
|
|
|
75461
|
-
// find a bridge between vertices that connects hole with an outer ring and
|
|
75496
|
+
// find a bridge between vertices that connects hole with an outer ring and link it
|
|
75462
75497
|
function eliminateHole(hole, outerNode) {
|
|
75463
75498
|
var bridge = findHoleBridge(hole, outerNode);
|
|
75464
75499
|
if (!bridge) {
|
|
@@ -75621,7 +75656,7 @@ function pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, px, py) {
|
|
|
75621
75656
|
// check if a diagonal between two polygon nodes is valid (lies in polygon interior)
|
|
75622
75657
|
function isValidDiagonal(a, b) {
|
|
75623
75658
|
return a.next.i !== b.i && a.prev.i !== b.i && !intersectsPolygon(a, b) && (
|
|
75624
|
-
//
|
|
75659
|
+
// doesn't intersect other edges
|
|
75625
75660
|
locallyInside(a, b) && locallyInside(b, a) && middleInside(a, b) && (
|
|
75626
75661
|
// locally visible
|
|
75627
75662
|
area(a.prev, a, b.prev) || area(a, b.prev, b)) ||
|