From 44372784e162f60e0a4179d56fba8fc574c188f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20=C5=81oskot?= <mateusz@loskot.net>
Date: Fri, 23 Sep 2022 14:35:32 +0100
Subject: [PATCH 1/4] Fix URL to WMTS capabilities to be based on public URL
 (#501)

---
 public/templates/index.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/templates/index.tmpl b/public/templates/index.tmpl
index 603f2eb..297520e 100644
--- a/public/templates/index.tmpl
+++ b/public/templates/index.tmpl
@@ -41,7 +41,7 @@
                 {{#if serving_data}}| {{/if}}<a href="{{public_url}}styles/{{@key}}.json{{&../key_query}}">TileJSON</a>
               {{/if}}
               {{#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 xyz_link}}
                 | <a href="#" onclick="return toggle_xyz('xyz_style_{{@key}}');">XYZ</a>

From a5459fb3ba967f117d4cc698235e3f119156f8a5 Mon Sep 17 00:00:00 2001
From: Tobias <t@tobiasjordans.de>
Date: Sat, 24 Sep 2022 06:46:17 +0200
Subject: [PATCH 2/4] CSS: Fix line break for long key-value strings (#580)

* CSS: Fix line break for long key-value strings

`break-all` forces a line break for long strings (https://developer.mozilla.org/en-US/docs/Web/CSS/word-break).

* add pr fix to maplinre-gl-inspect.css

Co-authored-by: acalcutt <acalcutt@techidiots.net>
---
 public/resources/maplibre-gl-inspect.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/resources/maplibre-gl-inspect.css b/public/resources/maplibre-gl-inspect.css
index 6730686..547c4e4 100644
--- a/public/resources/maplibre-gl-inspect.css
+++ b/public/resources/maplibre-gl-inspect.css
@@ -22,12 +22,13 @@
 
 .maplibregl-inspect_property-value {
   display: table-cell;
-
+  word-break: break-all;
 }
 
 .maplibregl-inspect_property-name {
   display: table-cell;
   padding-right: 10px;
+  word-break: break-all;
 }
 
 .maplibregl-ctrl-inspect {

From edd36dd251671e92ab7cf20f7bce1fb00b012450 Mon Sep 17 00:00:00 2001
From: Nathan Gass <gass@search.ch>
Date: Sat, 24 Sep 2022 18:17:35 +0200
Subject: [PATCH 3/4] Open mbtiles in readonly mode (#506)

---
 src/main.js           | 2 +-
 src/serve_data.js     | 2 +-
 src/serve_rendered.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.js b/src/main.js
index c9725a2..ea5ef0c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -105,7 +105,7 @@ const startWithMBTiles = (mbtilesFile) => {
     console.log(`ERROR: Not valid MBTiles file: ${mbtilesFile}`);
     process.exit(1);
   }
-  const instance = new MBTiles(mbtilesFile, (err) => {
+  const instance = new MBTiles(mbtilesFile + '?mode=ro', (err) => {
     if (err) {
       console.log('ERROR: Unable to open MBTiles.');
       console.log(`       Make sure ${path.basename(mbtilesFile)} is valid MBTiles.`);
diff --git a/src/serve_data.js b/src/serve_data.js
index 37649bf..efe0e95 100644
--- a/src/serve_data.js
+++ b/src/serve_data.js
@@ -129,7 +129,7 @@ module.exports = {
     }
     let source;
     const sourceInfoPromise = new Promise((resolve, reject) => {
-      source = new MBTiles(mbtilesFile, err => {
+      source = new MBTiles(mbtilesFile + '?mode=ro', err => {
         if (err) {
           reject(err);
           return;
diff --git a/src/serve_rendered.js b/src/serve_rendered.js
index e39d8d5..d22f794 100644
--- a/src/serve_rendered.js
+++ b/src/serve_rendered.js
@@ -763,7 +763,7 @@ module.exports = {
           if (!mbtilesFileStats.isFile() || mbtilesFileStats.size === 0) {
             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) => {
               if (err) {
                 console.error(err);

From 7cfcc413c47d4efc251eaf7a60abefe73dda2571 Mon Sep 17 00:00:00 2001
From: Michael Nutt <michael@nuttnet.net>
Date: Sat, 24 Sep 2022 16:36:39 -0400
Subject: [PATCH 4/4] don't include duplicate attributions (#613)

---
 src/serve_rendered.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/serve_rendered.js b/src/serve_rendered.js
index d22f794..591e11d 100644
--- a/src/serve_rendered.js
+++ b/src/serve_rendered.js
@@ -792,10 +792,12 @@ module.exports = {
 
               if (!attributionOverride &&
                 source.attribution && source.attribution.length > 0) {
-                if (tileJSON.attribution.length > 0) {
-                  tileJSON.attribution += '; ';
+                if (!tileJSON.attribution.includes(source.attribution)) {
+                  if (tileJSON.attribution.length > 0) {
+                    tileJSON.attribution += ' | ';
+                  }
+                  tileJSON.attribution += source.attribution;
                 }
-                tileJSON.attribution += source.attribution;
               }
               resolve();
             });