Skip to content

[FIX] Maps: 48708: Use configured tile servers in OpenLayers map #12398

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
dkippKPG wants to merge 1 commit into
base: release_12
Choose a base branch
from
+17 −7
Open

[FIX] Maps: 48708: Use configured tile servers in OpenLayers map #12398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion components/ILIAS/Maps/classes/class.ilMapUtil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

class ilMapUtil
{
public const DEFAULT_TILE = "a.tile.openstreetmap.org b.tile.openstreetmap.org c.tile.openstreetmap.org";
public const DEFAULT_TILE = "tile.openstreetmap.org";
public const DEFAULT_GEOLOCATION = null;

public static ?ilSetting $_settings = null;
Expand Down
11 changes: 8 additions & 3 deletions components/ILIAS/Maps/js/src/ServiceOpenLayers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,14 @@ export default class ServiceOpenLayers {
let zoom = map[2];
let central_marker = map[3];
let replace_marker = map[5];
let tile_servers = map[6];
let geo = map[7];
let pos = this.posToOSM([map[1], map[0]]);

this.geolocationURL = geo;

this.initView(id, pos, zoom);
this.initMap(id, replace_marker);
this.initMap(id, replace_marker, tile_servers);
this.initUserMarkers(id, pos, replace_marker, central_marker);
}
}
Expand Down Expand Up @@ -92,14 +93,18 @@ export default class ServiceOpenLayers {
*
* @param {string} id
* @param {boolean} replace_marker
* @param {array} tile_servers
* @return {void}
*/
initMap(id, replace_marker) {
initMap(id, replace_marker, tile_servers) {
let source = new OSM();
source.setUrls(tile_servers.map((server) => 'https://' + server + '/{z}/{x}/{y}.png'));

this.map = new OLMap({
layers: [
new TileLayer({
preload: 4,
source: new OSM()
source: source
}),
],
target: id,
Expand Down
11 changes: 8 additions & 3 deletions components/ILIAS/Maps/resources/ServiceOpenLayers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21234,13 +21234,14 @@ class ServiceOpenLayers {
let zoom = map[2];
let central_marker = map[3];
let replace_marker = map[5];
let tile_servers = map[6];
let geo = map[7];
let pos = this.posToOSM([map[1], map[0]]);

this.geolocationURL = geo;

this.initView(id, pos, zoom);
this.initMap(id, replace_marker);
this.initMap(id, replace_marker, tile_servers);
this.initUserMarkers(id, pos, replace_marker, central_marker);
}
}
Expand Down Expand Up @@ -21274,14 +21275,18 @@ class ServiceOpenLayers {
*
* @param {string} id
* @param {boolean} replace_marker
* @param {array} tile_servers
* @return {void}
*/
initMap(id, replace_marker) {
initMap(id, replace_marker, tile_servers) {
let source = new OSM();
source.setUrls(tile_servers.map((server) => 'https://' + server + '/{z}/{x}/{y}.png'));

this.map = new OLMap({
layers: [
new TileLayer({
preload: 4,
source: new OSM()
source: source
}),
],
target: id,
Expand Down
Loading