Raul Ochoa
12d1b1a4fe
Merge pull request #3 from CartoDB/console-output-on-debug-only
...
Only use console output if debug option is present
2014-12-05 17:36:24 +01:00
Raul Ochoa
8a5f75546f
Remove coverage run from travis configuration as it is failing
2014-12-05 13:06:53 +01:00
Raul Ochoa
74d807a3ae
Only use console output if debug option is present
2014-12-05 13:01:15 +01:00
Raul Ochoa
bf6537071a
Check for style property
2014-12-04 19:09:43 +01:00
Raul Ochoa
1cb891ef92
Return style function from shader
2014-12-04 18:58:37 +01:00
javi
79a770f0af
removed unnused files
2014-12-04 18:43:13 +01:00
javi
44610ab1c4
using torque reference
2014-12-04 18:42:30 +01:00
javi
7c35dda115
Merge remote-tracking branch 'origin/browserify' into update_to_master
...
Conflicts:
.gitignore
.travis.yml
CHANGELOG.md
Makefile
README.md
bin/mml2json.js
lib/carto/index.js
lib/carto/parser.js
lib/carto/tree/call.js
lib/carto/tree/filterset.js
lib/carto/tree/reference.js
lib/carto/tree/ruleset.js
package.json
test/errorhandling.test.js
test/errorhandling/invalid_value.mss
test/errorhandling/invalid_value.result
test/errorhandling/issue297.mss
test/errorhandling/issue297.result
test/rendering-mss.test.js
test/rendering/transforms.mss
test/rendering/transforms.result
test/specificity/demo.result
test/specificity/filters_and_ids.result
test/specificity/issue60.result
test/version.test.js
2014-12-04 18:35:24 +01:00
javi
146976c8a3
using process.browser instead of type window
2014-12-04 17:29:15 +01:00
javi
ae111041dd
making explicit imports
2014-12-04 17:28:54 +01:00
javi
2e00705b64
adds support for browserify
...
this pr also changes some code to make compatible with the browser. It exposes the global variable "carto"
One of the problems is mapnik reference, the module is not read to work with browserify since it loads modules dynamically. It does not make sense to make it compatible since mapnik-reference is not going to be used so people must to set the reference needed before parse/render:
carto.tree.Reference.setData(reference)
2014-12-04 16:29:20 +01:00
Dane Springmeyer
b19ade3850
use latest mapnik-reference@6.0.2
2014-09-26 13:10:51 -07:00
Dane Springmeyer
fe770630bb
Add test for proposed syntax for passing variable to mapnik (just as string) - refs #269
2014-09-25 18:57:48 -07:00
Dane Springmeyer
8df31b4fe6
Merge pull request #373 from mapbox/expressions
...
Al(most) all symbolizer properties as expressions
2014-09-25 18:56:53 -07:00
Dane Springmeyer
e29b900342
call this branch v0.14.0
2014-09-25 18:17:48 -07:00
Dane Springmeyer
150e7166f6
mapnik ref: default to Mapnik 3.0.0
2014-09-25 18:13:35 -07:00
Dane Springmeyer
1d6e4a6f5d
drop node v0.8.x testing on travis
2014-09-25 15:12:54 -07:00
Dane Springmeyer
52343ff833
text-name is an expression so flat string is okay - tweak issue297 to actually be invalid since text-face-name is not currently an expression
2014-09-25 15:06:56 -07:00
Dane Springmeyer
544491b91d
quoting of enumerations is okay, so let this be okay to carto tests
2014-09-25 14:58:58 -07:00
Dane Springmeyer
7d3ba895f5
trim rendering results to avoid comparing ending newlines
2014-09-25 14:56:29 -07:00
Dane Springmeyer
d5bf19a64f
remove back compat shim now that new mapnik-ref@6.0.0 is tagged
2014-09-25 12:37:52 -07:00
Dane Springmeyer
5890802d6d
use new mapnik-reference@6.0.0
2014-09-25 12:33:06 -07:00
Saman Bemel-Benrud
26a918d2e6
Merge pull request #372 from mapbox/fix-formatting
...
Fix formatting
2014-09-25 12:33:48 -04:00
samanpwbb
1ba5e0035e
Re-generate
2014-09-25 12:24:01 -04:00
samanpwbb
1e0657ee1e
bump / add newline
2014-09-23 18:58:14 -04:00
samanpwbb
2a5c85a9d5
smaller headings
2014-09-23 18:54:19 -04:00
samanpwbb
cbd4c0250d
better rules
2014-09-23 18:52:24 -04:00
samanpwbb
08ca40d3f7
try linebreaks
2014-09-23 18:51:11 -04:00
samanpwbb
9386a56464
whitespace adjustments
2014-09-23 18:47:10 -04:00
samanpwbb
d24998705d
adjust docs formatting
2014-09-23 18:45:55 -04:00
Dane Springmeyer
4de08ce68d
new mapnik-reference that declares all expressions for mapnik 3.x
2014-09-23 15:31:58 -07:00
samanpwbb
9f65589279
formatting fixes
2014-09-23 18:19:02 -04:00
Saman Bemel-Benrud
6f2ec7b335
Merge pull request #371 from mapbox/no-site
...
add minimal markdown docs
2014-09-23 18:10:13 -04:00
samanpwbb
89a282be82
add minimal markdown docs
2014-09-23 17:52:36 -04:00
Dane Springmeyer
51baca34ae
if test does not error (as expected) then assert false instead of hanging
2014-09-23 14:22:59 -07:00
Young Hahn
481a0fc406
0.13.0
2014-09-04 17:22:19 -04:00
Young Hahn
60e33e609b
Merge pull request #366 from mapbox/newref
...
Use newer mapnik ref
2014-09-04 17:17:10 -04:00
Young Hahn
339d781ca6
Use newer mapnik ref.
2014-09-04 16:34:48 -04:00
Tom MacWright
b7819be42d
Merge pull request #365 from mapbox/variable-transforms-test-coverage
...
Add support for variable transforms - refs #163 , and improve test covera...
2014-09-03 15:21:16 -04:00
Tom MacWright
c570c2cd0e
Add support for variable transforms - refs #163 , and improve test coverage
2014-09-03 15:12:31 -04:00
javi santana
30b4fe1fc6
Merge pull request #2 from CartoDB/update_to_master_fix
...
env parameter added to several function calls
2014-08-29 10:52:11 +02:00
Jan Marsch
1ddefbe8eb
env parameter added to several function calls
...
filtercondition-value now properly quotes strings
2014-08-25 12:34:29 +02:00
Young Hahn
57ddf46813
0.12.1
2014-08-02 21:47:27 -04:00
Young Hahn
ba720bcb84
Update changelog
2014-08-02 21:42:03 -04:00
Young Hahn
d608fa93b8
0.12.0
2014-08-02 21:41:17 -04:00
Young Hahn
bb81e5c785
Merge pull request #364 from mapbox/no-xml2js
...
Drop xml2js and thus mml2json
2014-08-02 18:40:27 -07:00
Young Hahn
bde0d0e2ab
Drop xml2js and thus mml2json.
2014-08-02 17:40:54 -04:00
Tom MacWright
145f1cc0b1
test color fns
2014-07-03 12:00:40 -04:00
Tom MacWright
2273e0174f
Test colors and comments
2014-07-03 11:53:12 -04:00
Tom MacWright
b9a00ed68b
Use coveralls and add coverage
2014-07-03 11:44:35 -04:00
