Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/ci-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ jobs:
- run: npx playwright install --with-deps
- run: npm install -g grunt-cli
- run: grunt default
- run: xvfb-run --auto-servernum -- npx playwright test layerContextMenuKeyboard popup --workers=1 --retries=3
- run: xvfb-run --auto-servernum -- npx playwright test --grep-invert="popupTabNavigation\.test\.js|layerContextMenuKeyboard\.test\.js" --workers=1 --retries=3
- run: xvfb-run --auto-servernum -- npx playwright test --grep="popupTabNavigation\.test\.js|layerContextMenuKeyboard\.test\.js" --workers=1 --retries=3
# - run: xvfb-run --auto-servernum -- npm run jest
env:
CI: true
1 change: 0 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
<map-link rel="tile" tref="https://tile.openstreetmap.org/{z}/{x}/{y}.png"></map-link>
</map-extent>
</layer->
</layer->
</mapml-viewer>
</body>
</html>
53 changes: 28 additions & 25 deletions src/mapml/layers/TemplatedTileLayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,31 +138,34 @@ export var TemplatedTileLayer = L.TileLayer.extend({
return this.options.pane;
},
_fetchTile: function (coords, tile) {
fetch(this.getTileUrl(coords), { redirect: 'follow' })
.then(function (response) {
if (response.status >= 200 && response.status < 300) {
return Promise.resolve(response);
} else {
console.log(
'Looks like there was a problem. Status Code: ' + response.status
);
return Promise.reject(response);
}
})
.then(function (response) {
return response.text();
})
.then((text) => {
var parser = new DOMParser();
return parser.parseFromString(text, 'application/xml');
})
.then((mapml) => {
this._createFeatures(mapml, coords, tile);
this._mapmlTileReady(tile);
})
.catch((err) => {
console.log('Error Creating Tile');
});
let url = this.getTileUrl(coords);
if (url) {
fetch(url, { redirect: 'follow' })
.then(function (response) {
if (response.status >= 200 && response.status < 300) {
return Promise.resolve(response);
} else {
console.log(
'Looks like there was a problem. Status Code: ' + response.status
);
return Promise.reject(response);
}
})
.then(function (response) {
return response.text();
})
.then((text) => {
var parser = new DOMParser();
return parser.parseFromString(text, 'application/xml');
})
.then((mapml) => {
this._createFeatures(mapml, coords, tile);
this._mapmlTileReady(tile);
})
.catch((err) => {
console.log('Error Creating Tile');
});
}
},

// TO DO: get rid of this function altogether; see TO DO below re: map-link
Expand Down
2,438 changes: 2,438 additions & 0 deletions test/e2e/data/tiles/osmtile/0/0/0.mapml

Large diffs are not rendered by default.

758 changes: 758 additions & 0 deletions test/e2e/data/tiles/osmtile/1/0/0.mapml

Large diffs are not rendered by default.

1,325 changes: 1,325 additions & 0 deletions test/e2e/data/tiles/osmtile/1/0/1.mapml

Large diffs are not rendered by default.

315 changes: 315 additions & 0 deletions test/e2e/data/tiles/osmtile/1/1/0.mapml

Large diffs are not rendered by default.

516 changes: 516 additions & 0 deletions test/e2e/data/tiles/osmtile/1/1/1.mapml

Large diffs are not rendered by default.

223 changes: 223 additions & 0 deletions test/e2e/data/tiles/osmtile/2/0/0.mapml

Large diffs are not rendered by default.

175 changes: 175 additions & 0 deletions test/e2e/data/tiles/osmtile/2/0/1.mapml

Large diffs are not rendered by default.

169 changes: 169 additions & 0 deletions test/e2e/data/tiles/osmtile/2/0/2.mapml

Large diffs are not rendered by default.

72 changes: 72 additions & 0 deletions test/e2e/data/tiles/osmtile/2/0/3.mapml

Large diffs are not rendered by default.

179 changes: 179 additions & 0 deletions test/e2e/data/tiles/osmtile/2/1/0.mapml

Large diffs are not rendered by default.

587 changes: 587 additions & 0 deletions test/e2e/data/tiles/osmtile/2/1/1.mapml

Large diffs are not rendered by default.

1,011 changes: 1,011 additions & 0 deletions test/e2e/data/tiles/osmtile/2/1/2.mapml

Large diffs are not rendered by default.

323 changes: 323 additions & 0 deletions test/e2e/data/tiles/osmtile/2/1/3.mapml

Large diffs are not rendered by default.

37 changes: 37 additions & 0 deletions test/e2e/data/tiles/osmtile/2/2/0.mapml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<mapml- xmlns="http://www.w3.org/1999/xhtml">
<map-head>
<map-title>ne_10m_admin_0_countries</map-title>
<map-meta charset="utf-8"/>
<map-meta content="text/mapml" http-equiv="Content-Type"/>
<map-meta name="projection" content="OSMTILE"></map-meta>
<map-meta name="cs" content="pcrs"></map-meta>
</map-head>
<map-body>
<map-feature id="fclass.5" class="fclass">
<map-geometry>
<map-polygon>
<map-coordinates>
-10107579.41972 -100601.44026 -10134945.54615 -40667.25671 -10158336.70449 0
<map-span class="noline">-10158573.51798 400.7613 -10196629.74432 400.7613</map-span>
-10197321.96838 0 -10174848.11037 -24614.28654 -10142436.83215 -63600.54332 -10190289.33254 -99684.02686 -10107579.41972 -100601.44026
</map-coordinates>
</map-polygon>
</map-geometry>
</map-feature>
<map-feature id="fclass.6" class="fclass">
<map-geometry>
<map-multipolygon>
<map-polygon>
<map-coordinates>-20037508.34279 -1916626.22114 -20010142.21637 -1880532.43377 -20037508.34279 -1896016.78349 -20037508.34279 -1916626.22114</map-coordinates>
</map-polygon>
<map-polygon>
<map-coordinates>-20037508.34279 -1867450.97229 -20028946.87307 -1863623.69866 -20032463.19099 -1856449.31803 -20037508.34279 -1861550.86463 -20037508.34279 -1867450.97229</map-coordinates>
</map-polygon>
<map-polygon>
<map-coordinates>-20037508.34279 -1824431.49843 -20032616.07438 -1822521.40936 -20031087.2405 -1818701.70843 -20037508.34279 -1822043.91196 -20037508.34279 -1824431.49843</map-coordinates>
</map-polygon>
</map-multipolygon>
</map-geometry>
</map-feature>
</map-body>
</mapml->
Loading