geojs 1.14.10 → 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 +22 -23
- package/geo.lean.js +22 -23
- package/geo.lean.min.js +2 -2
- package/geo.min.js +2 -2
- package/package.json +1 -1
- 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
|
|
|
@@ -97909,7 +97908,7 @@ module.exports = "/* quadFeature Color fragment shader */\n\nvarying mediump vec
|
|
|
97909
97908
|
* @constant
|
|
97910
97909
|
* @type {string}
|
|
97911
97910
|
*/
|
|
97912
|
-
module.exports = "
|
|
97911
|
+
module.exports = "a43155ff2781340b3078647437dd1d136c744d7f";
|
|
97913
97912
|
|
|
97914
97913
|
/***/ }),
|
|
97915
97914
|
|
|
@@ -103056,10 +103055,10 @@ function earcut(data, holeIndices) {
|
|
|
103056
103055
|
|
|
103057
103056
|
// if the shape is not too simple, we'll use z-order curve hash later; calculate polygon bbox
|
|
103058
103057
|
if (data.length > 80 * dim) {
|
|
103059
|
-
minX =
|
|
103060
|
-
minY =
|
|
103061
|
-
var maxX =
|
|
103062
|
-
var maxY =
|
|
103058
|
+
minX = data[0];
|
|
103059
|
+
minY = data[1];
|
|
103060
|
+
var maxX = minX;
|
|
103061
|
+
var maxY = minY;
|
|
103063
103062
|
for (var i = dim; i < outerLen; i += dim) {
|
|
103064
103063
|
var x = data[i];
|
|
103065
103064
|
var y = data[i + 1];
|
|
@@ -103308,7 +103307,7 @@ function compareXYSlope(a, b) {
|
|
|
103308
103307
|
return result;
|
|
103309
103308
|
}
|
|
103310
103309
|
|
|
103311
|
-
// 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
|
|
103312
103311
|
function eliminateHole(hole, outerNode) {
|
|
103313
103312
|
var bridge = findHoleBridge(hole, outerNode);
|
|
103314
103313
|
if (!bridge) {
|
|
@@ -103471,7 +103470,7 @@ function pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, px, py) {
|
|
|
103471
103470
|
// check if a diagonal between two polygon nodes is valid (lies in polygon interior)
|
|
103472
103471
|
function isValidDiagonal(a, b) {
|
|
103473
103472
|
return a.next.i !== b.i && a.prev.i !== b.i && !intersectsPolygon(a, b) && (
|
|
103474
|
-
//
|
|
103473
|
+
// doesn't intersect other edges
|
|
103475
103474
|
locallyInside(a, b) && locallyInside(b, a) && middleInside(a, b) && (
|
|
103476
103475
|
// locally visible
|
|
103477
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
|
|
|
@@ -70095,7 +70094,7 @@ module.exports = "/* quadFeature Color fragment shader */\n\nvarying mediump vec
|
|
|
70095
70094
|
* @constant
|
|
70096
70095
|
* @type {string}
|
|
70097
70096
|
*/
|
|
70098
|
-
module.exports = "
|
|
70097
|
+
module.exports = "a43155ff2781340b3078647437dd1d136c744d7f";
|
|
70099
70098
|
|
|
70100
70099
|
/***/ }),
|
|
70101
70100
|
|
|
@@ -75242,10 +75241,10 @@ function earcut(data, holeIndices) {
|
|
|
75242
75241
|
|
|
75243
75242
|
// if the shape is not too simple, we'll use z-order curve hash later; calculate polygon bbox
|
|
75244
75243
|
if (data.length > 80 * dim) {
|
|
75245
|
-
minX =
|
|
75246
|
-
minY =
|
|
75247
|
-
var maxX =
|
|
75248
|
-
var maxY =
|
|
75244
|
+
minX = data[0];
|
|
75245
|
+
minY = data[1];
|
|
75246
|
+
var maxX = minX;
|
|
75247
|
+
var maxY = minY;
|
|
75249
75248
|
for (var i = dim; i < outerLen; i += dim) {
|
|
75250
75249
|
var x = data[i];
|
|
75251
75250
|
var y = data[i + 1];
|
|
@@ -75494,7 +75493,7 @@ function compareXYSlope(a, b) {
|
|
|
75494
75493
|
return result;
|
|
75495
75494
|
}
|
|
75496
75495
|
|
|
75497
|
-
// 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
|
|
75498
75497
|
function eliminateHole(hole, outerNode) {
|
|
75499
75498
|
var bridge = findHoleBridge(hole, outerNode);
|
|
75500
75499
|
if (!bridge) {
|
|
@@ -75657,7 +75656,7 @@ function pointInTriangleExceptFirst(ax, ay, bx, by, cx, cy, px, py) {
|
|
|
75657
75656
|
// check if a diagonal between two polygon nodes is valid (lies in polygon interior)
|
|
75658
75657
|
function isValidDiagonal(a, b) {
|
|
75659
75658
|
return a.next.i !== b.i && a.prev.i !== b.i && !intersectsPolygon(a, b) && (
|
|
75660
|
-
//
|
|
75659
|
+
// doesn't intersect other edges
|
|
75661
75660
|
locallyInside(a, b) && locallyInside(b, a) && middleInside(a, b) && (
|
|
75662
75661
|
// locally visible
|
|
75663
75662
|
area(a.prev, a, b.prev) || area(a, b.prev, b)) ||
|