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

707 Commits

Author SHA1 Message Date
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
Tom MacWright
80aff7b18a Cleanup of unzip, still need to rewrite locateShp 2011-01-23 18:59:42 -05:00
Tom MacWright
c63e009acb Partially fix external-syncing. 2011-01-23 18:46:42 -05:00
Tom MacWright
87fae5ae0a Fontset support. 2011-01-23 17:07:52 -05:00
Tom MacWright
c670f51004 XML cleanup 2011-01-22 17:43:17 -05:00
Young Hahn
ca3a4a8b0a Fix syntax error. 2011-01-22 14:02:19 -05:00
Konstantin Käfer
8fabfc0f6a Merge branch 'unstable' 
Conflicts:
	.ndistro
	bin/messc
	lib/mess/index.js
	lib/mess/parser.js
	lib/mess/renderer.js
	lib/mess/tree/comparison.js
	lib/mess/tree/dimension.js
	lib/mess/tree/filter.js
	lib/mess/tree/operation.js
	lib/mess/tree/reference.js
	lib/mess/tree/rule.js
	lib/mess/tree/ruleset.js
	lib/mess/tree/variable.js
	test/mess-test.js
 2011-01-21 19:00:00 -05:00
Tom MacWright
dcb12ea092 Merge branch 'unstable' of github.com:developmentseed/mess.js into unstable 2011-01-21 18:42:06 -05:00
Tom MacWright
fc9ace9a31 Catch errors for TM 2011-01-21 18:41:10 -05:00
Konstantin Käfer
465bdd428f rename toCSS to toString or toXML 2011-01-21 18:28:54 -05:00
Konstantin Käfer
946a7f141a order attachments by the order they appear in the source 2011-01-21 18:11:41 -05:00
Tom MacWright
656f3bcedc Remove cruft 2011-01-21 18:02:39 -05:00
Konstantin Käfer
8c302b64d1 underscore to camelCase 2011-01-21 17:42:46 -05:00
Tom MacWright
87a91cfe77 Rename toMSS, remove toCSS 2011-01-21 17:31:30 -05:00
Konstantin Käfer
7c4933dc71 remove unused matching functions 2011-01-21 17:17:55 -05:00
Konstantin Käfer
6dee926fd5 cleanup parsing selectors 2011-01-21 17:16:16 -05:00
Tom MacWright
616ba20b1b Fix quotes 2011-01-21 16:55:05 -05:00
Tom MacWright
63f2de46d8 Merging reference.js from TileMill. 2011-01-21 16:54:05 -05:00
Konstantin Käfer
29194a4aee fix code error 2011-01-21 16:30:43 -05:00
Konstantin Käfer
5139ba1c82 Merge branch 'unstable' of github.com:developmentseed/mess.js into unstable 2011-01-21 16:28:04 -05:00
Konstantin Käfer
6dd557f834 also split definitions by attachment name 2011-01-21 16:27:41 -05:00
Tom MacWright
202ccff12d No console log here. 2011-01-21 16:24:54 -05:00
Tom MacWright
c692f3de99 Parens needed here 2011-01-21 16:24:01 -05:00
Konstantin Käfer
81f8a7b298 change new(name) to new name 2011-01-21 16:17:52 -05:00
Konstantin Käfer
90ac51a804 output layers again 2011-01-21 16:16:29 -05:00
Konstantin Käfer
3230af084e rename ambiguous symbolizer to 'attachment' 2011-01-21 16:12:52 -05:00
Konstantin Käfer
52c45a022e remove symbolizer object; we just store the string. that's easier for sorting 2011-01-21 16:00:08 -05:00
Konstantin Käfer
f3f714b437 use errorMessage() function also for other syntax errors 2011-01-21 15:50:05 -05:00
Konstantin Käfer
bda86d9ee8 use correct position for error message 2011-01-21 15:43:00 -05:00
Konstantin Käfer
7d43564707 throw proper error messages when encountering invalid symbolizers 2011-01-21 15:38:49 -05:00
Tom MacWright
ba7206d87d Merge branch 'unstable' of github.com:developmentseed/mess.js into unstable 2011-01-21 15:32:09 -05:00
Tom MacWright
c1a066a492 Removing inline and outline 2011-01-21 15:32:01 -05:00
Konstantin Käfer
2d16adef44 Merge branch 'unstable' of github.com:developmentseed/mess.js into unstable 2011-01-21 15:25:37 -05:00
Konstantin Käfer
f042b3bd7a add symbolizer support 2011-01-21 15:25:27 -05:00
Tom MacWright
b15ae8a1a2 Handle duplicate definitions again. Fixes #52. 2011-01-21 14:54:01 -05:00
Konstantin Käfer
7b5b0d86c1 Merge branch 'unstable' of github.com:developmentseed/mess.js into unstable 2011-01-21 13:25:49 -05:00
Konstantin Käfer
6905aa3dff reverse min/max for scale denominators 2011-01-21 13:25:19 -05:00
Tom MacWright
a521b7b454 Re-support background colors and images 2011-01-21 13:24:35 -05:00
Tom MacWright
f10ce6a7a3 Support operations and variables. 2011-01-21 13:07:50 -05:00
Konstantin Käfer
41ed66e962 revert the change; pass proper tree.Comparison objects into the constructor 2011-01-21 12:47:07 -05:00
Konstantin Käfer
f6fa2c1a29 cleanup 2011-01-21 12:42:49 -05:00
Konstantin Käfer
465c689ce5 remove unused functions 2011-01-21 12:39:34 -05:00
Konstantin Käfer
45c86768c9 revert comment 2011-01-21 12:34:19 -05:00
Konstantin Käfer
1cef8e306f use the right values for scaledenominators 2011-01-21 12:31:42 -05:00
Konstantin Käfer
b50ab614c2 Merge branch 'unstable' of github.com:developmentseed/mess.js into unstable 2011-01-21 12:14:13 -05:00
Konstantin Käfer
16fcf8812a split up rules when there are multiple zoom ranges defined 2011-01-21 12:13:56 -05:00
Tom MacWright
efb5322774 Merge branch 'unstable' of github.com:developmentseed/mess.js into unstable 2011-01-21 11:43:35 -05:00
Tom MacWright
9e2ed8aabe Removing Shorthand construct; doesn't have an equivalent in Mapnik XML 2011-01-21 11:43:28 -05:00
Konstantin Käfer
16e349af9f Merge branch 'unstable' of github.com:developmentseed/mess.js into unstable 2011-01-21 11:37:55 -05:00
Konstantin Käfer
15fb60377e handle zoom filters that never match correctly 2011-01-21 11:37:37 -05:00
Tom MacWright
1b175e8ae2 No more entities 2011-01-21 11:36:53 -05:00
Konstantin Käfer
fefcbd4dd6 Merge branch 'unstable' of github.com:developmentseed/mess.js into unstable 
Conflicts:
	lib/mess/renderer.js
 2011-01-21 11:16:54 -05:00
