Skip to content
This repository has been archived by the owner on Apr 4, 2019. It is now read-only.

Commit

Permalink
First steps to node 4.x compatiblity, thanks to: https://github.com/p…
Browse files Browse the repository at this point in the history
  • Loading branch information
florianf committed Jan 30, 2016
1 parent f67d28c commit 95f10a1
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion commands/core.bones
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ command.prototype.bootstrap = function(plugin, callback) {
}
// Load plugin
// NOTE: even broken plugins (ones that throw upon require) will likely get partially loaded here
require('bones').load(path.join(p, dir));
require('bones-clima').load(path.join(p, dir));
console.warn('Plugin [%s] loaded.', Bones.utils.colorize(data.name, 'green'));
return data;
} catch (err) {
Expand Down
8 changes: 4 additions & 4 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ if (existsSync(config)) {
argv.config = argv.config || config;
}

require('tilelive-mapnik').registerProtocols(require('tilelive'));
require('mbtiles').registerProtocols(require('tilelive'));
require('tilelive-mapnik').registerProtocols(require('tilelive-clima'));
require('mbtiles').registerProtocols(require('tilelive-clima'));

require('bones').load(__dirname);
!module.parent && require('bones').start();
require('bones-clima').load(__dirname);
!module.parent && require('bones-clima').start();
2 changes: 1 addition & 1 deletion models/Datasource.server.bones
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var url = require('url');
var fs = require('fs');
var mapnik = require('mapnik');
var Step = require('step');
var millstone = require('millstone');
var millstone = require('millstone-clima');

models.Datasource.prototype.sync = function(method, model, success, error) {
if (method !== 'read') return error('Method not supported.');
Expand Down
2 changes: 1 addition & 1 deletion models/Library.server.bones
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var config = Bones.plugin.config;
var url = require('url');
// node v6 -> v8 compatibility
var existsAsync = require('fs').exists || require('path').exists;
var millstone = require('millstone');
var millstone = require('millstone-clima');


// File based extensions supported by TileMill.
Expand Down
2 changes: 1 addition & 1 deletion models/Preview.server.bones
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var path = require('path');
var tilelive = require('tilelive');
var tilelive = require('tilelive-clima');
var settings = Bones.plugin.config;

models.Preview.prototype.sync = function(method, model, success, error) {
Expand Down
2 changes: 1 addition & 1 deletion models/Project.server.bones
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if (mapnik.register_system_fonts) mapnik.register_system_fonts();
if (mapnik.register_default_input_plugins) mapnik.register_default_input_plugins();

var EventEmitter = require('events').EventEmitter;
var millstone = require('millstone');
var millstone = require('millstone-clima');
var settings = Bones.plugin.config;
var tileURL = _('http://<%=url%>/tile/<%=id%>/{z}/{x}/{y}.<%=format%>?updated=<%=updated%>&metatile=<%=metatile%>&scale=<%=scale%>').template();
var request = require('request');
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "tileoven",
"name": "tilemill",
"version": "0.10.2",
"main": "./index.js",
"description": "A modern map design studio.",
Expand All @@ -26,28 +26,28 @@
"glob":"~4.0.0",
"generic-pool": "~2.1.1",
"backbone-dirty": "~1.1.3",
"jsdom":"https://github.com/springmeyer/jsdom-nogyp/tarball/c501ee8b71d8",
"jsdom":"7.0.0",
"xmlhttprequest": "1.5.0",
"backbone":"0.3.3",
"jquery":"1.6.3",
"jquery":"2.1.0",
"express":"2.5.11",
"connect":"1.9.2",
"bones": "1.3.29",
"bones-clima": "git://github.com/paulovieira/bones-clima.git",
"chrono": "~1.0.1",
"JSV": "4.0.x",
"sax": "0.6.x",
"request": "2.x",
"step": "~0.0.5",
"mbtiles": "~0.7.4",
"mbtiles": "~0.8.1",
"mapnik": "3.4.9",
"tilelive-mapnik": "~0.6.16 ",
"tilelive": "~4.5.3",
"tilelive-clima": "git://github.com/paulovieira/tilelive-clima.git",
"carto": "0.15.x",
"millstone": "~0.6.16",
"millstone-clima": "git://github.com/paulovieira/millstone-clima.git",
"sphericalmercator": "~1.0.2",
"underscore": "~1.6.0",
"wax": "6.4.2",
"sqlite3": "~3.0.4",
"sqlite3": "^3.1.x",
"modestmaps": "3.3.5",
"npm": "2.1.x",
"semver": "~4.1.0",
Expand All @@ -69,5 +69,5 @@
"tileoven": "./index.js"
},
"engineStrict": true,
"engines": { "node": "0.8.x || 0.10.x" }
"engines": { "node": "0.8.x || 0.10.x || 4.x"}
}
2 changes: 1 addition & 1 deletion servers/Tile.bones
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var fs = require('fs');
var path = require('path');
var tilelive = require('tilelive');
var tilelive = require('tilelive-clima');
var settings = Bones.plugin.config;
var Step = require('step');
var readdir = require('../lib/fsutil.js').readdir;
Expand Down

0 comments on commit 95f10a1

Please sign in to comment.