Skip to content

Commit 69216af

Browse files
sbrunnersbrunner
authored
Merge pull request #9407 from camptocamp/demo-2-9
Uses the demo 2.9
2 parents 24ae6b7 + 0e9e7a4 commit 69216af

File tree

23 files changed

+86
-86
lines changed

23 files changed

+86
-86
lines changed

‎api/dist/apihelp/apihelp.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ <h1>Simple API Help</h1>
5454
<h2>Basis</h2>
5555
<p>To use the API you should add the following HTML:</p>
5656
<pre><code data-language="html">
57-
&lt;link href="https://geomapfish-demo-2-8.camptocamp.com/api.css" rel="stylesheet"&gt;
58-
&lt;script src="https://geomapfish-demo-2-8.camptocamp.com/api.js?version=2"&gt;&lt;/script&gt;
57+
&lt;link href="https://geomapfish-demo-2-9.camptocamp.com/api.css" rel="stylesheet"&gt;
58+
&lt;script src="https://geomapfish-demo-2-9.camptocamp.com/api.js?version=2"&gt;&lt;/script&gt;
5959
&lt;script&gt;
6060
window.onload = function() {
6161
// add the code here

‎api/dist/apihelp/data.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
id point title description icon iconSize iconOffset
2-
1 1216300,2553000 Information Office de l'information<br />Tél: 032 000 00 00<br>Email: <a href="mailto:[email protected]">[email protected]</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
3-
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
4-
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
5-
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
6-
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
2+
1 1216300,2553000 Information Office de l'information<br />Tél: 032 000 00 00<br>Email: <a href="mailto:[email protected]">[email protected]</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
3+
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
4+
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
5+
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
6+
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

‎api/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {dynamicUrl} from './src/constants';
22
import Map from './src/Map';
33

4-
dynamicUrl.dynamicUrl = 'https://geomapfish-demo-2-8.camptocamp.com/dynamic.json?interface=api';
4+
dynamicUrl.dynamicUrl = 'https://geomapfish-demo-2-9.camptocamp.com/dynamic.json?interface=api';
55

66
const lib = {
77
Map,

‎buildtools/check-example.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ function loaded(page, browser) {
159159
return;
160160
}
161161
if (url.startsWith('http://localhost:8080/')) {
162-
url = url.replace('http://localhost:8080/', 'https://geomapfish-demo-2-8.camptocamp.com/');
162+
url = url.replace('http://localhost:8080/', 'https://geomapfish-demo-2-9.camptocamp.com/');
163163
}
164164
if (url == 'https://ows.asitvd.ch/wmts/1.0.0/WMTSCapabilities.xml') {
165165
request.respond(ASITVDCapabilities);

‎contribs/gmf/apps/desktop/index.html.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title ng-bind-template="{{'Desktop Application'|translate}}">GeoMapFish</title>
55
<meta charset="utf-8">
66
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
7-
<meta name="dynamicUrl" content="https://geomapfish-demo-2-8.camptocamp.com/dynamic.json">
7+
<meta name="dynamicUrl" content="https://geomapfish-demo-2-9.camptocamp.com/dynamic.json">
88
<meta name="interface" content="desktop">
99
<link rel="shortcut icon" href="<%=require("./image/favicon.ico")%>" crossorigin="anonymous" />
1010
<% for (var css in htmlWebpackPlugin.files.css) { %>

‎contribs/gmf/apps/desktop_alt/index.html.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title translate>Alternative Desktop Application</title>
55
<meta charset="utf-8">
66
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
7-
<meta name="dynamicUrl" content="https://geomapfish-demo-2-8.camptocamp.com/dynamic.json">
7+
<meta name="dynamicUrl" content="https://geomapfish-demo-2-9.camptocamp.com/dynamic.json">
88
<meta name="interface" content="desktop_alt">
99
<link rel="shortcut icon" href="<%=require("./image/favicon.ico")%>" crossorigin="anonymous" />
1010
<% for (var css in htmlWebpackPlugin.files.css) { %>

‎contribs/gmf/apps/iframe_api/index.html.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title ng-bind-template="{{'Iframe API Application'|translate}}">GeoMapFish</title>
55
<meta charset="utf-8">
66
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
7-
<meta name="dynamicUrl" content="https://geomapfish-demo-2-8.camptocamp.com/dynamic.json">
7+
<meta name="dynamicUrl" content="https://geomapfish-demo-2-9.camptocamp.com/dynamic.json">
88
<meta name="interface" content="iframe_api">
99
<link rel="shortcut icon" href="<%=require("./image/favicon.ico")%>" crossorigin="anonymous" />
1010
<% for (var css in htmlWebpackPlugin.files.css) { %>

‎contribs/gmf/apps/mobile/index.html.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
77
<meta name="mobile-web-app-capable" content="yes">
88
<meta name="apple-mobile-web-app-capable" content="yes">
9-
<meta name="dynamicUrl" content="https://geomapfish-demo-2-8.camptocamp.com/dynamic.json">
9+
<meta name="dynamicUrl" content="https://geomapfish-demo-2-9.camptocamp.com/dynamic.json">
1010
<meta name="interface" content="mobile">
1111
<link rel="shortcut icon" href="<%=require("./image/favicon.ico")%>" crossorigin="anonymous" />
1212
<% for (var css in htmlWebpackPlugin.files.css) { %>

‎contribs/gmf/apps/mobile_alt/index.html.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
77
<meta name="mobile-web-app-capable" content="yes">
88
<meta name="apple-mobile-web-app-capable" content="yes">
9-
<meta name="dynamicUrl" content="https://geomapfish-demo-2-8.camptocamp.com/dynamic.json">
9+
<meta name="dynamicUrl" content="https://geomapfish-demo-2-9.camptocamp.com/dynamic.json">
1010
<meta name="interface" content="mobile_alt">
1111
<link rel="shortcut icon" href="<%=require("./image/favicon.ico")%>" crossorigin="anonymous" />
1212
<% for (var css in htmlWebpackPlugin.files.css) { %>

‎contribs/gmf/apps/oeedit/index.html.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title ng-bind-template="{{'ObjectEditing - Edit Application'|translate}}">GeoMapFish</title>
55
<meta charset="utf-8">
66
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
7-
<meta name="dynamicUrl" content="https://geomapfish-demo-2-8.camptocamp.com/dynamic.json">
7+
<meta name="dynamicUrl" content="https://geomapfish-demo-2-9.camptocamp.com/dynamic.json">
88
<meta name="interface" content="oeedit">
99
<link rel="shortcut icon" href="<%=require("./image/favicon.ico")%>" crossorigin="anonymous" />
1010
<% for (var css in htmlWebpackPlugin.files.css) { %>

0 commit comments

Comments
 (0)