From 187da7bb589c32a301ab8978bbf2d49ce98906ab Mon Sep 17 00:00:00 2001 From: Petr Sloup Date: Wed, 4 May 2016 13:53:47 +0200 Subject: [PATCH] Add raster view for raster data --- public/resources/images/icons-000000@2x.png | Bin 0 -> 1410 bytes public/templates/{xray.tmpl => data.tmpl} | 25 ++++++++++++++++++++ public/templates/index.tmpl | 3 ++- public/templates/viewer.tmpl | 1 + src/serve_data.js | 1 + src/server.js | 5 ++-- 6 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 public/resources/images/icons-000000@2x.png rename public/templates/{xray.tmpl => data.tmpl} (81%) diff --git a/public/resources/images/icons-000000@2x.png b/public/resources/images/icons-000000@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..67d8d222665eb141a147eaed4a6a9edf38a006a9 GIT binary patch literal 1410 zcmeAS@N?(olHy`uVBq!ia0vp^CJYQr930F*mRO^$8jwl|@Ck7R(liCX{9p6}El?;4 z@(X6z{=dO&-;FPU3P&7X|8{2*k6l;8JM*zd5rL)VW3ND=TYxbHGqW6x@ zuD6N0xUi&c&W|t^dz-yGn%tc=mre=VZ@P4U``^1DrWfnMC$A^9@uRAr^QE1dkS>LQq6l)WIw5#{ch(8=obw=HM)9pnDGkF)l2 zci8o}DOT4*RU|5Jym@t8ugq6tzh7Y8-MsacORjsazg%B7w@%(mb7|L%#r;|pEHbSA zQxGOI;T%^yNMee-_&)+ z;M9p%lQn)m`S8o1EwC>8$>nb8x&rBm2XC9NS^cEn?S#DLq31N=l3F$!B{(Sepg`00rdGGpM#Qbe^Ap0KKn~$0`j+|XspD$pU=hUTK?)9fz z$zp|FM^>G{T)R%a`hzD-xt=M16nd=`zj#W}tM6emzD-GTjJ2s zNT=)DEw8e5te*1 z?8A)J&GOeXUb?>8^{Cf&8N;U9>@0@crunO+iqFZ!w8`H2yzIx%wKpY=FFh%|cC(8= z@ngkyE6>{eh2g9dCimQVV0FLx#o5OeQJaizsLP}rXf*GAfA*K`g~{v;s`B^ke%@Ql z?|F+U(`EMGn9Yj*YoAa3-jTvO=S0OF!|x6cfA48{Qpb0*c5~^GgPaEYH0pA8E|OI{ zd+@{7Y4Z-hmfL=_QK#Xt#izyj0`B)z4u5QA_%uJ*OZ)zb?=oMObDviHb@SrXecj#j zn6uk04}aMbTeZL2cDo>7&5fi4BZi}0_oT%#pZ=4$EFzKPtY;&2BZ9AJ!G?!7XB5kE z+MRvyr&wop`Lt=z3MWsS)Os{@nvLRGmEVOv=b6}VCcRvet{|d++OP1 {{name}} - TileServer GL + {{#is_vector}} + {{/is_vector}} + {{^is_vector}} + + + + + {{/is_vector}} + + {{#is_vector}}

{{name}}

@@ -98,5 +111,17 @@ }); }); + {{/is_vector}} + {{^is_vector}} +

{{name}}

+
+ + {{/is_vector}} diff --git a/public/templates/index.tmpl b/public/templates/index.tmpl index 040c3d9..c7c96c3 100644 --- a/public/templates/index.tmpl +++ b/public/templates/index.tmpl @@ -49,9 +49,10 @@

{{name}}

Id: {{@key}} |{{#if formatted_filesize}} {{formatted_filesize}} |{{/if}} {{#is_vector}}Vector{{/is_vector}}{{^is_vector}}Raster{{/is_vector}} data | TileJSON

{{#is_vector}} - X-Ray viewer + X-Ray view {{/is_vector}} {{^is_vector}} + Raster view {{/is_vector}} {{/each}} diff --git a/public/templates/viewer.tmpl b/public/templates/viewer.tmpl index 080cb20..6b9adb7 100644 --- a/public/templates/viewer.tmpl +++ b/public/templates/viewer.tmpl @@ -12,6 +12,7 @@ body { margin:0; padding:0; } #map { position:absolute; top:0; bottom:0; width:100%; } +

{{name}}

diff --git a/src/serve_data.js b/src/serve_data.js index 96f0f3b..5cc75e7 100644 --- a/src/serve_data.js +++ b/src/serve_data.js @@ -30,6 +30,7 @@ module.exports = function(options, repo, params, id) { tileJSON['tilejson'] = '2.0.0'; tileJSON['basename'] = id; tileJSON['filesize'] = fs.statSync(mbtilesFile)['size']; + delete tileJSON['scheme']; Object.assign(tileJSON, params.tilejson || {}); utils.fixTileJSONCenter(tileJSON); diff --git a/src/server.js b/src/server.js index f1217d6..458fb4f 100644 --- a/src/server.js +++ b/src/server.js @@ -253,13 +253,14 @@ module.exports = function(opts, callback) { }); */ - serveTemplate('/data/:id/$', 'xray', function(params) { + serveTemplate('/data/:id/$', 'data', function(params) { var id = params.id; - var data = serving.data[id]; + var data = clone(serving.data[id]); if (!data) { return null; } data.id = id; + data.is_vector = data.format == 'pbf'; return data; });