Skip to content

Commit 6ff586f

Browse files
prushforthprushforth
committed
Replace toporama_en usage in tests with static image file
1 parent efb281e commit 6ff586f

9 files changed

+57
-56
lines changed

‎package-lock.json

+50-50
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/e2e/core/metaDefault.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<map-input name="xmax" type="location" units="pcrs" position="top-right" axis="easting" ></map-input>
3232
<map-input name="ymax" type="location" units="pcrs" position="top-left" axis="northing" ></map-input>
3333
<map-link rel="image"
34-
tref="https://maps.geogratis.gc.ca/wms/toporama_en?SERVICE=WMS&REQUEST=GetMap&FORMAT=image/jpeg&TRANSPARENT=FALSE&STYLES=&VERSION=1.3.0&LAYERS=WMS-Toporama&WIDTH={w}&HEIGHT={h}&CRS=EPSG:3978&BBOX={xmin},{ymin},{xmax},{ymax}&m4h=t" ></map-link>
34+
tref="images/toporama_en.jpg?SERVICE=WMS&REQUEST=GetMap&FORMAT=image/jpeg&TRANSPARENT=FALSE&STYLES=&VERSION=1.3.0&LAYERS=WMS-Toporama&WIDTH={w}&HEIGHT={h}&CRS=EPSG:3978&BBOX={xmin},{ymin},{xmax},{ymax}&m4h=t" ></map-link>
3535
</map-extent>
3636
</layer->
3737
<layer- id="defaultMeta" label="Default meta" checked>

‎test/e2e/data/images/toporama_en.jpg

133 KB
Loading

‎test/e2e/data/tiles/cbmt/templatedImage.mapml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<map-input name="ymin" type="location" units="pcrs" position="bottom-left" axis="northing" min="28448056.0" max="42672085.0"></map-input>
1515
<map-input name="xmax" type="location" units="pcrs" position="top-right" axis="easting" min="28448056.0" max="38608077.0"></map-input>
1616
<map-input name="ymax" type="location" units="pcrs" position="top-left" axis="northing" min="28448056.0" max="42672085.0"></map-input>
17-
<map-link rel="image" tref="https://maps.geogratis.gc.ca/wms/toporama_en?SERVICE=WMS&amp;REQUEST=GetMap&amp;FORMAT=image/jpeg&amp;TRANSPARENT=FALSE&amp;STYLES=&amp;VERSION=1.3.0&amp;LAYERS=WMS-Toporama&amp;WIDTH={w}&amp;HEIGHT={h}&amp;CRS=EPSG:3978&amp;BBOX={xmin},{ymin},{xmax},{ymax}&amp;m4h=t"></map-link>
17+
<map-link rel="image" tref="images/toporama_en.jpg?WIDTH={w}&amp;HEIGHT={h}&amp;CRS=EPSG:3978&amp;BBOX={xmin},{ymin},{xmax},{ymax}&amp;m4h=t"></map-link>
1818
</map-extent>
1919
</map-body>
2020
</mapml->

‎test/e2e/layers/multipleExtents.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<map-input name="xmax" type="location" units="pcrs" position="top-right" axis="easting" ></map-input>
5050
<map-input name="ymax" type="location" units="pcrs" position="top-left" axis="northing" ></map-input>
5151
<map-link rel="image"
52-
tref="https://maps.geogratis.gc.ca/wms/toporama_en?SERVICE=WMS&REQUEST=GetMap&FORMAT=image/jpeg&TRANSPARENT=FALSE&STYLES=&VERSION=1.3.0&LAYERS=WMS-Toporama&WIDTH={w}&HEIGHT={h}&CRS=EPSG:3978&BBOX={xmin},{ymin},{xmax},{ymax}&m4h=t" ></map-link>
52+
tref="images/toporama_en.jpg?SERVICE=WMS&REQUEST=GetMap&FORMAT=image/jpeg&TRANSPARENT=FALSE&STYLES=&VERSION=1.3.0&LAYERS=WMS-Toporama&WIDTH={w}&HEIGHT={h}&CRS=EPSG:3978&BBOX={xmin},{ymin},{xmax},{ymax}&m4h=t" ></map-link>
5353
</map-extent>
5454
</layer->
5555
</mapml-viewer>

