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

844 Commits

Author SHA1 Message Date
Konstantin Käfer
03417147e3 test fixes due to other formatting 2011-02-02 16:17:43 -05:00
Konstantin Käfer
4dcf61fead Merge branch 'master' of github.com:developmentseed/mess.js into unstable 2011-02-02 16:07:23 -05:00
Konstantin Käfer
b64965c9be make specificity tests run again 2011-02-02 14:01:40 -05:00
Konstantin Käfer
ff6ef86790 some fixes for proper rule inheritance 2011-02-02 13:47:12 -05:00
Tom MacWright
f3ad935c28 Re-add color variable support and add test to make sure that it isn't regressed again 2011-02-02 13:19:46 -05:00
Konstantin Käfer
d562e23206 YaY! we don't need split symbolizers into multiple styles anymore 2011-02-02 12:59:24 -05:00
Tom MacWright
6e04976efc Moving reference data to independent JSON file. 2011-02-02 12:53:27 -05:00
Konstantin Käfer
b0a636c4df split up loop for better readability 2011-02-02 11:48:32 -05:00
Konstantin Käfer
dfe487459b another function we don't need anymore 2011-02-02 11:48:12 -05:00
Konstantin Käfer
ca76e45e0c output correct zoomlevels 2011-02-02 11:34:53 -05:00
Konstantin Käfer
b1533c3fe3 remove unused code 2011-02-02 11:34:37 -05:00
AJ Ashton
90785a9ca4 Making stroke-gamma consistent with other line-properties. 2011-02-02 10:29:12 -05:00
Tom MacWright
32ac11d655 Support keywords with numbers. Fixes #77. 2011-02-02 10:25:49 -05:00
Dane Springmeyer
9c385c0b22 add dx,dy for both text and shield on shield symbolizer 2011-02-01 20:45:36 -08:00
Dane Springmeyer
afe4c82b1e sync minimum_distance property with mapnik trunk and add minimum_padding for text 2011-02-01 20:29:55 -08:00
Dane Springmeyer
0498898495 'ratio' should be 'text-ratio' 2011-02-01 19:54:49 -08:00
Dane Springmeyer
fe60d3e65e standardize on single quotes (trying to parse this from python) 2011-02-01 19:25:37 -08:00
Konstantin Käfer
a67e48061f should output correct xml now 2011-02-01 21:35:40 -05:00
Dane Springmeyer
b26b0e42cd add stroke gamma 2011-02-01 18:01:12 -08:00
Konstantin Käfer
c48e0ee2bf saving state of work 2011-02-01 19:49:22 -05:00
Dane Springmeyer
d39d3cb0b2 Merge branch 'master' of github.com:developmentseed/mess.js 2011-02-01 15:17:29 -08:00
Dane Springmeyer
6aa10cdd0b update reference.js with new interior placement option in mapnik for point and text symbolizers 2011-02-01 15:17:15 -08:00
Konstantin Käfer
4143a0308a Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-31 17:35:35 -05:00
Konstantin Käfer
87873c0a4c we don't have winners here 2011-01-31 17:35:10 -05:00
Tom MacWright
71aa80bfbc Fixing everything-regex 2011-01-31 16:53:19 -05:00
Tom MacWright
021b3560a7 KML and geojson support 2011-01-31 16:40:16 -05:00
Tom MacWright
237880e6fa Adding findDataFile, raster support. 2011-01-31 15:06:37 -05:00
Konstantin Käfer
dbef7372f5 updated debug function to accomodate for light selectors 2011-01-31 12:07:14 -05:00
Konstantin Käfer
e1f44f9ff5 simplify more complex filters too 2011-01-31 12:06:57 -05:00
Konstantin Käfer
eff5b3312f add mergeSelectors back in 2011-01-31 11:36:47 -05:00
Konstantin Käfer
ad48269a7a Using a simple loop speeds this up by 70ms for opened.mml 2011-01-31 09:38:40 -05:00
Young Hahn
80e24517ae Add missing return. 2011-01-31 00:13:19 -05:00
Young Hahn
89731ed7ca Merge basic URL checking from tilelive.js netlib. 2011-01-30 23:28:04 -05:00
Konstantin Käfer
444577f548 fix escaping 2011-01-30 17:27:14 -05:00
Konstantin Käfer
dc03272d34 simplify filter.val 2011-01-30 17:20:17 -05:00
Konstantin Käfer
7c0b33d946 we don't need the index 2011-01-30 16:53:20 -05:00
Konstantin Käfer
7c9619f36c we never call it without an operator. 2011-01-30 16:27:56 -05:00
Konstantin Käfer
f58baab3bd remove Comparison object in favor of a plain string 2011-01-30 16:25:36 -05:00
Konstantin Käfer
caec1412fb only continue with sound filters 2011-01-30 16:00:47 -05:00
Konstantin Käfer
7a21f1bbfe convert values to numbers when comparing ranges 2011-01-28 22:54:29 -05:00
Konstantin Käfer
561b4973db simplify selectors correctly 2011-01-28 22:15:36 -05:00
Konstantin Käfer
9cf819e695 Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-28 21:01:04 -05:00
Konstantin Käfer
6b66e23ddc correct soundness check and add tests for it 2011-01-28 21:00:36 -05:00
Tom MacWright
ace2767273 Proper error handling for HTTP >= 400. 2011-01-28 17:54:57 -05:00
Konstantin Käfer
1010cb5f24 add superset detection and fix soundness check 2011-01-28 17:41:20 -05:00
Tom MacWright
c01b57eb07 KML test 2011-01-28 17:09:32 -05:00
Tom MacWright
2991e1db27 Cleaning up external and external tests 2011-01-28 17:00:31 -05:00
Konstantin Käfer
9ceba57511 only calculate the selector ID when we need it. down to 600ms for the opened benchmark 2011-01-28 16:54:16 -05:00
Konstantin Käfer
448516d002 use prototype directly instead of Object.getPrototypeOf. This breaks cloning of subclasses which we don't have anyway. 
also do lightweight clones of the selector object
 2011-01-28 16:36:19 -05:00
