geojs 1.15.0 → 1.15.2

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.
Files changed (7) hide show
  1. package/geo.js +14 -19
  2. package/geo.lean.js +14 -19
  3. package/geo.lean.min.js +3 -3
  4. package/geo.min.js +3 -3
  5. package/package.json +1 -1
  6. package/src/polygonFeature.js +2 -1
  7. package/src/webgl/lineFeature.js +11 -14
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "geojs",
3
- "version": "1.15.0",
3
+ "version": "1.15.2",
4
4
  "description": "JavaScript Geo Visualization and Analysis Library",
5
5
  "homepage": "https://github.com/OpenGeoscience/geojs",
6
6
  "license": "Apache-2.0",
package/src/polygonFeature.js CHANGED
@@ -469,7 +469,8 @@ var polygonFeature = function (arg) {
469
469
  m_lineFeature = m_this.layer().createFeature('line', {
470
470
  selectionAPI: false,
471
471
  gcs: m_this.gcs(),
472
- visible: m_this.visible(undefined, true)
472
+ visible: m_this.visible(undefined, true),
473
+ dynamicDraw: true
473
474
  });
474
475
  m_this.dependentFeatures([m_lineFeature]);
475
476
  }
package/src/webgl/lineFeature.js CHANGED
@@ -147,7 +147,7 @@ var webgl_lineFeature = function (arg) {
147
147
  miterLimit = m_this.style.get('miterLimit')(data),
148
148
  antialiasing = m_this.style.get('antialiasing')(data) || 0,
149
149
  uniformFunc = m_this.style.get('uniformLine'), uniformVal, uniform,
150
- order = m_this.featureVertices(), orderk0, prevkey, nextkey, offkey,
150
+ order = m_this.featureVertices(), orderk0,
151
151
  orderLen = order.length,
152
152
  // webgl buffers; see _init for details
153
153
  posBuf, prevBuf, nextBuf, farBuf, flagsBuf,
@@ -348,24 +348,21 @@ var webgl_lineFeature = function (arg) {
348
348
  posBuf[dest3] = position[v1.pos];
349
349
  posBuf[dest3 + 1] = position[v1.pos + 1];
350
350
  posBuf[dest3 + 2] = 0; // position[v1.pos + 2];
351
- prevkey = !orderk0 ? 'prev' : 'next';
352
- nextkey = !orderk0 ? 'next' : 'prev';
353
- prevBuf[dest3] = position[v1[prevkey]];
354
- prevBuf[dest3 + 1] = position[v1[prevkey] + 1];
355
- prevBuf[dest3 + 2] = 0; // position[v1[prevkey] + 2];
356
- nextBuf[dest3] = position[v1[nextkey]];
357
- nextBuf[dest3 + 1] = position[v1[nextkey] + 1];
358
- nextBuf[dest3 + 2] = 0; // position[v1[nextkey] + 2];
359
- farBuf[dest3] = position[v2[nextkey]];
360
- farBuf[dest3 + 1] = position[v2[nextkey] + 1];
361
- farBuf[dest3 + 2] = 0; // position[v2[nextkey] + 2];
351
+ prevBuf[dest3] = position[orderk0 ? v1.next : v1.prev];
352
+ prevBuf[dest3 + 1] = position[(orderk0 ? v1.next : v1.prev) + 1];
353
+ prevBuf[dest3 + 2] = 0; // position[(orderk0 ? v1.next : v1.prev) + 2];
354
+ nextBuf[dest3] = position[orderk0 ? v1.prev : v1.next];
355
+ nextBuf[dest3 + 1] = position[(orderk0 ? v1.prev : v1.next) + 1];
356
+ nextBuf[dest3 + 2] = 0; // position[(orderk0 ? v1.prev : v1.next) + 2];
357
+ farBuf[dest3] = position[orderk0 ? v2.prev : v2.next];
358
+ farBuf[dest3 + 1] = position[(orderk0 ? v2.prev : v2.next) + 1];
359
+ farBuf[dest3 + 2] = 0; // position[(orderk0 ? v2.prev : v2.next) + 2];
362
360
  }
363
361
  if (updateFlags) {
364
- offkey = !orderk0 ? 'negStrokeOffset' : 'posStrokeOffset';
365
362
  flagsBuf[dest] = (order[k][3] +
366
363
  v1.flags * flagsNearLineMult +
367
364
  v2.flags * flagsFarLineMult +
368
- v1[offkey] * flagsNearOffsetMult);
365
+ (orderk0 ? v1.posStrokeOffset : v1.negStrokeOffset) * flagsNearOffsetMult);
369
366
  }
370
367
  strokeWidthBuf[dest] = v1.strokeWidth;
371
368
  strokeColorBuf[dest3] = v1.strokeColor.r;