Merge pull request #9407 from camptocamp/demo-2-9

Uses the demo 2.9
camptocamp · Aug 20, 2024 · 69216af · 69216af
2 parents 24ae6b7 + 0e9e7a4
commit 69216af
Show file tree

Hide file tree

Showing 23 changed files with 86 additions and 86 deletions.
diff --git a/api/dist/apihelp/apihelp.html b/api/dist/apihelp/apihelp.html
@@ -54,8 +54,8 @@ <h1>Simple API Help</h1>
       <h2>Basis</h2>
       <p>To use the API you should add the following HTML:</p>
       <pre><code data-language="html">
-&lt;link href="https://geomapfish-demo-2-8.camptocamp.com/api.css" rel="stylesheet"&gt;
-&lt;script src="https://geomapfish-demo-2-8.camptocamp.com/api.js?version=2"&gt;&lt;/script&gt;
+&lt;link href="https://geomapfish-demo-2-9.camptocamp.com/api.css" rel="stylesheet"&gt;
+&lt;script src="https://geomapfish-demo-2-9.camptocamp.com/api.js?version=2"&gt;&lt;/script&gt;
 &lt;script&gt;
 window.onload = function() {
     // add the code here

diff --git a/api/dist/apihelp/data.txt b/api/dist/apihelp/data.txt
@@ -1,6 +1,6 @@
 id	point	title	description	icon	iconSize	iconOffset
-1	1216300,2553000	Information	Office de l'information<br />Tél: 032 000 00 00<br>Email: <a href="mailto:info@example.com">info@example.com</a><br />Internet: <a href="http://fr.wikipedia.org/wiki/La_Chaux-de-Fonds" target=new>Cliquer ici</a>	https://geomapfish-demo-2-8.camptocamp.com/static/0/img/markers/marker.png	21,25	-10.5,-25
-2	1215600,2554250	Ma première station	Diesel pas cher	https://geomapfish-demo-2-8.camptocamp.com/static/0/img/markers/marker-blue.png	21,25	-10.5,-25
-3	1215864,2552556	Mon parking	C'est celui-là le meilleur.	https://geomapfish-demo-2-8.camptocamp.com/static/0/img/markers/marker-gold.png	21,25	-10.5,-25
-4	1217126,2554489	Mon parking	Ce parking est<br/>le meillleur.	https://geomapfish-demo-2-8.camptocamp.com/static/0/img/markers/marker-gold.png	21,25	-10.5,-25
-5	1217326,2554089	Ma deuxième station	Sans-plomb pas cher.	https://geomapfish-demo-2-8.camptocamp.com/static/0/img/markers/marker-blue.png	21,25	-10.5,-25
+1	1216300,2553000	Information	Office de l'information<br />Tél: 032 000 00 00<br>Email: <a href="mailto:info@example.com">info@example.com</a><br />Internet: <a href="http://fr.wikipedia.org/wiki/La_Chaux-de-Fonds" target=new>Cliquer ici</a>	https://geomapfish-demo-2-9.camptocamp.com/static/0/img/markers/marker.png	21,25	-10.5,-25
+2	1215600,2554250	Ma première station	Diesel pas cher	https://geomapfish-demo-2-9.camptocamp.com/static/0/img/markers/marker-blue.png	21,25	-10.5,-25
+3	1215864,2552556	Mon parking	C'est celui-là le meilleur.	https://geomapfish-demo-2-9.camptocamp.com/static/0/img/markers/marker-gold.png	21,25	-10.5,-25
+4	1217126,2554489	Mon parking	Ce parking est<br/>le meillleur.	https://geomapfish-demo-2-9.camptocamp.com/static/0/img/markers/marker-gold.png	21,25	-10.5,-25
+5	1217326,2554089	Ma deuxième station	Sans-plomb pas cher.	https://geomapfish-demo-2-9.camptocamp.com/static/0/img/markers/marker-blue.png	21,25	-10.5,-25
diff --git a/api/index.js b/api/index.js
@@ -1,7 +1,7 @@
 import {dynamicUrl} from './src/constants';
 import Map from './src/Map';
 
-dynamicUrl.dynamicUrl = 'https://geomapfish-demo-2-8.camptocamp.com/dynamic.json?interface=api';
+dynamicUrl.dynamicUrl = 'https://geomapfish-demo-2-9.camptocamp.com/dynamic.json?interface=api';
 
 const lib = {
   Map,

diff --git a/buildtools/check-example.js b/buildtools/check-example.js
@@ -159,7 +159,7 @@ function loaded(page, browser) {
       return;
     }
     if (url.startsWith('http://localhost:8080/')) {
-      url = url.replace('http://localhost:8080/', 'https://geomapfish-demo-2-8.camptocamp.com/');
+      url = url.replace('http://localhost:8080/', 'https://geomapfish-demo-2-9.camptocamp.com/');
     }
     if (url == 'https://ows.asitvd.ch/wmts/1.0.0/WMTSCapabilities.xml') {
       request.respond(ASITVDCapabilities);

diff --git a/contribs/gmf/apps/desktop/index.html.ejs b/contribs/gmf/apps/desktop/index.html.ejs
@@ -4,7 +4,7 @@
     <title ng-bind-template="{{'Desktop Application'|translate}}">GeoMapFish</title>
     <meta charset="utf-8">
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
-    <meta name="dynamicUrl" content="https://geomapfish-demo-2-8.camptocamp.com/dynamic.json">
+    <meta name="dynamicUrl" content="https://geomapfish-demo-2-9.camptocamp.com/dynamic.json">
     <meta name="interface" content="desktop">
     <link rel="shortcut icon" href="<%=require("./image/favicon.ico")%>" crossorigin="anonymous" />
     <% for (var css in htmlWebpackPlugin.files.css) { %>

diff --git a/contribs/gmf/apps/desktop_alt/index.html.ejs b/contribs/gmf/apps/desktop_alt/index.html.ejs
@@ -4,7 +4,7 @@
     <title translate>Alternative Desktop Application</title>
     <meta charset="utf-8">
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
-    <meta name="dynamicUrl" content="https://geomapfish-demo-2-8.camptocamp.com/dynamic.json">
+    <meta name="dynamicUrl" content="https://geomapfish-demo-2-9.camptocamp.com/dynamic.json">
     <meta name="interface" content="desktop_alt">
     <link rel="shortcut icon" href="<%=require("./image/favicon.ico")%>" crossorigin="anonymous" />
     <% for (var css in htmlWebpackPlugin.files.css) { %>

diff --git a/contribs/gmf/apps/iframe_api/index.html.ejs b/contribs/gmf/apps/iframe_api/index.html.ejs
@@ -4,7 +4,7 @@
     <title ng-bind-template="{{'Iframe API Application'|translate}}">GeoMapFish</title>
     <meta charset="utf-8">
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
-    <meta name="dynamicUrl" content="https://geomapfish-demo-2-8.camptocamp.com/dynamic.json">
+    <meta name="dynamicUrl" content="https://geomapfish-demo-2-9.camptocamp.com/dynamic.json">
     <meta name="interface" content="iframe_api">
     <link rel="shortcut icon" href="<%=require("./image/favicon.ico")%>" crossorigin="anonymous" />
     <% for (var css in htmlWebpackPlugin.files.css) { %>

diff --git a/contribs/gmf/apps/mobile/index.html.ejs b/contribs/gmf/apps/mobile/index.html.ejs
@@ -6,7 +6,7 @@
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
     <meta name="mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="dynamicUrl" content="https://geomapfish-demo-2-8.camptocamp.com/dynamic.json">
+    <meta name="dynamicUrl" content="https://geomapfish-demo-2-9.camptocamp.com/dynamic.json">
     <meta name="interface" content="mobile">
     <link rel="shortcut icon" href="<%=require("./image/favicon.ico")%>" crossorigin="anonymous" />
     <% for (var css in htmlWebpackPlugin.files.css) { %>

diff --git a/contribs/gmf/apps/mobile_alt/index.html.ejs b/contribs/gmf/apps/mobile_alt/index.html.ejs
@@ -6,7 +6,7 @@
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
     <meta name="mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="dynamicUrl" content="https://geomapfish-demo-2-8.camptocamp.com/dynamic.json">
+    <meta name="dynamicUrl" content="https://geomapfish-demo-2-9.camptocamp.com/dynamic.json">
     <meta name="interface" content="mobile_alt">
     <link rel="shortcut icon" href="<%=require("./image/favicon.ico")%>" crossorigin="anonymous" />
     <% for (var css in htmlWebpackPlugin.files.css) { %>

diff --git a/contribs/gmf/apps/oeedit/index.html.ejs b/contribs/gmf/apps/oeedit/index.html.ejs
@@ -4,7 +4,7 @@
     <title ng-bind-template="{{'ObjectEditing - Edit Application'|translate}}">GeoMapFish</title>
     <meta charset="utf-8">
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
-    <meta name="dynamicUrl" content="https://geomapfish-demo-2-8.camptocamp.com/dynamic.json">
+    <meta name="dynamicUrl" content="https://geomapfish-demo-2-9.camptocamp.com/dynamic.json">
     <meta name="interface" content="oeedit">
     <link rel="shortcut icon" href="<%=require("./image/favicon.ico")%>" crossorigin="anonymous" />
     <% for (var css in htmlWebpackPlugin.files.css) { %>

diff --git a/contribs/gmf/examples/options.js b/contribs/gmf/examples/options.js
@@ -26,7 +26,7 @@ import './vars.scss';
  *
  * @type {string}
  */
-const GMF_DEMO = 'https://geomapfish-demo-2-8.camptocamp.com/';
+const GMF_DEMO = 'https://geomapfish-demo-2-9.camptocamp.com/';
 
 /**
  * Base url for the GeoMapFish demo server.

diff --git a/contribs/gmf/test/spec/classes/legendmapfishprintv3.spec.js b/contribs/gmf/test/spec/classes/legendmapfishprintv3.spec.js
@@ -120,13 +120,13 @@ describe('gmf.print.LegendMapFishPrintV3', () => {
             {
               'name': 'police_stations',
               'icons': [
-                'https://geomapfish-demo-2-8.camptocamp.com/static/cf85fcea5f7a4f6c866fd76a6da3da11/images/railways.png',
+                'https://geomapfish-demo-2-9.camptocamp.com/static/cf85fcea5f7a4f6c866fd76a6da3da11/images/railways.png',
               ],
             },
             {
               'name': 'post_office',
               'icons': [
-                'https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=post_office&SCALE=25000',
+                'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=post_office&SCALE=25000',
               ],
             },
           ],
@@ -153,13 +153,13 @@ describe('gmf.print.LegendMapFishPrintV3', () => {
             {
               'name': 'police_stations',
               'icons': [
-                'https://geomapfish-demo-2-8.camptocamp.com/static/cf85fcea5f7a4f6c866fd76a6da3da11/images/railways.png',
+                'https://geomapfish-demo-2-9.camptocamp.com/static/cf85fcea5f7a4f6c866fd76a6da3da11/images/railways.png',
               ],
             },
             {
               'name': 'post_office',
               'icons': [
-                'https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=post_office&SCALE=25000',
+                'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=post_office&SCALE=25000',
               ],
             },
           ],
@@ -186,14 +186,14 @@ describe('gmf.print.LegendMapFishPrintV3', () => {
             {
               'name': 'points',
               'icons': [
-                'https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=points&DPI=254&BBOX=0%2C0&SRS=EPSG%3A3857&SRCWIDTH=NaN&SRCHEIGHT=NaN&ITEMFONTFAMILY=DejaVu%20Sans&ITEMFONTSIZE=8&LAYERFONTFAMILY=DejaVu%20Sans&LAYERFONTSIZE=10',
+                'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=QGIS+server&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=points&DPI=254&BBOX=0%2C0&SRS=EPSG%3A3857&SRCWIDTH=NaN&SRCHEIGHT=NaN&ITEMFONTFAMILY=DejaVu%20Sans&ITEMFONTSIZE=8&LAYERFONTFAMILY=DejaVu%20Sans&LAYERFONTSIZE=10',
               ],
               'dpi': 254,
             },
             {
               'name': 'railways',
               'icons': [
-                'https://geomapfish-demo-2-8.camptocamp.com/static/cf85fcea5f7a4f6c866fd76a6da3da11/images/railways.png',
+                'https://geomapfish-demo-2-9.camptocamp.com/static/cf85fcea5f7a4f6c866fd76a6da3da11/images/railways.png',
               ],
             },
           ],
@@ -222,13 +222,13 @@ describe('gmf.print.LegendMapFishPrintV3', () => {
                 {
                   'name': 'sustenance',
                   'icons': [
-                    'https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=sustenance&SCALE=25000',
+                    'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=sustenance&SCALE=25000',
                   ],
                 },
                 {
                   'name': 'entertainment',
                   'icons': [
-                    'https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=entertainment&SCALE=25000',
+                    'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=entertainment&SCALE=25000',
                   ],
                 },
               ],
@@ -251,7 +251,7 @@ describe('gmf.print.LegendMapFishPrintV3', () => {
         {
           'name': 'fuel',
           'icons': [
-            'https://geomapfish-demo-2-8.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=fuel&SCALE=25000',
+            'https://geomapfish-demo-2-9.camptocamp.com/mapserv_proxy?ogcserver=Main+PNG&cache_version=cf85fcea5f7a4f6c866fd76a6da3da11&username=admin&FORMAT=image%2Fpng&TRANSPARENT=true&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetLegendGraphic&LAYER=fuel&SCALE=25000',
           ],
         },
       ],
@@ -274,7 +274,7 @@ describe('gmf.print.LegendMapFishPrintV3', () => {
             {
               'name': 'ch.astra.hauptstrassennetz',
               'icons': [
-                'https://geomapfish-demo-2-8.camptocamp.com/static/cf85fcea5f7a4f6c866fd76a6da3da11/images/railways.png',
+                'https://geomapfish-demo-2-9.camptocamp.com/static/cf85fcea5f7a4f6c866fd76a6da3da11/images/railways.png',
               ],
             },
           ],