Merge pull request #207 from CartoDB/no-smooth
Removes jquery-smoothness and outdated examples
This commit is contained in:
Francisco Dans
commit
5c2fc2a9a8
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 212 B |
Binary file not shown.
|
Before Width: | Height: | Size: 208 B |
Binary file not shown.
|
Before Width: | Height: | Size: 335 B |
Binary file not shown.
|
Before Width: | Height: | Size: 207 B |
Binary file not shown.
|
Before Width: | Height: | Size: 262 B |
Binary file not shown.
|
Before Width: | Height: | Size: 262 B |
Binary file not shown.
|
Before Width: | Height: | Size: 332 B |
Binary file not shown.
|
Before Width: | Height: | Size: 280 B |
Binary file not shown.
|
Before Width: | Height: | Size: 6.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.4 KiB |
544
css/jqueryui-smoothness/jquery-ui-1.10.2.custom.css
vendored
544
css/jqueryui-smoothness/jquery-ui-1.10.2.custom.css
vendored
@ -1,544 +0,0 @@
|
|||||||
/*! jQuery UI - v1.10.2 - 2013-03-29
|
|
||||||
* http://jqueryui.com
|
|
||||||
* Includes: jquery.ui.core.css, jquery.ui.slider.css
|
|
||||||
* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
|
|
||||||
* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */
|
|
||||||
|
|
||||||
/* Layout helpers
|
|
||||||
----------------------------------*/
|
|
||||||
.ui-helper-hidden {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.ui-helper-hidden-accessible {
|
|
||||||
border: 0;
|
|
||||||
clip: rect(0 0 0 0);
|
|
||||||
height: 1px;
|
|
||||||
margin: -1px;
|
|
||||||
overflow: hidden;
|
|
||||||
padding: 0;
|
|
||||||
position: absolute;
|
|
||||||
width: 1px;
|
|
||||||
}
|
|
||||||
.ui-helper-reset {
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
border: 0;
|
|
||||||
outline: 0;
|
|
||||||
line-height: 1.3;
|
|
||||||
text-decoration: none;
|
|
||||||
font-size: 100%;
|
|
||||||
list-style: none;
|
|
||||||
}
|
|
||||||
.ui-helper-clearfix:before,
|
|
||||||
.ui-helper-clearfix:after {
|
|
||||||
content: "";
|
|
||||||
display: table;
|
|
||||||
border-collapse: collapse;
|
|
||||||
}
|
|
||||||
.ui-helper-clearfix:after {
|
|
||||||
clear: both;
|
|
||||||
}
|
|
||||||
.ui-helper-clearfix {
|
|
||||||
min-height: 0; /* support: IE7 */
|
|
||||||
}
|
|
||||||
.ui-helper-zfix {
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
position: absolute;
|
|
||||||
opacity: 0;
|
|
||||||
filter:Alpha(Opacity=0);
|
|
||||||
}
|
|
||||||
|
|
||||||
.ui-front {
|
|
||||||
z-index: 100;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Interaction Cues
|
|
||||||
----------------------------------*/
|
|
||||||
.ui-state-disabled {
|
|
||||||
cursor: default !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Icons
|
|
||||||
----------------------------------*/
|
|
||||||
|
|
||||||
/* states and images */
|
|
||||||
.ui-icon {
|
|
||||||
display: block;
|
|
||||||
text-indent: -99999px;
|
|
||||||
overflow: hidden;
|
|
||||||
background-repeat: no-repeat;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* Misc visuals
|
|
||||||
----------------------------------*/
|
|
||||||
|
|
||||||
/* Overlays */
|
|
||||||
.ui-widget-overlay {
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
.ui-slider {
|
|
||||||
position: relative;
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
.ui-slider .ui-slider-handle {
|
|
||||||
position: absolute;
|
|
||||||
z-index: 2;
|
|
||||||
width: 1.2em;
|
|
||||||
height: 1.2em;
|
|
||||||
cursor: default;
|
|
||||||
}
|
|
||||||
.ui-slider .ui-slider-range {
|
|
||||||
position: absolute;
|
|
||||||
z-index: 1;
|
|
||||||
font-size: .7em;
|
|
||||||
display: block;
|
|
||||||
border: 0;
|
|
||||||
background-position: 0 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* For IE8 - See #6727 */
|
|
||||||
.ui-slider.ui-state-disabled .ui-slider-handle,
|
|
||||||
.ui-slider.ui-state-disabled .ui-slider-range {
|
|
||||||
filter: inherit;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ui-slider-horizontal {
|
|
||||||
height: .8em;
|
|
||||||
}
|
|
||||||
.ui-slider-horizontal .ui-slider-handle {
|
|
||||||
top: -.3em;
|
|
||||||
margin-left: -.6em;
|
|
||||||
}
|
|
||||||
.ui-slider-horizontal .ui-slider-range {
|
|
||||||
top: 0;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
.ui-slider-horizontal .ui-slider-range-min {
|
|
||||||
left: 0;
|
|
||||||
}
|
|
||||||
.ui-slider-horizontal .ui-slider-range-max {
|
|
||||||
right: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ui-slider-vertical {
|
|
||||||
width: .8em;
|
|
||||||
height: 100px;
|
|
||||||
}
|
|
||||||
.ui-slider-vertical .ui-slider-handle {
|
|
||||||
left: -.3em;
|
|
||||||
margin-left: 0;
|
|
||||||
margin-bottom: -.6em;
|
|
||||||
}
|
|
||||||
.ui-slider-vertical .ui-slider-range {
|
|
||||||
left: 0;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
.ui-slider-vertical .ui-slider-range-min {
|
|
||||||
bottom: 0;
|
|
||||||
}
|
|
||||||
.ui-slider-vertical .ui-slider-range-max {
|
|
||||||
top: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Component containers
|
|
||||||
----------------------------------*/
|
|
||||||
.ui-widget {
|
|
||||||
font-family: Verdana,Arial,sans-serif;
|
|
||||||
font-size: 1.1em;
|
|
||||||
}
|
|
||||||
.ui-widget .ui-widget {
|
|
||||||
font-size: 1em;
|
|
||||||
}
|
|
||||||
.ui-widget input,
|
|
||||||
.ui-widget select,
|
|
||||||
.ui-widget textarea,
|
|
||||||
.ui-widget button {
|
|
||||||
font-family: Verdana,Arial,sans-serif;
|
|
||||||
font-size: 1em;
|
|
||||||
}
|
|
||||||
.ui-widget-content {
|
|
||||||
border: 1px solid #aaaaaa;
|
|
||||||
background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
|
|
||||||
color: #222222;
|
|
||||||
}
|
|
||||||
.ui-widget-content a {
|
|
||||||
color: #222222;
|
|
||||||
}
|
|
||||||
.ui-widget-header {
|
|
||||||
border: 1px solid #aaaaaa;
|
|
||||||
background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
|
|
||||||
color: #222222;
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
.ui-widget-header a {
|
|
||||||
color: #222222;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Interaction states
|
|
||||||
----------------------------------*/
|
|
||||||
.ui-state-default,
|
|
||||||
.ui-widget-content .ui-state-default,
|
|
||||||
.ui-widget-header .ui-state-default {
|
|
||||||
border: 1px solid #d3d3d3;
|
|
||||||
background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;
|
|
||||||
font-weight: normal;
|
|
||||||
color: #555555;
|
|
||||||
}
|
|
||||||
.ui-state-default a,
|
|
||||||
.ui-state-default a:link,
|
|
||||||
.ui-state-default a:visited {
|
|
||||||
color: #555555;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
.ui-state-hover,
|
|
||||||
.ui-widget-content .ui-state-hover,
|
|
||||||
.ui-widget-header .ui-state-hover,
|
|
||||||
.ui-state-focus,
|
|
||||||
.ui-widget-content .ui-state-focus,
|
|
||||||
.ui-widget-header .ui-state-focus {
|
|
||||||
border: 1px solid #999999;
|
|
||||||
background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
|
|
||||||
font-weight: normal;
|
|
||||||
color: #212121;
|
|
||||||
}
|
|
||||||
.ui-state-hover a,
|
|
||||||
.ui-state-hover a:hover,
|
|
||||||
.ui-state-hover a:link,
|
|
||||||
.ui-state-hover a:visited {
|
|
||||||
color: #212121;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
.ui-state-active,
|
|
||||||
.ui-widget-content .ui-state-active,
|
|
||||||
.ui-widget-header .ui-state-active {
|
|
||||||
border: 1px solid #aaaaaa;
|
|
||||||
background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
|
|
||||||
font-weight: normal;
|
|
||||||
color: #212121;
|
|
||||||
}
|
|
||||||
.ui-state-active a,
|
|
||||||
.ui-state-active a:link,
|
|
||||||
.ui-state-active a:visited {
|
|
||||||
color: #212121;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Interaction Cues
|
|
||||||
----------------------------------*/
|
|
||||||
.ui-state-highlight,
|
|
||||||
.ui-widget-content .ui-state-highlight,
|
|
||||||
.ui-widget-header .ui-state-highlight {
|
|
||||||
border: 1px solid #fcefa1;
|
|
||||||
background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x;
|
|
||||||
color: #363636;
|
|
||||||
}
|
|
||||||
.ui-state-highlight a,
|
|
||||||
.ui-widget-content .ui-state-highlight a,
|
|
||||||
.ui-widget-header .ui-state-highlight a {
|
|
||||||
color: #363636;
|
|
||||||
}
|
|
||||||
.ui-state-error,
|
|
||||||
.ui-widget-content .ui-state-error,
|
|
||||||
.ui-widget-header .ui-state-error {
|
|
||||||
border: 1px solid #cd0a0a;
|
|
||||||
background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x;
|
|
||||||
color: #cd0a0a;
|
|
||||||
}
|
|
||||||
.ui-state-error a,
|
|
||||||
.ui-widget-content .ui-state-error a,
|
|
||||||
.ui-widget-header .ui-state-error a {
|
|
||||||
color: #cd0a0a;
|
|
||||||
}
|
|
||||||
.ui-state-error-text,
|
|
||||||
.ui-widget-content .ui-state-error-text,
|
|
||||||
.ui-widget-header .ui-state-error-text {
|
|
||||||
color: #cd0a0a;
|
|
||||||
}
|
|
||||||
.ui-priority-primary,
|
|
||||||
.ui-widget-content .ui-priority-primary,
|
|
||||||
.ui-widget-header .ui-priority-primary {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
.ui-priority-secondary,
|
|
||||||
.ui-widget-content .ui-priority-secondary,
|
|
||||||
.ui-widget-header .ui-priority-secondary {
|
|
||||||
opacity: .7;
|
|
||||||
filter:Alpha(Opacity=70);
|
|
||||||
font-weight: normal;
|
|
||||||
}
|
|
||||||
.ui-state-disabled,
|
|
||||||
.ui-widget-content .ui-state-disabled,
|
|
||||||
.ui-widget-header .ui-state-disabled {
|
|
||||||
opacity: .35;
|
|
||||||
filter:Alpha(Opacity=35);
|
|
||||||
background-image: none;
|
|
||||||
}
|
|
||||||
.ui-state-disabled .ui-icon {
|
|
||||||
filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Icons
|
|
||||||
----------------------------------*/
|
|
||||||
|
|
||||||
/* states and images */
|
|
||||||
.ui-icon {
|
|
||||||
width: 16px;
|
|
||||||
height: 16px;
|
|
||||||
}
|
|
||||||
.ui-icon,
|
|
||||||
.ui-widget-content .ui-icon {
|
|
||||||
background-image: url(images/ui-icons_222222_256x240.png);
|
|
||||||
}
|
|
||||||
.ui-widget-header .ui-icon {
|
|
||||||
background-image: url(images/ui-icons_222222_256x240.png);
|
|
||||||
}
|
|
||||||
.ui-state-default .ui-icon {
|
|
||||||
background-image: url(images/ui-icons_888888_256x240.png);
|
|
||||||
}
|
|
||||||
.ui-state-hover .ui-icon,
|
|
||||||
.ui-state-focus .ui-icon {
|
|
||||||
background-image: url(images/ui-icons_454545_256x240.png);
|
|
||||||
}
|
|
||||||
.ui-state-active .ui-icon {
|
|
||||||
background-image: url(images/ui-icons_454545_256x240.png);
|
|
||||||
}
|
|
||||||
.ui-state-highlight .ui-icon {
|
|
||||||
background-image: url(images/ui-icons_2e83ff_256x240.png);
|
|
||||||
}
|
|
||||||
.ui-state-error .ui-icon,
|
|
||||||
.ui-state-error-text .ui-icon {
|
|
||||||
background-image: url(images/ui-icons_cd0a0a_256x240.png);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* positioning */
|
|
||||||
.ui-icon-blank { background-position: 16px 16px; }
|
|
||||||
.ui-icon-carat-1-n { background-position: 0 0; }
|
|
||||||
.ui-icon-carat-1-ne { background-position: -16px 0; }
|
|
||||||
.ui-icon-carat-1-e { background-position: -32px 0; }
|
|
||||||
.ui-icon-carat-1-se { background-position: -48px 0; }
|
|
||||||
.ui-icon-carat-1-s { background-position: -64px 0; }
|
|
||||||
.ui-icon-carat-1-sw { background-position: -80px 0; }
|
|
||||||
.ui-icon-carat-1-w { background-position: -96px 0; }
|
|
||||||
.ui-icon-carat-1-nw { background-position: -112px 0; }
|
|
||||||
.ui-icon-carat-2-n-s { background-position: -128px 0; }
|
|
||||||
.ui-icon-carat-2-e-w { background-position: -144px 0; }
|
|
||||||
.ui-icon-triangle-1-n { background-position: 0 -16px; }
|
|
||||||
.ui-icon-triangle-1-ne { background-position: -16px -16px; }
|
|
||||||
.ui-icon-triangle-1-e { background-position: -32px -16px; }
|
|
||||||
.ui-icon-triangle-1-se { background-position: -48px -16px; }
|
|
||||||
.ui-icon-triangle-1-s { background-position: -64px -16px; }
|
|
||||||
.ui-icon-triangle-1-sw { background-position: -80px -16px; }
|
|
||||||
.ui-icon-triangle-1-w { background-position: -96px -16px; }
|
|
||||||
.ui-icon-triangle-1-nw { background-position: -112px -16px; }
|
|
||||||
.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
|
|
||||||
.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
|
|
||||||
.ui-icon-arrow-1-n { background-position: 0 -32px; }
|
|
||||||
.ui-icon-arrow-1-ne { background-position: -16px -32px; }
|
|
||||||
.ui-icon-arrow-1-e { background-position: -32px -32px; }
|
|
||||||
.ui-icon-arrow-1-se { background-position: -48px -32px; }
|
|
||||||
.ui-icon-arrow-1-s { background-position: -64px -32px; }
|
|
||||||
.ui-icon-arrow-1-sw { background-position: -80px -32px; }
|
|
||||||
.ui-icon-arrow-1-w { background-position: -96px -32px; }
|
|
||||||
.ui-icon-arrow-1-nw { background-position: -112px -32px; }
|
|
||||||
.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
|
|
||||||
.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
|
|
||||||
.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
|
|
||||||
.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
|
|
||||||
.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
|
|
||||||
.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
|
|
||||||
.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
|
|
||||||
.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
|
|
||||||
.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
|
|
||||||
.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
|
|
||||||
.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
|
|
||||||
.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
|
|
||||||
.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
|
|
||||||
.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
|
|
||||||
.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
|
|
||||||
.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
|
|
||||||
.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
|
|
||||||
.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
|
|
||||||
.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
|
|
||||||
.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
|
|
||||||
.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
|
|
||||||
.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
|
|
||||||
.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
|
|
||||||
.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
|
|
||||||
.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
|
|
||||||
.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
|
|
||||||
.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
|
|
||||||
.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
|
|
||||||
.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
|
|
||||||
.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
|
|
||||||
.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
|
|
||||||
.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
|
|
||||||
.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
|
|
||||||
.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
|
|
||||||
.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
|
|
||||||
.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
|
|
||||||
.ui-icon-arrow-4 { background-position: 0 -80px; }
|
|
||||||
.ui-icon-arrow-4-diag { background-position: -16px -80px; }
|
|
||||||
.ui-icon-extlink { background-position: -32px -80px; }
|
|
||||||
.ui-icon-newwin { background-position: -48px -80px; }
|
|
||||||
.ui-icon-refresh { background-position: -64px -80px; }
|
|
||||||
.ui-icon-shuffle { background-position: -80px -80px; }
|
|
||||||
.ui-icon-transfer-e-w { background-position: -96px -80px; }
|
|
||||||
.ui-icon-transferthick-e-w { background-position: -112px -80px; }
|
|
||||||
.ui-icon-folder-collapsed { background-position: 0 -96px; }
|
|
||||||
.ui-icon-folder-open { background-position: -16px -96px; }
|
|
||||||
.ui-icon-document { background-position: -32px -96px; }
|
|
||||||
.ui-icon-document-b { background-position: -48px -96px; }
|
|
||||||
.ui-icon-note { background-position: -64px -96px; }
|
|
||||||
.ui-icon-mail-closed { background-position: -80px -96px; }
|
|
||||||
.ui-icon-mail-open { background-position: -96px -96px; }
|
|
||||||
.ui-icon-suitcase { background-position: -112px -96px; }
|
|
||||||
.ui-icon-comment { background-position: -128px -96px; }
|
|
||||||
.ui-icon-person { background-position: -144px -96px; }
|
|
||||||
.ui-icon-print { background-position: -160px -96px; }
|
|
||||||
.ui-icon-trash { background-position: -176px -96px; }
|
|
||||||
.ui-icon-locked { background-position: -192px -96px; }
|
|
||||||
.ui-icon-unlocked { background-position: -208px -96px; }
|
|
||||||
.ui-icon-bookmark { background-position: -224px -96px; }
|
|
||||||
.ui-icon-tag { background-position: -240px -96px; }
|
|
||||||
.ui-icon-home { background-position: 0 -112px; }
|
|
||||||
.ui-icon-flag { background-position: -16px -112px; }
|
|
||||||
.ui-icon-calendar { background-position: -32px -112px; }
|
|
||||||
.ui-icon-cart { background-position: -48px -112px; }
|
|
||||||
.ui-icon-pencil { background-position: -64px -112px; }
|
|
||||||
.ui-icon-clock { background-position: -80px -112px; }
|
|
||||||
.ui-icon-disk { background-position: -96px -112px; }
|
|
||||||
.ui-icon-calculator { background-position: -112px -112px; }
|
|
||||||
.ui-icon-zoomin { background-position: -128px -112px; }
|
|
||||||
.ui-icon-zoomout { background-position: -144px -112px; }
|
|
||||||
.ui-icon-search { background-position: -160px -112px; }
|
|
||||||
.ui-icon-wrench { background-position: -176px -112px; }
|
|
||||||
.ui-icon-gear { background-position: -192px -112px; }
|
|
||||||
.ui-icon-heart { background-position: -208px -112px; }
|
|
||||||
.ui-icon-star { background-position: -224px -112px; }
|
|
||||||
.ui-icon-link { background-position: -240px -112px; }
|
|
||||||
.ui-icon-cancel { background-position: 0 -128px; }
|
|
||||||
.ui-icon-plus { background-position: -16px -128px; }
|
|
||||||
.ui-icon-plusthick { background-position: -32px -128px; }
|
|
||||||
.ui-icon-minus { background-position: -48px -128px; }
|
|
||||||
.ui-icon-minusthick { background-position: -64px -128px; }
|
|
||||||
.ui-icon-close { background-position: -80px -128px; }
|
|
||||||
.ui-icon-closethick { background-position: -96px -128px; }
|
|
||||||
.ui-icon-key { background-position: -112px -128px; }
|
|
||||||
.ui-icon-lightbulb { background-position: -128px -128px; }
|
|
||||||
.ui-icon-scissors { background-position: -144px -128px; }
|
|
||||||
.ui-icon-clipboard { background-position: -160px -128px; }
|
|
||||||
.ui-icon-copy { background-position: -176px -128px; }
|
|
||||||
.ui-icon-contact { background-position: -192px -128px; }
|
|
||||||
.ui-icon-image { background-position: -208px -128px; }
|
|
||||||
.ui-icon-video { background-position: -224px -128px; }
|
|
||||||
.ui-icon-script { background-position: -240px -128px; }
|
|
||||||
.ui-icon-alert { background-position: 0 -144px; }
|
|
||||||
.ui-icon-info { background-position: -16px -144px; }
|
|
||||||
.ui-icon-notice { background-position: -32px -144px; }
|
|
||||||
.ui-icon-help { background-position: -48px -144px; }
|
|
||||||
.ui-icon-check { background-position: -64px -144px; }
|
|
||||||
.ui-icon-bullet { background-position: -80px -144px; }
|
|
||||||
.ui-icon-radio-on { background-position: -96px -144px; }
|
|
||||||
.ui-icon-radio-off { background-position: -112px -144px; }
|
|
||||||
.ui-icon-pin-w { background-position: -128px -144px; }
|
|
||||||
.ui-icon-pin-s { background-position: -144px -144px; }
|
|
||||||
.ui-icon-play { background-position: 0 -160px; }
|
|
||||||
.ui-icon-pause { background-position: -16px -160px; }
|
|
||||||
.ui-icon-seek-next { background-position: -32px -160px; }
|
|
||||||
.ui-icon-seek-prev { background-position: -48px -160px; }
|
|
||||||
.ui-icon-seek-end { background-position: -64px -160px; }
|
|
||||||
.ui-icon-seek-start { background-position: -80px -160px; }
|
|
||||||
/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
|
|
||||||
.ui-icon-seek-first { background-position: -80px -160px; }
|
|
||||||
.ui-icon-stop { background-position: -96px -160px; }
|
|
||||||
.ui-icon-eject { background-position: -112px -160px; }
|
|
||||||
.ui-icon-volume-off { background-position: -128px -160px; }
|
|
||||||
.ui-icon-volume-on { background-position: -144px -160px; }
|
|
||||||
.ui-icon-power { background-position: 0 -176px; }
|
|
||||||
.ui-icon-signal-diag { background-position: -16px -176px; }
|
|
||||||
.ui-icon-signal { background-position: -32px -176px; }
|
|
||||||
.ui-icon-battery-0 { background-position: -48px -176px; }
|
|
||||||
.ui-icon-battery-1 { background-position: -64px -176px; }
|
|
||||||
.ui-icon-battery-2 { background-position: -80px -176px; }
|
|
||||||
.ui-icon-battery-3 { background-position: -96px -176px; }
|
|
||||||
.ui-icon-circle-plus { background-position: 0 -192px; }
|
|
||||||
.ui-icon-circle-minus { background-position: -16px -192px; }
|
|
||||||
.ui-icon-circle-close { background-position: -32px -192px; }
|
|
||||||
.ui-icon-circle-triangle-e { background-position: -48px -192px; }
|
|
||||||
.ui-icon-circle-triangle-s { background-position: -64px -192px; }
|
|
||||||
.ui-icon-circle-triangle-w { background-position: -80px -192px; }
|
|
||||||
.ui-icon-circle-triangle-n { background-position: -96px -192px; }
|
|
||||||
.ui-icon-circle-arrow-e { background-position: -112px -192px; }
|
|
||||||
.ui-icon-circle-arrow-s { background-position: -128px -192px; }
|
|
||||||
.ui-icon-circle-arrow-w { background-position: -144px -192px; }
|
|
||||||
.ui-icon-circle-arrow-n { background-position: -160px -192px; }
|
|
||||||
.ui-icon-circle-zoomin { background-position: -176px -192px; }
|
|
||||||
.ui-icon-circle-zoomout { background-position: -192px -192px; }
|
|
||||||
.ui-icon-circle-check { background-position: -208px -192px; }
|
|
||||||
.ui-icon-circlesmall-plus { background-position: 0 -208px; }
|
|
||||||
.ui-icon-circlesmall-minus { background-position: -16px -208px; }
|
|
||||||
.ui-icon-circlesmall-close { background-position: -32px -208px; }
|
|
||||||
.ui-icon-squaresmall-plus { background-position: -48px -208px; }
|
|
||||||
.ui-icon-squaresmall-minus { background-position: -64px -208px; }
|
|
||||||
.ui-icon-squaresmall-close { background-position: -80px -208px; }
|
|
||||||
.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
|
|
||||||
.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
|
|
||||||
.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
|
|
||||||
.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
|
|
||||||
.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
|
|
||||||
.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
|
|
||||||
|
|
||||||
|
|
||||||
/* Misc visuals
|
|
||||||
----------------------------------*/
|
|
||||||
|
|
||||||
/* Corner radius */
|
|
||||||
.ui-corner-all,
|
|
||||||
.ui-corner-top,
|
|
||||||
.ui-corner-left,
|
|
||||||
.ui-corner-tl {
|
|
||||||
border-top-left-radius: 4px;
|
|
||||||
}
|
|
||||||
.ui-corner-all,
|
|
||||||
.ui-corner-top,
|
|
||||||
.ui-corner-right,
|
|
||||||
.ui-corner-tr {
|
|
||||||
border-top-right-radius: 4px;
|
|
||||||
}
|
|
||||||
.ui-corner-all,
|
|
||||||
.ui-corner-bottom,
|
|
||||||
.ui-corner-left,
|
|
||||||
.ui-corner-bl {
|
|
||||||
border-bottom-left-radius: 4px;
|
|
||||||
}
|
|
||||||
.ui-corner-all,
|
|
||||||
.ui-corner-bottom,
|
|
||||||
.ui-corner-right,
|
|
||||||
.ui-corner-br {
|
|
||||||
border-bottom-right-radius: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Overlays */
|
|
||||||
.ui-widget-overlay {
|
|
||||||
background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
|
|
||||||
opacity: .3;
|
|
||||||
filter: Alpha(Opacity=30);
|
|
||||||
}
|
|
||||||
.ui-widget-shadow {
|
|
||||||
margin: -8px 0 0 -8px;
|
|
||||||
padding: 8px;
|
|
||||||
background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
|
|
||||||
opacity: .3;
|
|
||||||
filter: Alpha(Opacity=30);
|
|
||||||
border-radius: 8px;
|
|
||||||
}
|
|
||||||
File diff suppressed because one or more lines are too long
@ -1,157 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
|
|
||||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
|
|
||||||
<title>CartoDB + Time</title>
|
|
||||||
<link rel="shortcut icon" href="http://cartodb.com/favicon/favicon_32x32.ico" />
|
|
||||||
<link href="http://code.google.com/apis/maps/documentation/javascript/examples/default.css" rel="stylesheet" type="text/css" />
|
|
||||||
<link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css">
|
|
||||||
<style>
|
|
||||||
#torque-slider {
|
|
||||||
position:absolute;
|
|
||||||
bottom:18px;
|
|
||||||
right:25px;
|
|
||||||
width:300px;
|
|
||||||
}
|
|
||||||
#torque-pause {
|
|
||||||
position:absolute;
|
|
||||||
bottom:12px;
|
|
||||||
right:345px;
|
|
||||||
width:28px;
|
|
||||||
height: 26px;
|
|
||||||
padding: 1px 2px 2px 2px;
|
|
||||||
z-index: 1000;
|
|
||||||
border-radius: 3px;
|
|
||||||
cursor: pointer;
|
|
||||||
background-color: white;
|
|
||||||
background-image: url(../img/play.png);
|
|
||||||
background-repeat:no-repeat;
|
|
||||||
background-position:center;
|
|
||||||
}
|
|
||||||
#torque-pause.playing {
|
|
||||||
background-color: white; background-image: url(../img/pause.png); background-repeat:no-repeat; background-position:center;
|
|
||||||
}
|
|
||||||
|
|
||||||
#torque-time {
|
|
||||||
position: absolute;
|
|
||||||
top: 100px;
|
|
||||||
left: 50%;
|
|
||||||
color: white;
|
|
||||||
font-size: 31px;
|
|
||||||
font-family: Georgia, serif;
|
|
||||||
}
|
|
||||||
#map_canvas {
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<div id="map_canvas"></div>
|
|
||||||
<div id="torque-slider"></div>
|
|
||||||
<a id="torque-pause" class="playing"></a>
|
|
||||||
<div id="torque-time"></div>
|
|
||||||
<a class="cartodb_logo" href="http://www.cartodb.com" target="_blank">CartoDB</a>
|
|
||||||
|
|
||||||
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
|
|
||||||
<script type="text/javascript" src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
|
|
||||||
<script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?sensor=false"></script>
|
|
||||||
<script src="vendor/leaflet.js"></script>
|
|
||||||
<script src="vendor/carto.js"></script>
|
|
||||||
<script src="../dist/torque.uncompressed.js"></script>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
|
||||||
/**
|
|
||||||
* inits slider and a small play/pause button
|
|
||||||
*/
|
|
||||||
function init_slider(torqueLayer) {
|
|
||||||
var torqueTime = $('#torque-time');
|
|
||||||
$("#torque-slider").slider({
|
|
||||||
min: 0,
|
|
||||||
max: torqueLayer.options.steps,
|
|
||||||
value: 0,
|
|
||||||
step: 1,
|
|
||||||
slide: function(event, ui){
|
|
||||||
var step = ui.value;
|
|
||||||
torqueLayer.setStep(step);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// each time time changes, move the slider
|
|
||||||
torqueLayer.on('change:time', function(changes) {
|
|
||||||
$("#torque-slider" ).slider({ value: changes.step });
|
|
||||||
var month_year = changes.time.toString().substr(4).split(' ');
|
|
||||||
torqueTime.text(month_year[0] + " - " + month_year[2]);
|
|
||||||
console.log(torqueLayer.getTime());
|
|
||||||
});
|
|
||||||
|
|
||||||
// play-pause toggle
|
|
||||||
$("#torque-pause").click(function(){
|
|
||||||
torqueLayer.toggle();
|
|
||||||
$(this).toggleClass('playing');
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
function initialize() {
|
|
||||||
|
|
||||||
// initialise the google map
|
|
||||||
var map = new google.maps.Map(document.getElementById('map_canvas'), {
|
|
||||||
center: new google.maps.LatLng(30.95940879245423, -0.609375),
|
|
||||||
zoom: 2,
|
|
||||||
mapTypeId: google.maps.MapTypeId.SATELLITE,
|
|
||||||
mapTypeControl: false,
|
|
||||||
minZoom: 1
|
|
||||||
});
|
|
||||||
|
|
||||||
// dark map style
|
|
||||||
var gmaps_style = [{ stylers:[ { invert_lightness: true }, { weight:1 }, { saturation:-100 }, { lightness:-40 } ]
|
|
||||||
}, {
|
|
||||||
elementType:"labels",
|
|
||||||
stylers:[ { visibility:"simplified" } ]
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
map.setMapTypeId(google.maps.MapTypeId.ROADMAP);
|
|
||||||
map.setOptions({ styles: gmaps_style });
|
|
||||||
|
|
||||||
// init torque layer
|
|
||||||
var torqueLayer = new torque.GMapsTorqueLayer({
|
|
||||||
user : 'viz2',
|
|
||||||
table : 'ow',
|
|
||||||
column : 'date',
|
|
||||||
countby : 'count(cartodb_id)',
|
|
||||||
steps: 750,
|
|
||||||
blendmode : 'lighter',
|
|
||||||
animationDuration: 60,
|
|
||||||
map: map
|
|
||||||
});
|
|
||||||
|
|
||||||
var DEFAULT_CARTOCSS = [
|
|
||||||
'#layer {',
|
|
||||||
" marker-width: 3; ",
|
|
||||||
' marker-fill: #FEE391; ',
|
|
||||||
' [value > 2] { marker-fill: #FEC44F; }',
|
|
||||||
' [value > 3] { marker-fill: #FE9929; }',
|
|
||||||
' [value > 4] { marker-fill: #EC7014; }',
|
|
||||||
' [value > 5] { marker-fill: #CC4C02; }',
|
|
||||||
' [value > 6] { marker-fill: #993404; }',
|
|
||||||
' [value > 7] { marker-fill: #662506; }',
|
|
||||||
' [frame-offset = 1] { marker-width: 8;marker-fill-opacity: 0.05;}',
|
|
||||||
' [frame-offset = 2] { marker-width: 20;marker-fill-opacity: 0.02;}',
|
|
||||||
//' [frame-offset = 1] { marker-width: 25;marker-fill-opacity: 0.01;}',
|
|
||||||
'}'
|
|
||||||
].join('\n');
|
|
||||||
|
|
||||||
torqueLayer.setMap(map);
|
|
||||||
torqueLayer.setCartoCSS(DEFAULT_CARTOCSS);
|
|
||||||
|
|
||||||
init_slider(torqueLayer);
|
|
||||||
torqueLayer.play();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
window.onload = initialize;
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,220 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
|
|
||||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
|
|
||||||
<title>CartoDB + Time</title>
|
|
||||||
<link rel="shortcut icon" href="http://cartodb.com/favicon/favicon_32x32.ico" />
|
|
||||||
<link href="http://code.google.com/apis/maps/documentation/javascript/examples/default.css" rel="stylesheet" type="text/css" />
|
|
||||||
<link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css">
|
|
||||||
<style>
|
|
||||||
#torque-slider {
|
|
||||||
position:absolute;
|
|
||||||
bottom:18px;
|
|
||||||
right:25px;
|
|
||||||
width:300px;
|
|
||||||
}
|
|
||||||
#torque-pause {
|
|
||||||
position:absolute;
|
|
||||||
bottom:12px;
|
|
||||||
right:345px;
|
|
||||||
width:28px;
|
|
||||||
height: 26px;
|
|
||||||
padding: 1px 2px 2px 2px;
|
|
||||||
z-index: 1000;
|
|
||||||
border-radius: 3px;
|
|
||||||
cursor: pointer;
|
|
||||||
background-color: white;
|
|
||||||
background-image: url(../img/play.png);
|
|
||||||
background-repeat:no-repeat;
|
|
||||||
background-position:center;
|
|
||||||
}
|
|
||||||
#torque-pause.playing {
|
|
||||||
background-color: white; background-image: url(../img/pause.png); background-repeat:no-repeat; background-position:center;
|
|
||||||
}
|
|
||||||
|
|
||||||
#torque-time {
|
|
||||||
position: absolute;
|
|
||||||
top: 100px;
|
|
||||||
left: 50%;
|
|
||||||
color: white;
|
|
||||||
font-size: 31px;
|
|
||||||
font-family: Georgia, serif;
|
|
||||||
}
|
|
||||||
#livecode {
|
|
||||||
position: absolute;
|
|
||||||
left: 0;
|
|
||||||
top: 0;
|
|
||||||
bottom: 0;
|
|
||||||
width: 450px;
|
|
||||||
padding-left: 10px;
|
|
||||||
box-shadow: 0px 0px 5px 6px #ccc;
|
|
||||||
}
|
|
||||||
textarea {
|
|
||||||
color: rgba(0,0,0,0.9);
|
|
||||||
background-color:rgba(255,255,255,0.92);
|
|
||||||
position: absolute;
|
|
||||||
left: 10px;
|
|
||||||
top: 0;
|
|
||||||
bottom: 0;
|
|
||||||
padding: 0;
|
|
||||||
margin: 0;
|
|
||||||
border: none;
|
|
||||||
font-family: monospace;
|
|
||||||
font-size: 14px;
|
|
||||||
width: 350px;
|
|
||||||
border: 0;
|
|
||||||
outline: none;
|
|
||||||
padding: 40px;
|
|
||||||
}
|
|
||||||
.highlight {
|
|
||||||
font-family: monospace;
|
|
||||||
font-size: 19px;
|
|
||||||
color: #000;
|
|
||||||
}
|
|
||||||
|
|
||||||
#credits a { color: #06c; }
|
|
||||||
#credits {
|
|
||||||
position: absolute;
|
|
||||||
bottom: 50px;
|
|
||||||
left: 40px;
|
|
||||||
font-size: 17px;
|
|
||||||
font-family: Helvetica;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<div id="map_canvas"></div>
|
|
||||||
<textarea id="code">
|
|
||||||
</textarea>
|
|
||||||
<div id="credits">
|
|
||||||
<p>Copy the url to share this visualization</p>
|
|
||||||
<p>Made with <a href="https://github.com/cartodb/torque">Torque</a> and <a href="http://cartodb.com">CartoDB</a></p></div>
|
|
||||||
|
|
||||||
<div id="torque-slider"></div>
|
|
||||||
<a id="torque-pause" class="playing"></a>
|
|
||||||
<div id="torque-time"></div>
|
|
||||||
<!--<a class="cartodb_logo" href="http://www.cartodb.com" target="_blank">CartoDB</a>-->
|
|
||||||
|
|
||||||
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
|
|
||||||
<script type="text/javascript" src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
|
|
||||||
<script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?sensor=false"></script>
|
|
||||||
<script src="vendor/leaflet.js"></script>
|
|
||||||
<script src="vendor/carto.js"></script>
|
|
||||||
<script src="../dist/torque.uncompressed.js"></script>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
|
||||||
/**
|
|
||||||
* inits slider and a small play/pause button
|
|
||||||
*/
|
|
||||||
function init_slider(torqueLayer) {
|
|
||||||
var torqueTime = $('#torque-time');
|
|
||||||
$("#torque-slider").slider({
|
|
||||||
min: 0,
|
|
||||||
max: torqueLayer.options.steps,
|
|
||||||
value: 0,
|
|
||||||
step: 1,
|
|
||||||
slide: function(event, ui){
|
|
||||||
var step = ui.value;
|
|
||||||
torqueLayer.setStep(step);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// each time time changes, move the slider
|
|
||||||
torqueLayer.on('change:time', function(changes) {
|
|
||||||
$("#torque-slider" ).slider({ value: changes.step });
|
|
||||||
var month_year = changes.time.toString().substr(4).split(' ');
|
|
||||||
torqueTime.text(month_year[0] + " - " + month_year[2]);
|
|
||||||
console.log(torqueLayer.getTime());
|
|
||||||
});
|
|
||||||
|
|
||||||
// play-pause toggle
|
|
||||||
$("#torque-pause").click(function(){
|
|
||||||
torqueLayer.toggle();
|
|
||||||
$(this).toggleClass('playing');
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
function initialize() {
|
|
||||||
|
|
||||||
// initialise the google map
|
|
||||||
var map = new google.maps.Map(document.getElementById('map_canvas'), {
|
|
||||||
center: new google.maps.LatLng(30.95940879245423, -0.609375),
|
|
||||||
zoom: 2,
|
|
||||||
mapTypeId: google.maps.MapTypeId.SATELLITE,
|
|
||||||
mapTypeControl: false,
|
|
||||||
minZoom: 1
|
|
||||||
});
|
|
||||||
|
|
||||||
// dark map style
|
|
||||||
var gmaps_style = [{ stylers:[ { invert_lightness: true }, { weight:1 }, { saturation:-100 }, { lightness:-40 } ]
|
|
||||||
}, {
|
|
||||||
elementType:"labels",
|
|
||||||
stylers:[ { visibility:"simplified" } ]
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
map.setMapTypeId(google.maps.MapTypeId.ROADMAP);
|
|
||||||
map.setOptions({ styles: gmaps_style });
|
|
||||||
|
|
||||||
// init torque layer
|
|
||||||
var torqueLayer = new torque.GMapsTorqueLayer({
|
|
||||||
user : 'viz2',
|
|
||||||
table : 'ow',
|
|
||||||
column : 'date',
|
|
||||||
countby : 'count(cartodb_id)',
|
|
||||||
resolution: 1,
|
|
||||||
steps: 750,
|
|
||||||
blendmode : 'lighter',
|
|
||||||
animationDuration: 60,
|
|
||||||
map: map
|
|
||||||
});
|
|
||||||
|
|
||||||
var DEFAULT_CARTOCSS = [
|
|
||||||
'#layer {',
|
|
||||||
' marker-width: 2; ',
|
|
||||||
' marker-fill: #FEE391; ',
|
|
||||||
' [value > 2] { marker-fill: #FEC44F; }',
|
|
||||||
' [value > 3] { marker-fill: #FE9929; }',
|
|
||||||
' [value > 4] { marker-fill: #EC7014; }',
|
|
||||||
' [value > 5] { marker-fill: #CC4C02; }',
|
|
||||||
' [value > 6] { marker-fill: #993404; }',
|
|
||||||
' [value > 7] { marker-fill: #662506; }',
|
|
||||||
'',
|
|
||||||
'}',
|
|
||||||
'',
|
|
||||||
'#layer [frame-offset = 1] { ',
|
|
||||||
' marker-fill: #FEE391; ',
|
|
||||||
' marker-width: 8;',
|
|
||||||
' marker-fill-opacity: 0.05;',
|
|
||||||
'}',
|
|
||||||
'',
|
|
||||||
'#layer [frame-offset = 2] { ',
|
|
||||||
' marker-fill: #FEE391; ',
|
|
||||||
' marker-width: 20;',
|
|
||||||
' marker-fill-opacity: 0.02;',
|
|
||||||
'}'
|
|
||||||
].join('\n');
|
|
||||||
|
|
||||||
var code = $('#code')
|
|
||||||
code.on('keyup', function() {
|
|
||||||
torqueLayer.setCartoCSS(code.val());
|
|
||||||
location.hash = btoa(code.val());
|
|
||||||
});
|
|
||||||
|
|
||||||
torqueLayer.setMap(map);
|
|
||||||
|
|
||||||
var css = location.hash ? atob(location.hash.substring(1)): DEFAULT_CARTOCSS;
|
|
||||||
torqueLayer.setCartoCSS(css)
|
|
||||||
code.val(css);
|
|
||||||
|
|
||||||
init_slider(torqueLayer);
|
|
||||||
torqueLayer.play();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
window.onload = initialize;
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,164 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
|
|
||||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
|
|
||||||
<title>CartoDB + Time</title>
|
|
||||||
<link rel="shortcut icon" href="http://cartodb.com/favicon/favicon_32x32.ico" />
|
|
||||||
<link href="http://code.google.com/apis/maps/documentation/javascript/examples/default.css" rel="stylesheet" type="text/css" />
|
|
||||||
<link rel="stylesheet" href="../lib/cartodb.css">
|
|
||||||
<link rel="stylesheet" href="../css/jqueryui-smoothness/jquery-ui-1.10.2.custom.min.css">
|
|
||||||
<style>
|
|
||||||
#torque-slider{
|
|
||||||
position:absolute;
|
|
||||||
bottom:18px;
|
|
||||||
right:25px;
|
|
||||||
width:300px;
|
|
||||||
}
|
|
||||||
#torque-pause{
|
|
||||||
position:absolute;
|
|
||||||
bottom:12px;
|
|
||||||
right:345px;
|
|
||||||
width:28px;
|
|
||||||
height: 26px;
|
|
||||||
padding: 1px 2px 2px 2px;
|
|
||||||
z-index: 1000;
|
|
||||||
border-radius: 3px;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
.playing {background-color: white; background-image: url(../img/pause.png); background-repeat:no-repeat; background-position:center; }
|
|
||||||
.paused { background-color: white; background-image: url(../img/play.png);background-repeat:no-repeat; background-position:center;}
|
|
||||||
/* #torque-pause .playing {
|
|
||||||
background-image: url('../img/pause.png');
|
|
||||||
}
|
|
||||||
#torque-pause .paused{
|
|
||||||
background-image: url('../img/play.png');
|
|
||||||
}*/
|
|
||||||
</style>
|
|
||||||
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
|
|
||||||
<script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?sensor=false"></script>
|
|
||||||
<script type="text/javascript" src="../lib/jquery-ui-1.10.2.custom.min.js"></script>
|
|
||||||
<script type="text/javascript" src="../lib/wax.g.js"></script>
|
|
||||||
<script type="text/javascript" src="../lib/cartodb-gmapsv3.js"></script>
|
|
||||||
<script type="text/javascript" src="../lib/dat.gui.min.js"></script>
|
|
||||||
<script type="text/javascript" src="../lib/underscore-min.js"></script>
|
|
||||||
<script type="text/javascript" src="../lib/backbone.js"></script>
|
|
||||||
<script type="text/javascript" src="../lib/class.js"></script>
|
|
||||||
<script type="text/javascript" src="../lib/backbone.cartodb.js"></script>
|
|
||||||
<script type="text/javascript" src="../src/canvas_tile_layer.js"></script>
|
|
||||||
<script type="text/javascript" src="../src/grid_layer.js"></script>
|
|
||||||
<script type="text/javascript" src="../src/torque.js"></script>
|
|
||||||
<script type="text/javascript">
|
|
||||||
var gui;
|
|
||||||
function initialize() {
|
|
||||||
// initialise the google map
|
|
||||||
var map = new google.maps.Map(document.getElementById('map_canvas'), {
|
|
||||||
center:new google.maps.LatLng(30.95940879245423, -0.609375),
|
|
||||||
zoom:2,
|
|
||||||
mapTypeId:google.maps.MapTypeId.SATELLITE,
|
|
||||||
mapTypeControl:false,
|
|
||||||
minZoom:1
|
|
||||||
});
|
|
||||||
|
|
||||||
var map_style = {};
|
|
||||||
map_style.google_maps_customization_style = [
|
|
||||||
{
|
|
||||||
stylers:[
|
|
||||||
{ invert_lightness:true },
|
|
||||||
{ weight:1 },
|
|
||||||
{ saturation:-100 },
|
|
||||||
{ lightness:-40 }
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
elementType:"labels",
|
|
||||||
stylers:[
|
|
||||||
{ visibility:"simplified" }
|
|
||||||
]
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
var Soft = function () {
|
|
||||||
this.Soft = function () {
|
|
||||||
map.setMapTypeId(google.maps.MapTypeId.ROADMAP);
|
|
||||||
map.setOptions({styles:map_style.google_maps_customization_style});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
map.setMapTypeId(google.maps.MapTypeId.ROADMAP);
|
|
||||||
map.setOptions({styles:map_style.google_maps_customization_style});
|
|
||||||
|
|
||||||
|
|
||||||
function init_slider( that ){
|
|
||||||
var that_opts = that.options;
|
|
||||||
$('body').append('<div id="torque-slider"></div>');
|
|
||||||
// Init jQuery UI options
|
|
||||||
$("#torque-slider").slider({
|
|
||||||
min: Math.round(that_opts.start),
|
|
||||||
max: Math.floor(that_opts.end),
|
|
||||||
value: Math.round(that_opts.start),
|
|
||||||
step: that._step,
|
|
||||||
slide: function(event, ui){
|
|
||||||
that._current = ui.value;
|
|
||||||
var date = new Date(that._current * 1000);
|
|
||||||
var date_arry = date.toString().substr(4).split(' ');
|
|
||||||
that._display.set_time((that._current - that.start) / that._step);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
function on_move (that) {
|
|
||||||
$( "#torque-slider" ).slider({ value: that._current });
|
|
||||||
}
|
|
||||||
|
|
||||||
var TorqueOptions = {
|
|
||||||
user:'osm2',
|
|
||||||
table:'ship_flight_recorder',
|
|
||||||
column:'toc',
|
|
||||||
steps:140,
|
|
||||||
resolution:2,
|
|
||||||
cumulative:false,
|
|
||||||
clock:true,
|
|
||||||
fps:11,
|
|
||||||
fitbounds:false,
|
|
||||||
blendmode:'lighter',
|
|
||||||
trails:true,
|
|
||||||
point_type:'circle',
|
|
||||||
cellsize:1,
|
|
||||||
scrub: init_slider,
|
|
||||||
scrub_move: on_move
|
|
||||||
}
|
|
||||||
|
|
||||||
var torque = null;
|
|
||||||
Torque(function (env) {
|
|
||||||
Torque.app = new env.app.Instance();
|
|
||||||
torque = new Torque.app.addLayer(map, TorqueOptions);
|
|
||||||
Torque.env = env;
|
|
||||||
|
|
||||||
// TODO pause method needs to be added to Torque UI options
|
|
||||||
var pause = $('<a></a>');
|
|
||||||
$(pause).attr('id','torque-pause')
|
|
||||||
$(pause).addClass("playing");
|
|
||||||
$('body').append(pause);
|
|
||||||
$(pause).click(function(){
|
|
||||||
if($(this).hasClass('paused')){
|
|
||||||
torque.pause();
|
|
||||||
$(this).removeClass("paused");
|
|
||||||
$(this).addClass("playing");
|
|
||||||
} else {
|
|
||||||
$(this).removeClass("playing");
|
|
||||||
$(this).addClass("paused");
|
|
||||||
torque.pause();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
</head>
|
|
||||||
<body onload="initialize()">
|
|
||||||
<div id="map_canvas"></div>
|
|
||||||
<div class="torque_time"></div>
|
|
||||||
<a class="cartodb_logo" href="http://www.cartodb.com" target="_blank">CartoDB</a>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
Loading…
Reference in New Issue
Block a user