midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix ways: they show up again

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-11-16 02:33:44 +01:00
parent 314894085a
commit 2685b6e734
6 changed files with 67 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
Logic/FilteredLayer.ts
View file

@ -128,52 +128,45 @@ export class FilteredLayer {
let self = this;
console.log(data);
this._geolayer = L.geoJSON(data, {
/* style: feature => {
self.layerDef.GenerateLeafletStyle(feature.properties);
return {
color: "#f00",
weight: 4
}
},*/
/*
pointToLayer: function (feature, latLng) {
// Point to layer converts the 'point' to a layer object - as the geojson layer natively cannot handle points
// Click handling is done in the next step
style: feature =>
self.layerDef.GenerateLeafletStyle(feature.properties),
pointToLayer: function (feature, latLng) {
// Point to layer converts the 'point' to a layer object - as the geojson layer natively cannot handle points
// Click handling is done in the next step
const style = self.layerDef.GenerateLeafletStyle(feature.properties);
let marker;
if (style.icon === undefined) {
marker = L.circle(latLng, {
radius: 25,
color: style.color
});
} else if (style.icon.iconUrl.startsWith("$circle")) {
marker = L.circle(latLng, {
radius: 25,
color: style.color
});
} else {
if (style.icon.iconSize === undefined) {
style.icon.iconSize = [50, 50]
const style = self.layerDef.GenerateLeafletStyle(feature.properties);
let marker;
if (style.icon === undefined) {
marker = L.circle(latLng, {
radius: 25,
color: style.color
});
} else if (style.icon.iconUrl.startsWith("$circle")) {
marker = L.circle(latLng, {
radius: 25,
color: style.color
});
} else {
if (style.icon.iconSize === undefined) {
style.icon.iconSize = [50, 50]
}
marker = L.marker(latLng, {
icon: L.icon(style.icon)
});
}
return marker;
},
onEachFeature: function (feature, layer: Layer) {
marker = L.marker(latLng, {
icon: L.icon(style.icon)
});
}
return marker;
},*/
/*
onEachFeature: function (feature, layer:Layer) {
layer.on("click", (e) => {
if (layer.getPopup() === undefined
&& (window.screen.availHeight > 600 || window.screen.availWidth > 600) // We DON'T trigger this code on small screens! No need to create a popup
) {
const popup = L.popup({
autoPan: true,
closeOnEscapeKey: true,
}, layer);
layer.on("click", (e) => {
if (layer.getPopup() === undefined
&& (window.screen.availHeight > 600 || window.screen.availWidth > 600) // We DON'T trigger this code on small screens! No need to create a popup
) {
const popup = L.popup({
autoPan: true,
closeOnEscapeKey: true,
}, layer);
// @ts-ignore
popup.setLatLng(e.latlng)
@ -196,7 +189,6 @@ export class FilteredLayer {
L.DomEvent.stop(e);
});
}
*/
}
)
;

20
UI/Image/ImageUploadFlow.ts
View file

@ -103,21 +103,8 @@ export class ImageUploadFlow extends UIElement {
const label = new Combine([
Svg.camera_plus_svg().SetStyle("width: 36px;height: 36px;padding: 0.1em;margin-top: 5px;border-radius: 0;float: left;display:block"),
Translations.t.image.addPicture
.SetStyle("width:max-content;font-size: 28px;" +
"font-weight: bold;" +
"float: left;" +
"margin-top: 4px;" +
"padding-top: 4px;" +
"padding-bottom: 4px;" +
"padding-left: 13px;"),
]).SetStyle(" display: flex;" +
"cursor:pointer;" +
"padding: 0.5em;" +
"border-radius: 1em;" +
"border: 3px solid var(--foreground-color);" +
"box-sizing:border-box;")
]).SetClass("image-upload-flow-button")
const actualInputElement =
`<input style='display: none' id='fileselector-${this.id}' type='file' accept='image/*' name='picField' multiple='multiple' alt=''/>`;
@ -131,7 +118,8 @@ export class ImageUploadFlow extends UIElement {
return new Combine([
form,
extraInfo
]).SetStyle("margin-top: 1em;margin-bottom: 2em;text-align: center;")
]).SetClass("image-upload-flow")
.SetStyle("margin-top: 1em;margin-bottom: 2em;text-align: center;")
.Render();
}

23
css/imageUploadFlow.css Normal file
View file

@ -0,0 +1,23 @@
.image-upload-flow-button span {
width: max-content;
font-size: 28px;
font-weight: bold;
margin-top: 4px;
padding-top: 4px;
padding-bottom: 4px;
padding-left: 13px;
}
.image-upload-flow-button {
display: flex;
cursor: pointer;
padding: 0.5em;
border-radius: 1em;
border: 3px solid var(--foreground-color);
box-sizing: border-box;
}
.image-upload-flow svg {
fill: var(--foreground-color);
stroke: var(--foreground-color);
}

2
css/userbadge.css
View file

@ -46,7 +46,7 @@
.userstats svg {
width: 1em;
height: 1em;
border-radius: 0;
border-radius: 0;
display: block;
}

6
index.css
View file

@ -25,14 +25,12 @@ a {
color: var(--foreground-color)
}
svg {
#topleft-tools svg {
fill: var(--foreground-color) !important;
stroke: var(--foreground-color) !important;
width: 100%;
height: 100%;
}
svg path {
#topleft-tools svg path {
fill: var(--foreground-color) !important;
stroke: var(--foreground-color) !important;
}

1
index.html
View file

@ -13,6 +13,7 @@
<link rel="stylesheet" href="./css/mobile.css"/>
<link rel="stylesheet" href="./css/openinghourstable.css"/>
<link rel="stylesheet" href="./css/tagrendering.css"/>
<link rel="stylesheet" href="./css/imageUploadFlow.css"/>
<!-- $$$CUSTOM-CSS -->
<link rel="manifest" href="./manifest.manifest">
<link rel="icon" href="assets/svg/add.svg" sizes="any" type="image/svg+xml">