forked from MapComplete/MapComplete
		
	Merge master
This commit is contained in:
		
						commit
						93f6adf8a8
					
				
					 2 changed files with 10 additions and 4 deletions
				
			
		| 
						 | 
					@ -45,6 +45,7 @@ class OverlapFunc implements ExtraFunction {
 | 
				
			||||||
        return (...layerIds: string[]) => {
 | 
					        return (...layerIds: string[]) => {
 | 
				
			||||||
            const result: { feat: any, overlap: number }[] = []
 | 
					            const result: { feat: any, overlap: number }[] = []
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            console.log("Calculating overlap")
 | 
				
			||||||
            const bbox = BBox.get(feat)
 | 
					            const bbox = BBox.get(feat)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            for (const layerId of layerIds) {
 | 
					            for (const layerId of layerIds) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -96,7 +96,7 @@
 | 
				
			||||||
    "number": "number",
 | 
					    "number": "number",
 | 
				
			||||||
    "osmLinkTooltip": "Browse this object on OpenStreetMap for history and more editing options",
 | 
					    "osmLinkTooltip": "Browse this object on OpenStreetMap for history and more editing options",
 | 
				
			||||||
    "add": {
 | 
					    "add": {
 | 
				
			||||||
      "addNewMapLabel": "Add new item",
 | 
					      "addNewMapLabel": "Click here to add a new item",
 | 
				
			||||||
      "disableFiltersExplanation": "Some features might be hidden by a filter",
 | 
					      "disableFiltersExplanation": "Some features might be hidden by a filter",
 | 
				
			||||||
      "disableFilters": "Disable all filters",
 | 
					      "disableFilters": "Disable all filters",
 | 
				
			||||||
      "addNew": "Add a new {category} here",
 | 
					      "addNew": "Add a new {category} here",
 | 
				
			||||||
| 
						 | 
					@ -111,6 +111,10 @@
 | 
				
			||||||
      "confirmButton": "Add a {category} here.<br/><div class='alert'>Your addition is visible for everyone</div>",
 | 
					      "confirmButton": "Add a {category} here.<br/><div class='alert'>Your addition is visible for everyone</div>",
 | 
				
			||||||
      "openLayerControl": "Open the layer control box",
 | 
					      "openLayerControl": "Open the layer control box",
 | 
				
			||||||
      "layerNotEnabled": "The layer {layer} is not enabled. Enable this layer to add a point",
 | 
					      "layerNotEnabled": "The layer {layer} is not enabled. Enable this layer to add a point",
 | 
				
			||||||
 | 
					      "hasBeenImported": "This point has already been imported",
 | 
				
			||||||
 | 
					      "importTags": "The element will receive {tags}",
 | 
				
			||||||
 | 
					      "zoomInMore": "Zoom in more to import this feature",
 | 
				
			||||||
 | 
					      "wrongType": "This element is not a point or a way and can not be imported",
 | 
				
			||||||
      "import": {
 | 
					      "import": {
 | 
				
			||||||
        "officialThemesOnly": "The import button is disabled for unofficial themes to prevent accidents",
 | 
					        "officialThemesOnly": "The import button is disabled for unofficial themes to prevent accidents",
 | 
				
			||||||
        "howToTest": "To test, add <b>test=true</b> or <b>backend=osm-test</b> to the URL. The changeset will be printed in the console. Please open a PR to officialize this theme to actually enable the import button.",
 | 
					        "howToTest": "To test, add <b>test=true</b> or <b>backend=osm-test</b> to the URL. The changeset will be printed in the console. Please open a PR to officialize this theme to actually enable the import button.",
 | 
				
			||||||
| 
						 | 
					@ -200,8 +204,7 @@
 | 
				
			||||||
      "downloadAsPdf": "Download a PDF of the current map",
 | 
					      "downloadAsPdf": "Download a PDF of the current map",
 | 
				
			||||||
      "downloadAsPdfHelper": "Ideal to print the current map",
 | 
					      "downloadAsPdfHelper": "Ideal to print the current map",
 | 
				
			||||||
      "downloadGeojson": "Download visible data as GeoJSON",
 | 
					      "downloadGeojson": "Download visible data as GeoJSON",
 | 
				
			||||||
      "downloadFeatureAsGpx": "Download as GPX-file",
 | 
					      "downloadGpx": "Download as GPX-file",
 | 
				
			||||||
      "downloadFeatureAsGeojson": "Download as GeoJson-file",
 | 
					 | 
				
			||||||
      "downloadGpxHelper": "A GPX-file can be used with most navigation devices and applications",
 | 
					      "downloadGpxHelper": "A GPX-file can be used with most navigation devices and applications",
 | 
				
			||||||
      "uploadGpx": "Upload your track to OpenStreetMap",
 | 
					      "uploadGpx": "Upload your track to OpenStreetMap",
 | 
				
			||||||
      "exporting": "Exporting…",
 | 
					      "exporting": "Exporting…",
 | 
				
			||||||
| 
						 | 
					@ -210,7 +213,9 @@
 | 
				
			||||||
      "downloadCSVHelper": "Compatible with LibreOffice Calc, Excel, …",
 | 
					      "downloadCSVHelper": "Compatible with LibreOffice Calc, Excel, …",
 | 
				
			||||||
      "includeMetaData": "Include metadata (last editor, calculated values, …)",
 | 
					      "includeMetaData": "Include metadata (last editor, calculated values, …)",
 | 
				
			||||||
      "licenseInfo": "<h3>Copyright notice</h3>The provided data is available under ODbL. Reusing it is gratis for any purpose, but <ul><li>the attribution <b>© OpenStreetMap contributors</b> is required</li><li>Any change must be use the license</li></ul> Please read the full <a href='https://www.openstreetmap.org/copyright' target='_blank'>copyright notice</a> for details.",
 | 
					      "licenseInfo": "<h3>Copyright notice</h3>The provided data is available under ODbL. Reusing it is gratis for any purpose, but <ul><li>the attribution <b>© OpenStreetMap contributors</b> is required</li><li>Any change must be use the license</li></ul> Please read the full <a href='https://www.openstreetmap.org/copyright' target='_blank'>copyright notice</a> for details.",
 | 
				
			||||||
      "noDataLoaded": "No data is loaded yet. Download will be available soon"
 | 
					      "noDataLoaded": "No data is loaded yet. Download will be available soon",
 | 
				
			||||||
 | 
					      "downloadFeatureAsGpx": "Download as GPX-file",
 | 
				
			||||||
 | 
					      "downloadFeatureAsGeojson": "Download as GeoJson-file"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "weekdays": {
 | 
					    "weekdays": {
 | 
				
			||||||
      "abbreviations": {
 | 
					      "abbreviations": {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue