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
Tom MacWright
b7773c6452
Tolerate everything but ] in field names. Fixes #230
2013-01-02 11:31:17 -05:00
Tom MacWright
9ed9c2b028
Merge pull request #231 from mapbox/condense
...
Condense
2013-01-02 08:25:44 -08:00
Tom MacWright
fc500db69b
Pay attention to types in filterset, fixes #229 .
2013-01-02 11:22:25 -05:00
Tom MacWright
0233c523ea
Be backwards compatible for now.
2012-12-29 12:40:31 -05:00
Tom MacWright
4b8256e0f8
Fixing new parser reference to makeError. Fixes #228
2012-12-27 18:19:12 -05:00
Tom MacWright
551571fc17
Refactor
2012-12-27 18:11:48 -05:00
Tom MacWright
43073fa1e8
Further performance tuning, about a 10% improvement on
...
openstreetmap-carto
2012-12-26 22:23:04 -05:00
Tom MacWright
baab7dd0ec
Simplify and unify parser code style
2012-12-26 18:32:47 -05:00
Tom MacWright
f87e8adc95
Unswap specificity tests: ordering is now same as master
2012-12-26 18:24:17 -05:00
Tom MacWright
3f31bcbe5f
Fix absolute paths in other symbolizer types
2012-12-26 18:19:39 -05:00
Tom MacWright
9f00195100
Use for in rather than object create
2012-12-26 18:12:01 -05:00
Tom MacWright
6fed91d728
Update chunker, fixes #184 .
2012-12-26 17:48:01 -05:00
Tom MacWright
a8133e0d77
Bump mocha version to current
2012-12-26 17:40:33 -05:00
Dane Springmeyer
06b147323f
add currently failing test for handling of quoted attributes with :
2012-12-21 18:57:56 -08:00
Dane Springmeyer
47882ccb00
Add another empty rendering test
2012-12-21 18:37:39 -08:00
Dane Springmeyer
73e5178f1f
re-enable the standalone-mss rendering tests and fix them by avoiding empty styles and empty rules - closes #219
2012-12-21 18:34:30 -08:00
Dane Springmeyer
8846bfbbcd
use console.time for mss benchmarking
2012-12-21 17:49:53 -08:00
Dane Springmeyer
16db1c5b03
fix MSS standalone renderer, fixing failing error handling tests after f6c07afee6
2012-12-21 17:36:18 -08:00
Dane Springmeyer
800122e1af
error handling tests should rethrow if the test itself does not throw at all
2012-12-21 17:35:48 -08:00
Dane Springmeyer
3ac86f5fd3
use tree off carto object for consistency
2012-12-21 16:39:29 -08:00
Dane Springmeyer
bd17eed9f5
fix race condition in specificity tests and change expected result so all specificity tests now pass
2012-12-21 16:29:59 -08:00
Dane Springmeyer
c707188ed5
serialize json representation rather than mapnik xml for easier comparision
2012-12-21 16:12:02 -08:00
Dane Springmeyer
539d293388
fix failing zoomselector test by adjusting expected test output as it appears we were testing a bug
2012-12-21 16:11:35 -08:00
Dane Springmeyer
12cd05764b
Revert "partially fix regex nest test"
...
This reverts commit 92d239b7f8
2012-12-21 15:39:18 -08:00
Dane Springmeyer
92d239b7f8
partially fix regex nest test
2012-12-21 15:32:59 -08:00
Dane Springmeyer
a7c1e0bc49
Merge branch 'condense' of github.com:mapbox/carto into condense
2012-12-21 15:22:25 -08:00
