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

670 Commits

Author SHA1 Message Date
Tom MacWright
7b8641abeb Fixing up rule logic, letting styles output XML 2011-01-20 16:20:45 -05:00
Tom MacWright
3e9c1d67be Add style concept, start to rename toCSS to toXML 2011-01-20 15:48:44 -05:00
Tom MacWright
872ca02f41 Documentation, hints 2011-01-20 15:38:45 -05:00
Tom MacWright
5f5320a6bc Adding combinedFilter logic, fixing filter negation by creating proper Filter objects 2011-01-20 15:34:19 -05:00
Tom MacWright
f02e656679 Iterate in reverse, don't reverse an array just to be lazy 2011-01-20 15:19:05 -05:00
Tom MacWright
de32daa0a8 Filter negation 2011-01-20 15:16:30 -05:00
Tom MacWright
7c81eb353d Adding inheritance to demo.mss, moving utilities from Ruelset to Definition, working on process_chain. 2011-01-20 15:06:23 -05:00
Tom MacWright
eaabbf1f3e Splitting into chains, fixing negation 2011-01-20 14:47:34 -05:00
Tom MacWright
fc734c3637 Adding symbolizer splitting logic. 2011-01-20 14:20:33 -05:00
Konstantin Käfer
0a5af927e3 Merge branch 'unstable' of github.com:developmentseed/mess.js into unstable 2011-01-20 14:11:58 -05:00
Konstantin Käfer
dff0af3fdf add the index of the selector declaration to the specificity for correct ordering. rules that appear later in the file appear earlier in the resulting array 2011-01-20 14:11:16 -05:00
Tom MacWright
54141df94d Document 2011-01-20 12:47:35 -05:00
Tom MacWright
ecb0a4c26b Making zoomfilter work with negate 2011-01-20 12:36:56 -05:00
Tom MacWright
752dd391b5 Adding symbolizers() function to rulesets 2011-01-20 12:34:20 -05:00
Tom MacWright
7c143f4893 Basic filter negation 2011-01-20 12:28:59 -05:00
Tom MacWright
8c801b1e09 Don't use reserved words 2011-01-20 12:20:21 -05:00
Tom MacWright
6838e1ace5 Clean up zoomfilter 2011-01-20 12:03:43 -05:00
Tom MacWright
a9711bc96c Missing colons 2011-01-20 11:57:28 -05:00
Tom MacWright
3ded111f7e Merging, adding zoomfilter element type 2011-01-20 11:55:03 -05:00
Tom MacWright
6571489ef9 Adding zoomfilter type to alleviate filter complexity 2011-01-20 11:53:28 -05:00
Konstantin Käfer
ef597af7c0 rename rulesets to definitions 2011-01-20 11:48:00 -05:00
Konstantin Käfer
004578c2b6 add definition class for flattened rulesets 2011-01-20 11:45:29 -05:00
Konstantin Käfer
ff18eadf94 Merge branch 'unstable' of github.com:developmentseed/mess.js into unstable 2011-01-20 11:18:48 -05:00
Tom MacWright
1860ded45e Condensed style & debug 2011-01-20 11:17:06 -05:00
Konstantin Käfer
a8a91949fa doc 2011-01-20 11:15:17 -05:00
Konstantin Käfer
9eda5f7f2a Merge branch 'unstable' of github.com:developmentseed/mess.js into unstable 
Conflicts:
	lib/mess/renderer.js
 2011-01-20 11:13:55 -05:00
