Fabio/tileserver-gl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into esm_update

Browse source
This commit is contained in:
acalcutt 2022-09-25 08:05:51 -04:00
commit 87586387f4
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
public/resources/maplibre-gl-inspect.css
View file

@ -22,12 +22,13 @@
.maplibregl-inspect_property-value { .maplibregl-inspect_property-value {
display: table-cell; display: table-cell;
word-break: break-all;
} }
.maplibregl-inspect_property-name { .maplibregl-inspect_property-name {
display: table-cell; display: table-cell;
padding-right: 10px; padding-right: 10px;
word-break: break-all;
} }
.maplibregl-ctrl-inspect { .maplibregl-ctrl-inspect {

2
public/templates/index.tmpl
View file

@ -41,7 +41,7 @@
{{#if serving_data}}| {{/if}}<a href="{{public_url}}styles/{{@key}}.json{{&../key_query}}">TileJSON</a> {{#if serving_data}}| {{/if}}<a href="{{public_url}}styles/{{@key}}.json{{&../key_query}}">TileJSON</a>
{{/if}} {{/if}}
{{#if serving_rendered}} {{#if serving_rendered}}
| <a href="/styles/{{@key}}/wmts.xml{{&../key_query}}">WMTS</a> | <a href="{{public_url}}styles/{{@key}}/wmts.xml{{&../key_query}}">WMTS</a>
{{/if}} {{/if}}
{{#if xyz_link}} {{#if xyz_link}}
| <a href="#" onclick="return toggle_xyz('xyz_style_{{@key}}');">XYZ</a> | <a href="#" onclick="return toggle_xyz('xyz_style_{{@key}}');">XYZ</a>

2
src/main.js
View file

@ -107,7 +107,7 @@ const startWithMBTiles = (mbtilesFile) => {
console.log(`ERROR: Not valid MBTiles file: ${mbtilesFile}`); console.log(`ERROR: Not valid MBTiles file: ${mbtilesFile}`);
process.exit(1); process.exit(1);
} }
const instance = new MBTiles(mbtilesFile, (err) => { const instance = new MBTiles(mbtilesFile + '?mode=ro', (err) => {
if (err) { if (err) {
console.log('ERROR: Unable to open MBTiles.'); console.log('ERROR: Unable to open MBTiles.');
console.log(` Make sure ${path.basename(mbtilesFile)} is valid MBTiles.`); console.log(` Make sure ${path.basename(mbtilesFile)} is valid MBTiles.`);

2
src/serve_data.js
View file

@ -129,7 +129,7 @@ export const serve_data = {
} }
let source; let source;
const sourceInfoPromise = new Promise((resolve, reject) => { const sourceInfoPromise = new Promise((resolve, reject) => {
source = new MBTiles(mbtilesFile, (err) => { source = new MBTiles(mbtilesFile + '?mode=ro', err => {
if (err) { if (err) {
reject(err); reject(err);
return; return;

2
src/serve_rendered.js
View file

@ -760,7 +760,7 @@ export const serve_rendered = {
if (!mbtilesFileStats.isFile() || mbtilesFileStats.size === 0) { if (!mbtilesFileStats.isFile() || mbtilesFileStats.size === 0) {
throw Error(`Not valid MBTiles file: ${mbtilesFile}`); throw Error(`Not valid MBTiles file: ${mbtilesFile}`);
} }
map.sources[name] = new MBTiles(mbtilesFile, (err) => { map.sources[name] = new MBTiles(mbtilesFile + '?mode=ro', err => {
map.sources[name].getInfo((err, info) => { map.sources[name].getInfo((err, info) => {
if (err) { if (err) {
console.error(err); console.error(err);