midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge preliminary work on layer selection

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-07-16 14:56:19 +02:00
commit b4c2e4df70
5 changed files with 142 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Logic/FilteredLayer.ts
View file

@ -1,11 +1,11 @@
import {Basemap} from "./Basemap";
import {TagsFilter, TagUtils} from "./TagsFilter";
import {UIEventSource} from "../UI/UIEventSource";
import {ElementStorage} from "./ElementStorage";
import {Changes} from "./Changes";
import { Basemap } from "./Basemap";
import { TagsFilter, TagUtils } from "./TagsFilter";
import { UIEventSource } from "../UI/UIEventSource";
import { ElementStorage } from "./ElementStorage";
import { Changes } from "./Changes";
import L from "leaflet"
import {GeoOperations} from "./GeoOperations";
import {UIElement} from "../UI/UIElement";
import { GeoOperations } from "./GeoOperations";
import { UIElement } from "../UI/UIElement";
/***
* A filtered layer is a layer which offers a 'set-data' function
@ -20,6 +20,7 @@ export class FilteredLayer {
public readonly name: string;
public readonly filters: TagsFilter;
public readonly isDisplayed: UIEventSource<boolean> = new UIEventSource(true);
private readonly _map: Basemap;
private readonly _maxAllowedOverlap: number;
@ -65,6 +66,16 @@ export class FilteredLayer {
this._style = style;
this._storage = storage;
this._maxAllowedOverlap = maxAllowedOverlap;
const self = this;
this.isDisplayed.addCallback(function (isDisplayed) {
if (self._geolayer !== undefined && self._geolayer !== null) {
if (isDisplayed) {
self._geolayer.addTo(self._map.map);
} else {
self._map.map.removeLayer(self._geolayer);
}
}
})
}
@ -174,7 +185,7 @@ export class FilteredLayer {
radius: 25,
color: style.color
});
} else {
marker = L.marker(latLng, {
icon: style.icon
@ -206,7 +217,9 @@ export class FilteredLayer {
}
});
this._geolayer.addTo(this._map.map);
if (this.isDisplayed.data) {
this._geolayer.addTo(this._map.map);
}
}