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.

Sign up for GitHub

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

[SMOKES] Dynamic VS Vector decision + Vector Infowindows / Tooltips #1624

Merged
merged 80 commits into from
Jun 5, 2017
Merged

[SMOKES] Dynamic VS Vector decision + Vector Infowindows / Tooltips #1624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
adb3280
Wait until vis has been reloaded to render the view
Apr 4, 2017
e2b86a4
Fixed test
Apr 17, 2017
2be9ea1
Renamed variable
Apr 18, 2017
0f2c907
Merge remote-tracking branch 'origin/v4' into dynamic-raster-vs-vecto…
Apr 19, 2017
416a2dc
Merge branch 'render-view-after-first-reload' into dynamic-raster-vs-…
Apr 19, 2017
562ba88
leaflet-layer-view-factory decides whether to use raster or vector
Apr 19, 2017
312ad85
Improve tangram loading mechanism
donflopez Apr 19, 2017
1ba8b75
fix tests to handle the new async instance
donflopez Apr 19, 2017
6c78291
Added tests
Apr 19, 2017
70284d5
Use tangram.cartodb with the new async feature
donflopez Apr 20, 2017
9db7d49
Fix lint error
donflopez Apr 20, 2017
0523453
Added internal renderMode setting and implemented 'auto' mode.
Apr 20, 2017
fd24bcc
Examples
Apr 20, 2017
9e64e98
Point to cartodb/tangram.cartodb#master
Apr 20, 2017
fd9e5d6
Lint errors
Apr 20, 2017
20bb463
Change fake load event for a real ready event
donflopez Apr 21, 2017
14db76d
Log error
Apr 21, 2017
fdc660a
Moved shared behaviour to base class. Also "meta" attribute gets
Apr 21, 2017
649fc6a
Merge branch 'render-view-after-first-reload' of https://github.com/C…
Apr 21, 2017
6520a34
Revert "Change fake load event for a real ready event"
Apr 21, 2017
10100b7
Remove defer to make it works sync
donflopez Apr 24, 2017
8f44be6
Merge remote-tracking branch 'origin/v4' into render-view-after-first…
Apr 24, 2017
ff8c442
Revert "Remove defer to make it works sync"
Apr 24, 2017
abfe46f
Fixed torque layer views
Apr 24, 2017
f45af59
Add tooltip and infowindow behaviour to vector
donflopez Apr 26, 2017
f966d75
Add the correct index of the layer in the layergroup
donflopez Apr 26, 2017
fad80a5
Change filter by get from backbone
donflopez Apr 27, 2017
669cf3d
Fix webgl tests
donflopez Apr 27, 2017
25de3a2
Merge remote-tracking branch 'origin/render-view-after-first-reload' …
Apr 27, 2017
a9d2340
Fix lint errors
donflopez Apr 27, 2017
65385c3
Merge pull request #1630 from CartoDB/vector-tooltips-infowindow
donflopez Apr 27, 2017
f9ef38a
Fixed test
Apr 27, 2017
64cf185
Increased max number of features supported by vector rendering
Apr 27, 2017
1358c3f
Change tangram.cartodb branch for testing purpose
donflopez Apr 28, 2017
5c86e24
Lint errors
Apr 28, 2017
2dba253
Merge pull request #1627 from CartoDB/dynamic-raster-vs-vector-decisi…
pabletecodes Apr 28, 2017
5356c77
Merge branch 'render-view-after-first-reload' of github.com:CartoDB/c…
donflopez Apr 28, 2017
224244e
window.webGLRenderingContext -> window.WebGLRenderingContext
May 3, 2017
61f698a
Merge branch 'render-view-after-first-reload' of github.com:CartoDB/c…
donflopez May 3, 2017
d8422f7
Fix invalid array index
donflopez May 3, 2017
e9b825a
Send features
donflopez May 3, 2017
3e3397c
Fix layer wrong index access
donflopez May 3, 2017
c93c5e8
Add buffer size 0 for mvt
donflopez May 4, 2017
4bc6542
Merge pull request #1635 from CartoDB/SMOKES-render-view-after-first-…
donflopez May 4, 2017
af63c13
Add performance metrics ⌛️
donflopez May 8, 2017
6eee256
Use flag to send only one time
donflopez May 9, 2017
851dd17
Merge remote-tracking branch 'origin/v4' into render-view-after-first…
May 10, 2017
9d2dff3
Merge branch 'render-view-after-first-reload' of https://github.com/C…
May 10, 2017
8106606
Estimated number of features per layer
May 11, 2017
96a58ae
Merge pull request #1641 from CartoDB/send-stats
donflopez May 11, 2017
26ceb1b
Conditional
May 11, 2017
fe83f5c
Lint errors
May 11, 2017
2c4ddab
Merge branch 'render-view-after-first-reload' of https://github.com/C…
May 11, 2017
11a8aea
Merge remote-tracking branch 'origin/v4' into render-view-after-first…
May 11, 2017
a4f80bf
Removed attr
May 12, 2017
4add424
Moved function to util "package"
May 12, 2017
361b8ff
Moving away from settingsModel to simplify things
May 12, 2017
92ed755
featureCount -> estimatedFeatureCount
May 12, 2017
ba5476b
Lint errors
May 12, 2017
9d21af1
node 6.9.2 in travis.yml
May 12, 2017
11a8998
Adds some more tests
May 15, 2017
53ddb65
Point to cartodb/tangram-carto#master
May 17, 2017
d5b4abc
Better error message
May 17, 2017
572b944
Even better error message
May 17, 2017
90c36a3
Merge remote-tracking branch 'origin/v4' into render-view-after-first…
May 23, 2017
dfa155a
Lint error
May 23, 2017
4f7742e
Set flyto feature
donflopez May 25, 2017
7c18975
Use load events for handling loading bar
donflopez May 29, 2017
a9343d3
this by self, context error
donflopez May 29, 2017
75ae033
Fix multiple set view
donflopez May 31, 2017
4fd5068
Merge branch 'render-view-after-first-reload' of github.com:CartoDB/c…
donflopez May 31, 2017
384787d
Add debounce for multiple calling
donflopez May 31, 2017
fb14178
Rely on moveend event instead of move event. No need to debounce
May 31, 2017
d775925
Use vector key from vizjson
Jun 1, 2017
0feca33
Missing file
Jun 1, 2017
7e37ffc
Merge branch 'v4' of github.com:CartoDB/cartodb.js into render-view-a…
donflopez Jun 2, 2017
0a70757
Set correct branch for tangram.cartodb
donflopez Jun 5, 2017
a87e098
Tests
Jun 5, 2017
f5daadb
Merge branch 'render-view-after-first-reload' of https://github.com/C…
Jun 5, 2017
604aae1
Lint errors
Jun 5, 2017
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cache: false
language: node_js
node_js:
- "4.1"
- "6.9.2"

