cartodb/carto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

throw errors in cartox if the input xml arg is not provided or if it does not exist or if the xml using pre Mapnik 2 syntax

Browse Source
This commit is contained in:
Dane Springmeyer 2011-02-18 11:18:54 -08:00
parent 46171824b9
commit 02bbf43e07
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/cartox
View File

@ -56,6 +56,12 @@ var input = args[1];
if (input && input[0] != '/') { if (input && input[0] != '/') {
input = path.join(process.cwd(), input); input = path.join(process.cwd(), input);
} }
if (!input) {
sys.puts("cartox: no input files");
process.exit(1);
}
var output = args[2]; var output = args[2];
if (output && output[0] != '/') { if (output && output[0] != '/') {
output = path.join(process.cwd(), output); output = path.join(process.cwd(), output);
@ -103,6 +109,10 @@ upRule.prototype.upSymbolizers = function(xmlRule) {
for (var i in xmlRule) { for (var i in xmlRule) {
if (i in symmap) { if (i in symmap) {
for (var j in xmlRule[i][0]) { for (var j in xmlRule[i][0]) {
if (j == 'CssParameter') {
sys.puts("cartox: no support for CssParameter, please upgrade your xml to Mapnik 2.0 syntax first");
process.exit(1);
}
if (symmap[i][j].type == 'uri') { if (symmap[i][j].type == 'uri') {
css_rules.push(cssmap(i, j) + ': url("' + xmlRule[i][0][j] + '");'); css_rules.push(cssmap(i, j) + ': url("' + xmlRule[i][0][j] + '");');
} else { } else {
@ -136,6 +146,7 @@ fs.readFile(input, 'utf-8', function (e, data) {
var styles = []; var styles = [];
var document = {}; var document = {};
var layers = []; var layers = [];
if (e) throw e;
xml2tree(data, function(mapnik_xml) { xml2tree(data, function(mapnik_xml) {
mapnik_xml.Map[0].Style.forEach(function(s) { mapnik_xml.Map[0].Style.forEach(function(s) {
var newStyle = new upStyle(s); var newStyle = new upStyle(s);