Skip to content

Commit

Permalink
v0.15.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@bcamper
bcamper committed Aug 26, 2018
1 parent 417e4b9 commit 159e745
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 24 deletions.
44 changes: 25 additions & 19 deletions dist/tangram.debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32298,53 +32298,59 @@ var Scene = function () {
// One pass per mesh variant order (loop goes to max value +1 because 0 is a valid order value)

var _loop2 = function _loop2(mo) {
for (var t = 0; t < renderable_tiles.length; t++) {
var _loop3 = function _loop3(t) {
var tile = renderable_tiles[t];
var first_for_tile = true;

if (tile.meshes[style_name] == null) {
continue;
return 'continue';
}

// Skip proxy tiles if new tiles have finished loading this style
if (!tile.shouldProxyForStyle(style_name)) {
// log('trace', `Scene.renderStyle(): Skip proxy tile for style '${style_name}' `, tile, tile.proxy_for);
continue;
return 'continue';
}

// Render current mesh variant for current style for current tile
var mesh = tile.meshes[style_name].filter(function (m) {
var meshes = tile.meshes[style_name].filter(function (m) {
return m.variant.order === mo;
})[0]; // find mesh by variant order
if (mesh) {
}); // find meshes by variant order
meshes.forEach(function (mesh) {
// Style-specific state
// Only setup style if rendering for first time this frame
// (lazy init, not all styles will be used in all screen views; some styles might be defined but never used)
if (first_for_style === true) {
first_for_style = false;
program = _this7.setupStyle(style, program_key);
if (!program) {
return {
v: 0
};
return 0;
}
}

// Tile-specific state
_this7.view.setupTile(tile, program);
if (first_for_tile === true) {
first_for_tile = false;
_this7.view.setupTile(tile, program);
}

// Render this mesh variant
if (style.render(mesh)) {
_this7.requestRedraw();
}
render_count += mesh.geometry_count;
}
});
};

for (var t = 0; t < renderable_tiles.length; t++) {
var _ret3 = _loop3(t);

if (_ret3 === 'continue') continue;
}
};

for (var mo = 0; mo < max_mesh_variant_order + 1; mo++) {
var _ret2 = _loop2(mo);

if ((typeof _ret2 === 'undefined' ? 'undefined' : _typeof(_ret2)) === "object") return _ret2.v;
_loop2(mo);
}

return render_count;
Expand Down Expand Up @@ -33170,15 +33176,15 @@ var Scene = function () {
geometryCountByStyle: function geometryCountByStyle() {
var counts = {};
scene.tile_manager.getRenderableTiles().forEach(function (tile) {
var _loop3 = function _loop3(style) {
var _loop4 = function _loop4(style) {
counts[style] = counts[style] || 0;
tile.meshes[style].forEach(function (mesh) {
counts[style] += mesh.geometry_count;
});
};

for (var style in tile.meshes) {
_loop3(style);
_loop4(style);
}
});
return counts;
Expand All @@ -33196,15 +33202,15 @@ var Scene = function () {
geometrySizeByStyle: function geometrySizeByStyle() {
var sizes = {};
scene.tile_manager.getRenderableTiles().forEach(function (tile) {
var _loop4 = function _loop4(style) {
var _loop5 = function _loop5(style) {
sizes[style] = sizes[style] || 0;
tile.meshes[style].forEach(function (mesh) {
sizes[style] += mesh.buffer_size;
});
};

for (var style in tile.meshes) {
_loop4(style);
_loop5(style);
}
});
return sizes;
Expand Down Expand Up @@ -45984,7 +45990,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});

var pkg = JSON.parse("{\n \"name\": \"tangram\",\n \"version\": \"0.15.2\",\n \"description\": \"WebGL Maps for Vector Tiles\",\n \"repository\": {\n \"type\": \"git\",\n \"url\": \"git://github.com/tangrams/tangram.git\"\n },\n \"main\": \"dist/tangram.min.js\",\n \"homepage\": \"https://github.com/tangrams/tangram\",\n \"keywords\": [\n \"maps\",\n \"graphics\",\n \"rendering\",\n \"visualization\",\n \"WebGL\",\n \"OpenStreetMap\"\n ],\n \"config\": {\n \"output\": \"\",\n \"output_map\": \"\"\n },\n \"engines\": {\n \"npm\": \">=2.0.0\"\n },\n \"scripts\": {\n \"start\": \"npm run watch\",\n \"test\": \"npm run lint && npm run build-bundle && npm run test-local\",\n \"test-ci\": \"npm run lint && npm run build-bundle && npm run test-remote\",\n \"test-remote\": \"./node_modules/karma/bin/karma start --browsers SL_Firefox --single-run\",\n \"test-local\": \"./node_modules/karma/bin/karma start --browsers Chrome --single-run\",\n \"karma-start\": \"./node_modules/karma/bin/karma start --browsers Chrome --no-watch\",\n \"karma-run\": \"./node_modules/karma/bin/karma run --browsers Chrome\",\n \"lint\": \"./node_modules/.bin/jshint src/ && jshint test/\",\n \"build\": \"npm run build-bundle && npm run build-minify\",\n \"build-bundle\": \"./node_modules/.bin/browserify src/module.js -t [ babelify --presets [ es2015 ] ] -t brfs --debug -s Tangram -p browserify-derequire -p [ ./build/quine.js tangram.debug.js.map ] -p [ mapstraction ./dist/tangram.debug.js.map ] -o ./dist/tangram.debug.js\",\n \"build-minify\": \"./node_modules/.bin/uglifyjs dist/tangram.debug.js -c warnings=false -m | sed -e 's/tangram.debug.js.map//g' > dist/tangram.min.js && npm run build-size\",\n \"build-size\": \"gzip dist/tangram.min.js -c | wc -c | awk '{kb=$1/1024; print kb}' OFMT='%.0fk minified+gzipped'\",\n \"watch\": \"./node_modules/.bin/budo src/module.js:dist/tangram.debug.js --port 8000 --cors --live -- -t [ babelify --presets [ es2015 ] ] -t brfs -s Tangram -p [ ./build/quine.js tangram.debug.temp.js.map ] -p [ mapstraction ./dist/tangram.debug.temp.js.map ]\"\n },\n \"files\": [\n \"src/*\",\n \"dist/tangram.debug.js\",\n \"dist/tangram.debug.js.map\",\n \"dist/tangram.min.js\"\n ],\n \"author\": {\n \"name\": \"Tangram contributors\"\n },\n \"contributors\": [\n {\n \"name\": \"Brett Camper\"\n },\n {\n \"name\": \"Peter Richardson\"\n },\n {\n \"name\": \"Patricio Gonzalez Vivo\"\n },\n {\n \"name\": \"Karim Naaji\"\n },\n {\n \"name\": \"Ivan Willig\"\n },\n {\n \"name\": \"Lou Huang\"\n },\n {\n \"name\": \"David Valdman\"\n },\n {\n \"name\": \"Nick Doiron\"\n },\n {\n \"name\": \"Francisco López\"\n },\n {\n \"name\": \"David Manzanares\"\n }\n ],\n \"license\": \"MIT\",\n \"dependencies\": {\n \"@mapbox/vector-tile\": \"1.3.0\",\n \"brfs\": \"1.4.3\",\n \"csscolorparser\": \"1.0.3\",\n \"earcut\": \"2.1.1\",\n \"fontfaceobserver\": \"2.0.7\",\n \"geojson-vt\": \"2.4.0\",\n \"gl-mat3\": \"1.0.0\",\n \"gl-mat4\": \"1.1.4\",\n \"gl-shader-errors\": \"1.0.3\",\n \"js-yaml\": \"tangrams/js-yaml#read-only\",\n \"jszip\": \"tangrams/jszip#read-only\",\n \"pbf\": \"3.1.0\",\n \"strip-comments\": \"0.3.2\",\n \"topojson-client\": \"tangrams/topojson-client#read-only\"\n },\n \"devDependencies\": {\n \"babelify\": \"7.3.0\",\n \"babel-preset-es2015\": \"6.16.0\",\n \"browserify\": \"14.4.0\",\n \"browserify-derequire\": \"0.9.4\",\n \"budo\": \"10.0.3\",\n \"chai\": \"1.9.2\",\n \"chai-as-promised\": \"4.1.1\",\n \"core-js\": \"2.4.1\",\n \"glob\": \"4.0.6\",\n \"jshint\": \"2.9.4\",\n \"karma\": \"1.5.0\",\n \"karma-browserify\": \"5.1.1\",\n \"karma-chrome-launcher\": \"2.0.0\",\n \"karma-mocha\": \"0.1.9\",\n \"karma-mocha-reporter\": \"1.0.0\",\n \"karma-sauce-launcher\": \"tangrams/karma-sauce-launcher#firefox-profiles3\",\n \"karma-sinon\": \"1.0.4\",\n \"mapstraction\": \"1.0.1\",\n \"mocha\": \"1.21.4\",\n \"sinon\": \"1.10.3\",\n \"through2\": \"2.0.3\",\n \"uglify-js\": \"2.8.29\",\n \"yargs\": \"1.3.2\"\n }\n}\n");
var pkg = JSON.parse("{\n \"name\": \"tangram\",\n \"version\": \"0.15.3\",\n \"description\": \"WebGL Maps for Vector Tiles\",\n \"repository\": {\n \"type\": \"git\",\n \"url\": \"git://github.com/tangrams/tangram.git\"\n },\n \"main\": \"dist/tangram.min.js\",\n \"homepage\": \"https://github.com/tangrams/tangram\",\n \"keywords\": [\n \"maps\",\n \"graphics\",\n \"rendering\",\n \"visualization\",\n \"WebGL\",\n \"OpenStreetMap\"\n ],\n \"config\": {\n \"output\": \"\",\n \"output_map\": \"\"\n },\n \"engines\": {\n \"npm\": \">=2.0.0\"\n },\n \"scripts\": {\n \"start\": \"npm run watch\",\n \"test\": \"npm run lint && npm run build-bundle && npm run test-local\",\n \"test-ci\": \"npm run lint && npm run build-bundle && npm run test-remote\",\n \"test-remote\": \"./node_modules/karma/bin/karma start --browsers SL_Firefox --single-run\",\n \"test-local\": \"./node_modules/karma/bin/karma start --browsers Chrome --single-run\",\n \"karma-start\": \"./node_modules/karma/bin/karma start --browsers Chrome --no-watch\",\n \"karma-run\": \"./node_modules/karma/bin/karma run --browsers Chrome\",\n \"lint\": \"./node_modules/.bin/jshint src/ && jshint test/\",\n \"build\": \"npm run build-bundle && npm run build-minify\",\n \"build-bundle\": \"./node_modules/.bin/browserify src/module.js -t [ babelify --presets [ es2015 ] ] -t brfs --debug -s Tangram -p browserify-derequire -p [ ./build/quine.js tangram.debug.js.map ] -p [ mapstraction ./dist/tangram.debug.js.map ] -o ./dist/tangram.debug.js\",\n \"build-minify\": \"./node_modules/.bin/uglifyjs dist/tangram.debug.js -c warnings=false -m | sed -e 's/tangram.debug.js.map//g' > dist/tangram.min.js && npm run build-size\",\n \"build-size\": \"gzip dist/tangram.min.js -c | wc -c | awk '{kb=$1/1024; print kb}' OFMT='%.0fk minified+gzipped'\",\n \"watch\": \"./node_modules/.bin/budo src/module.js:dist/tangram.debug.js --port 8000 --cors --live -- -t [ babelify --presets [ es2015 ] ] -t brfs -s Tangram -p [ ./build/quine.js tangram.debug.temp.js.map ] -p [ mapstraction ./dist/tangram.debug.temp.js.map ]\"\n },\n \"files\": [\n \"src/*\",\n \"dist/tangram.debug.js\",\n \"dist/tangram.debug.js.map\",\n \"dist/tangram.min.js\"\n ],\n \"author\": {\n \"name\": \"Tangram contributors\"\n },\n \"contributors\": [\n {\n \"name\": \"Brett Camper\"\n },\n {\n \"name\": \"Peter Richardson\"\n },\n {\n \"name\": \"Patricio Gonzalez Vivo\"\n },\n {\n \"name\": \"Karim Naaji\"\n },\n {\n \"name\": \"Ivan Willig\"\n },\n {\n \"name\": \"Lou Huang\"\n },\n {\n \"name\": \"David Valdman\"\n },\n {\n \"name\": \"Nick Doiron\"\n },\n {\n \"name\": \"Francisco López\"\n },\n {\n \"name\": \"David Manzanares\"\n }\n ],\n \"license\": \"MIT\",\n \"dependencies\": {\n \"@mapbox/vector-tile\": \"1.3.0\",\n \"brfs\": \"1.4.3\",\n \"csscolorparser\": \"1.0.3\",\n \"earcut\": \"2.1.1\",\n \"fontfaceobserver\": \"2.0.7\",\n \"geojson-vt\": \"2.4.0\",\n \"gl-mat3\": \"1.0.0\",\n \"gl-mat4\": \"1.1.4\",\n \"gl-shader-errors\": \"1.0.3\",\n \"js-yaml\": \"tangrams/js-yaml#read-only\",\n \"jszip\": \"tangrams/jszip#read-only\",\n \"pbf\": \"3.1.0\",\n \"strip-comments\": \"0.3.2\",\n \"topojson-client\": \"tangrams/topojson-client#read-only\"\n },\n \"devDependencies\": {\n \"babelify\": \"7.3.0\",\n \"babel-preset-es2015\": \"6.16.0\",\n \"browserify\": \"14.4.0\",\n \"browserify-derequire\": \"0.9.4\",\n \"budo\": \"10.0.3\",\n \"chai\": \"1.9.2\",\n \"chai-as-promised\": \"4.1.1\",\n \"core-js\": \"2.4.1\",\n \"glob\": \"4.0.6\",\n \"jshint\": \"2.9.4\",\n \"karma\": \"1.5.0\",\n \"karma-browserify\": \"5.1.1\",\n \"karma-chrome-launcher\": \"2.0.0\",\n \"karma-mocha\": \"0.1.9\",\n \"karma-mocha-reporter\": \"1.0.0\",\n \"karma-sauce-launcher\": \"tangrams/karma-sauce-launcher#firefox-profiles3\",\n \"karma-sinon\": \"1.0.4\",\n \"mapstraction\": \"1.0.1\",\n \"mocha\": \"1.21.4\",\n \"sinon\": \"1.10.3\",\n \"through2\": \"2.0.3\",\n \"uglify-js\": \"2.8.29\",\n \"yargs\": \"1.3.2\"\n }\n}\n");
var version = void 0;
exports.default = version = 'v' + pkg.version;

Expand Down
4 changes: 2 additions & 2 deletions dist/tangram.debug.js.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/tangram.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tangram",
"version": "0.15.2",
"version": "0.15.3",
"description": "WebGL Maps for Vector Tiles",
"repository": {
"type": "git",
Expand Down

0 comments on commit 159e745

Please sign in to comment.