‎test/e2e/layers/step/imageStep.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ test.describe('Templated image layer with step', () => {
99
1,
1010
0,
1111
0,
12-
'https://maps.geogratis.gc.ca/wms/toporama_en?SERVICE=WMS&REQUEST=GetMap&FORMAT=image/jpeg&TRANSPARENT=FALSE&STYLES=&VERSION=1.3.0&LAYERS=WMS-Toporama&WIDTH=300&HEIGHT=150&CRS=EPSG:3978&BBOX=',
12+
'/images/toporama_en.jpg',
1313
'-5537023.0124460235,-2392385.4881043136,5972375.006350018,3362313.521293707&m4h=t',
1414
'',
1515
'-968982.6263652518,-107703.83540767431,1412272.136144273,1082923.545847088&m4h=t',

‎test/e2e/layers/step/templatedImageLayerStep.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<map-input name="ymax" type="location" units="pcrs" position="top-left" axis="northing" min="-3362085.3441706896"
4040
max="3952277.216154434" ></map-input>
4141
<map-link rel="image"
42-
tref="https://maps.geogratis.gc.ca/wms/toporama_en?SERVICE=WMS&amp;REQUEST=GetMap&amp;FORMAT=image/jpeg&amp;TRANSPARENT=FALSE&amp;STYLES=&amp;VERSION=1.3.0&amp;LAYERS=WMS-Toporama&amp;WIDTH={w}&amp;HEIGHT={h}&amp;CRS=EPSG:3978&amp;BBOX={xmin},{ymin},{xmax},{ymax}&amp;m4h=t" ></map-link>
42+
tref="/images/toporama_en.jpg?SERVICE=WMS&amp;REQUEST=GetMap&amp;FORMAT=image/jpeg&amp;TRANSPARENT=FALSE&amp;STYLES=&amp;VERSION=1.3.0&amp;LAYERS=WMS-Toporama&amp;WIDTH={w}&amp;HEIGHT={h}&amp;CRS=EPSG:3978&amp;BBOX={xmin},{ymin},{xmax},{ymax}&amp;m4h=t" ></map-link>
4343
</map-extent>
4444
</layer->
4545
</mapml-viewer>

‎test/e2e/layers/templatedImageLayer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<map-input name="ymax" type="location" units="pcrs" position="top-left" axis="northing" min="-3362085.3441706896"
4343
max="3952277.216154434" ></map-input>
4444
<map-link rel="image"
45-
tref="https://maps.geogratis.gc.ca/wms/toporama_en?SERVICE=WMS&amp;REQUEST=GetMap&amp;FORMAT=image/jpeg&amp;TRANSPARENT=FALSE&amp;STYLES=&amp;VERSION=1.3.0&amp;LAYERS=WMS-Toporama&amp;WIDTH={w}&amp;HEIGHT={h}&amp;CRS=EPSG:3978&amp;BBOX={xmin},{ymin},{xmax},{ymax}&amp;m4h=t" ></map-link>
45+
tref="images/toporama_en.jpg?WIDTH={w}&amp;HEIGHT={h}&amp;CRS=EPSG:3978&amp;BBOX={xmin},{ymin},{xmax},{ymax}&amp;m4h=t" ></map-link>
4646
</map-extent>
4747
</layer->
4848
<layer- label="Static MapML with tiles" checked>

‎test/server.js

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ app.get('/data/noMapMeta', (req, res, next) => {
7373

7474
app.use('/data', express.static(path.join(__dirname, 'e2e/data/tiles/cbmt')));
7575
app.use('/data', express.static(path.join(__dirname, 'e2e/data/tiles/wgs84')));
76+
app.use('/images', express.static(path.join(__dirname, 'e2e/data/images')));
7677
app.use(
7778
'/data',
7879
express.static(path.join(__dirname, 'e2e/data/tiles/osmtile'))

0 commit comments

Comments
 (0)