From f0ff5506c7e45aa18bdcb82bc1aa3b13f1a10196 Mon Sep 17 00:00:00 2001
From: Vaclav Blazek <vaclav.blazek@citationtech.net>
Date: Thu, 14 Mar 2019 16:06:35 +0100
Subject: [PATCH] terrain: convertig credits to attribution

---
 externals/vts-libs                               |   2 +-
 mapproxy/src/mapproxy/CMakeLists.txt             |   4 ++++
 mapproxy/src/mapproxy/cesium.cpp                 |   8 ++++++++
 mapproxy/src/mapproxy/cesium/cesium.js           |   7 +++++++
 .../melown-technologies-logo-transparent-28.png  | Bin 0 -> 4255 bytes
 mapproxy/src/mapproxy/generator/surface.cpp      |   8 ++++++++
 mapproxy/src/mapproxy/support/tilejson.cpp       |   1 +
 mapproxy/src/mapproxy/support/tilejson.hpp       |   1 +
 8 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 mapproxy/src/mapproxy/cesium/melown-technologies-logo-transparent-28.png

diff --git a/externals/vts-libs b/externals/vts-libs
index 4a45bd5..4f4bd72 160000
--- a/externals/vts-libs
+++ b/externals/vts-libs
@@ -1 +1 @@
-Subproject commit 4a45bd5ad240065a2c8ddaf052d4f9b2051216f4
+Subproject commit 4f4bd72d402bab5c009a2a998fdc2d5b0e2c8076
diff --git a/mapproxy/src/mapproxy/CMakeLists.txt b/mapproxy/src/mapproxy/CMakeLists.txt
index 1c901c9..b6b57dc 100644
--- a/mapproxy/src/mapproxy/CMakeLists.txt
+++ b/mapproxy/src/mapproxy/CMakeLists.txt
@@ -155,6 +155,10 @@ file_to_cpp(mapproxy_CESIUM_SOURCES
   cesium::cesium_js
   cesium/cesium.js)
 
+file_to_cpp(mapproxy_CESIUM_SOURCES
+  cesium::melowntech_png
+  cesium/melown-technologies-logo-transparent-28.png)
+
 add_executable(mapproxy
   ${mapproxy_SOURCES}
   ${mapproxy_BROWSER_SOURCES}
diff --git a/mapproxy/src/mapproxy/cesium.cpp b/mapproxy/src/mapproxy/cesium.cpp
index 58ad78f..d336eff 100644
--- a/mapproxy/src/mapproxy/cesium.cpp
+++ b/mapproxy/src/mapproxy/cesium.cpp
@@ -28,6 +28,7 @@
 
 #include "cesium/cesium.html.hpp"
 #include "cesium/cesium.js.hpp"
+#include "cesium/melown-technologies-logo-transparent-28.png.hpp"
 
 namespace cesium {
 
@@ -47,6 +48,13 @@ const vtslibs::storage::SupportFile::Files supportFiles =
             , cesium_js_attr_lastModified
             , "application/javascript; charset=utf-8"
         }
+    }, { "melowntech.png"
+      , {
+            melowntech_png
+            , sizeof(melowntech_png)
+            , melowntech_png_attr_lastModified
+            , "image/png"
+        }
     }
 };
 
diff --git a/mapproxy/src/mapproxy/cesium/cesium.js b/mapproxy/src/mapproxy/cesium/cesium.js
index 4089b09..ceb3263 100644
--- a/mapproxy/src/mapproxy/cesium/cesium.js
+++ b/mapproxy/src/mapproxy/cesium/cesium.js
@@ -33,9 +33,16 @@ function launchCesium(imageryProvider) {
         , scene3DOnly: true
         , navigationInstructionsInitiallyVisible: false
         , selectionIndicator: false
+        , requestRenderMode : true
         , imageryProvider: imageryProvider
         , terrainProvider: terrainProvider
     });
+
+    var melownCredit = new Cesium.Credit
+        ('<a href="https://www.melown.com/">'
+         + '<img src="melowntech.png" title="Melown Technologies SE" />'
+         + '</a>');
+    viewer.scene.frameState.creditDisplay.addDefaultCredit(melownCredit);
 }
 
 function resolveUrl(url, base) {
diff --git a/mapproxy/src/mapproxy/cesium/melown-technologies-logo-transparent-28.png b/mapproxy/src/mapproxy/cesium/melown-technologies-logo-transparent-28.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2edb7995e64d825e94ae8e9167c7f5ed879a436
GIT binary patch
literal 4255
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
U&^}TA^$no@=!tTPqD9cZ0R4a)KmY&$

literal 0
HcmV?d00001

diff --git a/mapproxy/src/mapproxy/generator/surface.cpp b/mapproxy/src/mapproxy/generator/surface.cpp
index 74d229a..46b97b5 100644
--- a/mapproxy/src/mapproxy/generator/surface.cpp
+++ b/mapproxy/src/mapproxy/generator/surface.cpp
@@ -29,6 +29,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/format.hpp>
 #include <boost/utility/in_place_factory.hpp>
+#include <boost/lexical_cast.hpp>
 
 #include <opencv2/highgui/highgui.hpp>
 
@@ -39,6 +40,7 @@
 #include "imgproc/rastermask/cvmat.hpp"
 #include "imgproc/png.hpp"
 
+#include "vts-libs/registry/io.hpp"
 #include "vts-libs/storage/fstreams.hpp"
 #include "vts-libs/vts/io.hpp"
 #include "vts-libs/vts/nodeinfo.hpp"
@@ -641,6 +643,12 @@ void SurfaceBase::layerJson(Sink &sink, const SurfaceFileInfo &fi) const
         }
     }
 
+    if (!r.credits.empty()) {
+        layer.attribution
+            = boost::lexical_cast<std::string>
+            (utility::join(html(asInlineCredits(r)), "<br/>"));
+    }
+
     std::ostringstream os;
     save(layer, os);
     sink.content(os.str(), fi.sinkFileInfo());
diff --git a/mapproxy/src/mapproxy/support/tilejson.cpp b/mapproxy/src/mapproxy/support/tilejson.cpp
index 35b0e42..7bea187 100644
--- a/mapproxy/src/mapproxy/support/tilejson.cpp
+++ b/mapproxy/src/mapproxy/support/tilejson.cpp
@@ -102,6 +102,7 @@ void build(Json::Value &content, const LayerJson &layer)
     build(content["available"], layer.available);
     content["minzoom"] = layer.zoom.min;
     content["maxzoom"] = layer.zoom.max;
+    build(content, "attribution", layer.attribution);
 }
 
 } // namespace
diff --git a/mapproxy/src/mapproxy/support/tilejson.hpp b/mapproxy/src/mapproxy/support/tilejson.hpp
index 326310e..e922837 100644
--- a/mapproxy/src/mapproxy/support/tilejson.hpp
+++ b/mapproxy/src/mapproxy/support/tilejson.hpp
@@ -65,6 +65,7 @@ struct LayerJson {
     vts::LodRange zoom;
     Available available;
     std::vector<std::string> tiles;
+    OString attribution;
 
     LayerJson()
         : tilejson(2, 0, 0), version(1, 0, 0), scheme(Scheme::xyz)