compile
This commit is contained in:
parent
2a47541cc5
commit
a03f9ca4e2
10
dist/torque.full.js
vendored
10
dist/torque.full.js
vendored
File diff suppressed because one or more lines are too long
25
dist/torque.full.uncompressed.js
vendored
25
dist/torque.full.uncompressed.js
vendored
@ -4473,6 +4473,20 @@ var Profiler = require('../profiler');
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function renderText(ctx,st){
|
||||||
|
var width = st['marker-width']
|
||||||
|
|
||||||
|
var text = st['text-name']
|
||||||
|
var font = st['text-face-name'] ? st['text-face-name'] : 'Droid Sans Regular'
|
||||||
|
var textSize = st['text-size'] ? st['text-size'] : '10px'
|
||||||
|
var color = st['text-fill'] ? st['text-fill'] : 'white'
|
||||||
|
|
||||||
|
// ctx.font = textSize+"px "+font
|
||||||
|
ctx.fillStyle = color
|
||||||
|
ctx.font= textSize + " " + font
|
||||||
|
ctx.fillText(text, -width/2.0, width/2.0 )
|
||||||
|
}
|
||||||
|
|
||||||
function renderSprite(ctx, img, st) {
|
function renderSprite(ctx, img, st) {
|
||||||
|
|
||||||
if(img.complete){
|
if(img.complete){
|
||||||
@ -4487,6 +4501,7 @@ module.exports = {
|
|||||||
renderPoint: renderPoint,
|
renderPoint: renderPoint,
|
||||||
renderSprite: renderSprite,
|
renderSprite: renderSprite,
|
||||||
renderRectangle: renderRectangle,
|
renderRectangle: renderRectangle,
|
||||||
|
renderText: renderText,
|
||||||
MAX_SPRITE_RADIUS: MAX_SPRITE_RADIUS
|
MAX_SPRITE_RADIUS: MAX_SPRITE_RADIUS
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -4659,6 +4674,12 @@ var Filters = require('./torque_filters');
|
|||||||
cartocss.renderPoint(ctx, st);
|
cartocss.renderPoint(ctx, st);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(st['text-name']){
|
||||||
|
st['text-name'] = st['text-name'].replace("{{value}}",value)
|
||||||
|
cartocss.renderText(ctx,st)
|
||||||
|
}
|
||||||
|
|
||||||
prof.end(true);
|
prof.end(true);
|
||||||
if (torque.flags.sprites_to_images) {
|
if (torque.flags.sprites_to_images) {
|
||||||
var i = this._createImage();
|
var i = this._createImage();
|
||||||
@ -13932,7 +13953,7 @@ module.exports={
|
|||||||
"url": "https://github.com/cartodb/carto",
|
"url": "https://github.com/cartodb/carto",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "http://github.com/cartodb/carto.git"
|
"url": "git+ssh://git@github.com/cartodb/carto.git"
|
||||||
},
|
},
|
||||||
"author": {
|
"author": {
|
||||||
"name": "CartoDB",
|
"name": "CartoDB",
|
||||||
@ -14003,7 +14024,7 @@ module.exports={
|
|||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/cartodb/carto/issues"
|
"url": "https://github.com/cartodb/carto/issues"
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/cartodb/carto",
|
"homepage": "https://github.com/cartodb/carto#readme",
|
||||||
"_id": "carto@0.15.1-cdb1",
|
"_id": "carto@0.15.1-cdb1",
|
||||||
"_shasum": "62534c2975cbee073f10c6c14a0c7e889c9469e7",
|
"_shasum": "62534c2975cbee073f10c6c14a0c7e889c9469e7",
|
||||||
"_resolved": "https://github.com/CartoDB/carto/archive/master.tar.gz",
|
"_resolved": "https://github.com/CartoDB/carto/archive/master.tar.gz",
|
||||||
|
2
dist/torque.js
vendored
2
dist/torque.js
vendored
File diff suppressed because one or more lines are too long
21
dist/torque.uncompressed.js
vendored
21
dist/torque.uncompressed.js
vendored
@ -4480,6 +4480,20 @@ var Profiler = require('../profiler');
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function renderText(ctx,st){
|
||||||
|
var width = st['marker-width']
|
||||||
|
|
||||||
|
var text = st['text-name']
|
||||||
|
var font = st['text-face-name'] ? st['text-face-name'] : 'Droid Sans Regular'
|
||||||
|
var textSize = st['text-size'] ? st['text-size'] : '10px'
|
||||||
|
var color = st['text-fill'] ? st['text-fill'] : 'white'
|
||||||
|
|
||||||
|
// ctx.font = textSize+"px "+font
|
||||||
|
ctx.fillStyle = color
|
||||||
|
ctx.font= textSize + " " + font
|
||||||
|
ctx.fillText(text, -width/2.0, width/2.0 )
|
||||||
|
}
|
||||||
|
|
||||||
function renderSprite(ctx, img, st) {
|
function renderSprite(ctx, img, st) {
|
||||||
|
|
||||||
if(img.complete){
|
if(img.complete){
|
||||||
@ -4494,6 +4508,7 @@ module.exports = {
|
|||||||
renderPoint: renderPoint,
|
renderPoint: renderPoint,
|
||||||
renderSprite: renderSprite,
|
renderSprite: renderSprite,
|
||||||
renderRectangle: renderRectangle,
|
renderRectangle: renderRectangle,
|
||||||
|
renderText: renderText,
|
||||||
MAX_SPRITE_RADIUS: MAX_SPRITE_RADIUS
|
MAX_SPRITE_RADIUS: MAX_SPRITE_RADIUS
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -4666,6 +4681,12 @@ var Filters = require('./torque_filters');
|
|||||||
cartocss.renderPoint(ctx, st);
|
cartocss.renderPoint(ctx, st);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(st['text-name']){
|
||||||
|
st['text-name'] = st['text-name'].replace("{{value}}",value)
|
||||||
|
cartocss.renderText(ctx,st)
|
||||||
|
}
|
||||||
|
|
||||||
prof.end(true);
|
prof.end(true);
|
||||||
if (torque.flags.sprites_to_images) {
|
if (torque.flags.sprites_to_images) {
|
||||||
var i = this._createImage();
|
var i = this._createImage();
|
||||||
|
Loading…
Reference in New Issue
Block a user