diff options
Diffstat (limited to 'templates/web/base/maps')
| -rw-r--r-- | templates/web/base/maps/google-ol.html | 2 | ||||
| -rw-r--r-- | templates/web/base/maps/noscript_map.html | 8 | ||||
| -rw-r--r-- | templates/web/base/maps/noscript_map_wmts.html | 2 | ||||
| -rw-r--r-- | templates/web/base/maps/openlayers.html | 9 | ||||
| -rw-r--r-- | templates/web/base/maps/wmts_config.html | 6 |
5 files changed, 15 insertions, 12 deletions
diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html index 8e0690f9d..47c940129 100644 --- a/templates/web/base/maps/google-ol.html +++ b/templates/web/base/maps/google-ol.html @@ -6,7 +6,7 @@ [% INCLUDE maps/openlayers.html %] [% UNLESS around_page %] <p class="sub-map-links" id="sub_map_links"> - [% map_sub_links %] + [% map_sub_links | safe %] </p> [% END %] [% END %] diff --git a/templates/web/base/maps/noscript_map.html b/templates/web/base/maps/noscript_map.html index 8418c4eb8..0b7431148 100644 --- a/templates/web/base/maps/noscript_map.html +++ b/templates/web/base/maps/noscript_map.html @@ -1,23 +1,23 @@ [% SET start = c.config.ADMIN_BASE_URL IF admin -%] <div class="noscript"> <div id="[% nsm_prefix %]drag"> - <[% map.img_type %] + <[% map.img_type | safe %] alt="NW map tile" id="[% nsm_prefix %]t2.2" name="tile_[% map.x_tile - 1 %].[% map.y_tile - 1 %]" src="[% map.tiles.0 %]" style="top:0; left:0;"> - <[% map.img_type %] + <[% map.img_type | safe %] alt="NE map tile" id="[% nsm_prefix %]t2.3" name="tile_[% map.x_tile %].[% map.y_tile - 1 %]" src="[% map.tiles.1 %]" style="top:0px; left:256px;"> <br> - <[% map.img_type %] + <[% map.img_type | safe %] alt="SW map tile" id="[% nsm_prefix %]t3.2" name="tile_[% map.x_tile - 1 %].[% map.y_tile %]" src="[% map.tiles.2 %]" style="top:256px; left:0;"> - <[% map.img_type %] + <[% map.img_type | safe %] alt="SE map tile" id="[% nsm_prefix %]t3.3" name="tile_[% map.x_tile %].[% map.y_tile %]" src="[% map.tiles.3 %]" diff --git a/templates/web/base/maps/noscript_map_wmts.html b/templates/web/base/maps/noscript_map_wmts.html index 987aa76a6..2b1c5e73c 100644 --- a/templates/web/base/maps/noscript_map_wmts.html +++ b/templates/web/base/maps/noscript_map_wmts.html @@ -5,7 +5,7 @@ [%- FOR tile IN row -%] [%- top_px = tile.row_offset * map.tile_size -%] [%- left_px = tile.col_offset * map.tile_size %] - <[% map.img_type %] + <[% map.img_type | safe %] class="square-map__tile" alt="[% tile.alt %]" id="[% nsm_prefix %]t[% tile.dotted_id %]" diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html index 02f6cb131..5002d4243 100644 --- a/templates/web/base/maps/openlayers.html +++ b/templates/web/base/maps/openlayers.html @@ -33,10 +33,13 @@ <div id="map_box" aria-hidden="true"> [% pre_map %] <div id="map"> - [% DEFAULT noscript_map_template = 'maps/noscript_map.html' %] - [% INCLUDE $noscript_map_template js = 1 %] + [% IF noscript_map_template == 'maps/noscript_map_wmts.html' %] + [% INCLUDE 'maps/noscript_map_wmts.html' js = 1 %] + [% ELSE %] + [% INCLUDE 'maps/noscript_map.html' js = 1 %] + [% END %] </div> [% IF map.copyright %] - <div class="olControlAttribution" style="position: absolute;">[% map.copyright %]</div> + <div class="olControlAttribution" style="position: absolute;">[% map.copyright | safe %]</div> [% END %] <img id="loading-indicator" class="hidden" aria-hidden="true" src="/i/loading.svg" alt="Loading..."> diff --git a/templates/web/base/maps/wmts_config.html b/templates/web/base/maps/wmts_config.html index 0b80a055b..680de57e3 100644 --- a/templates/web/base/maps/wmts_config.html +++ b/templates/web/base/maps/wmts_config.html @@ -3,12 +3,12 @@ fixmystreet.wmts_config = { 'map_projection': '[% map.map_projection %]', 'tile_dpi': [% map.tile_dpi %], - 'tile_urls': [% map.tile_urls %], + 'tile_urls': [% map.tile_urls | safe %], 'tile_suffix': '[% map.tile_suffix %]', - 'layer_names': [% map.layer_names %], + 'layer_names': [% map.layer_names | safe %], 'layer_style': '[% map.layer_style %]', 'matrix_set': '[% map.matrix_set %]', - 'scales': [% map.scales %], + 'scales': [% map.scales | safe %], 'origin_x': [% map.origin_x %], 'origin_y': [% map.origin_y %] }; |