diff options
Diffstat (limited to 'app/main.js')
| -rw-r--r-- | app/main.js | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/app/main.js b/app/main.js index 617b9bb..2485cb1 100644 --- a/app/main.js +++ b/app/main.js @@ -107,7 +107,6 @@ export class App { this.#stats = stats; this.#controls = controls; - // Initialize map this.#map = new MapEl({ onHouseClick: (houseId, persistent) => this.#showHouseModal(houseId, persistent), onHouseHover: (houseId, hide) => { @@ -118,8 +117,9 @@ export class App { } }, }); - mapContainer.append(this.#map.initializeMap(), stats); - this.#loadData(loading); + + mapContainer.append(this.#map.svg, stats); + this.#initialize(loading); } /** @@ -583,7 +583,7 @@ export class App { * Load data and initialize application * @param {HTMLElement} loading */ - async #loadData(loading) { + async #initialize(loading) { try { const [districts, houses, trainStations, trainTracks, coastLine, mainRoads] = await Promise.all([ @@ -603,10 +603,8 @@ export class App { this.#filtered = houses.slice(); if (this.#map) { + this.#map.initialize(districts, coastLine, mainRoads, trainTracks, trainStations); this.#map.setHouses(houses, this.#colorParameter); - this.#map.setTrainData(trainStations, trainTracks); - this.#map.setDistricts(districts); - this.#map.setMapData(coastLine, mainRoads); } // Populate district multi-select |