Skip to content

fix problems with some urls when use --public_url #583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emiliopardo wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix problems with some urls when use --public_url #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e13556a
added public_url to templates
emiliopardo Apr 4, 2022
ba250de
delete styles with url
emiliopardo Apr 4, 2022
9a5c4eb
added styles with url {{public_url}}
emiliopardo Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions public/resources/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,3 @@
@font-face {
font-family: 'OpenSans';
src: url('/fonts/OpenSans-Regular.ttf');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'OpenSans';
src: url('/fonts/OpenSans-Italic.ttf');
font-weight: normal;
font-style: italic;
}
@font-face {
font-family: 'OpenSans';
src: url('/fonts/OpenSans-Bold.ttf');
font-weight: bold;
font-style: normal;
}

body{
background-color: #fff;
color: #212121;
font-family:'OpenSans', sans-serif, Arial;
font-size: 14px;
margin:0;
background-repeat:no-repeat !important;
background-size: contain !important;
background-image: url(/images/header-map-1280px.png);
}
a{
color: #499DCE;
transition: color .2s;
Expand Down
33 changes: 32 additions & 1 deletion public/templates/index.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,37 @@
return false;
}
</script>
<style>
@font-face {
font-family: "OpenSans";
src: url("{{public_url}}fonts/OpenSans-Regular.ttf");
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: "OpenSans";
src: url("{{public_url}}fonts/OpenSans-Italic.ttf");
font-weight: normal;
font-style: italic;
}
@font-face {
font-family: "OpenSans";
src: url("{{public_url}}fonts/OpenSans-Bold.ttf");
font-weight: bold;
font-style: normal;
}

body{
background-color: #fff;
color: #212121;
font-family:"OpenSans", sans-serif, Arial;
font-size: 14px;
margin:0;
background-repeat:no-repeat !important;
background-size: contain !important;
background-image: url({{public_url}}/images/header-map-1280px.png);
}
</style>
</head>
<body>
<section>
Expand Down Expand Up @@ -41,7 +72,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>
Comment on lines -44 to +75
Copy link
Contributor

@mloskot mloskot Jan 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this has been fixed long ago

{{/if}}
{{#if xyz_link}}
| <a href="#" onclick="return toggle_xyz('xyz_style_{{@key}}');">XYZ</a>
Expand Down
8 changes: 4 additions & 4 deletions public/templates/wmts.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ows:Operation name="GetCapabilities">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:href="{{baseUrl}}/wmts/{{id}}/">
<ows:Get xlink:href="{{public_url}}wmts/{{id}}/">
<ows:Constraint name="GetEncoding">
<ows:AllowedValues>
<ows:Value>RESTful</ows:Value>
Expand All @@ -24,7 +24,7 @@
<ows:Operation name="GetTile">
<ows:DCP>
<ows:HTTP>
<ows:Get xlink:href="{{baseUrl}}/styles/">
<ows:Get xlink:href="{{public_url}}styles/">
<ows:Constraint name="GetEncoding">
<ows:AllowedValues>
<ows:Value>RESTful</ows:Value>
Expand All @@ -50,7 +50,7 @@
<TileMatrixSetLink>
<TileMatrixSet>GoogleMapsCompatible</TileMatrixSet>
</TileMatrixSetLink>
<ResourceURL format="image/png" resourceType="tile" template="{{baseUrl}}/styles/{{id}}/{TileMatrix}/{TileCol}/{TileRow}.png{{key_query}}"/>
<ResourceURL format="image/png" resourceType="tile" template="{{public_url}}styles/{{id}}/{TileMatrix}/{TileCol}/{TileRow}.png{{key_query}}"/>
</Layer><TileMatrixSet>
<ows:Title>GoogleMapsCompatible</ows:Title>
<ows:Abstract>GoogleMapsCompatible EPSG:3857</ows:Abstract>
Expand Down Expand Up @@ -403,5 +403,5 @@
<MatrixHeight>262144</MatrixHeight>
</TileMatrix></TileMatrixSet>
</Contents>
<ServiceMetadataURL xlink:href="{{baseUrl}}/wmts/{{id}}/"/>
<ServiceMetadataURL xlink:href="{{public_url}}wmts/{{id}}/"/>
</Capabilities>