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

Merge branch 'feature/climbing-layer' into kletterspots-develop

Browse source
This commit is contained in:
Christian Neumann 2020-11-23 11:58:23 +01:00
commit e24e725411
46 changed files with 1225 additions and 533 deletions
Download patch file Download diff file Expand all files Collapse all files

12
InitUiElements.ts
View file

@ -85,6 +85,11 @@ export class InitUiElements {
throw "Incorrect layout"
}
const hashContent = QueryParameters.GetQueryParameter("hash_content", "", "A workaround for the share-api which doesn't share the hash...");
if((hashContent.data ?? "") !== ""){
window.location.hash = hashContent.data;
}
console.log("Using layout: ", layoutToUse.id, "LayoutFromBase64 is ", layoutFromBase64);
State.state = new State(layoutToUse);
@ -161,7 +166,7 @@ export class InitUiElements {
if (feature === undefined) {
State.state.fullScreenMessage.setData(undefined);
}
if (feature?.properties === undefined) {
if (feature?.properties === undefined) {
return;
}
const data = feature.properties;
@ -175,7 +180,7 @@ export class InitUiElements {
continue;
}
if(layer.title === null && layer.tagRenderings.length === 0){
if((layer.title ?? null) === null && layer.tagRenderings.length === 0){
continue;
}
@ -230,7 +235,6 @@ export class InitUiElements {
});
const marker = L.marker([home.lat, home.lon], {icon: icon})
marker.addTo(State.state.bm.map)
console.log(marker)
});
new GeoLocationHandler()
@ -300,7 +304,7 @@ export class InitUiElements {
]
if (State.state.featureSwitchShareScreen.data) {
tabs.push({header: Svg.share, content: new ShareScreen()});
tabs.push({header: Svg.share_img, content: new ShareScreen()});
}
if (State.state.featureSwitchMoreQuests.data) {