{"action":"created","issue":{"url":"https://api.github.com/repos/mapbox/carto/issues/413","labels_url":"https://api.github.com/repos/mapbox/carto/issues/413/labels{/name}","comments_url":"https://api.github.com/repos/mapbox/carto/issues/413/comments","events_url":"https://api.github.com/repos/mapbox/carto/issues/413/events","html_url":"https://github.com/mapbox/carto/issues/413","id":119616231,"number":413,"title":"Merging CartoDB changes back upstream","user":{"login":"pnorman","id":1190866,"avatar_url":"https://avatars.githubusercontent.com/u/1190866?v=3","gravatar_id":"","url":"https://api.github.com/users/pnorman","html_url":"https://github.com/pnorman","followers_url":"https://api.github.com/users/pnorman/followers","following_url":"https://api.github.com/users/pnorman/following{/other_user}","gists_url":"https://api.github.com/users/pnorman/gists{/gist_id}","starred_url":"https://api.github.com/users/pnorman/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pnorman/subscriptions","organizations_url":"https://api.github.com/users/pnorman/orgs","repos_url":"https://api.github.com/users/pnorman/repos","events_url":"https://api.github.com/users/pnorman/events{/privacy}","received_events_url":"https://api.github.com/users/pnorman/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-12-01T00:54:24Z","updated_at":"2015-12-04T16:23:51Z","closed_at":null,"body":"I'm working at getting our carto changes merged back here to minimize different versions, and I'm wondering about what strategy to use to make it easy for you to merge.\r\n\r\nIn principle, the changes are\r\n\r\n1. You can `browserify` carto and run it in the browser\r\n2. carto will output to a JSON equivalent of Mapnik XML\r\n3. A different mapnik-reference can be used. This is needed for passing to torque, which supports some [additional properties](http://docs.cartodb.com/cartodb-platform/cartocss/properties-for-torque/) and doesn't support some mapnik-specific ones\r\n4. Supports [`frame-offset`](http://docs.cartodb.com/cartodb-platform/cartocss/properties-for-torque/#frame-offset-number) in selectors\r\n\r\nThe cartodb tree is https://github.com/CartoDB/carto/tree/master, but Github won't diff it since it was forked before mapbox/carto was made not a fork of less/less.css. This shell might help see changes while ignoring docs and compiled files: ``git diff mapbox/master cartodb/master -- `git diff mapbox/master cartodb/master --name-only | grep -v '^dist/' | grep -v '.*\\.md$'` ``\r\n\r\nMy inclination is to first PR small non-browserify dependent changes, add browser support and tests, then add json output.\r\n\r\nI'm not sure how to best handle 3 and 4. 3 is fairly easily to locally patch if we need to, but 4 is an addition that Mapnik wouldn't support."},"comment":{"url":"https://api.github.com/repos/mapbox/carto/issues/comments/162010648","html_url":"https://github.com/mapbox/carto/issues/413#issuecomment-162010648","issue_url":"https://api.github.com/repos/mapbox/carto/issues/413","id":162010648,"user":{"login":"tmcw","id":32314,"avatar_url":"https://avatars.githubusercontent.com/u/32314?v=3","gravatar_id":"","url":"https://api.github.com/users/tmcw","html_url":"https://github.com/tmcw","followers_url":"https://api.github.com/users/tmcw/followers","following_url":"https://api.github.com/users/tmcw/following{/other_user}","gists_url":"https://api.github.com/users/tmcw/gists{/gist_id}","starred_url":"https://api.github.com/users/tmcw/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tmcw/subscriptions","organizations_url":"https://api.github.com/users/tmcw/orgs","repos_url":"https://api.github.com/users/tmcw/repos","events_url":"https://api.github.com/users/tmcw/events{/privacy}","received_events_url":"https://api.github.com/users/tmcw/received_events","type":"User","site_admin":false},"created_at":"2015-12-04T16:23:51Z","updated_at":"2015-12-04T16:23:51Z","body":"We're happy to bring these changes back into the mainline - so far I'm a little [confused by the direction of the browserification](https://github.com/mapbox/carto/pull/414) and note that we previously [had another attempt at bringing changes back](https://github.com/mapbox/carto/pull/379) that made things browserify compatible, but not idiomatic or consistent with CommonJS - basic tenets like avoiding globals, using require(), and using a single entry point. If carto goes commonjs with browserify support, it should go all the way and follow the right patterns."}}