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

Refactoring: highlight the currently selected element

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-04-27 02:24:38 +02:00
parent 06631ccd6d
commit 2b47cf934c
20 changed files with 214 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
View file

@ -30,7 +30,7 @@ export class UpdateLegacyLayer extends DesugaringStep<
config.source = config.source ?? {
osmTags: config["overpassTags"],
}
config.source.osmTags = config["overpassTags"]
config.source["osmTags"] = config["overpassTags"]
delete config["overpassTags"]
}

2
Models/ThemeConfig/PointRenderingConfig.ts
View file

@ -13,7 +13,7 @@ import Combine from "../../UI/Base/Combine"
import { VariableUiElement } from "../../UI/Base/VariableUIElement"
export default class PointRenderingConfig extends WithContextLoader {
private static readonly allowed_location_codes = new Set<string>([
static readonly allowed_location_codes: ReadonlySet<string> = new Set<string>([
"point",
"centroid",
"start",

54
Models/ThemeViewState.ts
View file

@ -476,29 +476,45 @@ export default class ThemeViewState implements SpecialVisualizationState {
* Setup various services for which no reference are needed
*/
private initActors() {
this.selectedElement.addCallback((selected) => {
Hash.hash.setData(selected?.properties?.id)
})
{
// Set the hash based on the selected element...
this.selectedElement.addCallback((selected) => {
Hash.hash.setData(selected?.properties?.id)
})
// ... search and select an element based on the hash
Hash.hash.mapD(
(hash) => {
console.log("Searching for an id:", hash)
if (this.selectedElement.data?.properties?.id === hash) {
// We already have the correct hash
return
}
Hash.hash.mapD(
(hash) => {
console.log("Searching for an id:", hash)
if (this.selectedElement.data?.properties?.id === hash) {
// We already have the correct hash
const found = this.indexedFeatures.featuresById.data?.get(hash)
if (!found) {
return
}
const layer = this.layout.getMatchingLayer(found.properties)
this.selectedElement.setData(found)
this.selectedLayer.setData(layer)
},
[this.indexedFeatures.featuresById.stabilized(250)]
)
}
{
// Unselect the selected element if it is panned out of view
this.mapProperties.bounds.stabilized(250).addCallbackD((bounds) => {
const selected = this.selectedElement.data
if (selected === undefined) {
return
}
const found = this.indexedFeatures.featuresById.data?.get(hash)
if (!found) {
return
const bbox = BBox.get(selected)
if (!bbox.overlapsWith(bounds)) {
this.selectedElement.setData(undefined)
}
const layer = this.layout.getMatchingLayer(found.properties)
this.selectedElement.setData(found)
this.selectedLayer.setData(layer)
},
[this.indexedFeatures.featuresById.stabilized(250)]
)
})
}
new MetaTagging(this)
new TitleHandler(this.selectedElement, this.selectedLayer, this.featureProperties, this)
new ChangeToElementsActor(this.changes, this.featureProperties)