geojs 1.4.3 → 1.6.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.
- package/.github/workflows/main.yml +3 -3
- package/CHANGELOG.md +273 -247
- package/geo.js +82534 -86247
- package/geo.lean.js +69723 -64014
- package/geo.lean.min.js +28 -41
- package/geo.min.js +30 -47
- package/package.json +64 -84
- package/src/annotationLayer.js +13 -13
- package/src/canvas/heatmapFeature.js +39 -16
- package/src/choroplethFeature.js +3 -3
- package/src/feature.js +4 -4
- package/src/geojsonReader.js +5 -4
- package/src/heatmapFeature.js +16 -5
- package/src/index.js +1 -1
- package/src/isolineFeature.js +4 -4
- package/src/lineFeature.js +4 -4
- package/src/map.js +2 -2
- package/src/mapInteractor.js +3 -0
- package/src/markerFeature.js +8 -8
- package/src/object.js +1 -3
- package/src/osmLayer.js +5 -3
- package/src/pixelmapFeature.js +1 -1
- package/src/pointFeature.js +1 -1
- package/src/polygonFeature.js +4 -4
- package/src/registry.js +1 -1
- package/src/svg/svgRenderer.js +3 -0
- package/src/svg/vectorFeature.js +1 -1
- package/src/tile.js +1 -1
- package/src/tileLayer.js +4 -4
- package/src/trackFeature.js +12 -12
- package/src/transform.js +11 -10
- package/src/ui/colorLegendWidget.js +6 -6
- package/src/ui/colorLegendWidget.styl +1 -1
- package/src/ui/legendWidget.js +3 -3
- package/src/ui/sliderWidget.js +4 -4
- package/src/util/common.js +9 -8
- package/src/util/mockVGL.js +3 -2
- package/src/util/throttle.js +3 -3
- package/src/vendor.js +0 -2
- package/src/vtkjs/vtkjsRenderer.js +3 -0
- package/src/webgl/layer.js +1 -1
- package/src/webgl/markerFeature.js +4 -4
- package/src/webgl/meshColored.js +3 -3
- package/src/webgl/pointFeature.js +11 -11
- package/src/webgl/polygonFeature.js +3 -3
- package/src/webgl/quadFeature.js +3 -1
- package/src/webgl/quadFeatureColor.vert +0 -1
- package/src/webgl/webglRenderer.js +1 -2
- package/src/polyfills.js +0 -4
|
@@ -321,7 +321,7 @@ var webgl_pointFeature = function (arg) {
|
|
|
321
321
|
} else {
|
|
322
322
|
needsRefresh = true;
|
|
323
323
|
}
|
|
324
|
-
|
|
324
|
+
const mod = m_this.modified;
|
|
325
325
|
if (!needsRefresh) {
|
|
326
326
|
// don't allow modified to be adjusted if we don't need to refresh
|
|
327
327
|
m_this.modified = () => {};
|
|
@@ -362,25 +362,25 @@ var webgl_pointFeature = function (arg) {
|
|
|
362
362
|
mat = vgl.material(),
|
|
363
363
|
blend = vgl.blend(),
|
|
364
364
|
geom = vgl.geometryData(),
|
|
365
|
-
sourcePositions = vgl.sourceDataP3fv({
|
|
365
|
+
sourcePositions = vgl.sourceDataP3fv({name: 'pos'}),
|
|
366
366
|
sourceUnits = vgl.sourceDataAnyfv(
|
|
367
|
-
2, vgl.vertexAttributeKeysIndexed.One, {
|
|
367
|
+
2, vgl.vertexAttributeKeysIndexed.One, {name: 'unit'}),
|
|
368
368
|
sourceRadius = vgl.sourceDataAnyfv(
|
|
369
|
-
1, vgl.vertexAttributeKeysIndexed.Two, {
|
|
369
|
+
1, vgl.vertexAttributeKeysIndexed.Two, {name: 'radius'}),
|
|
370
370
|
sourceStrokeWidth = vgl.sourceDataAnyfv(
|
|
371
|
-
1, vgl.vertexAttributeKeysIndexed.Three, {
|
|
371
|
+
1, vgl.vertexAttributeKeysIndexed.Three, {name: 'strokeWidth'}),
|
|
372
372
|
sourceFillColor = vgl.sourceDataAnyfv(
|
|
373
|
-
3, vgl.vertexAttributeKeysIndexed.Four, {
|
|
373
|
+
3, vgl.vertexAttributeKeysIndexed.Four, {name: 'fillColor'}),
|
|
374
374
|
sourceFill = vgl.sourceDataAnyfv(
|
|
375
|
-
1, vgl.vertexAttributeKeysIndexed.Five, {
|
|
375
|
+
1, vgl.vertexAttributeKeysIndexed.Five, {name: 'fill'}),
|
|
376
376
|
sourceStrokeColor = vgl.sourceDataAnyfv(
|
|
377
|
-
3, vgl.vertexAttributeKeysIndexed.Six, {
|
|
377
|
+
3, vgl.vertexAttributeKeysIndexed.Six, {name: 'strokeColor'}),
|
|
378
378
|
sourceStroke = vgl.sourceDataAnyfv(
|
|
379
|
-
1, vgl.vertexAttributeKeysIndexed.Seven, {
|
|
379
|
+
1, vgl.vertexAttributeKeysIndexed.Seven, {name: 'stroke'}),
|
|
380
380
|
sourceAlpha = vgl.sourceDataAnyfv(
|
|
381
|
-
1, vgl.vertexAttributeKeysIndexed.Eight, {
|
|
381
|
+
1, vgl.vertexAttributeKeysIndexed.Eight, {name: 'fillOpacity'}),
|
|
382
382
|
sourceStrokeOpacity = vgl.sourceDataAnyfv(
|
|
383
|
-
1, vgl.vertexAttributeKeysIndexed.Nine, {
|
|
383
|
+
1, vgl.vertexAttributeKeysIndexed.Nine, {name: 'strokeOpacity'}),
|
|
384
384
|
primitive;
|
|
385
385
|
m_modelViewUniform = new vgl.modelViewOriginUniform('modelViewMatrix', m_origin);
|
|
386
386
|
|
|
@@ -267,11 +267,11 @@ var webgl_polygonFeature = function (arg) {
|
|
|
267
267
|
fragmentShader = createFragmentShader(),
|
|
268
268
|
blend = vgl.blend(),
|
|
269
269
|
geom = vgl.geometryData(),
|
|
270
|
-
sourcePositions = vgl.sourceDataP3fv({
|
|
270
|
+
sourcePositions = vgl.sourceDataP3fv({name: 'pos'}),
|
|
271
271
|
sourceFillColor = vgl.sourceDataAnyfv(
|
|
272
|
-
3, vgl.vertexAttributeKeysIndexed.Two, {
|
|
272
|
+
3, vgl.vertexAttributeKeysIndexed.Two, {name: 'fillColor'}),
|
|
273
273
|
sourceFillOpacity = vgl.sourceDataAnyfv(
|
|
274
|
-
1, vgl.vertexAttributeKeysIndexed.Three, {
|
|
274
|
+
1, vgl.vertexAttributeKeysIndexed.Three, {name: 'fillOpacity'}),
|
|
275
275
|
trianglePrimitive = vgl.triangles();
|
|
276
276
|
m_modelViewUniform = new vgl.modelViewOriginUniform('modelViewMatrix');
|
|
277
277
|
|
package/src/webgl/quadFeature.js
CHANGED
|
@@ -361,7 +361,9 @@ var webgl_quadFeature = function (arg) {
|
|
|
361
361
|
return;
|
|
362
362
|
}
|
|
363
363
|
quad.texture.bind(renderState);
|
|
364
|
-
|
|
364
|
+
if (context.getError() === context.OUT_OF_MEMORY) {
|
|
365
|
+
console.log('Insufficient GPU memory for texture');
|
|
366
|
+
}
|
|
365
367
|
if (quad.opacity !== opacity) {
|
|
366
368
|
opacity = quad.opacity;
|
|
367
369
|
context.uniform1fv(renderState.m_material.shaderProgram()
|
|
@@ -271,8 +271,7 @@ var webglRenderer = function (arg) {
|
|
|
271
271
|
|
|
272
272
|
// Connect to pan event. This is sufficient, as all zooms and rotations also
|
|
273
273
|
// produce a pan
|
|
274
|
-
m_this.layer().geoOn(geo_event.pan, function (
|
|
275
|
-
void (evt);
|
|
274
|
+
m_this.layer().geoOn(geo_event.pan, function (_evt) {
|
|
276
275
|
m_updateCamera = true;
|
|
277
276
|
});
|
|
278
277
|
|
package/src/polyfills.js
DELETED