Konstantin Käfer
17e926df0b move elements parameter to third position 2011-01-28 16:17:20 -05:00
Konstantin Käfer
73dbcaed0d create instances on the fly 2011-01-28 16:15:02 -05:00
Konstantin Käfer
d2bc9c18d0 Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-28 16:10:07 -05:00
Konstantin Käfer
c0ac2e477f replace __default__ with undefined/empty string 2011-01-28 16:09:50 -05:00
Tom MacWright
a7e7c3388e Adding BuildingSymbolizer 2011-01-28 15:47:59 -05:00
Konstantin Käfer
c5108fb786 Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-28 15:46:22 -05:00
Konstantin Käfer
d347665f10 make condition resolving less complex 2011-01-28 15:46:07 -05:00
Tom MacWright
3617d41b9e toString of filter comparison needs to be XML-safe. possibly should be renamed toXML, but right now causes mapnik failure 2011-01-28 13:02:39 -05:00
Tom MacWright
8b731764a0 Adding type for variable error 2011-01-28 11:23:50 -05:00
Tom MacWright
1782e81407 Adding first error test, and error testing framework 2011-01-28 11:08:38 -05:00
Konstantin Käfer
c2931d8983 add an id to selectors 2011-01-27 22:10:31 -05:00
Konstantin Käfer
4e0fee38b4 Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-27 21:50:31 -05:00
Konstantin Käfer
7acc9ac89c simplify filters as we go 2011-01-27 21:50:15 -05:00
Konstantin Käfer
d06ea5e4fc filters are now indexed by hash as opposed to throwing them in an array 2011-01-27 20:50:53 -05:00
Dane Springmeyer
e1726ccbbf skip directories rather than throwing 2011-01-27 16:56:18 -08:00
Tom MacWright
2fe17cf5e3 Support external images for background-images 2011-01-27 19:01:38 -05:00
Tom MacWright
bb765146f1 Support JPEG as well 2011-01-27 19:01:21 -05:00
Tom MacWright
fb7b73a8d0 Re-adding all-equal optimization 2011-01-27 17:14:31 -05:00
Konstantin Käfer
d6f3f6b2f8 Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-27 16:52:24 -05:00
Konstantin Käfer
0065de0e64 change tree.Zoom to use bitmasks instead of arrays 2011-01-27 16:52:07 -05:00
Tom MacWright
7833b26ade Properly handle no-closing } parser failures. 2011-01-27 16:39:35 -05:00
Tom MacWright
b8d4735179 Complete refactor of error reporting, which needs 
the attendant commit in TM. Fixes #71, breaks
one error: closing brackets.
 2011-01-27 16:11:58 -05:00
