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

Mapbox gl integration #270

Merged
merged 2 commits into from
Apr 24, 2018
Merged

Mapbox gl integration #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ee695d
Use mapboxgl from cdn instead local version
IagoLast Apr 9, 2018
75e6e43
Use css from cdn instead local version
IagoLast Apr 9, 2018
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
4 changes: 2 additions & 2 deletions docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ TBD
<!-- Include CARTO GL JS -->
<script src="../../dist/cartovl.js"></script>
<!-- Include CARTO Mapbox GL JS fork -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
body { margin: 0; padding: 0; }
#map { position: absolute; height: 100%; width: 100%; }
Expand Down
4 changes: 2 additions & 2 deletions examples/basics/change-source.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
* {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/basics/change-style.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
* {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/basics/multi-layer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/basics/single-layer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/expressions/animation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/expressions/color.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
* {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/expressions/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/expressions/filter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/expressions/order.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
* {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/expressions/ramp-category.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
* {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/expressions/ramp-numeric.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
* {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/expressions/torque.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/expressions/viewport.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/interactivity/feature-click.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
* {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/interactivity/feature-enter-leave.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
* {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/interactivity/feature-hover.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
* {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/interactivity/multi-feature.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
* {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/interactivity/style-feature.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
* {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/misc/boilerplate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href='../../vendor/mapbox-gl-dev.css' rel='stylesheet' />
<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css' rel='stylesheet' />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/misc/edit-sql-expressions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
* {
margin:0;
Expand Down
4 changes: 2 additions & 2 deletions examples/misc/geojson-viewer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
body {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/misc/populated-places.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
* {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions examples/misc/popups.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
* {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions test/benchmark/benchmark.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<!-- Include CARTO GL JS -->
<script src="../../dist/carto-gl.js"></script>
<!-- Include Mapbox GL JS -->
<script src="../../vendor/mapbox-gl-dev.js"></script>
<script src="https://unpkg.com/@carto/[email protected]/dist/mapbox-gl.js"></script>
<!-- Include Mapbox GL CSS -->
<link href="../../vendor/mapbox-gl-dev.css" rel="stylesheet" />
<link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet" />
<style>
body {
margin: 0;
Expand Down