Commit 74ef40cf authored by ext.sopra.ncastejon's avatar ext.sopra.ncastejon
Browse files

Add ign layer for raster images.

parent eb82d0df
{
"name": "webapp",
"version": "2.3.2",
"version": "2.4.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......@@ -984,9 +984,9 @@
"dev": true
},
"@types/mapbox-gl": {
"version": "0.54.1",
"resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-0.54.1.tgz",
"integrity": "sha512-qRsv6e0KYxJPAjqaxOWFSFm+U5tPBk2EmIxg0wgr1ffoB0sJ5hfnWnljO/XXQjHZrZzXfbf2P1jsDK2zrrq9dA==",
"version": "1.6.2",
"resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-1.6.2.tgz",
"integrity": "sha512-xDRNZhiqleCJuYPzXpp5UUcJzhiKTalKFVTr49I50gyo81qBNMErWeJRZJFjHd05U0onIdDFuX44TGpoVpJhXA==",
"dev": true,
"requires": {
"@types/geojson": "*"
......@@ -3234,9 +3234,9 @@
}
},
"earcut": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/earcut/-/earcut-2.1.5.tgz",
"integrity": "sha512-QFWC7ywTVLtvRAJTVp8ugsuuGQ5mVqNmJ1cRYeLrSHgP3nycr2RHTJob9OtM0v8ujuoKN0NY1a93J/omeTL1PA=="
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.1.tgz",
"integrity": "sha512-5jIMi2RB3HtGPHcYd9Yyl0cczo84y+48lgKPxMijliNQaKAHEZJbdzLmKmdxG/mCdS/YD9DQ1gihL8mxzR0F9w=="
},
"ecc-jsbn": {
"version": "0.1.2",
......@@ -3467,11 +3467,6 @@
"estraverse": "^4.1.1"
}
},
"esm": {
"version": "3.0.84",
"resolved": "https://registry.npmjs.org/esm/-/esm-3.0.84.tgz",
"integrity": "sha512-SzSGoZc17S7P+12R9cg21Bdb7eybX25RnIeRZ80xZs+VZ3kdQKzqTp2k4hZJjR7p9l0186TTXSgrxzlMDBktlw=="
},
"esprima": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
......@@ -4768,9 +4763,9 @@
}
},
"gl-matrix": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.0.0.tgz",
"integrity": "sha512-PD4mVH/C/Zs64kOozeFnKY8ybhgwxXXQYGWdB4h68krAHknWJgk9uKOn6z8YElh5//vs++90pb6csrTIDWnexA=="
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.1.0.tgz",
"integrity": "sha512-526NA+3EA+ztAQi0IZpSWiM0fyQXIp7IbRvfJ4wS/TjjQD0uv0fVybXwwqqSOlq33UckivI0yMDlVtboWm3k7A=="
},
"glob": {
"version": "7.1.3",
......@@ -6726,9 +6721,9 @@
}
},
"mapbox-gl": {
"version": "0.54.1",
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-0.54.1.tgz",
"integrity": "sha512-HtY+HobYTHTsFOJ3buTHtNvZv/Tjfp0vararhEWCjI7wQq8XxK16sEpsXucokrAhuu94js4KJylo13bKJx6l0Q==",
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.6.1.tgz",
"integrity": "sha512-qUvu8c/WX0woSLj8M64eK8351th4RI2+grGJ0ZlFb5ELEJNTb4SqMX/4uxRkb5d1euh2U72+AML1QOZjQnUPUw==",
"requires": {
"@mapbox/geojson-rewind": "^0.4.0",
"@mapbox/geojson-types": "^1.0.2",
......@@ -6740,18 +6735,17 @@
"@mapbox/vector-tile": "^1.3.1",
"@mapbox/whoots-js": "^3.1.0",
"csscolorparser": "~1.0.2",
"earcut": "^2.1.5",
"esm": "~3.0.84",
"earcut": "^2.2.0",
"geojson-vt": "^3.2.1",
"gl-matrix": "^3.0.0",
"grid-index": "^1.1.0",
"minimist": "0.0.8",
"murmurhash-js": "^1.0.0",
"pbf": "^3.0.5",
"pbf": "^3.2.1",
"potpack": "^1.0.1",
"quickselect": "^2.0.0",
"rw": "^1.3.3",
"supercluster": "^6.0.1",
"supercluster": "^7.0.0",
"tinyqueue": "^2.0.0",
"vt-pbf": "^3.1.1"
}
......@@ -8035,9 +8029,9 @@
}
},
"pbf": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.0.tgz",
"integrity": "sha512-98Eh7rsJNJF/Im6XYMLaOW3cLnNyedlOd6hu3iWMD5I7FZGgpw8yN3vQBrmLbLodu7G784Irb9Qsv2yFrxSAGw==",
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz",
"integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==",
"requires": {
"ieee754": "^1.1.12",
"resolve-protobuf-schema": "^2.1.0"
......@@ -10219,9 +10213,9 @@
}
},
"supercluster": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/supercluster/-/supercluster-6.0.2.tgz",
"integrity": "sha512-aa0v2HURjBTOpbcknilcfxGDuArM8khklKSmZ/T8ZXL0BuRwb5aRw95lz+2bmWpFvCXDX/+FzqHxmg0TIaJErw==",
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.0.0.tgz",
"integrity": "sha512-8VuHI8ynylYQj7Qf6PBMWy1PdgsnBiIxujOgc9Z83QvJ8ualIYWNx2iMKyKeC4DZI5ntD9tz/CIwwZvIelixsA==",
"requires": {
"kdbush": "^3.0.0"
}
......
......@@ -154,7 +154,7 @@ export class MapComponent implements OnInit, OnDestroy {
const mapboxOptions = {
container: 'map',
center: [4.85, 45.75] as mapboxgl.LngLatLike,
minZoom: 9,
// minZoom: 9,
zoom: 12,
};
......
......@@ -79,6 +79,15 @@ export class MapService {
credentials: 'include',
};
}
console.log(resourceType);
console.log(url);
if (resourceType === 'Tile' && url.includes('ign')) {
console.log("set the good referer");
return {
url,
};
}
};
this._map = new mapboxgl.Map(options);
......
......@@ -4,7 +4,8 @@
"raster-tiles": {
"type": "raster",
"tiles": [
"https://ortho.data.grandlyon.com/?bbox={bbox-epsg-3857}&format=image/jpeg&service=WMS&version=1.1.1&request=GetMap&srs=EPSG:3857&width=512&height=512&transparent=true&layers=ortho2018"
"https://ortho.data.grandlyon.com/?bbox={bbox-epsg-3857}&format=image/jpeg&service=WMS&version=1.1.1&request=GetMap&srs=EPSG:3857&width=256&height=256bon&transparent=true&layers=ortho2018",
"http://localhost:9000/ign?bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&srs=EPSG:3857&width=256&height=256&transparent=true&layers=ORTHOIMAGERY.ORTHOPHOTOS.BDORTHO&styles=normal"
],
"maxzoom": 21,
"attribution": "© <a href='https://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors"
......
......@@ -45,6 +45,7 @@ $input-color: $brand-color;
@import "../../node_modules/bulma/sass/elements/icon.sass";
@import "../../node_modules/bulma/sass/elements/title.sass";
@import "../../node_modules/bulma/sass/components/dropdown.sass";
@import "../../node_modules/bulma/sass/components/modal.sass";
@import "../../node_modules/bulma/sass/grid/columns.sass";
@import "../../node_modules/bulma/sass/form/_all";
@import "../../node_modules/bulma/sass/layout/footer.sass";
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment