Commit Graph

465 Commits

Author SHA1 Message Date
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
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
04cf9013a8 Rewrite zoom filters as objects, support variables in zoom definitions. 2012-12-20 12:37:38 -05:00
Tom MacWright
3c4baaf8cb Update filtervariable test 2012-12-20 11:13:18 -05:00
Tom MacWright
f693f062ec Allow for filters which compare fields. 2012-12-19 18:59:16 -05:00
Tom MacWright
73f544333a Remove straggling import stuff 2012-12-19 18:24:35 -05:00
Tom MacWright
84a34be10a Add filter test 2012-12-19 17:37:17 -05:00
Tom MacWright
180cd0cc6e Add field test 2012-12-19 17:34:34 -05:00
Tom MacWright
9eee907467 Simplify filter system, support numeric variables in filters 2012-12-19 17:01:35 -05:00
Tom MacWright
8603799fa7 Add oneline test 2012-12-19 14:19:13 -05:00
Dane Springmeyer
0d294c1075 add standalone mss rendering tests for desired empty style dropping behavior - refs #219 2012-12-18 18:25:13 -08:00
Dane Springmeyer
23d11fedc6 skip mss that is valid 2012-12-18 16:40:11 -08:00
Dane Springmeyer
675158cba9 call path.basename on mss filename input 2012-12-18 16:24:14 -08:00
Dane Springmeyer
75875e2781 add tests for #214 - test 'a' currently fails for me 2012-12-18 16:12:47 -08:00
Dane Springmeyer
cd948535a5 add test for #218 2012-12-18 16:09:31 -08:00
Dane Springmeyer
4825f9aee8 only call done when the test is actually finished, whether error or not - refs #210 2012-12-18 16:02:44 -08:00
Dane Springmeyer
7d7cc2653c add tests specifically of error handling of parsing standalone mss files 2012-12-18 15:51:39 -08:00
Tom MacWright
f41312597c Move .is to prototype, start testing quoteds 2012-12-18 17:16:40 -05:00
Tom MacWright
4181df378f Rewrite filterset in more vanilla-javascript style, add more tests 2012-12-18 16:50:53 -05:00
Tom MacWright
13bc8c3488 Start on a condense branch. This is related to #20
See https://gist.github.com/4329932 for more detail.
2012-12-18 13:27:04 -05:00
Tom MacWright
25a2940ebc Fix regex nesting inheritance 2012-12-06 12:48:09 -05:00
Tom MacWright
2fcbdaacfd Stricter equality for empty string arguments to functions, and tests. 2012-11-29 15:17:06 -05:00
Dane Springmeyer
8ef4efbe39 fix handling of no errors from error handling tests - closes #210 2012-11-29 11:36:39 -08:00
Dane Springmeyer
dc798c0e07 Merge branch 'master' of github.com:mapbox/carto 2012-10-24 13:06:02 -07:00
Dane Springmeyer
410f47b5ce report correct, current carto version via package.json - closes #205 2012-10-24 13:04:25 -07:00
Tom MacWright
8fc2c06b45 Evaluate calls before keywords. Fixes #203 2012-10-21 17:57:45 -04:00
Tom MacWright
f9fcffeeba Fix nested class behavior. This changes the output of complex_cascades
and changes current behavior, but to the best of my sleep-deprived
cognition I think we were testing for incorrect behavior.
2012-10-15 10:16:27 -07:00
Tom MacWright
00e797dc2d Did you mean for properties, with proper levenstein distance for
better matching. Fixes #199
2012-10-09 21:30:42 -04:00
Tom MacWright
e7658c618e Much better error reporting, did you mean 2012-10-09 09:09:17 -04:00
Tom MacWright
45657268f9 More verbose and informative error messages, especially when dealing
with keyword values. Fixes #109
2012-10-08 18:39:09 -04:00
Tom MacWright
1d9b5d93ca Permit keywords as strings. Fixes #193 2012-10-08 18:28:27 -04:00
Tom MacWright
4b7fc5fb57 Fix concatenation of strings with variables and other strings 2012-10-08 18:12:54 -04:00
Tom MacWright
3d216f6295 Test for #192 to keep it closed 2012-09-29 16:54:10 -04:00
Tom MacWright
101026fe3c Fix parsing of selectors with comments between elements.
This brings over cloudhead/less.js@3331637913 and fixes #179
2012-09-21 14:52:47 -04:00
Tom MacWright
912988e174 Fix parsing of whitespace in calls.
This brings over cloudmade/less.js@333d1def4 to permit whitespace in
front of arguments of function calls, and tweaks the related test to
make sure it stays that way. This fixes #154
2012-09-21 14:27:19 -04:00
Tom MacWright
033a5cd5a5 Add missing MML file for transforms test 2012-09-21 14:20:21 -04:00
Dane Springmeyer
6a794cd610 add raster-mesh-size test and bump to 0.9.2 2012-09-06 22:33:27 -07:00
Dane Springmeyer
63152ef4e3 fix tests 2012-09-06 22:31:31 -07:00
Tom MacWright
829fe84baf Add unsigned support and test code 2012-09-04 12:57:25 -04:00
Dane Springmeyer
874f51870a adapt to Mapnik 2.1 syntax for new features that are settling out - specifically now using commas to separate chained transforms or image-filters and using () in agg-stack-blur image filter - refs #171 and #140 2012-08-14 13:26:33 -07:00
Dane Springmeyer
53e7ece4cc finish update to use mapnik-reference 0.4.0 2012-08-01 18:16:48 -07:00
Dane Springmeyer
3710517fdc bump to 0.9.0 with breaking rename changes in experimental features via mapnik-reference 2012-08-01 17:55:56 -07:00
javi
6fb339e21c test files 2012-07-25 17:42:49 +02:00
Tom MacWright
bfc92c26bc Stubbing out assert, trying to get higher-level stylesheets 2012-07-18 17:27:19 +02:00
Tom MacWright
f11259d734 Carto, with a few small tweaks, starting to operate in-browser 2012-07-18 17:27:19 +02:00
Tom MacWright
05718df884 Push to 0.8.0, push mapnik-reference dependency to 3.0.0. Changes are
detailed in the CHANGELOG and are extensive; this is
backwards-compatible and introduces new field and functions types
in reference.json which allow more powerful use of transforms,
image filters, and expressions in Mapnik
2012-06-28 14:17:17 -04:00
Tom MacWright
255b0219b6 Merge 2012-06-28 13:58:04 -04:00
Tom MacWright
d57006dd97 Add advanced field test, fixes for combining fields with colors that otherwise go back to mapnik 2012-06-27 14:58:56 -04:00
Tom MacWright
651a650f2e Simplify quoted implementation, move field logic up to
operate level, add Literal, add tests for transforms with fields.
2012-06-26 17:54:01 -04:00
Tom MacWright
a66fa6c462 Fix quoting situation around fields 2012-06-26 17:03:34 -04:00
Tom MacWright
672a271cbe Change field result, fix building height result. 2012-06-26 14:41:13 -04:00
Tom MacWright
d7e6cdf082 Improve operating with mapnik field types 2012-06-26 12:57:10 -04:00
Tom MacWright
bdfcd7aa6d Note some new features in the changelog, add modulus operation 2012-06-26 12:37:05 -04:00
Tom MacWright
28ab872e72 Support operations between strings and fields, support concatenating
strings.
2012-06-26 12:14:13 -04:00
Tom MacWright
ea89af6ae2 Add field type, parsing, and failing test. 2012-06-22 18:35:00 -04:00
Tom MacWright
265554813b Update results for temporary image-transform renaming, update
reference to mapnik-reference to point to the transforms branch,
prep a changelog message
2012-06-22 18:06:15 -04:00
Tom MacWright
a941bda795 Add backwards compatibility for transforms tests 2012-06-22 12:38:20 -04:00
Tom MacWright
e27ce12ea0 Support variables and expressions as the arguments to functions. 2012-06-22 12:32:36 -04:00
Tom MacWright
42784dcca2 Revert last, still in transforms branch 2012-06-20 19:04:18 -04:00
Tom MacWright
5ff9051104 Support named transforms in Carto with variable interpolation. Removes
Anonymous type.
2012-06-20 17:34:27 -04:00
Tom MacWright
4c3aa03012 Version 0.7.0: adds style level opacity support. Fixes #146. 2012-06-19 17:33:42 -04:00
Tom MacWright
c7a3ded1a2 Version 0.6.0, push mapnik-reference dep 2012-06-19 16:11:45 -04:00
Tom MacWright
b839983a9f Bump mapnik-reference dependency, add result for image_filters operation 2012-06-18 16:28:51 -04:00
Tom MacWright
40b032c9bb Remove reference.json in favor of adding a mapnik-reference
dependency which will update easily from the other repository.
Also update tests for 2.1.0 compatibility
2012-06-18 15:35:19 -04:00
Tom MacWright
fef914cdc2 Support future syntax of agg-stack-blur 2012-05-22 16:19:28 -04:00
Tom MacWright
3e3b4f09bc Add comp-op support. 2012-05-10 18:28:57 -04:00
Tom MacWright
66012862db Working push. Still needs agg-gradient 2012-05-10 18:12:51 -04:00
Tom MacWright
5efa4bd40e First push toward compositing 2012-05-10 17:08:09 -04:00
Tom MacWright
262ef7e722 Add regex filter, tests, clean up code more. Fixes #66 2012-05-08 15:26:08 -04:00
Tom MacWright
9960cd2667 Add maximum-extent property. Fixes #43. 2012-05-08 12:30:28 -04:00
Tom MacWright
afad11d3fe XML-escape quotes in quoted values. 2012-05-02 14:05:38 -04:00
Tom MacWright
a7748e6392 Port tests to mocha, remove many global variable leaks. 2012-05-02 12:56:38 -04:00
Tom MacWright
34deb99997 Add test suite for #32 2012-05-02 12:08:10 -04:00
Tom MacWright
c48a02196e Adding error tests for 119 and 124. Fixes #124 2012-05-01 15:48:01 -04:00
Tom MacWright
d17416b54f Test for 123 fix. Fixes #123 2012-05-01 15:17:46 -04:00
Young Hahn
b644e9588b Add test for parameter rendering. 2012-04-30 02:48:22 -04:00
Young Hahn
5e63b49558 Remove irrelevant/unused MML keys. 2012-04-30 02:22:47 -04:00
Dane Springmeyer
c1b4903c0f remove unused 'sys' module usage avoiding deprecation warning 2012-04-16 15:33:31 -07:00
Dane Springmeyer
d01c45d714 carto works fine with node v6, so allow it 2012-03-07 12:42:16 -08:00
Tom MacWright
90fbe75213 Adding quick test case for not-enough-args error 2011-12-07 22:58:51 -05:00
Tom MacWright
f03aee60c6 Ignoring more 2011-10-20 11:33:31 -07:00
Tom MacWright
e830559d81 Fixing other test cases for new textsymbolizer syntax 2011-10-20 04:42:36 -04:00
Tom MacWright
5b3e00af97 Fix complexfontset test 2011-10-20 04:25:53 -04:00
Tom MacWright
9b295d6909 Fix tests for layer-less output, and fix background_attributes test for no-layer-when-not-needed change. 2011-10-13 11:47:55 -04:00
Tom MacWright
d607326cc7 Don't tolerate no-selector elements, tolerate Map, adds tests 2011-10-13 11:12:50 -04:00
Tom MacWright
b1da1af86c Nopound tests 2011-10-13 10:59:54 -04:00
Konstantin Käfer
79abfa1436 allow adding multiple instances of a symbolizer by prefixing new
instances with name/ (where name can be any string)
2011-09-12 10:22:18 +02:00
Will White
3a7f7d4375 Merge branch 'master' of github.com:mapbox/carto 2011-09-06 12:52:35 -04:00
Will White
db733702e9 Rename attributes to properties. 2011-09-06 12:49:50 -04:00
Tom MacWright
5785d4d63a Adding test case for #100 2011-09-06 11:08:28 -04:00
Tom MacWright
70cc208e62 Add new tests, tree.Filter fix. 2011-09-06 11:00:14 -04:00
Tom MacWright
fbf9b22931 Supporting attributes: {} on layers. Includes tests. 2011-08-30 18:20:13 -04:00
Tom MacWright
dec481c76c Adding Issue #60 tests 2011-08-30 18:19:39 -04:00
Tom MacWright
73ab87dcce Updating tests to deal with correct symbolizer order. Fixes #60 2011-08-30 16:51:24 -04:00
Tom MacWright
42e3260386 Addressing #60, but this could be cleaner 2011-08-30 16:42:20 -04:00
Tom MacWright
ac00f32e0d Cheap addition of node order. Fixes #94 2011-08-30 16:01:10 -04:00
Tom MacWright
754221fd2e Fix color variable test 2011-08-30 15:30:05 -04:00
Tom MacWright
94df025cc6 Adding test that includes HSL colors 2011-08-26 16:17:09 -04:00
Tom MacWright
d3b2bfc199 Adding should-be-failing test for #60 2011-08-24 12:25:02 -04:00
Tom MacWright
7c2a5aa9a1 Fix multiple inheritance, fixes #74. Introduces Filterset.clone() 2011-08-24 11:22:44 -04:00
Tom MacWright
4ccd95aaee Adding failing test for #74 2011-08-23 16:14:18 -04:00
Tom MacWright
e8d985efd4 Adding zoomselector test 2011-08-23 16:09:56 -04:00
Tom MacWright
f6b5f5785a Adding nested classes test and fixed specificity test runner 2011-08-22 16:21:57 -04:00
Tom MacWright
86e79b9b2c Fixing high zoom levels, adding test. Addresses #48, needs confirmation 2011-08-19 14:46:43 -04:00
Young Hahn
25e1757597 Accept valid Map properties directly from input mml object. 2011-07-27 17:16:01 -04:00
Young Hahn
e14d8f3720 Use Error objects. 2011-07-25 02:26:20 -04:00
Young Hahn
5375ca0540 Initial gutting of externals. 2011-07-22 13:48:52 -04:00
Tom MacWright
eea30fe6bb Merge branch 'master' of github.com:mapbox/carto 2011-07-21 10:34:09 -04:00
Tom MacWright
209df3edc5 Adding filter variable result 2011-07-21 10:34:01 -04:00
Young Hahn
51d6768ac4 Update md5sum for couchsurf.kml 2011-07-20 19:09:18 -04:00
Tom MacWright
02b4ff4008 Support variables in filters on the lhs 2011-07-01 13:26:45 -04:00
Tom MacWright
6b9e97f87c Fixes #21: de-dedup fontsets beyond the first. 2011-06-15 18:13:51 -04:00
Tom MacWright
c8b9051faf Support keyword arguments with underscores: Fixes
#57
2011-06-15 18:02:20 -04:00
Young Hahn
25008d9121 Node 0.2-friendly require paths. 2011-05-26 14:07:50 -04:00
Young Hahn
26ae82fb23 Fix test requires. 2011-05-26 11:04:31 -04:00
Young Hahn
210d0be7bd Node 0.4 compatibility. 2011-05-26 11:04:20 -04:00
Young Hahn
dfa2af8a23 Fix require paths for test. 2011-05-25 13:57:35 -04:00
Tom MacWright
4c30131e4f Merging package. Supporting variables in filters 2011-05-17 13:54:44 -04:00
Dane Springmeyer
f5fee15c91 add +wktext to all spherical mercator proj4 strings 2011-05-12 11:33:58 -07:00
Dane Springmeyer
c03b6334c6 add +over to proj4 mercator definitions - see https://github.com/mapbox/tilemill/issues/330 2011-05-10 17:07:23 -07:00
Dane Springmeyer
a57b08dc95 add +over to proj4 mercator definitions - see https://github.com/mapbox/tilemill/issues/330 2011-05-10 17:05:07 -07:00
Tom MacWright
0e005fe21d Tagging 0.1.5 2011-05-03 11:12:36 -04:00
Tom MacWright
9a473d38ed Marker type is now marker-type 2011-04-14 10:21:07 -04:00
Tom MacWright
6626b3257e Catch several more classes of undefined variable errors. Fixes TM#278 2011-03-14 11:15:36 -04:00
Tom MacWright
bc8e0e5131 Fix raster rendering test. 2011-02-18 14:44:28 -05:00
Tom MacWright
7c1cea7f0a Ignore dotfiles and dot-directories. TM #210 related. 2011-02-17 10:08:21 -05:00
Tom MacWright
27ec5bb47c Adding VIM syntax generation 2011-02-11 09:59:07 -05:00
Konstantin Käfer
59fe61267f remove id in favor of name and make sure only valid rules are added to <Map> 2011-02-07 14:22:10 -05:00
Tom MacWright
f71f5bca71 Raster rending test 2011-02-07 13:38:51 -05:00
Konstantin Käfer
1f4f2a1340 reverse output rules 2011-02-07 12:51:38 -05:00
Konstantin Käfer
7f1e1be32c rename _ to - 2011-02-07 12:50:41 -05:00
Konstantin Käfer
0b5d35c8d0 print errors when tests fail 2011-02-07 12:50:04 -05:00
Konstantin Käfer
7760bbabec replace xml2js 2011-02-07 12:41:00 -05:00
Konstantin Käfer
e9974c2a11 test filterset 2011-02-07 11:26:04 -05:00
Konstantin Käfer
34b6a4bdc0 Merge branch 'master' of github.com:mapbox/carto 2011-02-07 11:23:53 -05:00
Tom MacWright
3147a89a48 Rename mess to carto. 2011-02-07 11:22:14 -05:00
Konstantin Käfer
17ee133fe5 update test case to the change that put selectors at the position of their first own rule 2011-02-07 11:17:39 -05:00
Konstantin Käfer
5f48e6a92b use color variables without the @ sign. You can still do operations with colors, like "green + #222" 2011-02-07 11:17:10 -05:00
Konstantin Käfer
3e0f28b421 fix test for proper variable quoting 2011-02-02 18:02:00 -05:00
Konstantin Käfer
460b44eeeb fix remaining test and remove outdated tests 2011-02-02 17:10:17 -05:00
Konstantin Käfer
50b9e86037 fix test 2011-02-02 16:45:14 -05:00