Konstantin Käfer
15fd744a54 split up selectors 2011-01-20 11:12:51 -05:00
Tom MacWright
2ccf7bc604 Fixing merge error 2011-01-20 11:04:22 -05:00
Tom MacWright
e71d9f00fc Merge branch 'unstable' of github.com:developmentseed/mess.js into unstable 2011-01-20 11:00:00 -05:00
Tom MacWright
c53115dfce Make logic more consistent. 2011-01-20 10:59:28 -05:00
Konstantin Käfer
95407e6d1f merge changes 2011-01-20 10:57:10 -05:00
Tom MacWright
b45dd638fe Match classes, keep plain strings for class and id name interfaces. 2011-01-20 10:51:19 -05:00
Tom MacWright
0d67673544 Remove obsolete functions 2011-01-20 10:42:07 -05:00
Konstantin Käfer
b6f4ef57e3 change toMSS so that it returns the AST and remove some of the _ dependency 2011-01-20 10:35:01 -05:00
Konstantin Käfer
ca180ccc59 starting to process the styles from the layer's perspective 2011-01-20 09:59:28 -05:00
Tom MacWright
73e8cc8b7e Rewrite specificity to not break at > 10, rewrite specificitySort 2011-01-19 18:17:02 -05:00
Tom MacWright
394dfdf8ab Fix up zoom level interactions 2011-01-19 18:07:35 -05:00
Tom MacWright
bde844e349 Adding zoom-level logic 2011-01-19 18:01:41 -05:00
Tom MacWright
98de9014d5 Backporting filter-comparison fix 2011-01-19 18:01:30 -05:00
Tom MacWright
0db6a04ca9 Cleaning ruleset code. 2011-01-19 18:01:17 -05:00
Tom MacWright
af9194dbfb Zoom range formalizing. 2011-01-19 17:37:47 -05:00
Tom MacWright
3550af0838 Filters are specific too, like cascadenik specifies. 2011-01-19 17:08:12 -05:00
Tom MacWright
10f0d4a7be Document newly written functions. 2011-01-19 16:46:34 -05:00
Tom MacWright
ea5f76c8cf Adding reduceRules - see commented code to check out 2011-01-19 16:28:52 -05:00
Tom MacWright
cdf63cb997 Add matchingRulesets function for determing rulesets 2011-01-19 16:02:09 -05:00
AJ Ashton
40dab880d5 No space in >= or <= 2011-01-19 16:01:43 -05:00
Tom MacWright
7279375d6c Class matching as well 2011-01-19 15:39:50 -05:00
Tom MacWright
066ba365fc Selector matching 2011-01-19 15:36:35 -05:00
Tom MacWright
37292a0c22 Remove parser.toAST, remove ruleset.toAST 2011-01-19 15:18:57 -05:00
Tom MacWright
e48bb6073b Start unstable branch - kkaefer's flatten work 2011-01-19 15:06:42 -05:00
Konstantin Käfer
5241f62bfd update test runner to be more verbose and show what failed on errors 
uses node-xml2js to compare xml files
use ndistro to install dependencies

Conflicts:

	lib/mess/parser.js
	test/mess-test.js
 2011-01-19 12:22:24 -05:00
Konstantin Käfer
f899909e1d update test runner to be more verbose and show what failed on errors 
uses node-xml2js to compare xml files
use ndistro to install dependencies
 2011-01-19 12:16:50 -05:00
