cartodb/carto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,783 Commits 33 Branches 59 Tags 21 MiB
update_to_master
Commit Graph

1783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom MacWright
3382bfa29f Merge branch 'missing-bracket' 2013-03-11 16:32:48 -04:00
Tom MacWright
7ac2d81062 Merge pull request #257 from tomhughes/master 
Add a man page for carto
 2013-03-03 11:30:48 -08:00
Tom Hughes
caa639beb8 Add a man page for carto 2013-03-03 19:05:47 +00:00
Dane Springmeyer
039031b68d fix failing tests in master 2013-03-01 15:22:22 -05:00
Dane Springmeyer
19bf87cf3a fix expected result so test passes because it appears #239 is not actually a regression 2013-03-01 15:14:23 -05:00
Dane Springmeyer
8efc1c5d5e output both path to json mismatches to make debugging test failures easier 2013-03-01 15:08:29 -05:00
Dane Springmeyer
e8566e817e point to master mapnik-reference 2013-03-01 15:08:05 -05:00
root
7deb1b86e0 Merge branch 'layerzoom' 2013-02-26 11:40:58 -05:00
Tom MacWright
c5a67fa938 Missing bracket. Refs #254 2013-02-25 09:17:56 -05:00
Young Hahn
be78202e0b Allow layers to be rendered without datasources. 2013-02-21 15:29:33 -05:00
Tom MacWright
0e0bac0e5c Fix fadeout 2013-02-18 17:34:49 -05:00
Dane Springmeyer
6ca0c705c8 add raster colorizer (https://github.com/mapnik/mapnik/wiki/RasterColorizer) support to master - closes #5 - refs mapbox/tilemill#761 - depends on 41772edbd7 2013-02-12 11:17:56 -08:00
Tom MacWright
4c044f93fe Merge pull request #250 from tomhughes/master 
Update xml2js dependency
 2013-02-10 12:49:43 -08:00
Tom Hughes
48d89889fe Update to use v0.2.x of xml2js 2013-02-10 20:46:12 +00:00
root
47464fc18d Convert minzoom/maxzoom parameters on Layer properties. 2013-02-04 16:42:57 -05:00
Dane Springmeyer
74fa914c8c updated raster colorizer support 2013-02-01 15:57:29 -05:00
Tom MacWright
55fbafe0d0 Merge branch 'master' of github.com:mapbox/carto 2013-01-31 08:54:41 -05:00
Tom MacWright
5fa4478d40 Fix rgba handling, fixes #246 2013-01-31 08:54:27 -05:00
Dane Springmeyer
633754306e add testcase for issue #239 2013-01-23 16:59:22 -08:00
Dane Springmeyer
3f70b8a36c avoid unneeded whitespace in style XML output 2013-01-23 16:57:27 -08:00
Tom MacWright
16f60edc50 Merge pull request #243 from mapbox/localize-on-demand 
Localize on demand
 2013-01-23 16:16:39 -08:00
Dane Springmeyer
76b271ebc5 change carto command line to only try to localize mml docs if explicitly requested 2013-01-23 13:01:55 -08:00
Tom MacWright
3fd91ccb6b Predo changelog 2013-01-23 16:01:31 -05:00
Tom MacWright
e2764d12f1 Add rendering tests for units 2013-01-23 16:01:03 -05:00
Dane Springmeyer
8c51c59fe9 Merge pull request #240 from stefanklug/units 
Add unit support to css
 2013-01-23 12:47:30 -08:00
Stefan Klug
cf8c11f038 replace dpi by ppi 2013-01-23 10:20:04 +01:00
Tom MacWright
31504baabe Merge pull request #241 from stefanklug/extent 
don't overwrite maximum-extent when specified in mml
 2013-01-21 09:50:41 -08:00
Stefan Klug
8f8c1ad39b remove debug output 2013-01-21 18:43:49 +01:00
Stefan Klug
494c07d383 don't overwrite maximum-extent when specified in mml 2013-01-21 18:28:10 +01:00
Stefan Klug
de40fd4e42 added dpi parameter to carto bin 
use optimist to parse command line arguments
 2013-01-21 16:40:16 +01:00
Stefan Klug
6a5309e22e fixed regression introduced in last commit 2013-01-21 16:40:16 +01:00
Stefan Klug
56ac678c0a add support for the units m, mm, cm, pt, pc 
these are converted to pixels depending on env.dpi (defaulting to 90.714)

adding and subtracting percentages works also
 2013-01-21 16:40:15 +01:00
Tom MacWright
1769cb4a59 Merge branch 'master' of github.com:mapbox/carto 2013-01-16 17:42:31 -05:00
AJ Ashton
9deb60cd08 Fix numeric check regex 2013-01-16 17:15:28 -05:00
Tom MacWright
a687bec9b6 Merge pull request #236 from stefanklug/fix-global-install 
fix carto to work as global node module
 2013-01-11 05:41:46 -08:00
Stefan Klug
c9d88add12 fix carto to work as global node module 2013-01-11 13:17:58 +01:00
Tom MacWright
6ce476d2a2 parseFloat sucks 2013-01-08 16:42:50 -05:00
Dane Springmeyer
0d686bb8d8 fixup code comments - amends 87d4f9627b 2013-01-06 11:58:14 -08:00
Tom MacWright
f3bde1fde3 No more in operator, checking for undefined is much much faster 2013-01-04 18:45:19 -05:00
Dane Springmeyer
bfc9d40f43 fix testcase issue # 214 -> 204 - previously incorrectly referenced 214 - refs #214 and #204 2013-01-03 18:47:10 -08:00
Tom MacWright
f0e245183a Fix hang around massive stylesheets, fixes mapbox-base 2013-01-03 18:43:12 -05:00
Tom MacWright
4d4abb27b5 clean up renderer, possibly fix issue with attachments, work on function names 2013-01-03 18:32:04 -05:00
Tom MacWright
6eda91a541 Fixing basic jshint issues 2013-01-03 16:29:22 -05:00
Tom MacWright
87d4f9627b Rename eval to ev to fix many jshint problems and future safari problems 2013-01-03 16:19:25 -05:00
Tom MacWright
29b641c72d Detect and report basic self-conflicting filters. 
This does not yet report anything for more complex cases. We were also testing for
tolerance of self-conflicting filters, which this breaks, in
partial_overrides. This patch may want to wait for warning reporting
since it may break stylesheets in the wild.
 2013-01-03 15:06:07 -05:00
Tom MacWright
6f687ff9e3 Remove throws in function evaluation and handle color function arguments 
correctly.
 2013-01-03 13:47:51 -05:00
Tom MacWright
ece3eb3b0e Remove throw in zoom evaluation 2013-01-03 13:20:49 -05:00
Tom MacWright
d97286de57 Merge branch 'master' of github.com:mapbox/carto 2013-01-03 10:12:02 -05:00
Tom MacWright
c1e8c3b8f3 Support mapnik keywords in filters and error on bare keywords. Fixes 2013-01-03 10:11:30 -05:00
Dane Springmeyer
3cefa968a0 remove Mapnik2 name in readme for more explicit version string 2013-01-02 10:50:40 -08:00