forked from MapComplete/MapComplete
		
	Merge develop
This commit is contained in:
		
						commit
						f19e94b523
					
				
					 4 changed files with 6 additions and 2 deletions
				
			
		| 
						 | 
					@ -190,7 +190,6 @@ class DownloadNsiLogos extends Script {
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    async main(): Promise<void> {
 | 
					    async main(): Promise<void> {
 | 
				
			||||||
        const nsi = await NameSuggestionIndex.getNsiIndex()
 | 
					 | 
				
			||||||
        const types = ["brand", "operator"]
 | 
					        const types = ["brand", "operator"]
 | 
				
			||||||
        for (const type of types) {
 | 
					        for (const type of types) {
 | 
				
			||||||
            await this.downloadFor(type)
 | 
					            await this.downloadFor(type)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -640,6 +640,10 @@ export class OsmConnection {
 | 
				
			||||||
        this.fetchCapabilities().then(({ api, gpx }) => {
 | 
					        this.fetchCapabilities().then(({ api, gpx }) => {
 | 
				
			||||||
            this.apiIsOnline.setData(api)
 | 
					            this.apiIsOnline.setData(api)
 | 
				
			||||||
            this.gpxServiceIsOnline.setData(gpx)
 | 
					            this.gpxServiceIsOnline.setData(gpx)
 | 
				
			||||||
 | 
					        }).catch(err => {
 | 
				
			||||||
 | 
					            console.log("Could not reach the api:", err)
 | 
				
			||||||
 | 
					            this.apiIsOnline.set("unreachable")
 | 
				
			||||||
 | 
					            this.gpxServiceIsOnline.set("unreachable")
 | 
				
			||||||
        })
 | 
					        })
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -419,6 +419,7 @@ export default class UserRelatedState {
 | 
				
			||||||
        if(!Utils.runningFromConsole){
 | 
					        if(!Utils.runningFromConsole){
 | 
				
			||||||
            amendedPrefs.data["_host"] = window.location.host
 | 
					            amendedPrefs.data["_host"] = window.location.host
 | 
				
			||||||
            amendedPrefs.data["_path"] = window.location.pathname
 | 
					            amendedPrefs.data["_path"] = window.location.pathname
 | 
				
			||||||
 | 
					            amendedPrefs.data["_userAgent"] = navigator.userAgent
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        for (const key in Constants.userJourney) {
 | 
					        for (const key in Constants.userJourney) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -421,7 +421,7 @@
 | 
				
			||||||
      <If condition={state.featureSwitches.featureSwitchFakeUser}>
 | 
					      <If condition={state.featureSwitches.featureSwitchFakeUser}>
 | 
				
			||||||
        <div class="alert w-fit">Faking a user (Testmode)</div>
 | 
					        <div class="alert w-fit">Faking a user (Testmode)</div>
 | 
				
			||||||
      </If>
 | 
					      </If>
 | 
				
			||||||
      {#if $apiState !== "online"}
 | 
					      {#if $apiState !== "online" && $apiState !== "unknown"}
 | 
				
			||||||
        <div class="alert w-fit">API is {$apiState}</div>
 | 
					        <div class="alert w-fit">API is {$apiState}</div>
 | 
				
			||||||
      {/if}
 | 
					      {/if}
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue