@deck.gl/geo-layers 9.0.40 → 9.1.0-beta.3

package/src/trips-layer/trips-layer.ts

@@ -1,27 +1,13 @@
-// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 
 import type {NumericArray} from '@math.gl/core';
 import {AccessorFunction, DefaultProps} from '@deck.gl/core';
 import {PathLayer, PathLayerProps} from '@deck.gl/layers';
 
+import {tripsUniforms, TripsProps} from './trips-layer-uniforms';
+
 const defaultProps: DefaultProps<TripsLayerProps> = {
   fadeTrail: true,
   trailLength: {type: 'number', value: 120, min: 0},
@@ -67,7 +53,6 @@ export default class TripsLayer<DataT = any, ExtraProps extends {} = {}> extends
     const shaders = super.getShaders();
     shaders.inject = {
       'vs:#decl': `\
-uniform float trailLength;
 in float instanceTimestamps;
 in float instanceNextTimestamps;
 out float vTime;
@@ -77,24 +62,22 @@ out float vTime;
 vTime = instanceTimestamps + (instanceNextTimestamps - instanceTimestamps) * vPathPosition.y / vPathLength;
 `,
       'fs:#decl': `\
-uniform bool fadeTrail;
-uniform float trailLength;
-uniform float currentTime;
 in float vTime;
 `,
       // Drop the segments outside of the time window
       'fs:#main-start': `\
-if(vTime > currentTime || (fadeTrail && (vTime < currentTime - trailLength))) {
+if(vTime > trips.currentTime || (trips.fadeTrail && (vTime < trips.currentTime - trips.trailLength))) {
   discard;
 }
 `,
       // Fade the color (currentTime - 100%, end of trail - 0%)
       'fs:DECKGL_FILTER_COLOR': `\
-if(fadeTrail) {
-  color.a *= 1.0 - (currentTime - vTime) / trailLength;
+if(trips.fadeTrail) {
+  color.a *= 1.0 - (trips.currentTime - vTime) / trips.trailLength;
 }
 `
     };
+    shaders.modules = [...shaders.modules, tripsUniforms];
     return shaders;
   }
 
@@ -120,14 +103,10 @@ if(fadeTrail) {
 
   draw(params) {
     const {fadeTrail, trailLength, currentTime} = this.props;
+    const tripsProps: TripsProps = {fadeTrail, trailLength, currentTime};
 
-    params.uniforms = {
-      ...params.uniforms,
-      fadeTrail,
-      trailLength,
-      currentTime
-    };
-
+    const model = this.state.model!;
+    model.shaderInputs.setProps({trips: tripsProps});
     super.draw(params);
   }
 }

package/src/wms-layer/utils.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {lngLatToWorld} from '@math.gl/web-mercator';
 
 // https://epsg.io/3857

package/src/wms-layer/wms-layer.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 // deck.gl, MIT license
 // Attributions:
 // Copyright 2022 Foursquare Labs, Inc.