Skip to content

Commit

Permalink
Merge pull request #886 from CartoDB/mgl-integration
Browse files Browse the repository at this point in the history
Native MGL integration
  • Loading branch information
Jesus89 authored Aug 24, 2018
2 parents 5c23e44 + edaef0b commit 2a13c0b
Show file tree
Hide file tree
Showing 109 changed files with 18,360 additions and 734 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
paths:
- ./node_modules
- run: echo "127.0.0.1 localhost.localhost.lan" | sudo tee -a /etc/hosts
- run: yarn build:min && yarn wait-on http://localhost.localhost.lan:8181 && MIN=1 yarn mocha test/acceptance/e2e.test.js --timeout 10000
- run: yarn build:min && yarn wait-on http://localhost.localhost.lan:8181 && MIN=1 yarn mocha test/acceptance/e2e.test.js --timeout 15000

test-unit-lint-docs:
docker:
Expand Down
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]
### Added
- Use the new Custom Layer interface with MGL (v0.48.0-carto1)
- Add `layer.remove()` API function
- Make viz optional in `layer.update(source, viz?)` API function
- Throw error for duplicated properties and variables
- Throw error extra arguments are passed to any expression.
- Throw error extra arguments are passed to any expression
- Add reverse expression to arrays, besides palettes

### Changed
Expand All @@ -18,7 +21,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Trigger feature events (hover, enter, leave) when layers are updated
- Improve error message when creating buckets without an array
- ramp($category, ...) implementation is fixed when using multiple categorical properties
- Use undescore in image constants.
- Use underscore in image constants
- Use local basemaps for testing

## Fixed
- Fix animation example
- Fix interactivity examples

### Removed
- Removed XYZ expression
Expand Down
4 changes: 2 additions & 2 deletions debug/MVT.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<!-- Include CARTO VL JS -->
<script src="../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../examples/style.css">
</head>

Expand Down
4 changes: 2 additions & 2 deletions debug/animation.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="UTF-8">
<script src="../../dist/carto-vl.js"></script>
<script src='https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js'></script>
<link href='https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css' rel='stylesheet' />
<script src='https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js'></script>
<link href='https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css' rel='stylesheet' />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions debug/animation_sql.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="UTF-8">
<script src="../../dist/carto-vl.js"></script>
<script src='https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js'></script>
<link href='https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css' rel='stylesheet' />
<script src='https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js'></script>
<link href='https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css' rel='stylesheet' />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions debug/animation_sql_notz.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="UTF-8">
<script src="../../dist/carto-vl.js"></script>
<script src='https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js'></script>
<link href='https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css' rel='stylesheet' />
<script src='https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js'></script>
<link href='https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css' rel='stylesheet' />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions debug/interactive-based-styling.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../examples/style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions debug/layer-visibility.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<script src="../dist/carto-vl.js"></script>
<!-- <script src="https://cartodb.github.io/carto-vl/dist/carto-vl.js"></script> -->
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400" rel="stylesheet">
<style type="text/css">
* {
Expand Down
4 changes: 2 additions & 2 deletions debug/lines-geojson.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions debug/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="UTF-8">
<script src="../dist/carto-vl.js"></script>
<script src='https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js'></script>
<link href='https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css' rel='stylesheet' />
<script src='https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js'></script>
<link href='https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css' rel='stylesheet' />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions debug/local-windshaft.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../examples/style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions debug/multi-anim.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<!-- Include CARTO VL JS -->
<script src="../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://cartodb-libs.global.ssl.fastly.net/mapbox-gl/v0.44.1-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions debug/point-geojson.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions debug/viewport.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="UTF-8">
<script src="../dist/carto-vl.js"></script>
<script src='https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js'></script>
<link href='https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css' rel='stylesheet' />
<script src='https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js'></script>
<link href='https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css' rel='stylesheet' />

<style>
body {
Expand Down
4 changes: 2 additions & 2 deletions debug/viewportagg-perf.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../examples/style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions docs/guides/01-getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ The easiest way to use CARTO VL is to include the required files from our CDN. T
<!-- Include CARTO VL JS -->
<script src="https://libs.cartocdn.com/carto-vl/%VERSION%/carto-vl.min.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
</head>
```

Expand Down
4 changes: 2 additions & 2 deletions examples/advanced/denver-trees.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions examples/advanced/external-geojson.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions examples/advanced/hurricane-harvey.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions examples/advanced/landing-page/detroit-development.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../../style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions examples/advanced/landing-page/hurricane-harvey.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions examples/advanced/landing-page/rivers.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions examples/advanced/landing-page/spend-data.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions examples/advanced/landing-page/us-population-by-country.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions examples/advanced/ocean-bathymetry.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions examples/advanced/taxi-pickups.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions examples/advanced/us-population-by-county.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions examples/basics/add-layer.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions examples/basics/basic-style.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions examples/basics/boilerplate.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href='https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css' rel='stylesheet' />
<link href='https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css' rel='stylesheet' />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/basics/multiple-layers.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../style.css">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions examples/basics/query-layer.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO VL JS -->
<script src="../../dist/carto-vl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.js"></script>
<script src="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="https://libs.cartocdn.com/mapbox-gl/v0.45.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link href="https://libs.cartocdn.com/mapbox-gl/v0.48.0-carto1/mapbox-gl.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="../style.css">
</head>
<body>
Expand Down
Loading

0 comments on commit 2a13c0b

Please sign in to comment.