Konstantin Käfer
f889597358 Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-27 16:00:07 -05:00
Tom MacWright
18471b2ab5 Validate font if any font in a fontset is available 2011-01-27 11:44:05 -05:00
Tom MacWright
b0cec7ca1d Support values separated only by commas, and fix multi-font validation. Fixes #70. 2011-01-27 11:35:29 -05:00
Tom MacWright
10cf45f423 Tweak validation fail language 2011-01-27 10:58:21 -05:00
Tom MacWright
c2ad0c0d88 Fixing tricky syntax error in font validation. 2011-01-27 10:52:28 -05:00
Konstantin Käfer
2012d1a99a more instrumentation 2011-01-27 10:17:45 -05:00
Konstantin Käfer
4c40bcc2c5 add some time instrumentation 2011-01-27 10:06:56 -05:00
Tom MacWright
b5625ff29d Micro-optimization for large rule #s 2011-01-27 09:58:22 -05:00
Tom MacWright
047fc6e88b Outputting errors in messc again. 2011-01-27 09:56:39 -05:00
Konstantin Käfer
2590b987d6 microoptimizations for shortcut 2011-01-27 09:38:46 -05:00
Tom MacWright
01035a8805 Handling float values in filters. 2011-01-27 09:24:15 -05:00
Konstantin Käfer
b699baaa71 Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-26 18:50:02 -05:00
Konstantin Käfer
bfc5b90c7c microoptimizations 2011-01-26 18:49:43 -05:00
Tom MacWright
19fbde80d6 Fix tests with shortcut 2011-01-26 18:43:54 -05:00
Tom MacWright
71e33ad325 Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-26 18:34:07 -05:00
Tom MacWright
04a60bfba5 Add gnarly optimizations for single-selector equality lines 2011-01-26 18:34:03 -05:00
Konstantin Käfer
2e09386b4c remove unneeded sort 2011-01-26 18:24:52 -05:00
Tom MacWright
b2c8d2800a Adding req_prop_list_cache 2011-01-26 18:04:53 -05:00
Tom MacWright
9506b27515 Adding rules cache. 2011-01-26 17:56:46 -05:00
Tom MacWright
facc5b7b94 First tiny performance stub 2011-01-26 17:41:14 -05:00
Konstantin Käfer
abbc323fee completely rework selector splitting to accomodate for all edge cases 2011-01-26 16:59:18 -05:00
Tom MacWright
1f97c050bf Remove external dependency 2011-01-26 16:19:08 -05:00
Tom MacWright
b42cee2dff Documenting new arg 2011-01-26 14:20:17 -05:00
Tom MacWright
104c2e09f3 Switching to non-blocking version of zipfile 
bindings. Requires re-ndistro. Fixes #66.
 2011-01-26 14:03:58 -05:00
Tom MacWright
3a20bea0dd Adding dy/dx to shield 2011-01-26 13:34:16 -05:00
Tom MacWright
155438fe7c Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-26 12:51:42 -05:00
Tom MacWright
b1cb94e904 Fix rendering of stylesheets without deffered stuff 2011-01-26 12:51:36 -05:00
Konstantin Käfer
b02d2f9625 Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-26 12:44:29 -05:00
Konstantin Käfer
daeba23782 call the right function 2011-01-26 12:44:03 -05:00
Tom MacWright
b05c3e99ec Adding support for external URLs. Test on deck. 2011-01-26 12:24:35 -05:00
Konstantin Käfer
7e2d2366df resolve some more potential race conditions with Step 2011-01-26 11:58:50 -05:00
Konstantin Käfer
103ac1b4b9 move merging code into separate function 2011-01-26 11:55:04 -05:00
Konstantin Käfer
b49e0be3e2 resolve race condition with multiple stylesheets: 
The group() that is incrementing the wait counter was called in the readFile callback. This means that depending on IO speed, it sometimes fired before the others, sometimes after the others. This lead to situations where sometimes, stylesheets were not decoded correctly.
 2011-01-26 11:49:53 -05:00
