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

First version with working level selector

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-07-22 01:33:11 +02:00
parent 15e6fde194
commit 707961761c
9 changed files with 266 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

69
UI/BigComponents/RightControls.ts
View file

@ -7,6 +7,11 @@ import MapState from "../../Logic/State/MapState";
import LevelSelector from "../Input/LevelSelector";
import FeaturePipeline from "../../Logic/FeatureSource/FeaturePipeline";
import {Utils} from "../../Utils";
import {TagUtils} from "../../Logic/Tags/TagUtils";
import {RegexTag} from "../../Logic/Tags/RegexTag";
import {Or} from "../../Logic/Tags/Or";
import {Tag} from "../../Logic/Tags/Tag";
import {TagsFilter} from "../../Logic/Tags/TagsFilter";
export default class RightControls extends Combine {
@ -42,26 +47,72 @@ export default class RightControls extends Combine {
});
const levelsInView = state.currentBounds.map(bbox => {
if(bbox === undefined){
if (bbox === undefined) {
return []
}
const allElements = state.featurePipeline.GetAllFeaturesAndMetaWithin(bbox);
const allLevelsRaw: string[] = [].concat(...allElements.map(allElements => allElements.features.map(f => <string>f.properties["level"])))
const allLevels = [].concat(...allLevelsRaw.map(l => LevelSelector.LevelsParser(l)))
allLevels.sort((a,b) => a < b ? -1 : 1)
const allLevels = [].concat(...allLevelsRaw.map(l => TagUtils.LevelsParser(l)))
if(allLevels.indexOf("0") < 0){
allLevels.push("0")
}
allLevels.sort((a, b) => a < b ? -1 : 1)
return Utils.Dedup(allLevels)
})
state.globalFilters.data.push({
filter: {
currentFilter: undefined,
state: undefined
}, id: "level"
})
const levelSelect = new LevelSelector(levelsInView)
levelsInView.addCallbackAndRun(levelsInView => {
if(levelsInView.length <= 1){
levelSelect.SetClass("invisible")
}else{
const isShown = levelsInView.map(levelsInView => levelsInView.length !== 0 && state.locationControl.data.zoom >= 17,
[state.locationControl])
function setLevelFilter() {
const filter = state.globalFilters.data.find(gf => gf.id === "level")
const oldState = filter.filter.state;
if (!isShown.data) {
filter.filter = {
state: "*",
currentFilter: undefined
}
} else {
const l = levelSelect.GetValue().data
let neededLevel : TagsFilter = new RegexTag("level", new RegExp("(^|;)" + l + "(;|$)"));
if(l === "0"){
neededLevel = new Or([neededLevel, new Tag("level", "")])
}
filter.filter = {
state: l,
currentFilter: neededLevel
}
}
if(filter.filter.state !== oldState){
state.globalFilters.ping();
console.log("Level filter is now ", filter?.filter?.currentFilter?.asHumanString(false, false, {}))
}
return;
}
isShown.addCallbackAndRun(shown => {
console.log("Is level selector shown?", shown)
setLevelFilter()
if (shown) {
// levelSelect.SetClass("invisible")
} else {
levelSelect.RemoveClass("invisible")
}
})
levelSelect.GetValue().addCallback(_ => setLevelFilter())
super([levelSelect, plus, min, geolocationButton].map(el => el.SetClass("m-0.5 md:m-1")))
super([new Combine([levelSelect]).SetClass(""), plus, min, geolocationButton].map(el => el.SetClass("m-0.5 md:m-1")))
this.SetClass("flex flex-col items-center")
}