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

update the urls to the customized modules #1

Merged
merged 2 commits into from
Feb 1, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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-clima').load(path.join(p, dir));
require('bones').load(path.join(p, dir));
console.warn('Plugin [%s] loaded.', Bones.utils.colorize(data.name, 'green'));
return data;
} catch (err) {
Expand Down
2 changes: 1 addition & 1 deletion commands/export.bones
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ command.prototype.static_map = function(project, callback) {

command.prototype.tilelive = function (project, callback) {
var cmd = this;
var tilelive = require('tilelive-clima');
var tilelive = require('tilelive');

// Attempt to support additional tilelive protocols.
try { require('tilelive-' + this.opts.format).registerProtocols(tilelive); }
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-clima'));
require('mbtiles').registerProtocols(require('tilelive-clima'));
require('tilelive-mapnik').registerProtocols(require('tilelive'));
require('mbtiles').registerProtocols(require('tilelive'));

require('bones-clima').load(__dirname);
!module.parent && require('bones-clima').start();
require('bones').load(__dirname);
!module.parent && require('bones').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-clima');
var millstone = require('millstone');

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-clima');
var millstone = require('millstone');


// 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-clima');
var tilelive = require('tilelive');
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-clima');
var millstone = require('millstone');
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
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"jquery":"2.1.0",
"express":"2.5.11",
"connect":"1.9.2",
"bones-clima": "git://github.com/paulovieira/bones-clima.git",
"bones": "git://github.com/paulovieira/bones.git#1.3",
"chrono": "~1.0.1",
"JSV": "4.0.x",
"sax": "0.6.x",
Expand All @@ -41,9 +41,9 @@
"mbtiles": "~0.8.1",
"mapnik": "3.4.9",
"tilelive-mapnik": "~0.6.16 ",
"tilelive-clima": "git://github.com/paulovieira/tilelive-clima.git",
"tilelive": "git://github.com/paulovieira/tilelive.git",
"carto": "0.15.x",
"millstone-clima": "git://github.com/paulovieira/millstone-clima.git",
"millstone": "git://github.com/paulovieira/millstone.git",
"sphericalmercator": "~1.0.2",
"underscore": "~1.6.0",
"wax": "6.4.2",
Expand Down
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-clima');
var tilelive = require('tilelive');
var settings = Bones.plugin.config;
var Step = require('step');
var readdir = require('../lib/fsutil.js').readdir;
Expand Down
2 changes: 1 addition & 1 deletion test/support/start.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ catch (err) { if (err.code !== 'ENOENT') throw err }

// Load application.
require('../..');
var tilemill = require('bones-clima').plugin;
var tilemill = require('bones').plugin;
tilemill.config.files = path.resolve(__dirname + '/../fixtures/files');
tilemill.config.examples = false;

Expand Down