Konstantin Käfer
7f033b640d include the renamed file 2011-01-26 11:49:38 -05:00
Konstantin Käfer
fca6f37a7f rename ZoomFilter to Zoom to reflect that it's no longer treated as a Filter 2011-01-26 11:36:07 -05:00
Konstantin Käfer
d772884d13 Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-26 11:35:10 -05:00
Konstantin Käfer
51f12c9198 split up zoomlevels into a separate thing. they are no longer in the filters array 2011-01-26 11:34:51 -05:00
Tom MacWright
314035e5d7 Fixing renderer code style. 2011-01-26 11:31:35 -05:00
Tom MacWright
f0bab393f0 Fixing multiple on-disk stylesheets. Fixes #67. 2011-01-26 11:12:42 -05:00
Konstantin Käfer
5bd5b0fe9d handle partial overrides correctly 2011-01-25 19:09:02 -05:00
Konstantin Käfer
cfac34fef8 fix #63: support = for zoomlevels 2011-01-25 18:21:53 -05:00
Tom MacWright
925ead096b Never print debugging to stdout. Fixes #64 2011-01-25 17:37:09 -05:00
Tom MacWright
fec9ff60ac Re-add required properties. Fixes #61. 2011-01-25 16:44:18 -05:00
Tom MacWright
00d144bc08 Gracefully handle failing XML files, for error reporting 2011-01-25 16:15:20 -05:00
Konstantin Käfer
cc746a591e make sure we're not iterating over filters other than zoomfilter 2011-01-25 16:10:37 -05:00
Konstantin Käfer
57eddba1ca Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-25 15:42:35 -05:00
Konstantin Käfer
dc659fef8d find shapefiles asynchronously in unzipped folders 2011-01-25 15:42:14 -05:00
Young Hahn
948710c151 Add External to mess exports. 2011-01-25 15:28:33 -05:00
Konstantin Käfer
9358b8b58f add names to functions to be more descriptive 2011-01-25 14:40:39 -05:00
Konstantin Käfer
1e17152cf0 use different callbacks for error and success 2011-01-25 14:38:37 -05:00
Konstantin Käfer
5a4184882a fix #60: don't download the same file twice 2011-01-25 14:17:08 -05:00
Konstantin Käfer
3b102afc8e use full URL for status messages 2011-01-25 14:16:03 -05:00
Konstantin Käfer
1f9553968f fix #57: correctly chunk comments that are not separate by whitespace 2011-01-25 13:39:10 -05:00
Konstantin Käfer
bd7e9ee36c remove accidental function name 2011-01-25 12:41:46 -05:00
Konstantin Käfer
dcad607704 Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-25 12:40:03 -05:00
Konstantin Käfer
7e33846de5 fix #54: simplify filters for contradicting rules and ignore unsound rules alltogether 2011-01-25 12:39:20 -05:00
Tom MacWright
4342f98a11 Fixing markerssymbolizer properties 2011-01-25 12:37:58 -05:00
Konstantin Käfer
bbcca46f6f make objects easier recognizable with obj.constructor.name 2011-01-25 11:56:07 -05:00
Konstantin Käfer
19482586f9 remove options that no longer work, fix #55 2011-01-25 09:46:35 -05:00
Tom MacWright
d54b36729b Catch syntax errors. Also, don't let comment regex make weird behavior. Also, only let error() record, never let it throw. 2011-01-24 18:32:18 -05:00
Konstantin Käfer
8ba60b3e0d only fire callback when we're really ready 2011-01-24 18:28:07 -05:00
Konstantin Käfer
986624accc don't create directory tree for caching files 2011-01-24 18:17:35 -05:00
Konstantin Käfer
32510d8fd0 use the .shp file from extracted zipfiles 2011-01-24 18:14:54 -05:00
Konstantin Käfer
ed38139c0b refactor external to make tests working 2011-01-24 17:23:18 -05:00
AJ Ashton
32b81b142d Proper mapnik syntax for text-transform. 2011-01-24 16:49:04 -05:00
Tom MacWright
05a782a370 Unique fontsets. 2011-01-24 16:14:28 -05:00
Tom MacWright
49bb63d666 Switching up toString method in getMapProperties 2011-01-24 15:21:42 -05:00
Tom MacWright
d1c660bf96 Removing returnErrors indirection 2011-01-24 15:20:18 -05:00
Tom MacWright
93f66ec41a Fixing variable support, removing annoying 
toString method on rule, more to go.
 2011-01-24 15:08:47 -05:00
Tom MacWright
6882f772c8 Cleaning up renderer exception handling 2011-01-24 14:33:30 -05:00
Tom MacWright
a2732bbe9b Reasonable defaults in selectors 2011-01-24 14:32:39 -05:00
Tom MacWright
d938bf7dde Catching but not catching errors is weird behavior 2011-01-24 13:53:38 -05:00
Tom MacWright
3a87423e9d Comment no longer applies 2011-01-24 13:42:56 -05:00
Tom MacWright
e20b6be6cd Cleaning up renderer, fixing zoom denominators for multiple symbolizers. Fixes #53. 2011-01-24 13:42:14 -05:00
Tom MacWright
76122df6f2 First pass at tilemill-friendly validation 2011-01-24 12:50:42 -05:00
Tom MacWright
3a727b1e47 Remove sys inspect on errors, not very user-friendly 2011-01-24 12:50:12 -05:00
Tom MacWright
b05b2c285a Removing final traces of compress, cleaning up zoomfilter 2011-01-24 12:49:19 -05:00
Konstantin Käfer
c3d0f91410 don't overwrite values in the passed in env variable 2011-01-24 12:38:12 -05:00
Tom MacWright
ab0e95385c Catch non-zipfile errors 2011-01-24 10:46:35 -05:00