Update project's structure

CartoDB · Feb 7, 2018 · ae71596 · ae71596
1 parent 7318709
commit ae71596
Show file tree

Hide file tree

Showing 55 changed files with 44 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
-node_modules/
-docs/
+.log
+
 .vscode/
+docs/
 dist/
+node_modules/
diff --git a/README.md b/README.md
@@ -0,0 +1,3 @@
+## CARTO GL
+
+![](./doc/carto-gl-capture.png)
diff --git a/output-image.png → doc/carto-gl-capture.png b/output-image.png → doc/carto-gl-capture.png
diff --git a/example/css/normalize.css → examples/complete/css/normalize.css b/example/css/normalize.css → examples/complete/css/normalize.css
diff --git a/example/css/skeleton.css → examples/complete/css/skeleton.css b/example/css/skeleton.css → examples/complete/css/skeleton.css
diff --git a/example/mapbox.html → examples/complete/mapbox.html b/example/mapbox.html → examples/complete/mapbox.html
diff --git a/example/mapbox.js → examples/complete/mapbox.js b/example/mapbox.js → examples/complete/mapbox.js
@@ -1,8 +1,8 @@
 /*eslint-env jquery*/
 /*eslint no-console: ["off"] */
 
-import * as MGL from '../contrib/mapboxgl';
-import WindshaftSQL from '../contrib/windshaft-sql';
+import * as MGL from '../lib/api/mapboxgl';
+import WindshaftSQL from '../lib/api/windshaft-sql';
 import * as R from '../src/index';
 
 const styles = [

diff --git a/package.json b/package.json
@@ -1,34 +1,21 @@
 {
-  "name": "renderer-prototype",
+  "name": "carto-gl",
   "version": "0.0.0",
-  "description": "",
-  "scripts": {
-    "sst": "mocha test/sstest/index.test.js --timeout 15000",
-    "test": "./node_modules/.bin/eslint example/ contrib/ src/",
-    "loc": "node_modules/sloc/bin/sloc src/ contrib/ example/",
-    "build": "webpack",
-    "build:watch": "webpack -w",
-    "build-doc": "rm -rf docs/; node_modules/.bin/jsdoc --configure config/jsdoc/internal.json; node_modules/.bin/jsdoc --configure config/jsdoc/public.json",
-    "publish": "git checkout gh-pages && git merge master && npm run build && npm run build-doc && git commit -a -m \"Auto generated gh-pages\" && git push && git checkout master"
-  },
+  "description": "CARTO Vector library",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/CartoDB/renderer-prototype.git"
+    "url": "git://github.com/CartoDB/renderer-prototype.git"
   },
-  "keywords": [],
-  "author": "David Manzanares",
-  "license": "BSD-3-Clause",
-  "bugs": {
-    "url": "https://github.com/CartoDB/renderer-prototype/issues"
-  },
-  "homepage": "https://github.com/CartoDB/renderer-prototype#readme",
-  "devDependencies": {
-    "chai": "^4.1.2",
-    "eslint": "^4.15.0",
-    "serve": "^6.4.9",
-    "sloc": "^0.2.0",
-    "webpack": "^3.8.1"
+  "author": {
+    "name": "CARTO",
+    "url": "https://carto.com/"
   },
+  "contributors": [
+    "David Manzanares <[email protected]>",
+    "Iago Lastra <[email protected]>",
+    "Jesús Arroyo Torrens <[email protected]>"
+  ],
+  "license": "BSD-3-Clause",
   "dependencies": {
     "@mapbox/vector-tile": "^1.3.0",
     "cartocolor": "^4.0.0",
@@ -38,5 +25,22 @@
     "jsep": "^0.3.2",
     "lru-cache": "^4.1.1",
     "pbf": "^3.1.0"
+  },
+  "devDependencies": {
+    "chai": "^4.1.2",
+    "eslint": "^4.15.0",
+    "serve": "^6.4.9",
+    "sloc": "^0.2.0",
+    "webpack": "^3.8.1"
+  },
+  "main": "src/index.js",
+  "scripts": {
+    "sst": "mocha test/sstest/index.test.js --timeout 15000",
+    "test": "./node_modules/.bin/eslint example/ contrib/ src/",
+    "loc": "node_modules/sloc/bin/sloc src/ contrib/ example/",
+    "build": "webpack",
+    "build:watch": "webpack -w",
+    "build-doc": "rm -rf docs/; node_modules/.bin/jsdoc --configure config/jsdoc/internal.json; node_modules/.bin/jsdoc --configure config/jsdoc/public.json",
+    "publish": "git checkout gh-pages && git merge master && npm run build && npm run build-doc && git commit -a -m \"Auto generated gh-pages\" && git push && git checkout master"
   }
 }
diff --git a/src/api/layer/.keep b/src/api/layer/.keep
diff --git a/contrib/mapboxgl.js → src/api/mapboxgl.js b/contrib/mapboxgl.js → src/api/mapboxgl.js
diff --git a/contrib/rsys.js → src/api/rsys.js b/contrib/rsys.js → src/api/rsys.js
diff --git a/src/api/source/.keep b/src/api/source/.keep
diff --git a/src/api/style/.keep b/src/api/style/.keep
diff --git a/contrib/windshaft-sql.js → src/api/windshaft-sql.js b/contrib/windshaft-sql.js → src/api/windshaft-sql.js
diff --git a/src/dataframe.js → src/core/dataframe.js b/src/dataframe.js → src/core/dataframe.js
diff --git a/src/index.js → src/core/index.js b/src/index.js → src/core/index.js
@@ -45,7 +45,6 @@ function Renderer(canvas) {
     this._center = { x: 0, y: 0 };
     this._zoom = 1;
     console.log('R', this);
-    this.canvas = canvas;
     this.dataframes = [];
     this.computePool = []; //TODO hack, refactor needed
 }
@@ -563,4 +562,4 @@ Renderer.prototype.compute = function (type, expressions) {
 };
 
 
-export { Renderer, Style, Dataframe, schema };
+export { Renderer, Style, Dataframe, schema };
diff --git a/src/metadata.js → src/core/metadata.js b/src/metadata.js → src/core/metadata.js
diff --git a/src/schema.js → src/core/schema.js b/src/schema.js → src/core/schema.js
diff --git a/src/shaders/index.js → src/core/shaders/index.js b/src/shaders/index.js → src/core/shaders/index.js
diff --git a/src/shaders/renderer/index.js → src/core/shaders/renderer/index.js b/src/shaders/renderer/index.js → src/core/shaders/renderer/index.js
diff --git a/src/shaders/renderer/lines.js → src/core/shaders/renderer/lines.js b/src/shaders/renderer/lines.js → src/core/shaders/renderer/lines.js
diff --git a/src/shaders/renderer/point.js → src/core/shaders/renderer/point.js b/src/shaders/renderer/point.js → src/core/shaders/renderer/point.js
diff --git a/src/shaders/renderer/tris.js → src/core/shaders/renderer/tris.js b/src/shaders/renderer/tris.js → src/core/shaders/renderer/tris.js
diff --git a/src/shaders/styler/index.js → src/core/shaders/styler/index.js b/src/shaders/styler/index.js → src/core/shaders/styler/index.js
diff --git a/src/style/expressions/CIELab.js → src/core/style/expressions/CIELab.js b/src/style/expressions/CIELab.js → src/core/style/expressions/CIELab.js
diff --git a/src/style/expressions/aggregation.js → src/core/style/expressions/aggregation.js b/src/style/expressions/aggregation.js → src/core/style/expressions/aggregation.js
diff --git a/src/style/expressions/animate.js → src/core/style/expressions/animate.js b/src/style/expressions/animate.js → src/core/style/expressions/animate.js
diff --git a/src/style/expressions/binary.js → src/core/style/expressions/binary.js b/src/style/expressions/binary.js → src/core/style/expressions/binary.js
diff --git a/src/style/expressions/blend.js → src/core/style/expressions/blend.js b/src/style/expressions/blend.js → src/core/style/expressions/blend.js
diff --git a/src/style/expressions/buckets.js → src/core/style/expressions/buckets.js b/src/style/expressions/buckets.js → src/core/style/expressions/buckets.js
diff --git a/src/style/expressions/expression.js → src/core/style/expressions/expression.js b/src/style/expressions/expression.js → src/core/style/expressions/expression.js
diff --git a/src/style/expressions/float.js → src/core/style/expressions/float.js b/src/style/expressions/float.js → src/core/style/expressions/float.js
diff --git a/src/style/expressions/hsv.js → src/core/style/expressions/hsv.js b/src/style/expressions/hsv.js → src/core/style/expressions/hsv.js
diff --git a/src/style/expressions/interpolators.js → src/core/style/expressions/interpolators.js b/src/style/expressions/interpolators.js → src/core/style/expressions/interpolators.js
diff --git a/src/style/expressions/linear.js → src/core/style/expressions/linear.js b/src/style/expressions/linear.js → src/core/style/expressions/linear.js
diff --git a/src/style/expressions/near.js → src/core/style/expressions/near.js b/src/style/expressions/near.js → src/core/style/expressions/near.js
diff --git a/src/style/expressions/now.js → src/core/style/expressions/now.js b/src/style/expressions/now.js → src/core/style/expressions/now.js
diff --git a/src/style/expressions/opacity.js → src/core/style/expressions/opacity.js b/src/style/expressions/opacity.js → src/core/style/expressions/opacity.js
diff --git a/src/style/expressions/palettes.js → src/core/style/expressions/palettes.js b/src/style/expressions/palettes.js → src/core/style/expressions/palettes.js
diff --git a/src/style/expressions/property.js → src/core/style/expressions/property.js b/src/style/expressions/property.js → src/core/style/expressions/property.js
diff --git a/src/style/expressions/ramp.js → src/core/style/expressions/ramp.js b/src/style/expressions/ramp.js → src/core/style/expressions/ramp.js
diff --git a/src/style/expressions/rgba.js → src/core/style/expressions/rgba.js b/src/style/expressions/rgba.js → src/core/style/expressions/rgba.js
diff --git a/src/style/expressions/setOpacity.js → src/core/style/expressions/setOpacity.js b/src/style/expressions/setOpacity.js → src/core/style/expressions/setOpacity.js
diff --git a/src/style/expressions/top.js → src/core/style/expressions/top.js b/src/style/expressions/top.js → src/core/style/expressions/top.js
diff --git a/src/style/expressions/unary.js → src/core/style/expressions/unary.js b/src/style/expressions/unary.js → src/core/style/expressions/unary.js
diff --git a/src/style/expressions/utils.js → src/core/style/expressions/utils.js b/src/style/expressions/utils.js → src/core/style/expressions/utils.js
diff --git a/src/style/expressions/xyz.js → src/core/style/expressions/xyz.js b/src/style/expressions/xyz.js → src/core/style/expressions/xyz.js
diff --git a/src/style/expressions/zoom.js → src/core/style/expressions/zoom.js b/src/style/expressions/zoom.js → src/core/style/expressions/zoom.js
diff --git a/src/style/functions.js → src/core/style/functions.js b/src/style/functions.js → src/core/style/functions.js
diff --git a/src/style/index.js → src/core/style/index.js b/src/style/index.js → src/core/style/index.js
diff --git a/src/style/parser.js → src/core/style/parser.js b/src/style/parser.js → src/core/style/parser.js
diff --git a/src/style/shader-compiler.js → src/core/style/shader-compiler.js b/src/style/shader-compiler.js → src/core/style/shader-compiler.js
diff --git a/test/api/.keep b/test/api/.keep
diff --git a/test/core/.keep b/test/core/.keep
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,13 +1,12 @@
 const path = require('path');
 
-module.exports =
-  {
+module.exports = {
     devtool: 'source-map',
     entry: {
-      mapbox: "./example/mapbox.js",
+        mapbox: './examples/complete/mapbox.js',
     },
     output: {
-      path: path.join(__dirname, "dist"),
-      filename: "[name].js"
+        path: path.join(__dirname, 'dist'),
+        filename: '[name].js'
     }
-  };
+};