From efc920cbf5f22b03aa7f125d44f3a1a3aa54884e Mon Sep 17 00:00:00 2001
From: latlon team <info@lat-lon.de>
Date: Fri, 24 Nov 2023 18:25:24 +0000
Subject: [PATCH] Code drop
- XPLANBOX-2474 ensure 24h time format (combined with English & Berlin TZ) (4a19974aa)
- XPLANBOX-2554 - fixed GetTile requests (d2f046a6f)
Co-authored-by: Lyn Elisa Goltz <goltz@lat-lon.de>
Co-authored-by: Marc Guillemot <guillemot@lat-lon.de>
Dropped from commit: 0c0c9935a744207e5fa45297194338fa8b332a96
---
xplan-resources/xplan-sql-scripts/Dockerfile | 10 ++++++----
.../xplan-webservices-soapui-project.xml | 20 +++++++++----------
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/xplan-resources/xplan-sql-scripts/Dockerfile b/xplan-resources/xplan-sql-scripts/Dockerfile
index 7ad79cbe2a..1ba2bf2a24 100644
--- a/xplan-resources/xplan-sql-scripts/Dockerfile
+++ b/xplan-resources/xplan-sql-scripts/Dockerfile
@@ -16,10 +16,12 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
"org.opencontainers.image.version"="$XPLANBOX_VERSION" \
"maintainer"=""
-ENV TZ=Europe/Berlin
-ENV LC_TIME=en_US
-ENV LC_ALL="en_US.UTF-8"
-ENV LC_CTYPE="en_US.UTF-8"
+RUN echo "en_GB.UTF-8 UTF-8" > /etc/locale.gen \
+ && locale-gen
+
+ENV TZ=Europe/Berlin \
+ LC_ALL=en_GB.UTF-8
+
# sets superuser and password for PG instance
ENV POSTGRES_USER=postgres
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-webservices-soapui-project.xml b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-webservices-soapui-project.xml
index 0dce7f7fd8..8e8b65b7d7 100644
--- a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-webservices-soapui-project.xml
+++ b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-webservices-soapui-project.xml
@@ -12097,7 +12097,7 @@ exists(//wmts:Layer[ows:Identifier='soplan_vektor'])</path>
</con:parameter>
<con:parameter>
<con:name>TILEMATRIX</con:name>
- <con:value>14</con:value>
+ <con:value>6</con:value>
<con:style>QUERY</con:style>
<con:default>14</con:default>
<con:path xsi:nil="true"/>
@@ -12105,7 +12105,7 @@ exists(//wmts:Layer[ows:Identifier='soplan_vektor'])</path>
</con:parameter>
<con:parameter>
<con:name>TILEROW</con:name>
- <con:value>4592</con:value>
+ <con:value>2050</con:value>
<con:style>QUERY</con:style>
<con:default>4592</con:default>
<con:path xsi:nil="true"/>
@@ -12113,7 +12113,7 @@ exists(//wmts:Layer[ows:Identifier='soplan_vektor'])</path>
</con:parameter>
<con:parameter>
<con:name>TILECOL</con:name>
- <con:value>8202</con:value>
+ <con:value>1148</con:value>
<con:style>QUERY</con:style>
<con:default>8202</con:default>
<con:path xsi:nil="true"/>
@@ -12210,7 +12210,7 @@ exists(//wmts:Layer[ows:Identifier='soplan_vektor'])</path>
</con:parameter>
<con:parameter>
<con:name>TILEMATRIX</con:name>
- <con:value>14</con:value>
+ <con:value>6</con:value>
<con:style>QUERY</con:style>
<con:default>14</con:default>
<con:path xsi:nil="true"/>
@@ -12218,7 +12218,7 @@ exists(//wmts:Layer[ows:Identifier='soplan_vektor'])</path>
</con:parameter>
<con:parameter>
<con:name>TILEROW</con:name>
- <con:value>4592</con:value>
+ <con:value>2050</con:value>
<con:style>QUERY</con:style>
<con:default>4592</con:default>
<con:path xsi:nil="true"/>
@@ -12226,7 +12226,7 @@ exists(//wmts:Layer[ows:Identifier='soplan_vektor'])</path>
</con:parameter>
<con:parameter>
<con:name>TILECOL</con:name>
- <con:value>8202</con:value>
+ <con:value>1148</con:value>
<con:style>QUERY</con:style>
<con:default>8202</con:default>
<con:path xsi:nil="true"/>
@@ -12241,7 +12241,7 @@ exists(//wmts:Layer[ows:Identifier='soplan_vektor'])</path>
<con:settings>
<con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting>
</con:settings>
- <con:endpoint>${#Project#baseUrlMapProxy}/wmts/bplan_raster/gdi_de_25832/14/8202/4592.png</con:endpoint>
+ <con:endpoint>${#Project#baseUrlMapProxy}/wmts/bplan_raster/gdi_de_25832/6/2050/1148.png</con:endpoint>
<con:request/>
<con:assertion type="Valid HTTP Status Codes" id="6f5f2a6d-d21d-476b-84d8-69b271ab5021" name="Valid HTTP Status Codes">
<con:configuration>
@@ -12264,7 +12264,7 @@ exists(//wmts:Layer[ows:Identifier='soplan_vektor'])</path>
</con:credentials>
<con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
<con:jmsPropertyConfig/>
- <con:parameters></con:parameters>
+ <con:parameters/>
</con:config>
</con:testStep>
<con:testStep type="httprequest" name="REST GetTile - bplan_vektor" id="16fa6248-6d25-4906-92ca-12b79fa8e63c">
@@ -12273,7 +12273,7 @@ exists(//wmts:Layer[ows:Identifier='soplan_vektor'])</path>
<con:settings>
<con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><xml-fragment/></con:setting>
</con:settings>
- <con:endpoint>${#Project#baseUrlMapProxy}/wmts/bplan_vektor/gdi_de_25832/14/8202/4592.png</con:endpoint>
+ <con:endpoint>${#Project#baseUrlMapProxy}/wmts/bplan_vektor/gdi_de_25832/6/2050/1148.png</con:endpoint>
<con:request/>
<con:assertion type="Valid HTTP Status Codes" id="6f5f2a6d-d21d-476b-84d8-69b271ab5021" name="Valid HTTP Status Codes">
<con:configuration>
@@ -12296,7 +12296,7 @@ exists(//wmts:Layer[ows:Identifier='soplan_vektor'])</path>
</con:credentials>
<con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
<con:jmsPropertyConfig/>
- <con:parameters></con:parameters>
+ <con:parameters/>
</con:config>
</con:testStep>
<con:properties/>
--
GitLab