Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Full code cleanup

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-01-26 21:40:38 +01:00
parent 3a4a2a2016
commit fa971ffbbf
300 changed files with 16352 additions and 19284 deletions
Download patch file Download diff file Expand all files Collapse all files

16
UI/ShowDataLayer/ShowDataLayer.ts
View file

@ -44,8 +44,8 @@ export default class ShowDataLayer {
*/
private readonly leafletLayersPerId = new Map<string, { feature: any, leafletlayer: any }>()
private readonly showDataLayerid: number;
private readonly createPopup : (tags: any, layer: LayerConfig) => ScrollableFullScreen
private readonly createPopup: (tags: any, layer: LayerConfig) => ScrollableFullScreen
constructor(options: ShowDataLayerOptions & { layerToShow: LayerConfig }) {
this._leafletMap = options.leafletMap;
this.showDataLayerid = ShowDataLayer.dataLayerIds;
@ -60,7 +60,7 @@ export default class ShowDataLayer {
this.allElements = options.state?.allElements;
this.createPopup = undefined;
this._enablePopups = options.popup !== undefined;
if(options.popup !== undefined){
if (options.popup !== undefined) {
this.createPopup = options.popup
}
const self = this;
@ -73,7 +73,7 @@ export default class ShowDataLayer {
this._features.features.addCallback(_ => self.update(options));
options.doShowLayer?.addCallback(doShow => {
const mp = options.leafletMap.data;
if(mp === null){
if (mp === null) {
self.Destroy()
return true;
}
@ -142,7 +142,7 @@ export default class ShowDataLayer {
}
}
private update(options: ShowDataLayerOptions) : boolean{
private update(options: ShowDataLayerOptions): boolean {
if (this._features.features.data === undefined) {
return;
}
@ -152,13 +152,13 @@ export default class ShowDataLayer {
}
const mp = options.leafletMap.data;
if(mp === null){
if (mp === null) {
return true; // Unregister as the map has been destroyed
}
if (mp === undefined) {
return;
}
this._cleanCount++
// clean all the old stuff away, if any
if (this.geoLayer !== undefined) {
@ -312,7 +312,7 @@ export default class ShowDataLayer {
leafletLayer.on("popupopen", () => {
if (infobox === undefined) {
const tags = this.allElements?.getEventSourceById(feature.properties.id) ?? new UIEventSource<any>(feature.properties);
infobox = createpopup(tags, layer );
infobox = createpopup(tags, layer);
infobox.isShown.addCallback(isShown => {
if (!isShown) {

7
UI/ShowDataLayer/ShowDataLayerOptions.ts
View file

@ -1,11 +1,6 @@
import FeatureSource from "../../Logic/FeatureSource/FeatureSource";
import {UIEventSource} from "../../Logic/UIEventSource";
import {ElementStorage} from "../../Logic/ElementStorage";
import {OsmConnection} from "../../Logic/Osm/OsmConnection";
import {Changes} from "../../Logic/Osm/Changes";
import LayoutConfig from "../../Models/ThemeConfig/LayoutConfig";
import FilteredLayer from "../../Models/FilteredLayer";
import BaseLayer from "../../Models/BaseLayer";
import LayerConfig from "../../Models/ThemeConfig/LayerConfig";
import ScrollableFullScreen from "../Base/ScrollableFullScreen";
@ -16,5 +11,5 @@ export interface ShowDataLayerOptions {
popup?: undefined | ((tags: any, layer: LayerConfig) => ScrollableFullScreen),
zoomToFeatures?: false | boolean,
doShowLayer?: UIEventSource<boolean>,
state?: {allElements?: ElementStorage}
state?: { allElements?: ElementStorage }
}

1
UI/ShowDataLayer/ShowTileInfo.ts
View file

@ -7,7 +7,6 @@ import {GeoOperations} from "../../Logic/GeoOperations";
import {Tiles} from "../../Models/TileRange";
import * as clusterstyle from "../../assets/layers/cluster_style/cluster_style.json"
import State from "../../State";
import FeatureInfoBox from "../Popup/FeatureInfoBox";
export default class ShowTileInfo {
public static readonly styling = new LayerConfig(clusterstyle, "ShowTileInfo", true)