Konstantin Käfer
509c260ac5 basic zoom filters are working 2011-01-21 11:13:48 -05:00
Tom MacWright
9d9f28c5ed Background color & image support 2011-01-21 10:59:18 -05:00
Tom MacWright
d36aa198db More dead code condensing 2011-01-21 10:45:38 -05:00
Tom MacWright
d85290f422 Removing more dead code 2011-01-21 10:38:16 -05:00
Tom MacWright
5065882f0e Documenting more code, removing dead code 2011-01-21 10:36:23 -05:00
Konstantin Käfer
37f0b8c121 use value instead of val 2011-01-21 09:33:16 -05:00
Tom MacWright
cd053f88c3 Correctly handle negation filters in stylesheets 2011-01-20 20:13:03 -05:00
Dane Springmeyer
1423859aca add files for support for node-unzip, new espresso test, and support for reading local zipped shapefiles 2011-01-20 19:06:38 -05:00
Tom MacWright
03f8331553 Fix comment support 2011-01-20 18:53:15 -05:00
Tom MacWright
bce3a3bf17 Filter out zoomfilters from toXML function 2011-01-20 18:29:23 -05:00
Tom MacWright
6684642faf Don't die on zoomfilters - toXML instead of toCSS 2011-01-20 18:22:56 -05:00
Tom MacWright
dcf3256460 Correcting TODO 2011-01-20 17:50:12 -05:00
Tom MacWright
27a247456d Removing debugging so that one can pipe to nik2img 2011-01-20 17:46:48 -05:00
Tom MacWright
ffa648ef08 Layer concept, etc 2011-01-20 17:43:39 -05:00
Tom MacWright
7826462266 Fix no-toCSS on Elements 2011-01-20 17:22:57 -05:00
Konstantin Käfer
23796ca048 Merge branch 'unstable' of github.com:developmentseed/mess.js into unstable 2011-01-20 17:21:51 -05:00
Konstantin Käfer
120e37bd8b add support for descendant selectors without class/id 2011-01-20 17:21:30 -05:00
Tom MacWright
b8f255f129 Merge branch 'unstable' of github.com:developmentseed/mess.js into unstable 2011-01-20 17:11:58 -05:00
Tom MacWright
7cd7cd086b Actual style naming 2011-01-20 17:10:36 -05:00
Konstantin Käfer
5423bf706f remove combinators 2011-01-20 17:10:17 -05:00
Tom MacWright
67200b691c Actual XML output, Filter improvements, etc. 2011-01-20 16:41:16 -05:00
Tom MacWright
c0121f7682 Output valid XML 2011-01-20 16:32:59 -05:00
Tom MacWright
c78c9b2818 Removing toMSS from Ruleset - remove toCSS on next sweep. 2011-01-20 16:21:52 -05:00
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