install:
- npm install
Expand Down
315 changes: 126 additions & 189 deletions examples/leaflet-layergroup-vector.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,18 @@

<script>
function main() {
var vizjson = {
var vizjson = {
"id":"2b13c956-e7c1-11e2-806b-5404a6a683d5",
"version":"0.1.0",
"title":"european_countries_e 0",
"likes":0,
"description":null,
"scrollwheel":true,
"legends":true,
"vector":true,
"url":null,
"map_provider":"leaflet",
"bounds":[
[
-18.979025953255253,
-155.7421875
],
[
80.58972691308571,
261.2109375
]
],
"center":"[52.5897007687178, 52.734375]",
"zoom":2,
"zoom":4,
"updated_at":"2015-03-13T11:24:37+00:00",
"datasource": {
"user_name": "documentation",
Expand Down Expand Up @@ -80,181 +69,130 @@
"type":"tiled"
},
{
"type":"layergroup",
"id":"923b7812-2d56-41c6-ac15-3ce430db090f",
"type":"CartoDB",
"infowindow":{
"fields":[
{
"name":"name",
"title":true,
"position":4
}
],
"template": '' +
'<div class="CDB-infowindow CDB-infowindow--custom js-infowindow" style="max-width: 200px;">' +
'<div class="CDB-infowindow-close js-close"></div>' +
'<div class="CDB-infowindow-container">' +
'<div class="CDB-infowindow-header CDB-infowindow-headerBg CDB-infowindow-headerBg--dark">' +
'<div class="CDB-infowindow-list">' +
'<div class="CDB-infowindow-listItem">' +
'<h4 class="CDB-infowindow-title">{{ name }}</h4>' +
'</div>' +
'</div>' +
'</div>' +
'<div class="CDB-hook CDB-hook--white">' +
'<div class="CDB-hook-inner">' +
'</div>' +
'</div>' +
'</div>' +
'</div>',
"alternative_names":{},
"width":226,
"maxHeight":180
},
"tooltip":{
"fields": [
{
"name": "name",
"title": true,
"position": 1
}
],
"template_name":"tooltip_light",
"template": ' '+
'<div class="CDB-Tooltip CDB-Tooltip--isDark js-content">'+
'<ul class="CDB-Tooltip-list">'+
'{{#fields}}'+
'<li class="CDB-Tooltip-listItem">'+
'<h3 class="CDB-Tooltip-listTitle">NAME</h3>'+
'<h4 class="CDB-Tooltip-listText">{{value}}</h4>'+
'</li>'+
'{{/fields}}'+
'</ul>'+
'</div>',
"alternative_names":{},
"maxHeight":180
},
"legend":{
"type":"choropleth",
"show_title":false,
"title":"",
"template":"",
"items":[
{
"name":"Left label",
"visible":true,
"value":"5592.00",
"type":"text"
},
{
"name":"Right label",
"visible":true,
"value":"1638094.00",
"type":"text"
},
{
"name":"Color",
"visible":true,
"value":"#FFFFB2",
"type":"color"
},
{
"name":"Color",
"visible":true,
"value":"#FED976",
"type":"color"
},
{
"name":"Color",
"visible":true,
"value":"#FEB24C",
"type":"color"
},
{
"name":"Color",
"visible":true,
"value":"#FD8D3C",
"type":"color"
},
{
"name":"Color",
"visible":true,
"value":"#FC4E2A",
"type":"color"
},
{
"name":"Color",
"visible":true,
"value":"#E31A1C",
"type":"color"
},
{
"name":"Color",
"visible":true,
"value":"#B10026",
"type":"color"
}
]
},
"order":1,
"visible":true,
"options":{
"layer_definition":{
"layers":[
{
"id":"923b7812-2d56-41c6-ac15-3ce430db090f",
"type":"CartoDB",
"infowindow":{
"fields":[
{
"name":"area",
"title":true,
"position":0
},
{
"name":"gmi_cntry",
"title":true,
"position":1
},
{
"name":"iso_2_code",
"title":true,
"position":2
},
{
"name":"iso_3_code",
"title":true,
"position":3
},
{
"name":"name",
"title":true,
"position":4
},
{
"name":"name_1",
"title":true,
"position":5
},
{
"name":"name_12",
"title":true,
"position":6
},
{
"name":"pop2005",
"title":true,
"position":7
},
{
"name":"region",
"title":true,
"position":8
}
],
"template_name":"table/views/infowindow_light",
"template": " " +
'<div class="CDB-infowindow CDB-infowindow--custom js-infowindow" style="max-width: 200px;">' +
'<div class="CDB-infowindow-container">' +
'<div class="CDB-infowindow-header CDB-infowindow-headerBg CDB-infowindow-headerBg--dark" style="background: #98E0A8;">' +
'<div class="CDB-infowindow-list">' +
'<div class="CDB-infowindow-listItem">' +
'<h4 class="CDB-infowindow-title">{{ name }}</h4>' +
'</div>' +
'</div>' +
'</div>' +
'<div class="CDB-hook CDB-hook--green">' +
'<div class="CDB-hook-inner" style="background: #98E0A8;">' +
'</div>' +
'</div>' +
'</div>' +
'</div>',
"alternative_names":{},
"width":226,
"maxHeight":180
},
"tooltip":{
"fields": [
{
"name": "iso_2_code",
"title": true,
"position": 1
}
],
"template_name":"tooltip_light",
"template": ' '+
'<div class="CDB-Tooltip CDB-Tooltip--isDark js-content">'+
'<ul class="CDB-Tooltip-list">'+
'{{#fields}}'+
'<li class="CDB-Tooltip-listItem">'+
'<h3 class="CDB-Tooltip-listTitle">ISO CODE</h3>'+
'<h4 class="CDB-Tooltip-listText">{{value}}</h4>'+
'</li>'+
'{{/fields}}'+
'</ul>'+
'</div>',
"alternative_names":{},
"maxHeight":180
},
"legend":{
"type":"choropleth",
"show_title":false,
"title":"",
"template":"",
"items":[
{
"name":"Left label",
"visible":true,
"value":"5592.00",
"type":"text"
},
{
"name":"Right label",
"visible":true,
"value":"1638094.00",
"type":"text"
},
{
"name":"Color",
"visible":true,
"value":"#FFFFB2",
"type":"color"
},
{
"name":"Color",
"visible":true,
"value":"#FED976",
"type":"color"
},
{
"name":"Color",
"visible":true,
"value":"#FEB24C",
"type":"color"
},
{
"name":"Color",
"visible":true,
"value":"#FD8D3C",
"type":"color"
},
{
"name":"Color",
"visible":true,
"value":"#FC4E2A",
"type":"color"
},
{
"name":"Color",
"visible":true,
"value":"#E31A1C",
"type":"color"
},
{
"name":"Color",
"visible":true,
"value":"#B10026",
"type":"color"
}
]
},
"order":1,
"visible":true,
"options":{
"sql":"select * from european_countries_e",
"layer_name":"european_countries_e",
"cartocss":"/** choropleth visualization */\n\n#european_countries_e{\n polygon-fill: #FFFFB2;\n polygon-opacity: 0.8;\n line-color: #FFF;\n line-width: 1;\n line-opacity: 0.5;\n}\n#european_countries_e [ area <= 1638094] {\n polygon-fill: #B10026;\n}\n#european_countries_e [ area <= 55010] {\n polygon-fill: #E31A1C;\n}\n#european_countries_e [ area <= 34895] {\n polygon-fill: #FC4E2A;\n}\n#european_countries_e [ area <= 12890] {\n polygon-fill: #FD8D3C;\n}\n#european_countries_e [ area <= 10025] {\n polygon-fill: #FEB24C;\n}\n#european_countries_e [ area <= 9150] {\n polygon-fill: #FED976;\n}\n#european_countries_e [ area <= 5592] {\n polygon-fill: #FFFFB2;\n}",
"cartocss_version":"2.1.1",
"interactivity":"cartodb_id",
"table_name":"\"\"."
}
}
]
},
"attribution":""
"sql":"select * from european_countries_e",
"layer_name":"european_countries_e",
"cartocss":"/** choropleth visualization */\n\n#european_countries_e{\n polygon-fill: #FFFFB2;\n polygon-opacity: 0.8;\n line-color: #FFF;\n line-width: 1;\n line-opacity: 0.5;\n}\n#european_countries_e [ area <= 1638094] {\n polygon-fill: #B10026;\n}\n#european_countries_e [ area <= 55010] {\n polygon-fill: #E31A1C;\n}\n#european_countries_e [ area <= 34895] {\n polygon-fill: #FC4E2A;\n}\n#european_countries_e [ area <= 12890] {\n polygon-fill: #FD8D3C;\n}\n#european_countries_e [ area <= 10025] {\n polygon-fill: #FEB24C;\n}\n#european_countries_e [ area <= 9150] {\n polygon-fill: #FED976;\n}\n#european_countries_e [ area <= 5592] {\n polygon-fill: #FFFFB2;\n}",
"cartocss_version":"2.1.1",
"table_name":"\"\"."
}
},
{
Expand All @@ -266,7 +204,7 @@
"subdomains": "abcd",
"minZoom": "0",
"maxZoom": "18",
"attribution":"&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors",
"attribution": "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors",
"urlTemplate": "http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png",
"name": "Positron Labels",
"id": "bc054932-1ae8-4d4a-96d6-d49ce4247a59",
Expand All @@ -279,7 +217,6 @@
"order": 3,
"type": "tiled"
}

],
"overlays":[
{
Expand Down
2 changes: 1 addition & 1 deletion examples/leaflet-layergroup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<script>
function main() {
var vizjson = {
var vizjson = {
"id":"2b13c956-e7c1-11e2-806b-5404a6a683d5",
"version":"0.1.0",
"title":"european_countries_e 0",
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"leaflet": "1.0.3",
"mustache": "1.1.0",
"perfect-scrollbar": "git://github.com/CartoDB/perfect-scrollbar.git#master",
"tangram-cartocss": "cartodb/tangram-carto#master",
"torque.js": "CartoDB/torque#master",
"underscore": "1.8.3"
},
Expand Down
Loading