Commit Graph

1685 Commits

Author SHA1 Message Date
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
Dane Springmeyer
a55b4ca0e9 disable mss tests for now since they are intentionally failing - lets focus on unintential failures 2012-12-21 15:22:14 -08:00
Tom MacWright
958b61c343 Fix specificity tests 2012-12-21 18:17:59 -05:00
Dane Springmeyer
0a9cb6afe7 Merge branch 'condense' of github.com:mapbox/carto into condense 2012-12-21 15:16:26 -08:00
Tom MacWright
67b66b5568 Fix zoom interpretation in helper 2012-12-21 18:15:31 -05:00
Dane Springmeyer
9967393820 cleanup old failures that now pass 2012-12-21 15:14:36 -08:00
Tom MacWright
75f55f8d04 Update specificity test helper 2012-12-21 18:13:36 -05:00
Dane Springmeyer
2aba917e3d merge master into condense to bring in further race condition fixes in errorhandling tests 2012-12-21 15:13:22 -08:00
Dane Springmeyer
f2a6922586 fix race condition in renderer test and write failures instead of diffing since this can crash on large diffs like the fontset dupe test 2012-12-21 15:05:17 -08:00
Tom MacWright
f6c07afee6 Refine heap performance. Switch back to underscore since lodash does npm
all wrong.
2012-12-21 16:53:38 -05:00
Tom MacWright
22f5d0cc45 Support : in column names 2012-12-20 17:49:11 -05:00
Tom MacWright
f4722f516e Fix tiny, critical bug 2012-12-20 17:42:41 -05:00
Tom MacWright
607c4dba5a Be a little safer with naming 2012-12-20 17:35:03 -05:00
Tom MacWright
b3b7fec337 Compare filters numerically if possible 2012-12-20 15:45:43 -05:00
Tom MacWright
5145655c46 Remove oneline tests for now, update external image 2012-12-20 15:37:12 -05:00
Tom MacWright
a106e2768f Revert "Update chunker to less.js's version. Fixes #184"
This reverts commit 78b3a5a5d4.
2012-12-20 14:36:04 -05:00
Tom MacWright
04cf9013a8 Rewrite zoom filters as objects, support variables in zoom definitions. 2012-12-20 12:37:38 -05:00