X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.maps.server%2Fserver%2Ftileserver-mapnik%2Fserver.js;h=ab7615471c734ca496757cf6785afcc8243e7b91;hb=refs%2Fheads%2Frelease%2F1.32.0.2;hp=4013c6d7778b1dde601e9718b5a864d7646ececb;hpb=2529be6d456deeb07c128603ce4971f1dc29b695;p=simantics%2Fdistrict.git

diff --git a/org.simantics.maps.server/server/tileserver-mapnik/server.js b/org.simantics.maps.server/server/tileserver-mapnik/server.js
index 4013c6d7..ab761547 100644
--- a/org.simantics.maps.server/server/tileserver-mapnik/server.js
+++ b/org.simantics.maps.server/server/tileserver-mapnik/server.js
@@ -19,6 +19,10 @@ var serve = require("./lib/app"),
 
 debug = debug("tessera");
 
+var tmstyle = require('tilelive-tmstyle');
+var tilelivevector = require('tilelive-vector');
+var mbtiles = require('mbtiles');
+
 module.exports = function(opts, callback) {
   var app = express().disable("x-powered-by"),
       tilelive = require("tilelive-cache")(require("tilelive"), {
@@ -32,7 +36,13 @@ module.exports = function(opts, callback) {
 
   // load and register tilelive modules
   require("tilelive-modules/loader")(tilelive, opts);
-
+  console.log('tilelive : ' + tilelive.protocols);
+  // test by jani
+  var testOpts = {
+    require: ['tilelive-vector', 'tilelive-tmstyle', 'mbtiles']
+  };
+  require("tilelive-modules/loader")(tilelive, testOpts);
+  console.log('tilelive2 : ' + tilelive.protocols);
   if (process.env.NODE_ENV !== "production") {
     // TODO configurable logging per-style
     app.use(morgan("dev"));
@@ -42,7 +52,7 @@ module.exports = function(opts, callback) {
     app.use(responseTime());
     app.use(cors());
     app.use(express.static(path.join(__dirname, "public")));
-    app.use(express.static(path.join(__dirname, "bower_components")));
+    //app.use(express.static(path.join(__dirname, "bower_components")));
     app.use(serve(tilelive, opts.uri));
 
     tilelive.load(opts.uri, function(err, src) {
@@ -59,7 +69,7 @@ module.exports = function(opts, callback) {
         if (info.format === "pbf") {
           app.use("/_", serve(tilelive, "xray+" + opts.uri));
           app.use("/_", express.static(path.join(__dirname, "public")));
-          app.use("/_", express.static(path.join(__dirname, "bower_components")));
+          //app.use("/_", express.static(path.join(__dirname, "bower_components")));
         }
       });
     });
@@ -104,7 +114,7 @@ module.exports = function(opts, callback) {
 
     // serve index.html even on the root
     app.use("/", express.static(path.join(__dirname, "public")));
-    app.use("/", express.static(path.join(__dirname, "bower_components")));
+    //app.use("/", express.static(path.join(__dirname, "bower_components")));
 
     // aggregate index.json on root for multiple sources
     app.get("/index.json", function(req, res, next) {