Skip to content
This repository has been archived by the owner on Dec 3, 2018. It is now read-only.

Commit

Permalink
Switch to carto master, nuke default style generation. Refs #4.
Browse files Browse the repository at this point in the history
  • Loading branch information
Young Hahn committed Jun 24, 2013
1 parent addb925 commit b4a1d82
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 12 deletions.
8 changes: 1 addition & 7 deletions lib/project.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,16 +145,10 @@ project.toXML = function(data, callback) {
srs:srs900913
} });

// These empty style declarations ensure layers are declared in Carto's
// MML output and match up with the layer indices in the datatiles.
// @TODO remove this once a new tag/package of node-mapnik is available.
// Fixed as of https://github.com/mapbox/node-mapnik-data-tile/commit/b1415addc30fc9044fa4f4425470101dbf8f79cc
opts.Stylesheet = _(data.styles).map(function(style,basename) { return {
id: basename,
data: style
}; }).concat([{
data: tm.templates.stylesdef(opts.Layer)
}]);
}; });

new carto.Renderer().render(opts, callback);
});
Expand Down
1 change: 0 additions & 1 deletion lib/source.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ source.toXML = function(data, callback) {
}, {});
opts.srs = srs900913;
opts.Layer = data.Layer;
opts.Stylesheet = [{ data:tm.templates.stylesdef(data.Layer) }];

new carto.Renderer().render(opts, callback);
};
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"fstream": "0.1.x",
"tar": "0.1.x",
"mapnik": "1.0.0",
"carto": "https://github.com/mapbox/carto/tarball/49c81edd3ac57a3c3ced2c0c4d335423b4329df8",
"carto": "https://github.com/mapbox/carto/tarball/master",
"tilelive-bridge": "https://github.com/mapbox/tilelive-bridge/tarball/master",
"tilelive-vector": "https://github.com/mapbox/tilelive-vector/tarball/master",
"tm2-default-fonts": "https://github.com/mapbox/tm2-default-fonts/tarball/master",
Expand Down
3 changes: 0 additions & 3 deletions templates/stylesdef._

This file was deleted.

0 comments on commit b4a1d82

Please sign in to comment.