forked from MapComplete/MapComplete
		
	Fix ways: they show up again
This commit is contained in:
		
							parent
							
								
									314894085a
								
							
						
					
					
						commit
						2685b6e734
					
				
					 6 changed files with 67 additions and 65 deletions
				
			
		|  | @ -128,14 +128,8 @@ export class FilteredLayer { | ||||||
|         let self = this; |         let self = this; | ||||||
|         console.log(data); |         console.log(data); | ||||||
|         this._geolayer = L.geoJSON(data, { |         this._geolayer = L.geoJSON(data, { | ||||||
|            /* style: feature => { |                 style: feature => | ||||||
|                 self.layerDef.GenerateLeafletStyle(feature.properties); |                     self.layerDef.GenerateLeafletStyle(feature.properties), | ||||||
|                 return { |  | ||||||
|                     color: "#f00", |  | ||||||
|                     weight: 4 |  | ||||||
|                 } |  | ||||||
|             },*/ |  | ||||||
|             /* |  | ||||||
|                 pointToLayer: function (feature, latLng) { |                 pointToLayer: function (feature, latLng) { | ||||||
|                     // Point to layer converts the 'point' to a layer object - as the geojson layer natively cannot handle points
 |                     // 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
 |                     // Click handling is done in the next step
 | ||||||
|  | @ -162,9 +156,8 @@ export class FilteredLayer { | ||||||
|                         }); |                         }); | ||||||
|                     } |                     } | ||||||
|                     return marker; |                     return marker; | ||||||
|             },*/ |                 }, | ||||||
| /* |                 onEachFeature: function (feature, layer: Layer) { | ||||||
|             onEachFeature: function (feature, layer:Layer) { |  | ||||||
| 
 | 
 | ||||||
|                     layer.on("click", (e) => { |                     layer.on("click", (e) => { | ||||||
|                         if (layer.getPopup() === undefined |                         if (layer.getPopup() === undefined | ||||||
|  | @ -196,7 +189,6 @@ export class FilteredLayer { | ||||||
|                     L.DomEvent.stop(e); |                     L.DomEvent.stop(e); | ||||||
|                 }); |                 }); | ||||||
|             } |             } | ||||||
|         */ |  | ||||||
|         } |         } | ||||||
|         ) |         ) | ||||||
|         ; |         ; | ||||||
|  |  | ||||||
|  | @ -103,20 +103,7 @@ export class ImageUploadFlow extends UIElement { | ||||||
|         const label = new Combine([ |         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"), |             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 |             Translations.t.image.addPicture | ||||||
|                 .SetStyle("width:max-content;font-size: 28px;" + |         ]).SetClass("image-upload-flow-button") | ||||||
|                     "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;") |  | ||||||
|      |      | ||||||
|         const actualInputElement = |         const actualInputElement = | ||||||
|             `<input style='display: none' id='fileselector-${this.id}' type='file' accept='image/*' name='picField' multiple='multiple' alt=''/>`; |             `<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([ |         return new Combine([ | ||||||
|             form, |             form, | ||||||
|             extraInfo |             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(); |             .Render(); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
							
								
								
									
										23
									
								
								css/imageUploadFlow.css
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								css/imageUploadFlow.css
									
										
									
									
									
										Normal 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); | ||||||
|  | } | ||||||
|  | @ -25,14 +25,12 @@ a { | ||||||
|     color: var(--foreground-color) |     color: var(--foreground-color) | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| svg { | #topleft-tools svg { | ||||||
|     fill: var(--foreground-color) !important; |     fill: var(--foreground-color) !important; | ||||||
|     stroke: var(--foreground-color) !important; |     stroke: var(--foreground-color) !important; | ||||||
|     width: 100%; |  | ||||||
|     height: 100%; |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| svg path { | #topleft-tools svg path { | ||||||
|     fill: var(--foreground-color) !important; |     fill: var(--foreground-color) !important; | ||||||
|     stroke: var(--foreground-color) !important; |     stroke: var(--foreground-color) !important; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -13,6 +13,7 @@ | ||||||
|     <link rel="stylesheet" href="./css/mobile.css"/> |     <link rel="stylesheet" href="./css/mobile.css"/> | ||||||
|     <link rel="stylesheet" href="./css/openinghourstable.css"/> |     <link rel="stylesheet" href="./css/openinghourstable.css"/> | ||||||
|     <link rel="stylesheet" href="./css/tagrendering.css"/> |     <link rel="stylesheet" href="./css/tagrendering.css"/> | ||||||
|  |     <link rel="stylesheet" href="./css/imageUploadFlow.css"/> | ||||||
|     <!-- $$$CUSTOM-CSS --> |     <!-- $$$CUSTOM-CSS --> | ||||||
|     <link rel="manifest" href="./manifest.manifest"> |     <link rel="manifest" href="./manifest.manifest"> | ||||||
|     <link rel="icon" href="assets/svg/add.svg" sizes="any" type="image/svg+xml"> |     <link rel="icon" href="assets/svg/add.svg" sizes="any" type="image/svg+xml"> | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue