geojs 1.15.2 → 1.15.3
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 +14 -8
- package/geo.lean.js +14 -8
- package/geo.lean.min.js +3 -3
- package/geo.min.js +3 -3
- package/package.json +1 -1
- package/src/webgl/lineFeature.js +9 -6
package/geo.js
CHANGED
|
@@ -26491,7 +26491,7 @@ module.exports = svg_tileLayer;
|
|
|
26491
26491
|
* @constant
|
|
26492
26492
|
* @type {string}
|
|
26493
26493
|
*/
|
|
26494
|
-
module.exports = "1.15.
|
|
26494
|
+
module.exports = "1.15.3";
|
|
26495
26495
|
|
|
26496
26496
|
/***/ }),
|
|
26497
26497
|
|
|
@@ -71282,6 +71282,8 @@ var _webgl_lineFeature = function webgl_lineFeature(arg) {
|
|
|
71282
71282
|
uniformFunc = m_this.style.get('uniformLine'),
|
|
71283
71283
|
uniformVal,
|
|
71284
71284
|
uniform,
|
|
71285
|
+
drop,
|
|
71286
|
+
skipped,
|
|
71285
71287
|
order = m_this.featureVertices(),
|
|
71286
71288
|
orderk0,
|
|
71287
71289
|
orderLen = order.length,
|
|
@@ -71356,10 +71358,13 @@ var _webgl_lineFeature = function webgl_lineFeature(arg) {
|
|
|
71356
71358
|
position = transform.transformCoordinates(target_gcs, map_gcs, position, 3);
|
|
71357
71359
|
m_origin = new Float32Array(m_this.style.get('origin')(position));
|
|
71358
71360
|
if (m_origin[0] || m_origin[1] || m_origin[2]) {
|
|
71361
|
+
var o0 = m_origin[0],
|
|
71362
|
+
o1 = m_origin[1],
|
|
71363
|
+
o2 = m_origin[2];
|
|
71359
71364
|
for (i = 0; i < position.length; i += 3) {
|
|
71360
|
-
position[i] -=
|
|
71361
|
-
position[i + 1] -=
|
|
71362
|
-
position[i + 2] -=
|
|
71365
|
+
position[i] -= o0;
|
|
71366
|
+
position[i + 1] -= o1;
|
|
71367
|
+
position[i + 2] -= o2;
|
|
71363
71368
|
}
|
|
71364
71369
|
}
|
|
71365
71370
|
m_modelViewUniform.setOrigin(m_origin);
|
|
@@ -71399,11 +71404,12 @@ var _webgl_lineFeature = function webgl_lineFeature(arg) {
|
|
|
71399
71404
|
continue;
|
|
71400
71405
|
}
|
|
71401
71406
|
uniform = uniformVal === undefined ? uniformFunc(lineItem, i) : uniformVal;
|
|
71407
|
+
drop = uniform === 'drop';
|
|
71402
71408
|
d = data[i];
|
|
71403
71409
|
closedVal = closed[i];
|
|
71404
71410
|
firstPosIdx3 = posIdx3;
|
|
71405
71411
|
maxj = lineItem.length + (closedVal === 2 ? 1 : 0);
|
|
71406
|
-
|
|
71412
|
+
skipped = 0;
|
|
71407
71413
|
for (j = 0; j < maxj; j += 1, posIdx3 += 3) {
|
|
71408
71414
|
lidx = j;
|
|
71409
71415
|
if (j === lineItem.length) {
|
|
@@ -71460,14 +71466,14 @@ var _webgl_lineFeature = function webgl_lineFeature(arg) {
|
|
|
71460
71466
|
}
|
|
71461
71467
|
}
|
|
71462
71468
|
if (j) {
|
|
71463
|
-
if (
|
|
71469
|
+
if (drop && j > 1 && position[vert[0].pos] === position[vert[1].pos] && position[vert[0].pos + 1] === position[vert[1].pos + 1]) {
|
|
71464
71470
|
skipped += 1;
|
|
71465
71471
|
continue;
|
|
71466
71472
|
}
|
|
71467
71473
|
/* zero out the z position. This can be changed if we handle it in
|
|
71468
71474
|
* the shader. */
|
|
71469
71475
|
for (k = 0; k < orderLen; k += 1, dest += 1, dest3 += 3) {
|
|
71470
|
-
if (
|
|
71476
|
+
if (drop && vert[0].strokeOpacity <= 0 && vert[1].strokeOpacity <= 0) {
|
|
71471
71477
|
strokeOpacityBuf[dest] = -1;
|
|
71472
71478
|
continue;
|
|
71473
71479
|
}
|
|
@@ -98031,7 +98037,7 @@ module.exports = "/* quadFeature Color fragment shader */\n\nvarying mediump vec
|
|
|
98031
98037
|
* @constant
|
|
98032
98038
|
* @type {string}
|
|
98033
98039
|
*/
|
|
98034
|
-
module.exports = "
|
|
98040
|
+
module.exports = "36f5efe9fe98ff0e952442662614c39f2e2ec9c3";
|
|
98035
98041
|
|
|
98036
98042
|
/***/ }),
|
|
98037
98043
|
|
package/geo.lean.js
CHANGED
|
@@ -23500,7 +23500,7 @@ module.exports = svg_tileLayer;
|
|
|
23500
23500
|
* @constant
|
|
23501
23501
|
* @type {string}
|
|
23502
23502
|
*/
|
|
23503
|
-
module.exports = "1.15.
|
|
23503
|
+
module.exports = "1.15.3";
|
|
23504
23504
|
|
|
23505
23505
|
/***/ }),
|
|
23506
23506
|
|
|
@@ -43458,6 +43458,8 @@ var _webgl_lineFeature = function webgl_lineFeature(arg) {
|
|
|
43458
43458
|
uniformFunc = m_this.style.get('uniformLine'),
|
|
43459
43459
|
uniformVal,
|
|
43460
43460
|
uniform,
|
|
43461
|
+
drop,
|
|
43462
|
+
skipped,
|
|
43461
43463
|
order = m_this.featureVertices(),
|
|
43462
43464
|
orderk0,
|
|
43463
43465
|
orderLen = order.length,
|
|
@@ -43532,10 +43534,13 @@ var _webgl_lineFeature = function webgl_lineFeature(arg) {
|
|
|
43532
43534
|
position = transform.transformCoordinates(target_gcs, map_gcs, position, 3);
|
|
43533
43535
|
m_origin = new Float32Array(m_this.style.get('origin')(position));
|
|
43534
43536
|
if (m_origin[0] || m_origin[1] || m_origin[2]) {
|
|
43537
|
+
var o0 = m_origin[0],
|
|
43538
|
+
o1 = m_origin[1],
|
|
43539
|
+
o2 = m_origin[2];
|
|
43535
43540
|
for (i = 0; i < position.length; i += 3) {
|
|
43536
|
-
position[i] -=
|
|
43537
|
-
position[i + 1] -=
|
|
43538
|
-
position[i + 2] -=
|
|
43541
|
+
position[i] -= o0;
|
|
43542
|
+
position[i + 1] -= o1;
|
|
43543
|
+
position[i + 2] -= o2;
|
|
43539
43544
|
}
|
|
43540
43545
|
}
|
|
43541
43546
|
m_modelViewUniform.setOrigin(m_origin);
|
|
@@ -43575,11 +43580,12 @@ var _webgl_lineFeature = function webgl_lineFeature(arg) {
|
|
|
43575
43580
|
continue;
|
|
43576
43581
|
}
|
|
43577
43582
|
uniform = uniformVal === undefined ? uniformFunc(lineItem, i) : uniformVal;
|
|
43583
|
+
drop = uniform === 'drop';
|
|
43578
43584
|
d = data[i];
|
|
43579
43585
|
closedVal = closed[i];
|
|
43580
43586
|
firstPosIdx3 = posIdx3;
|
|
43581
43587
|
maxj = lineItem.length + (closedVal === 2 ? 1 : 0);
|
|
43582
|
-
|
|
43588
|
+
skipped = 0;
|
|
43583
43589
|
for (j = 0; j < maxj; j += 1, posIdx3 += 3) {
|
|
43584
43590
|
lidx = j;
|
|
43585
43591
|
if (j === lineItem.length) {
|
|
@@ -43636,14 +43642,14 @@ var _webgl_lineFeature = function webgl_lineFeature(arg) {
|
|
|
43636
43642
|
}
|
|
43637
43643
|
}
|
|
43638
43644
|
if (j) {
|
|
43639
|
-
if (
|
|
43645
|
+
if (drop && j > 1 && position[vert[0].pos] === position[vert[1].pos] && position[vert[0].pos + 1] === position[vert[1].pos + 1]) {
|
|
43640
43646
|
skipped += 1;
|
|
43641
43647
|
continue;
|
|
43642
43648
|
}
|
|
43643
43649
|
/* zero out the z position. This can be changed if we handle it in
|
|
43644
43650
|
* the shader. */
|
|
43645
43651
|
for (k = 0; k < orderLen; k += 1, dest += 1, dest3 += 3) {
|
|
43646
|
-
if (
|
|
43652
|
+
if (drop && vert[0].strokeOpacity <= 0 && vert[1].strokeOpacity <= 0) {
|
|
43647
43653
|
strokeOpacityBuf[dest] = -1;
|
|
43648
43654
|
continue;
|
|
43649
43655
|
}
|
|
@@ -70217,7 +70223,7 @@ module.exports = "/* quadFeature Color fragment shader */\n\nvarying mediump vec
|
|
|
70217
70223
|
* @constant
|
|
70218
70224
|
* @type {string}
|
|
70219
70225
|
*/
|
|
70220
|
-
module.exports = "
|
|
70226
|
+
module.exports = "36f5efe9fe98ff0e952442662614c39f2e2ec9c3";
|
|
70221
70227
|
|
|
70222
70228
|
/***/ }),
|
|
70223
70229
|
|