From 56b7267ec5238afe8bac0ed2d40ee467fccc2373 Mon Sep 17 00:00:00 2001 From: csobier Date: Wed, 19 Oct 2016 15:23:37 -0400 Subject: [PATCH] fixed broken hyperlinks that broke when the rebranding baseurl was changed --- doc/torque_api.md | 8 ++++---- doc/torque_time_slider.md | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/torque_api.md b/doc/torque_api.md index 76c9d79..1ea5a85 100644 --- a/doc/torque_api.md +++ b/doc/torque_api.md @@ -32,7 +32,7 @@ tileSize | Size, in pixels of the tiles Name | Description --- | --- -user | A string object, your CARTO [account name](/carto-editor/your-account/#account). Default value is ```null``` +user | A string object, your CARTO [account name](https://carto.com/docs/carto-editor/your-account/#account). Default value is ```null``` table | A string object, the CARTO table name where data is found (also known as a dataset.) Default value is ```null``` ##### Using a custom SQL query @@ -62,7 +62,7 @@ Method | Options | Returns | Description | `getTime()` | | current animation time (Date) | gets the real animation time `isRunning()` | | `true`/`false` | describes whether the Torque layer is playing or is stopped -**Note:** Torque.js interprets the beginning and ending date/time from your "Time Column" as one block, then divides that up into [Steps](/carto-engine/cartocss/properties-for-torque/#torque-frame-count-number), depending on the number you set. It does not necessarily draw one frame for each row. +**Note:** Torque.js interprets the beginning and ending date/time from your "Time Column" as one block, then divides that up into [Steps](https://carto.com/docs/carto-engine/cartocss/properties-for-torque/#torque-frame-count-number), depending on the number you set. It does not necessarily draw one frame for each row. #### Layer Control Methods @@ -75,9 +75,9 @@ Method | Options | Returns | Description | Method | Options | Returns | Description ---|---|---|---| -`setCartoCSS(cartocss)` | `cartocss string` | `this` | style the map rendering using client-side CartoCSS (not available with [Named maps](/carto-engine/maps-api/named-maps/)) +`setCartoCSS(cartocss)` | `cartocss string` | `this` | style the map rendering using client-side CartoCSS (not available with [Named maps](https://carto.com/docs/carto-engine/maps-api/named-maps/)) -Torque supports a limited subset of CartoCSS rules defined in the [torque-reference](https://github.com/cartodb/torque-reference). To see the full list of supported rules, read the [Torque CartoCSS documentation](/carto-engine/cartocss/properties-for-torque/). `value` and `zoom` variables can be used. `value` is the value of aggregation. `zoom` is the current zoom being rendered. +Torque supports a limited subset of CartoCSS rules defined in the [torque-reference](https://github.com/cartodb/torque-reference). To see the full list of supported rules, read the [Torque CartoCSS documentation](https://carto.com/docs/carto-engine/cartocss/properties-for-torque/). `value` and `zoom` variables can be used. `value` is the value of aggregation. `zoom` is the current zoom being rendered. TorqueLayer currently expects `marker` styling. diff --git a/doc/torque_time_slider.md b/doc/torque_time_slider.md index e3d4ad5..ec877de 100644 --- a/doc/torque_time_slider.md +++ b/doc/torque_time_slider.md @@ -1,25 +1,25 @@ # Torque Time Slider -You can use the `time_slider` option to show an animated time slider with Torque layers. This option is enabled by default when creating visualizations with [cartodb.createVis](http://docs.carto.com/carto-engine/carto-js/api-methods/#cartodbcreatevis) and [createLayer](http://docs.carto.com/carto-engine/carto-js/api-methods/#cartodbcreatelayermap-layersource--options--callback). Both require a map_id DOM object. +You can use the `time_slider` option to show an animated time slider with Torque layers. This option is enabled by default when creating visualizations with [cartodb.createVis](https://carto.com/docs/carto-engine/carto-js/api-methods/#cartodbcreatevis) and [createLayer](https://carto.com/docs/carto-engine/carto-js/api-methods/#cartodbcreatelayermap-layersource--options--callback). Both require a map_id DOM object. **Enable / Disable the Torque Time Slider** Description | The Torque time slider is enabled by default, for your visualization or layer. Sample Torque.js Code | `{ time_slider: true });` Default Value | `true`, enabled by default. -Available Values | See [boolean](http://docs.carto.com/carto-engine/cartocss/properties/#boolean). +Available Values | See [boolean](https://carto.com/docs/carto-engine/cartocss/properties/#boolean). Related Examples | To disable the time slider option, use `time_slider: false`. See [No Torque Time Slider - Example Code](http://bl.ocks.org/michellechandra/081ca7160a8c782266d2).

For a code example about how to use the `time_slider` option to modify a Torque map, see [Torque with a Custom Time Slider](http://bl.ocks.org/csobier/cebdd47242d7ca98ec5e). -**Note:** The `time_slider` option is specific for Torque.js only. All the other CARTO.js options are also supported for Torque.js. For the complete list of arguments, options, and returns, see [CARTO.js API Methods](http://docs.carto.com/carto-engine/carto-js/api-methods/#api-methods). +**Note:** The `time_slider` option is specific for Torque.js only. All the other CARTO.js options are also supported for Torque.js. For the complete list of arguments, options, and returns, see [CARTO.js API Methods](https://carto.com/docs/carto-engine/carto-js/api-methods/#api-methods). ## Customize Animation for your Time Slider -You can customize the animation of your Torque time slider by editing the `-torque-frame-count` and `-torque-animation-duration` CartoCSS properties. (Optionally, you can create a [CARTO.js](http://docs.carto.com/carto-engine/carto-js/api-methods/#api-methods) map to create a custom time slider). This section also describes how time interval data is aggregated, and describes the formula used to calculate time buckets. +You can customize the animation of your Torque time slider by editing the `-torque-frame-count` and `-torque-animation-duration` CartoCSS properties. (Optionally, you can create a [CARTO.js](https://carto.com/docs/carto-engine/carto-js/api-methods/#api-methods) map to create a custom time slider). This section also describes how time interval data is aggregated, and describes the formula used to calculate time buckets. -- [`-torque-frame-count`](http://docs.carto.com/carto-engine/cartocss/properties-for-torque/#torque-frame-count-number) specifies the number of animation steps/frames in your torque animation. You can change the time slider timestamp by adjusting the number of steps.

**Tip:** This is the _Steps_ option from the [Torque wizard](/carto-editor/maps/#torque) of the CARTO Editor. +- [`-torque-frame-count`](https://carto.com/docs/carto-engine/cartocss/properties-for-torque/#torque-frame-count-number) specifies the number of animation steps/frames in your torque animation. You can change the time slider timestamp by adjusting the number of steps.

**Tip:** This is the _Steps_ option from the [Torque wizard](https://carto.com/docs/carto-editor/maps/#torque) of the CARTO Editor. -- [`-torque-animation-duration`](http://docs.carto.com/carto-engine/cartocss/properties-for-torque/#torque-animation-duration-number) specifies the length of time for your animation, in seconds. You can adjust the duration of the animation as needed.

**Tip:** This is the _Duration (secs)_ option from the [Torque wizard](/carto-editor/maps/#torque) of the CARTO Editor. +- [`-torque-animation-duration`](https://carto.com/docs/carto-engine/cartocss/properties-for-torque/#torque-animation-duration-number) specifies the length of time for your animation, in seconds. You can adjust the duration of the animation as needed.

**Tip:** This is the _Duration (secs)_ option from the [Torque wizard](https://carto.com/docs/carto-editor/maps/#torque) of the CARTO Editor. ### Aggregating Time Interval Data @@ -29,7 +29,7 @@ Before customizing the time slider, you should understand how Torque time interv - Reads the last date/time stamp to from your dataset - Aggregates the time period based on the first and last date/time stamp (including seconds) - Once the time interval is defined, it breaks the time period up in smaller "buckets" -- The number of buckets is based on the number of [Steps](http://docs.carto.com/carto-engine/cartocss/properties-for-torque/#torque-frame-count-number) you select for your Torque map +- The number of buckets is based on the number of [Steps](https://carto.com/docs/carto-engine/cartocss/properties-for-torque/#torque-frame-count-number) you select for your Torque map - Each bucket, or step, is one animation frame Thus, the start and end time for each bucket depends on the number of divided steps (not a specific start time or end time that you entered). @@ -48,7 +48,7 @@ Where: - `times.start` = the earliest time in your date/time column - `times.end` = the latest time in your date/time column -The Torque time slider displays these buckets of time, animating the entire sequence of your dataset, and divides the time according to the number of specified steps. You can alter the [duration](http://docs.carto.com/carto-engine/cartocss/properties-for-torque/#torque-animation-duration-number) of the animation, and adjust the time slider timestamp with the number of [Steps](http://docs.carto.com/carto-engine/cartocss/properties-for-torque/#torque-frame-count-number). +The Torque time slider displays these buckets of time, animating the entire sequence of your dataset, and divides the time according to the number of specified steps. You can alter the [duration](https://carto.com/docs/carto-engine/cartocss/properties-for-torque/#torque-animation-duration-number) of the animation, and adjust the time slider timestamp with the number of [Steps](https://carto.com/docs/carto-engine/cartocss/properties-for-torque/#torque-frame-count-number). #### Calculating the Time Slider in the CARTO Editor