Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix animation filter category selected #661

Closed
wants to merge 55 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
00551ec
Connect the VL Bridge with the Animation Controls widget
elenatorro Jun 28, 2019
ab92a27
Add specs
elenatorro Jun 28, 2019
4181197
Fix lint
elenatorro Jun 28, 2019
590e38b
Add specs, snapshots and e2e tests
elenatorro Jun 28, 2019
7cc5675
Update packages/components/src/components/as-animation-controls-widge…
elenatorro Jul 1, 2019
1af992f
Update packages/components/src/components/as-animation-controls-widge…
elenatorro Jul 1, 2019
68d257c
Update packages/components/src/components/as-range-slider/slider/as-r…
elenatorro Jul 1, 2019
13b3e02
Update examples/bridge/animation-controls/simple.html
elenatorro Jul 1, 2019
7a83f10
Update packages/components/src/components/as-range-slider/slider/as-r…
elenatorro Jul 1, 2019
8483e4c
Fix range slider properties
elenatorro Jul 1, 2019
31a7af7
Fix variable usage
elenatorro Jul 1, 2019
859111c
Modify the usage of variableName
elenatorro Jul 1, 2019
ba623ff
Fix example
elenatorro Jul 2, 2019
ca869a6
Allow property and variable
elenatorro Jul 2, 2019
8f6d75f
Use variable when filtering
elenatorro Jul 2, 2019
f9b6819
Center range slider
elenatorro Jul 2, 2019
7c2b451
Allow other properties for animation
elenatorro Jul 3, 2019
ada75d5
Allow all binary expressions in both TimeSeries and AnimationControls
elenatorro Jul 3, 2019
a3ae87e
Add documentation
elenatorro Jul 3, 2019
71f587b
Merge pull request #634 from CartoDB/feature/812-cartoframes-add-anim…
elenatorro Jul 3, 2019
7ea739b
Use variable from viz style and simplify API
elenatorro Jul 3, 2019
87002a9
Add progress value
elenatorro Jul 4, 2019
4de65c1
Format and style progress value
elenatorro Jul 4, 2019
696fd85
Add check for TimeZoneDate format in CARTO VL
elenatorro Jul 4, 2019
a70a3f2
Fix specs
elenatorro Jul 4, 2019
c103d6d
Add documentation
elenatorro Jul 4, 2019
7249b67
Add animation controls widget examples
elenatorro Jul 4, 2019
2614eee
Add bridge docs
elenatorro Jul 4, 2019
058ec42
Fix examples and review changes
elenatorro Jul 4, 2019
f8b4dda
Fix TimeSeries
elenatorro Jul 4, 2019
e2f1f0a
Use a getter
elenatorro Jul 4, 2019
9faddc5
Fix animation example
elenatorro Jul 4, 2019
83b61f6
Simplify viz style usage
elenatorro Jul 4, 2019
ddbd736
Update docs
elenatorro Jul 5, 2019
b8d24d5
Fix variable use cases
elenatorro Jul 5, 2019
fac2a3d
Add combined filters example
elenatorro Jul 8, 2019
8b2276d
Revert variableName usage
elenatorro Jul 8, 2019
97dd093
Allow style properties
elenatorro Jul 8, 2019
5633222
Add combined filters example
elenatorro Jul 8, 2019
6f45436
Hide header if no heading or description are present
elenatorro Jul 8, 2019
ace18b4
Merge pull request #635 from CartoDB/feature/812-cartoframes-change-a…
elenatorro Jul 8, 2019
a2af034
Merge branch 'develop' of github.com:CartoDB/airship into develop
elenatorro Jul 16, 2019
c301c67
Merge branch 'develop' of github.com:CartoDB/airship into develop
elenatorro Jul 17, 2019
57863cb
Merge branch 'develop' of github.com:CartoDB/airship into develop
elenatorro Jul 25, 2019
ff0007a
Merge branch 'develop' of github.com:CartoDB/airship into develop
elenatorro Aug 27, 2019
f389293
Merge branch 'develop' of github.com:CartoDB/airship into develop
elenatorro Sep 5, 2019
5deba87
Merge branch 'develop' of github.com:CartoDB/airship into develop
elenatorro Sep 23, 2019
3358a2c
Reset animation when filter changes
elenatorro Jan 8, 2020
fd7e00d
Restart the animation everytime the filter changes
elenatorro Jan 8, 2020
50892ca
Fix lint
elenatorro Jan 8, 2020
202ac24
Change import order
elenatorro Jan 8, 2020
3d097f1
Fix import order
elenatorro Jan 9, 2020
c57879c
Remove unneded binding
elenatorro Jan 9, 2020
361de0b
Refactor mitt import
elenatorro Jan 9, 2020
0c23339
Fix lint
elenatorro Jan 9, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5,972 changes: 5,057 additions & 915 deletions packages/bridge/package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions packages/bridge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"jest": "23.6.0",
"ts-jest": "^23.10.5",
"ts-loader": "^5.3.1",
"tslint": "^5.20.1",
"typescript": "3.5.3",
"webpack": "^4.27.0",
"webpack-cli": "^3.1.2"
Expand Down
1 change: 1 addition & 0 deletions packages/bridge/src/vl/VLBridge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,7 @@ export default class VLBridge {

// Update the Visualization filter
this._layer.viz.filter.blendTo(newFilter, 0);
this._animation.restart();
}

private _combineFilters(filters) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ export class AnimationControls {
return this._animation;
}

public restart() {
this._animation.setProgressPct(0);
}

public get variableName(): string {
return this._variableName;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/bridge/src/vl/base/BaseFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export abstract class BaseFilter {
* @memberof BaseFilter
*/
constructor(type: string, column: string, layer: any, source: any, readOnly: boolean = true) {
this._emitter = new mitt();
this._emitter = mitt();

this._name = `asbind_${type}_${column}_${BaseFilter._counter}`;
this._column = column;
Expand Down
4 changes: 4 additions & 0 deletions packages/bridge/src/vl/time-series/TimeSeries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ export class TimeSeries {
return this._animation;
}

public restart() {
this._animation.setProgressPct(0);
}

/**
* This method sets up the events to handle animation updates and bind it to the TimeSeries widget:
* - Update the progress
Expand Down
4 changes: 4 additions & 0 deletions packages/bridge/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
}
}
],
"ordered-imports": [true, {
"import-sources-order": "any",
"named-imports-order": "case-insensitive"
}],
"variable-name": [true, "ban-keywords", "check-format", "allow-leading-underscore"]
},
"rulesDirectory": []
Expand Down
Loading