AJ Ashton
4f878f89c9 Proper text-transform property name. 2011-01-19 11:48:39 -05:00
Konstantin Käfer
a1ebe4dfbb Throw errors on units other than px (fix #40) 2011-01-19 09:45:17 -05:00
Young Hahn
e8c5b4e82c Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-18 20:02:28 -05:00
Young Hahn
39f931ab20 Add node-srs based layer SRS autodetection. 2011-01-18 20:02:21 -05:00
Tom MacWright
f350eefd65 Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-18 18:26:22 -05:00
Tom MacWright
7b29b6a3b1 Adding colors as variables 2011-01-18 18:25:27 -05:00
Young Hahn
87ed4bdea5 Update netlib to handle binary encoded files properly and update calls to netlib methods. 2011-01-18 17:35:33 -05:00
Tom MacWright
248f09cdf6 Sadface sorting code. 2011-01-18 15:58:06 -05:00
Tom MacWright
20f0ed366d Adding flattenRules function. 2011-01-18 15:35:46 -05:00
Tom MacWright
6c4154ea15 Passing rulesets up 2011-01-18 14:42:14 -05:00
Tom MacWright
940c186bab Avoid toCSS more 2011-01-18 14:38:51 -05:00
Tom MacWright
f09657e653 Saving state of current work. 2011-01-18 14:26:57 -05:00
Young Hahn
fb29724a34 Replace filesystem unsafe characters. 2011-01-18 13:50:51 -05:00
Young Hahn
3022b97562 Don't use writestream until 'open' event is emitted. 2011-01-18 13:50:29 -05:00
Konstantin Käfer
f688102fed continue parsing after parsing errors with the returnErrors: true option. 
If set, it collects errors and returns them instead of throwing them.
 2011-01-17 19:08:33 -05:00
Konstantin Käfer
2bc2b22cf6 tree object that handles invalid code 2011-01-17 17:23:01 -05:00
Konstantin Käfer
dcee98a55b Handle invalid code and continue with parsing the file 2011-01-17 17:21:19 -05:00
Tom MacWright
d248372172 Starting AST work 2011-01-17 16:17:00 -05:00
Tom MacWright
b0e35f4441 Merge branch 'master' of github.com:developmentseed/mess.js into cascade 2011-01-17 15:39:59 -05:00
Konstantin Käfer
1fbcaf2164 Automatically close comments at the end of input instead of throwing a "Syntax Error on line 1" 2011-01-17 15:31:15 -05:00
Tom MacWright
cf003944b5 Google code style, not cloudhead's. Sorry, cloudhead 2011-01-17 14:46:22 -05:00
Tom MacWright
ff501e2cb0 Removing compression cruft 2011-01-17 14:22:17 -05:00
Tom MacWright
b6e8148a84 Adding specificity code 2011-01-17 14:22:02 -05:00
Tom MacWright
96d19204cf Simplifying nested example, removing compress variables and frames code. 2011-01-17 13:52:13 -05:00
Tom MacWright
8e615e549f Updating testing, adding docs 2011-01-17 13:19:14 -05:00
AJ Ashton
031c395288 Fixing Mapnik properties that use underscores, not dashes. 2011-01-17 12:00:26 -05:00
Tom MacWright
75ed469a06 Accept fully-qualified absolute paths for now. 2011-01-15 17:01:51 -05:00
Tom MacWright
27fd483b06 Ignoring non-HTTP protocols for now. 2011-01-15 16:36:30 -05:00
Tom MacWright
1057a15893 Coalesce symbol-shorthand-to-symbolizer functionality 2011-01-15 16:34:39 -05:00
AJ Ashton
1a53448d2e Clean up indentation, etc in generated Style xml 2011-01-15 14:48:12 -05:00
AJ Ashton
71b804550c Properly translate things like pattern symbolizers. Fixes #33 (but probably kills kittens - needs review) 2011-01-15 13:01:21 -05:00
AJ Ashton
f0616eb0f5 Cleaning up indentation in Layer xml template. 2011-01-15 11:28:43 -05:00
Tom MacWright
51e9bd3ce8 Requirements for prior commit 2011-01-14 18:51:36 -05:00
Tom MacWright
008abe40d7 Adding support for multiple filtered selectors 2011-01-14 18:42:58 -05:00
Tom MacWright
a033a970a1 First bit of support for inplace files. Require nodejs bug to be fixed. 2011-01-14 14:33:40 -05:00
Tom MacWright
d46c50d351 Removing do-nothing value-side validation 2011-01-14 12:15:58 -05:00
Tom MacWright
4db08c47ec Gracefully fail on bad shapefile loads - this should return an error eventually, but after inspection works. 2011-01-13 18:11:31 -05:00
Tom MacWright
2de9117134 That, not this. 2011-01-13 17:17:45 -05:00
Tom MacWright
b1711d68c0 Reluctantly letting users throw units onto dimensions. If we have a way to warn, not block, on errors, we should use that eventually 2011-01-13 17:03:31 -05:00
Tom MacWright
a1a64c6f35 Less locking, better code for dealing with already-downloaded externals 2011-01-13 16:04:50 -05:00
Tom MacWright
04caf24d2d Fix marker symbolizer. Needs fix in other reference.json's 2011-01-13 15:59:44 -05:00
Tom MacWright
0da256ed20 Supporting edge case of maps without any data layers 2011-01-13 15:15:25 -05:00
Tom MacWright
370e3f917c Adding required attributes for shieldsymbolizer and textsymbolizer. Fixes #20. 2011-01-13 14:49:23 -05:00
Tom MacWright
29a3ec0269 Handle SHP as well as shp. Fixes #89 2011-01-12 18:32:47 -05:00
Tom MacWright
af2079ca7c Don't crash on repeated ruleset values. Fixes #25. 2011-01-12 18:01:14 -05:00
Tom MacWright
4d29a3ada2 Reorganizing externals and handling uppercase files easily 2011-01-12 17:18:03 -05:00
Tom MacWright
3c12e453e5 Fix fonts 2011-01-12 17:16:48 -05:00
Tom MacWright
373d032eaa Support local URL arguments. Works on #27 but needs work to support remote datasources 2011-01-12 11:39:01 -05:00
Tom MacWright
0c5bff814e Support numbers type, fixes line-dasharray. Fixes #28 2011-01-12 11:33:21 -05:00
Tom MacWright
0881cb5b8e Switching all int types to float types 2011-01-12 11:04:19 -05:00
Tom MacWright
30021b43f5 Support filters with string arguments. Fixes #23. 2011-01-11 13:20:01 -05:00
Tom MacWright
89dcd2ec37 Background color support. Fixes #8. Does not support expressions yet. 2011-01-10 18:49:58 -05:00
Tom MacWright
658665703d Less than equal to and greater than equal to 2011-01-10 18:14:39 -05:00
Tom MacWright
c82a1fa260 Zoom support. Fixes #21 2011-01-10 18:10:23 -05:00
Tom MacWright
eb87b9d2d2 Support text halos 2011-01-10 13:20:31 -05:00
Tom MacWright
26a6ac452f Supporting labels 2011-01-10 13:04:12 -05:00
Tom MacWright
cf3d69e50b No underscore reliance at this level, unfortunately 2011-01-10 11:51:07 -05:00
Tom MacWright
b2c246b616 Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-10 11:47:42 -05:00
Tom MacWright
c59615245d Filters support 2011-01-10 11:47:34 -05:00
Tom MacWright
f833d9e589 Support attributes with numbers in their names 2011-01-10 11:47:10 -05:00
Tom MacWright
58a3d9afa1 Making renderer safe for non-classed layers 2011-01-10 11:18:45 -05:00
Tom MacWright
d11d36795e Primitive class application 2011-01-10 10:55:34 -05:00
Tom MacWright
ffe6393a70 Double-closing bracket for layer XML 2011-01-10 10:21:22 -05:00
Young Hahn
75a11ea636 Include layer name in rendered XML output. 2011-01-10 01:15:34 -05:00
Tom MacWright
3697c68d1d Safe for base-level comments 2011-01-09 16:07:52 -05:00
Tom MacWright
d5c39c5854 More natural wording for errors 2011-01-08 13:48:29 -05:00
Tom MacWright
7375f13fda Only fail on failure 2011-01-07 16:14:37 -05:00
Tom MacWright
dc4dc110cb Safer error handling 2011-01-07 15:19:23 -05:00
Tom MacWright
61b8e3e6f9 Safer operation; never bail from the process. 2011-01-07 15:15:18 -05:00
Tom MacWright
27a125ac80 Supporting base-level comments 2011-01-07 10:57:24 -05:00
Young Hahn
dbabc1e239 Fix some symbolizer parameters. 2011-01-07 00:10:05 -05:00
Tom MacWright
87537326b9 And a bit quieter 2011-01-06 18:09:19 -05:00
Tom MacWright
58b5ff52bc Less loud operation 2011-01-06 18:07:55 -05:00
Tom MacWright
12ca143120 Correct Map srs etc 2011-01-06 16:33:49 -05:00
Tom MacWright
40bfd3b7f8 Removing Map reference - Layers and Styles now in the root of the JSON file 2011-01-06 14:51:36 -05:00
Tom MacWright
40caca01ce Merge branch 'master' of github.com:developmentseed/mess.js 2011-01-06 14:42:08 -05:00
Tom MacWright
77efd016e6 Code cleanup 2011-01-06 14:42:02 -05:00
Tom MacWright
9b28c04511 Removing old json reference 2011-01-06 14:41:42 -05:00
Tom MacWright
0b151d97cf Removing swapfiles 2011-01-06 14:40:13 -05:00
Tom MacWright
edfdd55125 Removing other dead reference file 2011-01-05 14:28:45 -05:00
Tom MacWright
852c379298 Removing stale reference file 2011-01-05 14:26:18 -05:00
Tom MacWright
e5ba37d71e Full rename to mess 2011-01-05 14:23:28 -05:00
Tom MacWright
8314277c57 fixjs sweep on renderer 2011-01-05 13:01:10 -05:00
Tom MacWright
41904a668a Support embedded styles. Fixes #10. Needs testing for non-embedded styles 2011-01-05 12:46:31 -05:00
Tom MacWright
b5bf53959e Don't redownload things. Fixes #7 2011-01-04 19:57:35 -05:00
Tom MacWright
717530239d Mapnik2 syntax 2011-01-04 18:51:12 -05:00
Tom MacWright
e90296da18 White background default for the time being 2011-01-04 18:50:53 -05:00
Tom MacWright
7fcedbc10e Document renderer. 2011-01-04 18:37:40 -05:00
Tom MacWright
f7d6020fe8 fixjsstyle for ruleset 2011-01-04 18:30:57 -05:00
Tom MacWright
53a61e2964 First full-process successful map render. Fixes #5 2011-01-04 18:30:23 -05:00
Tom MacWright
3d484ab398 Correct reduce refactoring 2011-01-04 18:29:00 -05:00
Tom MacWright
d5f5e27689 Condense to-object rule 2011-01-04 17:44:09 -05:00
Tom MacWright
fb8176ea76 'It works', as in, it doens't break 2011-01-04 17:35:21 -05:00
Tom MacWright
ba8f5dd4d0 Rather important chunk of code here. 2011-01-04 15:15:06 -05:00
Tom MacWright
5aa09d6d72 Download, compile, save, etc 2011-01-04 14:47:00 -05:00
Tom MacWright
750d6b1f12 Adding rendering machinery 2011-01-04 13:07:27 -05:00
Tom MacWright
bf2ac07bde Not serving mapsymbolizer. Sort of fixes #1 2011-01-03 16:35:52 -05:00
Tom MacWright
04a4900cc6 First step towards actual style-naming 2011-01-03 15:28:28 -05:00
Tom MacWright
6cb8a9a94a Forcing all selectors to be full-bore selectors 2011-01-03 15:20:03 -05:00
Tom MacWright
46cc87a826 Removing more currently-unused functionality 2011-01-03 15:19:45 -05:00
Tom MacWright
c7c802e8b7 Guard rails against cascadenik stuff invoking other code 2011-01-03 14:41:41 -05:00
Tom MacWright
e78d0d914c Formatting filters a bit better 2010-12-14 11:32:39 -05:00
Tom MacWright
edb09e9c57 Label support, filter support 2010-12-14 11:16:21 -05:00
Tom MacWright
7d5855f00d First successful pass on a large shapefile. Super fast so far 2010-12-13 23:00:29 -05:00
Tom MacWright
d78357361e Symbolizers 2010-12-13 22:48:10 -05:00
Tom MacWright
0c7b1fc0b3 Adding set validation 2010-12-13 22:21:44 -05:00
Tom MacWright
301cb4bf04 Elemental type validation 2010-12-13 19:10:18 -05:00
Tom MacWright
fbf24c74e1 Validating selector names, switching out selector names for mapnik css names on toCSS, giving good errors 2010-12-13 18:28:49 -05:00
Tom MacWright
354de5c153 Support ge and le 2010-12-01 15:42:03 -05:00
Tom MacWright
dfb4ce9742 Start the mess 2010-12-01 15:33:17 -05:00
cloudhead
b2edd8e2b9 (dist) version bump to 1.0.40 2010-11-30 11:51:20 -05:00
cloudhead
dae6ec2cbf (doc) added copyright notice to color mix function 2010-11-28 08:13:13 -05:00
cloudhead
ac95b0d238 (doc) removed old comment which doesn't apply 2010-11-27 22:52:50 -05:00
cloudhead
868130e3a3 don't crash if there's no 'lastModified' header 2010-11-26 17:43:26 -05:00
James A. Rosen
c58d8aa156 fixed @media and @page parsing problem 2010-11-27 06:34:17 +08:00
cloudhead
45475d58be fix merge conflicts 2010-11-26 17:21:33 -05:00
cloudhead
138b2763a4 (new) mix function (StanAngeloff) 2010-11-26 17:19:30 -05:00
cloudhead
70ab408b97 Merge '::selector' fix from StanAngeloff 2010-11-26 17:18:01 -05:00
Daniel Bergey
c7d1b7c132 Fixed issue (#134) where subfiles' @imports were regarding #, ? and url portions thereafter as part of the base url. 2010-11-27 06:09:10 +08:00
Ian Beck
f4437cb8f3 Modified selector regexen to support CSS character escapes, added test files to verify change 
Closes #78, closes #105
 2010-11-27 06:07:14 +08:00
robmadole
d6ebe3ae9c Fix for #149 Facebook login button fails to work with FF 3.6+ 2010-11-27 06:04:29 +08:00
cloudhead
aba37e65dd (dist) version bump 2010-11-20 02:18:37 -05:00
cloudhead
a985924d68 (new) support for unquoted data URIs in url() 2010-11-20 02:17:35 -05:00
cloudhead
8d089eebff (dist) version bump 2010-11-19 15:19:11 -05:00
cloudhead
b019e954a9 add fadein & fadeout color functions 2010-11-19 15:18:56 -05:00
cloudhead
01549ab751 use 'type' attribute from link tag, when performing a request 2010-11-19 15:18:35 -05:00
cloudhead
f129522a92 (dist) version bump 2010-10-14 17:26:30 -04:00
cloudhead
9b808fd305 Merge branch 'master' of github.com:cloudhead/less.js 2010-10-14 17:05:54 -04:00
cloudhead
7497a1ce1a pass url to errback() 2010-10-14 17:05:38 -04:00
neonstalwart
674053b97c fixing logic to determine less.env in the browser 2010-10-13 14:22:47 +08:00
Felix Geisendörfer
ef71bb0db2 Fix @import file loading routine 
Again, old fs.open syntax is deprecated, replaced with fs.readFile.
 2010-10-13 14:09:00 +08:00
cloudhead
86a0a33de7 (dist) version bump 2010-08-22 14:47:45 -04:00
cloudhead
bbf419b2ff improve error reporting 2010-08-22 14:45:22 -04:00
cloudhead
b57093fa9b attempt to fix IE relative urls 2010-08-22 14:44:45 -04:00
cloudhead
cce5c17505 attempt at url() relative path fix 2010-08-20 00:02:47 -04:00
cloudhead
bbd10f6b77 (dist) version bump 2010-08-15 11:00:18 -04:00
cloudhead
ddbc8676b6 basic ability to overwrite some config options in browser 2010-08-15 10:58:52 -04:00
cloudhead
88b923914b add 'rad' 'grad' 'turn' units 2010-07-26 00:00:24 -04:00
cloudhead
e9d4499789 stateless URL evaluation 2010-07-25 17:01:27 -04:00
cloudhead
059a3208b5 support uppercase characters in attribute 2010-07-25 16:51:19 -04:00
cloudhead
57778b31fe squeeze extra slashes in url() 2010-07-25 16:44:27 -04:00
cloudhead
f946c2a87c support relative url() paths in the browser 2010-07-25 16:42:19 -04:00
cloudhead
4d6335b4e2 make strings behave like other nodes. 
- rename 'content' to 'value'
 2010-07-25 16:41:05 -04:00
Fedor Indutny
29b797e8df Fixed dot in css name error(when using style.1.css and style.2.css), also fixed 'url()' error 2010-07-26 03:56:14 +08:00
cloudhead
93f03ee1dd (dist) version bump 2010-07-23 19:49:03 -04:00
cloudhead
ba2cfe9265 cleanup ruleset evaluation 
- remove eval() from ruleset.toCSS
- fix multiple mixin calls with different arguments yeilding the same
  output.
 2010-07-23 19:46:48 -04:00
cloudhead
0c6a5ca789 IE fix 2010-07-12 08:06:38 -04:00
cloudhead
d764f2021c refactor mixin definition parser 2010-07-12 08:06:28 -04:00