From a1df915da44ab2824aef8d8ed70e26da6db7e0bb Mon Sep 17 00:00:00 2001 From: Oscar Lorentzon Date: Wed, 9 Jun 2021 21:23:05 +0200 Subject: [PATCH] fix: viewer configuration as observables Avoid setting static properties which affects all future Viewers created in the same app. Use observables instead. --- .../attribution/AttributionComponent.ts | 25 ++-- src/component/cover/CoverComponent.ts | 17 ++- src/component/image/ImageComponent.ts | 117 ++++++++++-------- src/component/slider/SliderComponent.ts | 108 +++++++++------- src/viewer/ConfigurationService.ts | 29 +++++ src/viewer/Container.ts | 19 +-- src/viewer/PlayService.ts | 1 - src/viewer/Viewer.ts | 3 - src/viewer/ViewerConfiguration.ts | 40 ------ styles/cover.css | 19 ++- .../helper/ConfigurationServiceMockCreator.ts | 26 ++++ test/helper/ContainerMockCreator.ts | 6 + test/util/ViewerConfiguration.test.ts | 26 ---- test/viewer/ConfigurationService.test.ts | 89 +++++++++++++ 14 files changed, 327 insertions(+), 198 deletions(-) create mode 100644 src/viewer/ConfigurationService.ts delete mode 100644 src/viewer/ViewerConfiguration.ts create mode 100644 test/helper/ConfigurationServiceMockCreator.ts delete mode 100644 test/util/ViewerConfiguration.test.ts create mode 100644 test/viewer/ConfigurationService.test.ts diff --git a/src/component/attribution/AttributionComponent.ts b/src/component/attribution/AttributionComponent.ts index 2d3f3a6e6..8d19b6552 100644 --- a/src/component/attribution/AttributionComponent.ts +++ b/src/component/attribution/AttributionComponent.ts @@ -6,7 +6,6 @@ import { map } from "rxjs/operators"; import { Image } from "../../graph/Image"; import { ViewportSize } from "../../render/interfaces/ViewportSize"; import { VirtualNodeHash } from "../../render/interfaces/VirtualNodeHash"; -import { ViewerConfiguration } from "../../viewer/ViewerConfiguration"; import { Component } from "../Component"; import { ComponentConfiguration } from "../interfaces/ComponentConfiguration"; @@ -18,13 +17,15 @@ export class AttributionComponent extends Component { protected _activate(): void { this._subscriptions.push( observableCombineLatest( + this._container.configurationService.exploreUrl$, this._navigator.stateService.currentImage$, this._container.renderService.size$).pipe( map( - ([image, size]: [Image, ViewportSize]): VirtualNodeHash => { + ([exploreUrl, image, size]: [string, Image, ViewportSize]): VirtualNodeHash => { const attribution = this._makeAttribution( image.creatorUsername, + exploreUrl, image.id, image.capturedAt, size.width); @@ -44,8 +45,13 @@ export class AttributionComponent extends Component { return {}; } + private makeImageUrl(exploreUrl: string, id: string): string { + return `${exploreUrl}/app/?pKey=${id}&focus=photo`; + } + private _makeAttribution( creatorUsername: string, + exploreUrl: string, imageId: string, capturedAt: number, viewportWidth: number) @@ -53,7 +59,7 @@ export class AttributionComponent extends Component { const compact = viewportWidth <= 640; const date = this._makeDate(capturedAt, compact); - const by = this._makeBy(creatorUsername, imageId, compact); + const by = this._makeBy(creatorUsername, exploreUrl, imageId, compact); const compactClass = compact ? ".mapillary-attribution-compact" : ""; @@ -66,6 +72,7 @@ export class AttributionComponent extends Component { private _makeBy( creatorUsername: string, + exploreUrl: string, imageId: string, compact: boolean): vd.VNode[] { @@ -73,18 +80,19 @@ export class AttributionComponent extends Component { "div.mapillary-attribution-logo", []); return creatorUsername ? - this._makeCreatorBy(icon, creatorUsername, imageId, compact) : - this._makeGeneralBy(icon, imageId, compact); + this._makeCreatorBy(icon, creatorUsername, exploreUrl, imageId, compact) : + this._makeGeneralBy(icon, exploreUrl, imageId, compact); } private _makeCreatorBy( icon: vd.VNode, creatorUsername: string, + exploreUrl: string, imageId: string, compact: boolean): vd.VNode[] { const mapillary = vd.h( "a.mapillary-attribution-icon-container", - { href: ViewerConfiguration.explore, rel: "noreferrer", target: "_blank" }, + { href: exploreUrl, rel: "noreferrer", target: "_blank" }, [icon]); const content = compact ? @@ -97,7 +105,7 @@ export class AttributionComponent extends Component { const image = vd.h( "a.mapillary-attribution-image-container", { - href: ViewerConfiguration.exploreImage(imageId), + href: this.makeImageUrl(exploreUrl, imageId), rel: "noreferrer", target: "_blank", }, @@ -108,6 +116,7 @@ export class AttributionComponent extends Component { private _makeGeneralBy( icon: vd.VNode, + exploreUrl: string, imageId: string, compact: boolean): vd.VNode[] { @@ -134,7 +143,7 @@ export class AttributionComponent extends Component { const image = vd.h( "a.mapillary-attribution-image-container", { - href: ViewerConfiguration.exploreImage(imageId), + href: this.makeImageUrl(exploreUrl, imageId), rel: "noreferrer", target: "_blank", }, diff --git a/src/component/cover/CoverComponent.ts b/src/component/cover/CoverComponent.ts index 8ec2731ec..cbff843c4 100644 --- a/src/component/cover/CoverComponent.ts +++ b/src/component/cover/CoverComponent.ts @@ -26,7 +26,6 @@ import { MapillaryError } from "../../error/MapillaryError"; import { Image as MImage } from "../../graph/Image"; import { ViewportSize } from "../../render/interfaces/ViewportSize"; import { VirtualNodeHash } from "../../render/interfaces/VirtualNodeHash"; -import { ViewerConfiguration } from "../../viewer/ViewerConfiguration"; import { Container } from "../../viewer/Container"; import { Navigator } from "../../viewer/Navigator"; import { ImagesContract } from "../../api/contracts/ImagesContract"; @@ -128,9 +127,11 @@ export class CoverComponent extends Component { subs.push(observableCombineLatest( this._configuration$, + this._container.configurationService.exploreUrl$, this._container.renderService.size$).pipe( map( - ([configuration, size]: [CoverConfiguration, ViewportSize]): VirtualNodeHash => { + ([configuration, exploreUrl, size]: + [CoverConfiguration, string, ViewportSize]): VirtualNodeHash => { if (!configuration.src) { return { name: this._name, vNode: vd.h("div", []) }; } @@ -147,7 +148,7 @@ export class CoverComponent extends Component { const container: vd.VNode = vd.h( "div.mapillary-cover-container" + compactClass, - [this._getCoverButtonVNode(configuration)]); + [this._getCoverButtonVNode(configuration, exploreUrl)]); return { name: this._name, vNode: container }; })) @@ -162,13 +163,19 @@ export class CoverComponent extends Component { return { state: CoverState.Visible }; } - private _getCoverButtonVNode(configuration: CoverConfiguration): vd.VNode { + private _getCoverButtonVNode( + configuration: CoverConfiguration, + exploreUrl: string): vd.VNode { + const cover: string = configuration.state === CoverState.Loading ? "div.mapillary-cover.mapillary-cover-loading" : "div.mapillary-cover"; const coverButton: vd.VNode = vd.h( "div.mapillary-cover-button", [vd.h("div.mapillary-cover-button-icon", [])]); - const coverLogo: vd.VNode = vd.h("a.mapillary-cover-logo", { href: ViewerConfiguration.explore, target: "_blank" }, []); + const coverLogo: vd.VNode = vd.h( + "a.mapillary-cover-logo", + { href: exploreUrl, target: "_blank" }, + []); const coverIndicator: vd.VNode = vd.h( "div.mapillary-cover-indicator", { onclick: (): void => { this.configure({ state: CoverState.Loading }); } }, diff --git a/src/component/image/ImageComponent.ts b/src/component/image/ImageComponent.ts index 4e16c4cbf..49f88c7f7 100644 --- a/src/component/image/ImageComponent.ts +++ b/src/component/image/ImageComponent.ts @@ -46,10 +46,8 @@ import { RegionOfInterestCalculator } import { TextureProvider } from "../../tile/TextureProvider"; import { ComponentConfiguration } from "../interfaces/ComponentConfiguration"; import { Transform } from "../../geo/Transform"; -import { ViewerConfiguration } from "../../viewer/ViewerConfiguration"; import { ComponentName } from "../ComponentName"; import { State } from "../../state/State"; -import { Camera } from "three"; interface ImageGLRendererOperation { (renderer: ImageGLRenderer): ImageGLRenderer; @@ -170,9 +168,14 @@ export class ImageComponent extends Component { })) .subscribe(this._rendererOperation$)); - const textureProvider$ = this._navigator.stateService.currentState$ - .pipe( - filter(() => ViewerConfiguration.imageTiling), + const textureProvider$ = + this._container.configurationService.imageTiling$.pipe( + switchMap( + (active): Observable => { + return active ? + this._navigator.stateService.currentState$ : + new Subject(); + }), distinctUntilChanged( undefined, (frame: AnimationFrame): string => { @@ -220,56 +223,60 @@ export class ImageComponent extends Component { previous.abort(); })); - const roiTrigger$ = ViewerConfiguration.imageTiling ? - observableCombineLatest( - this._navigator.stateService.state$, - this._navigator.stateService.inTranslation$) - .pipe( - switchMap( - ([state, inTranslation]: [State, boolean]) => { - const streetState = - state === State.Traversing || - state === State.Waiting || - state === State.WaitingInteractively; - const active = streetState && !inTranslation; - return active ? - this._container.renderService.renderCameraFrame$ : - observableEmpty(); - }), - map( - (camera: RenderCamera): PositionLookat => { - return { - camera, - height: camera.size.height.valueOf(), - lookat: camera.camera.lookat.clone(), - width: camera.size.width.valueOf(), - zoom: camera.zoom.valueOf(), - }; - }), - pairwise(), - map( - ([pl0, pl1]: [PositionLookat, PositionLookat]) - : StalledCamera => { - const stalled = - pl0.width === pl1.width && - pl0.height === pl1.height && - pl0.zoom === pl1.zoom && - pl0.lookat.equals(pl1.lookat); - - return { camera: pl1.camera, stalled }; - }), - distinctUntilChanged( - (x, y): boolean => { - return x.stalled === y.stalled; - }), - filter( - (camera: StalledCamera): boolean => { - return camera.stalled; - }), - withLatestFrom( - this._container.renderService.size$, - this._navigator.stateService.currentTransform$)) : - observableEmpty(); + const roiTrigger$ = + this._container.configurationService.imageTiling$.pipe( + switchMap( + (active): Observable<[State, boolean]> => { + return active ? + observableCombineLatest( + this._navigator.stateService.state$, + this._navigator.stateService.inTranslation$) : + new Subject(); + }), + switchMap( + ([state, inTranslation]: [State, boolean]) => { + const streetState = + state === State.Traversing || + state === State.Waiting || + state === State.WaitingInteractively; + const active = streetState && !inTranslation; + return active ? + this._container.renderService.renderCameraFrame$ : + observableEmpty(); + }), + map( + (camera: RenderCamera): PositionLookat => { + return { + camera, + height: camera.size.height.valueOf(), + lookat: camera.camera.lookat.clone(), + width: camera.size.width.valueOf(), + zoom: camera.zoom.valueOf(), + }; + }), + pairwise(), + map( + ([pl0, pl1]: [PositionLookat, PositionLookat]) + : StalledCamera => { + const stalled = + pl0.width === pl1.width && + pl0.height === pl1.height && + pl0.zoom === pl1.zoom && + pl0.lookat.equals(pl1.lookat); + + return { camera: pl1.camera, stalled }; + }), + distinctUntilChanged( + (x, y): boolean => { + return x.stalled === y.stalled; + }), + filter( + (camera: StalledCamera): boolean => { + return camera.stalled; + }), + withLatestFrom( + this._container.renderService.size$, + this._navigator.stateService.currentTransform$)); subs.push(textureProvider$.pipe( switchMap( diff --git a/src/component/slider/SliderComponent.ts b/src/component/slider/SliderComponent.ts index f842f92aa..b8de183f4 100644 --- a/src/component/slider/SliderComponent.ts +++ b/src/component/slider/SliderComponent.ts @@ -64,7 +64,6 @@ import { SliderGLRenderer } from "./SliderGLRenderer"; import { Transform } from "../../geo/Transform"; import { SliderDOMRenderer } from "./SliderDOMRenderer"; import { isSpherical } from "../../geo/Geo"; -import { ViewerConfiguration } from "../../viewer/ViewerConfiguration"; import { ComponentName } from "../ComponentName"; /** @@ -396,9 +395,14 @@ export class SliderComponent extends Component { })); - const textureProvider$ = this._navigator.stateService.currentState$ - .pipe( - filter(() => ViewerConfiguration.imageTiling), + const textureProvider$ = + this._container.configurationService.imageTiling$.pipe( + switchMap( + (active): Observable => { + return active ? + this._navigator.stateService.currentState$ : + new Subject(); + }), distinctUntilChanged( undefined, (frame: AnimationFrame): string => { @@ -449,10 +453,16 @@ export class SliderComponent extends Component { previous.abort(); })); - const roiTrigger$ = observableCombineLatest( - this._container.renderService.renderCameraFrame$, - this._container.renderService.size$.pipe(debounceTime(250))).pipe( - filter(() => ViewerConfiguration.imageTiling), + const roiTrigger$ = + this._container.configurationService.imageTiling$.pipe( + switchMap( + (active): Observable<[RenderCamera, ViewportSize]> => { + return active ? + observableCombineLatest( + this._container.renderService.renderCameraFrame$, + this._container.renderService.size$.pipe(debounceTime(250))) : + new Subject(); + }), map( ([camera, size]: [RenderCamera, ViewportSize]): PositionLookat => { return [ @@ -527,37 +537,43 @@ export class SliderComponent extends Component { subs.push(hasTexture$.subscribe(() => { /*noop*/ })); - const textureProviderPrev$ = this._navigator.stateService.currentState$.pipe( - filter(() => ViewerConfiguration.imageTiling), - filter( - (frame: AnimationFrame): boolean => { - return !!frame.state.previousImage; - }), - distinctUntilChanged( - undefined, - (frame: AnimationFrame): string => { - return frame.state.previousImage.id; - }), - withLatestFrom( - this._container.glRenderer.webGLRenderer$, - this._container.renderService.size$), - map( - ([frame, renderer, size]: [AnimationFrame, THREE.WebGLRenderer, ViewportSize]): TextureProvider => { - const state = frame.state; - const previousImage = state.previousImage; - const previousTransform = state.previousTransform; - - return new TextureProvider( - previousImage.id, - previousTransform.basicWidth, - previousTransform.basicHeight, - previousImage.image, - this._imageTileLoader, - new TileStore(), - renderer); - }), - publishReplay(1), - refCount()); + const textureProviderPrev$ = + this._container.configurationService.imageTiling$.pipe( + switchMap( + (active): Observable => { + return active ? + this._navigator.stateService.currentState$ : + new Subject(); + }), + filter( + (frame: AnimationFrame): boolean => { + return !!frame.state.previousImage; + }), + distinctUntilChanged( + undefined, + (frame: AnimationFrame): string => { + return frame.state.previousImage.id; + }), + withLatestFrom( + this._container.glRenderer.webGLRenderer$, + this._container.renderService.size$), + map( + ([frame, renderer, size]: [AnimationFrame, THREE.WebGLRenderer, ViewportSize]): TextureProvider => { + const state = frame.state; + const previousImage = state.previousImage; + const previousTransform = state.previousTransform; + + return new TextureProvider( + previousImage.id, + previousTransform.basicWidth, + previousTransform.basicHeight, + previousImage.image, + this._imageTileLoader, + new TileStore(), + renderer); + }), + publishReplay(1), + refCount()); subs.push(textureProviderPrev$.subscribe(() => { /*noop*/ })); @@ -580,10 +596,16 @@ export class SliderComponent extends Component { previous.abort(); })); - const roiTriggerPrev$ = observableCombineLatest( - this._container.renderService.renderCameraFrame$, - this._container.renderService.size$.pipe(debounceTime(250))).pipe( - filter(() => ViewerConfiguration.imageTiling), + const roiTriggerPrev$ = + this._container.configurationService.imageTiling$.pipe( + switchMap( + (active): Observable<[RenderCamera, ViewportSize]> => { + return active ? + observableCombineLatest( + this._container.renderService.renderCameraFrame$, + this._container.renderService.size$.pipe(debounceTime(250))) : + new Subject(); + }), map( ([camera, size]: [RenderCamera, ViewportSize]): PositionLookat => { return [ diff --git a/src/viewer/ConfigurationService.ts b/src/viewer/ConfigurationService.ts new file mode 100644 index 000000000..992fbc815 --- /dev/null +++ b/src/viewer/ConfigurationService.ts @@ -0,0 +1,29 @@ +import { + Observable, + of as observableOf, +} from "rxjs"; + +import { ViewerOptions } from "../external/viewer"; + +export class ConfigurationService { + private _imageTiling$: Observable; + private _exploreUrl$: Observable; + + constructor(options: ViewerOptions) { + const host = options?.url?.exploreHost ?? "www.mapillary.com"; + const scheme = options?.url?.scheme ?? "https"; + const exploreUrl = `${scheme}://${host}`; + this._exploreUrl$ = observableOf(exploreUrl); + + const imageTiling = options?.imageTiling === false ? false : true; + this._imageTiling$ = observableOf(imageTiling); + } + + public get exploreUrl$(): Observable { + return this._exploreUrl$; + } + + public get imageTiling$(): Observable { + return this._imageTiling$; + } +} diff --git a/src/viewer/Container.ts b/src/viewer/Container.ts index 854912464..98357f874 100644 --- a/src/viewer/Container.ts +++ b/src/viewer/Container.ts @@ -1,15 +1,16 @@ -import { KeyboardService } from "./KeyboardService"; -import { MouseService } from "./MouseService"; -import { SpriteService } from "./SpriteService"; -import { TouchService } from "./TouchService"; -import { ViewerOptions } from "./options/ViewerOptions"; - import { DOMRenderer } from "../render/DOMRenderer"; import { GLRenderer } from "../render/GLRenderer"; import { RenderService } from "../render/RenderService"; import { StateService } from "../state/StateService"; import { DOM } from "../util/DOM"; +import { ViewerOptions } from "./options/ViewerOptions"; +import { KeyboardService } from "./KeyboardService"; +import { MouseService } from "./MouseService"; +import { SpriteService } from "./SpriteService"; +import { TouchService } from "./TouchService"; +import { ConfigurationService } from "./ConfigurationService"; + export class Container { public id: string; @@ -24,6 +25,8 @@ export class Container { public spriteService: SpriteService; + public readonly configurationService: ConfigurationService; + private _canvasContainer: HTMLDivElement; private _canvas: HTMLCanvasElement; private _container: HTMLElement; @@ -87,6 +90,8 @@ export class Container { "mapillary-dom", this._container); + this.configurationService = new ConfigurationService(options); + this.renderService = new RenderService( this._container, @@ -166,7 +171,7 @@ export class Container { if (this._trackResize) { this.renderService.resize$.next(); } - } + }; private _removeNode(node: Node): void { if (node.parentNode) { diff --git a/src/viewer/PlayService.ts b/src/viewer/PlayService.ts index 5b31b7dfe..6cbbcd769 100644 --- a/src/viewer/PlayService.ts +++ b/src/viewer/PlayService.ts @@ -27,7 +27,6 @@ import { withLatestFrom, } from "rxjs/operators"; -import { GraphCalculator } from "../graph/GraphCalculator"; import { GraphMode } from "../graph/GraphMode"; import { GraphService } from "../graph/GraphService"; import { Image } from '../graph/Image'; diff --git a/src/viewer/Viewer.ts b/src/viewer/Viewer.ts index bddff03eb..154d83e16 100644 --- a/src/viewer/Viewer.ts +++ b/src/viewer/Viewer.ts @@ -19,7 +19,6 @@ import { RenderCamera } from "../render/RenderCamera"; import { RenderMode } from "../render/RenderMode"; import { TransitionMode } from "../state/TransitionMode"; import { EventEmitter } from "../util/EventEmitter"; -import { ViewerConfiguration } from "./ViewerConfiguration"; import { ICustomRenderer } from "./interfaces/ICustomRenderer"; import { PointOfView } from "./interfaces/PointOfView"; import { ViewerOptions } from "./options/ViewerOptions"; @@ -141,8 +140,6 @@ export class Viewer extends EventEmitter implements IViewer { constructor(options: ViewerOptions) { super(); - ViewerConfiguration.setOptions(options); - this._navigator = new Navigator(options); diff --git a/src/viewer/ViewerConfiguration.ts b/src/viewer/ViewerConfiguration.ts deleted file mode 100644 index d02601db8..000000000 --- a/src/viewer/ViewerConfiguration.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { ViewerOptions } from "./options/ViewerOptions"; - -export class ViewerConfiguration { - private static _exploreHost: string = "www.mapillary.com"; - private static _scheme: string = "https"; - private static _imageTiling: boolean = true; - - public static get explore(): string { - const scheme = ViewerConfiguration._scheme; - const host = ViewerConfiguration._exploreHost; - return `${scheme}://${host}`; - } - - public static get imageTiling(): boolean { - return ViewerConfiguration._imageTiling; - } - - public static exploreImage(id: string): string { - return `${ViewerConfiguration.explore}/app/?pKey=${id}&focus=photo`; - } - - public static exploreUser(username: string): string { - return `${ViewerConfiguration.explore}/app/user/${username}`; - } - - public static setOptions(options: ViewerOptions): void { - if (!options) { return; } - if (options.imageTiling === false) { - ViewerConfiguration._imageTiling = false; - } - - if (!options.url) { return; } - if (!!options.url.exploreHost) { - ViewerConfiguration._exploreHost = options.url.exploreHost; - } - if (!!options.url.scheme) { - ViewerConfiguration._scheme = options.url.scheme; - } - } -} diff --git a/styles/cover.css b/styles/cover.css index 73bfd1012..301ecf0c3 100644 --- a/styles/cover.css +++ b/styles/cover.css @@ -30,7 +30,7 @@ top: 0; z-index: 0; background-color: rgba(0, 0, 0, 0.2); - transition: opacity .1s ease-in-out; + transition: opacity 0.1s ease-in-out; cursor: pointer; } @@ -49,7 +49,7 @@ margin-left: -64px; margin-top: -64px; position: absolute; - transition: opacity .2s ease-in-out; + transition: opacity 0.2s ease-in-out; z-index: 1; pointer-events: none; } @@ -64,7 +64,7 @@ .mapillary-cover-button-icon { background-size: contain; background-repeat: no-repeat; - background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjgiIGhlaWdodD0iMTI4IiB2aWV3Qm94PSIwIDAgMTI4IDEyOCI+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4gIDxwYXRoIGZpbGw9IiNGRkYiIGQ9Ik01Ny43NDc4MjExLDU2LjkzMTc4NDUgTDQwLjkxNDUzODEsNjQuNjM0MjkyIEMzOC40NjQ1MzU5LDY1Ljc1NDY0MzIgMzQuNzg1NzMyMiw2NS43NTMzNDM1IDMyLjc2MzkxMDMsNjQuNjMyOTkyMyBDMzAuNzczNzU4Niw2My41Mjk1MzczIDMxLjE4ODAwNCw2MS43Nzg4MjYxIDMzLjYyNTMzODIsNjAuNzE5NTYxMyBMNjAuMjgzOTk3MSw0OS4xNTIxMzAyIEM2Mi4yODU1NTAxLDQ4LjI4MjYyMzMgNjUuNTAwNzAzLDQ4LjI4MjYyMzMgNjcuNTE2MTkwOCw0OS4xNTIxMzAyIEw5NC4zNDIwNjgyLDYwLjcyNjA1OTkgQzk2Ljc5NDYwNCw2MS43ODQwMjUgOTcuMjM0MTg1Niw2My41MzYwMzU5IDk1LjI2MDUwMjMsNjQuNjM5NDkwOCBDOTMuMjU1MTQ4OSw2NS43NTk4NDIgODkuNTczODExNSw2NS43NTk4NDIgODcuMTA4NjA3Nyw2NC42MzgxOTExIEw3MC42MjEzMjk1LDU3LjE0MDMxMjIgTDcxLjc5NzkzNTgsNzcuMzkyODQ3MiBDNzEuODk1MjAzMSw3OS4wODYzOTEyIDY4LjU0MjcyMzIsODAuNSA2NC4zNDU5NjMsODAuNSBDNjAuMTQ5MjAyOSw4MC41IDU2Ljc3NzI2OTUsNzkuMDg2MzkxMiA1Ni44NTExOTI2LDc3LjM5Mjg0NzIgTDU3Ljc0NzgyMTEsNTYuOTMxNzg0NSBaIi8+PC9nPiAgPC9zdmc+ICA='); + background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjgiIGhlaWdodD0iMTI4IiB2aWV3Qm94PSIwIDAgMTI4IDEyOCI+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4gIDxwYXRoIGZpbGw9IiNGRkYiIGQ9Ik01Ny43NDc4MjExLDU2LjkzMTc4NDUgTDQwLjkxNDUzODEsNjQuNjM0MjkyIEMzOC40NjQ1MzU5LDY1Ljc1NDY0MzIgMzQuNzg1NzMyMiw2NS43NTMzNDM1IDMyLjc2MzkxMDMsNjQuNjMyOTkyMyBDMzAuNzczNzU4Niw2My41Mjk1MzczIDMxLjE4ODAwNCw2MS43Nzg4MjYxIDMzLjYyNTMzODIsNjAuNzE5NTYxMyBMNjAuMjgzOTk3MSw0OS4xNTIxMzAyIEM2Mi4yODU1NTAxLDQ4LjI4MjYyMzMgNjUuNTAwNzAzLDQ4LjI4MjYyMzMgNjcuNTE2MTkwOCw0OS4xNTIxMzAyIEw5NC4zNDIwNjgyLDYwLjcyNjA1OTkgQzk2Ljc5NDYwNCw2MS43ODQwMjUgOTcuMjM0MTg1Niw2My41MzYwMzU5IDk1LjI2MDUwMjMsNjQuNjM5NDkwOCBDOTMuMjU1MTQ4OSw2NS43NTk4NDIgODkuNTczODExNSw2NS43NTk4NDIgODcuMTA4NjA3Nyw2NC42MzgxOTExIEw3MC42MjEzMjk1LDU3LjE0MDMxMjIgTDcxLjc5NzkzNTgsNzcuMzkyODQ3MiBDNzEuODk1MjAzMSw3OS4wODYzOTEyIDY4LjU0MjcyMzIsODAuNSA2NC4zNDU5NjMsODAuNSBDNjAuMTQ5MjAyOSw4MC41IDU2Ljc3NzI2OTUsNzkuMDg2MzkxMiA1Ni44NTExOTI2LDc3LjM5Mjg0NzIgTDU3Ljc0NzgyMTEsNTYuOTMxNzg0NSBaIi8+PC9nPiAgPC9zdmc+ICA="); height: 100%; width: 100%; position: absolute; @@ -79,16 +79,15 @@ .mapillary-cover-logo { background-size: contain; background-repeat: no-repeat; - background-image: url('data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" width="157" height="52" viewBox="0 0 157 52"><g fill="none" fill-rule="evenodd">  <path fill="#000" fill-opacity=".5" d="M83.2304 19.0686L83.2304 20.2956C82.8444 19.9146 82.4234 19.5826 81.9614 19.3406 81.1124 18.8956 80.1924 18.6716 79.2284 18.6716 78.5344 18.6716 77.8684 18.7736 77.2364 18.9806L74.2024 18.9806 67.4874 18.9786C67.0274 18.8636 66.5494 18.8036 66.0564 18.8036 64.2034 18.8036 62.6954 19.3826 61.5444 20.3906L61.5444 15.4576 54.9304 15.4576 51.9004 22.7016 48.8704 15.4576 42.2564 15.4576 42.2564 36.0066 61.5444 36.0066 61.5444 34.7516C62.6954 35.7586 64.2034 36.3386 66.0564 36.3386 66.5204 36.3386 66.9744 36.2776 67.4174 36.1626L71.4604 36.1626 71.4604 41.4856 78.6494 39.9136 78.6494 36.2936C78.8524 36.3096 79.0604 36.3176 79.2754 36.3176 80.2474 36.3176 81.1684 36.0996 82.0104 35.6636 82.4534 35.4346 82.8594 35.1476 83.2304 34.8096L83.2304 36.0066 88.1084 36.0066 90.4434 36.0066 92.9614 36.0066 95.2964 36.0066 100.1504 36.0066 100.1504 34.7256C101.3054 35.7496 102.8214 36.3386 104.6904 36.3386 105.1544 36.3386 105.6084 36.2776 106.0514 36.1626L112.8364 36.1626 117.6414 36.1616 117.6414 26.0316 119.5834 27.7746 120.0964 26.4786 122.3604 32.8866 119.6714 40.5976 127.2314 40.5976 134.8344 19.0686 127.0934 19.0686 126.1924 21.9276 125.2904 19.0686 119.9594 19.0686C119.8984 19.0446 119.8404 19.0116 119.7764 18.9906 119.2364 18.8116 118.6754 18.6716 118.1024 18.6716 117.4484 18.6716 116.8104 18.7736 116.1974 18.9806L112.8364 18.9806 106.1214 18.9786C105.6614 18.8636 105.1834 18.8036 104.6904 18.8036 102.8214 18.8036 101.3054 19.3926 100.1504 20.4166L100.1504 13.7666 95.2964 15.4416 95.2964 13.7666 89.5184 15.7596C89.4784 15.7146 89.4494 15.6646 89.4074 15.6206 88.7154 14.8976 87.8174 14.5016 86.8254 14.5016 85.7924 14.5016 84.8624 14.9076 84.1804 15.6756 83.5554 16.3806 83.2304 17.2526 83.2304 18.1986L83.2304 19.0686zM39.8891 35.345C39.8501 35.276 39.5011 34.644 38.8021 33.375 38.8531 33.468 37.1111 30.307 36.5581 29.306 34.3491 25.301 33.2921 23.388 33.1761 23.197 32.9351 22.799 32.5951 22.489 32.2091 22.258 32.2331 21.82 32.1611 21.37 31.9641 20.941 31.8551 20.702 31.0841 19.31 29.3241 16.151 29.2421 16.003 26.8051 11.632 26.7751 11.575 25.6331 9.408 22.4741 9.446 21.6331 11.879L21.2171 13.082 20.4621 15.266 19.2011 18.915C15.6491 20.089 12.5871 21.093 12.1361 21.22 9.7131 21.901 9.1671 25.087 11.4591 26.313 11.6551 26.418 20.6331 31.11 21.1621 31.385 21.6181 31.622 22.1121 31.721 22.5951 31.699 22.8601 32.106 23.2321 32.459 23.7241 32.706 24.1181 32.905 35.6301 38.908 36.1041 39.16 38.5621 40.468 41.2941 37.827 39.8891 35.345"/>  <path fill="#FFF" d="M59.5444 17.4573L59.5444 34.0073 56.3554 34.0073 56.3554 25.3973 52.7684 34.0073 51.0334 34.0073 47.4454 25.3973 47.4454 34.0073 44.2564 34.0073 44.2564 17.4573 47.5394 17.4573 51.9004 27.8843 56.2614 17.4573 59.5444 17.4573zM73.4614 21.0683L76.2514 21.0683 76.2514 22.1443C76.4384 21.7623 76.8134 21.4363 77.3764 21.1643 77.9384 20.8943 78.5564 20.7583 79.2284 20.7583 79.8694 20.7583 80.4704 20.9053 81.0344 21.2003 81.5964 21.4953 82.0854 21.9303 82.4994 22.5033 82.9134 23.0773 83.2424 23.7873 83.4844 24.6323 83.7264 25.4773 83.8474 26.4413 83.8474 27.5253 83.8474 28.6423 83.7304 29.6223 83.4964 30.4673 83.2614 31.3123 82.9404 32.0213 82.5344 32.5963 82.1284 33.1703 81.6474 33.6003 81.0924 33.8873 80.5384 34.1743 79.9314 34.3173 79.2754 34.3173 78.5724 34.3173 78.0044 34.2063 77.5754 33.9823 77.1454 33.7603 76.8364 33.4803 76.6494 33.1453L76.6494 38.3033 73.4614 39.0013 73.4614 21.0683zM78.4784 31.2323C80.0254 31.2323 80.7994 30.0053 80.7994 27.5503 80.7994 26.3533 80.6084 25.4453 80.2244 24.8233 79.8414 24.2013 79.2914 23.8913 78.5724 23.8913 78.0404 23.8913 77.5984 24.0783 77.2474 24.4523 76.8954 24.8273 76.6264 25.2693 76.4384 25.7793L76.4384 29.4633C76.6574 30.0533 76.9504 30.4953 77.3174 30.7903 77.6844 31.0853 78.0714 31.2323 78.4784 31.2323zM85.2304 34.0073L88.4434 34.0073 88.4434 21.0693 85.2304 21.0693 85.2304 34.0073zM85.2304 18.1983C85.2304 17.7363 85.3794 17.3383 85.6764 17.0033 85.9734 16.6683 86.3564 16.5013 86.8254 16.5013 87.2624 16.5013 87.6414 16.6683 87.9624 17.0033 88.2834 17.3383 88.4434 17.7363 88.4434 18.1983 88.4434 18.6453 88.2834 19.0233 87.9624 19.3353 87.6414 19.6453 87.2624 19.8013 86.8254 19.8013 86.3564 19.8013 85.9734 19.6453 85.6764 19.3353 85.3794 19.0233 85.2304 18.6453 85.2304 18.1983zM90.1074 17.6733L93.2964 16.5723 93.2964 34.0073 90.1074 34.0073 90.1074 17.6733zM94.9614 17.6733L98.1504 16.5723 98.1504 34.0073 94.9614 34.0073 94.9614 17.6733zM115.4534 21.0683L115.4534 21.9533C115.6714 21.5873 116.0324 21.2963 116.5324 21.0803 117.0324 20.8653 117.5554 20.7583 118.1034 20.7583 118.4624 20.7583 118.8104 20.8133 119.1464 20.9253 119.4824 21.0363 119.7444 21.2203 119.9314 21.4753L118.7834 24.3693C118.3924 24.0183 117.9614 23.8433 117.4934 23.8433 117.1024 23.8433 116.7474 23.9903 116.4264 24.2853 116.1064 24.5803 115.8444 25.0383 115.6414 25.6603L115.6414 34.0073 112.4524 34.0073 112.4524 21.0683 115.4534 21.0683zM107.5864 33.0633C106.7374 33.8153 105.7474 34.3383 104.6904 34.3383 101.0314 34.3383 99.4984 31.3093 99.4984 27.5703 99.4984 23.8333 101.0314 20.8043 104.6904 20.8043 105.8284 20.8043 106.7954 21.2903 107.5864 22.0213L107.5864 20.9783 110.8364 20.9783 110.8364 34.1623 107.5864 34.1623 107.5864 33.0633zM107.5864 29.7963C107.1794 30.6943 106.4614 31.2563 105.4204 31.2733 103.4554 31.3093 102.7014 29.6583 102.6654 27.6063 102.6294 25.5553 103.3274 23.8793 105.2934 23.8443 106.3064 23.8263 107.1284 24.4803 107.5864 25.5343L107.5864 29.7963zM68.9534 33.0633C68.1034 33.8153 67.1134 34.3383 66.0564 34.3383 62.3974 34.3383 60.8634 31.3093 60.8634 27.5703 60.8634 23.8333 62.3974 20.8043 66.0564 20.8043 67.1944 20.8043 68.1614 21.2903 68.9534 22.0213L68.9534 20.9783 72.2024 20.9783 72.2024 34.1623 68.9534 34.1623 68.9534 33.0633zM68.9534 29.7963C68.5454 30.6943 67.8264 31.2563 66.7874 31.2733 64.8214 31.3093 64.0664 29.6583 64.0314 27.6063 63.9964 25.5553 64.6924 23.8793 66.6584 23.8443 67.6724 23.8263 68.4944 24.4803 68.9534 25.5343L68.9534 29.7963zM125.8164 38.5993L122.4874 38.5993 124.4804 32.8833 120.3064 21.0683 123.8244 21.0683 126.1924 28.5783 128.5604 21.0683 132.0064 21.0683 125.8164 38.5993zM24.624 30.9201C24.146 30.6801 24.03 30.2671 24.286 29.8181 24.416 29.5911 24.697 29.1371 24.927 28.7711 25.242 28.2671 25.703 28.2661 25.962 28.4151 26.222 28.5651 29.897 30.4701 30.135 30.5991 30.696 30.9031 31.523 30.2061 31.152 29.5951 30.975 29.3031 29.426 26.5171 28.934 25.5991 28.71 25.1811 28.771 24.8051 29.27 24.5551 29.518 24.4321 29.959 24.1731 30.343 23.9431 30.734 23.7091 31.255 23.8861 31.467 24.2341 31.678 24.5831 37.949 35.9761 38.149 36.3291 38.546 37.0321 37.773 37.7831 37.043 37.3951 36.678 37.2001 25.102 31.1601 24.624 30.9201M12.402 24.5491C11.786 24.2201 11.899 23.3631 12.677 23.1461 13.335 22.9601 18.686 21.1911 20.305 20.6561 20.597 20.5601 20.825 20.3371 20.923 20.0541 21.475 18.4581 23.316 13.1301 23.523 12.5321 23.766 11.8291 24.646 11.8261 25.005 12.5081 25.133 12.7491 29.978 21.4071 30.146 21.7741 30.315 22.1421 30.206 22.5491 29.824 22.7831 29.442 23.0181 28.819 23.3691 28.602 23.5021 28.209 23.7421 27.832 23.5751 27.653 23.2021 27.474 22.8291 26.092 20.4241 25.528 19.4021 25.247 18.8921 24.398 18.6951 24.112 19.5211 23.906 20.1171 23.425 21.5091 23.175 22.2321 23.079 22.5101 22.836 22.7481 22.553 22.8411 21.849 23.0701 20.512 23.5081 19.731 23.7631 19.174 23.9441 18.903 24.7861 19.655 25.1411 19.812 25.2141 23.199 27.0061 23.549 27.1701 23.898 27.3341 24.093 27.8071 23.888 28.1431 23.609 28.6001 23.251 29.1801 23.122 29.3681 22.897 29.6941 22.456 29.8031 22.085 29.6101 21.714 29.4181 12.623 24.6671 12.402 24.5491"/></g>  </svg>  '); + background-image: url("data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" width="157" height="52" viewBox="0 0 157 52"><g fill="none" fill-rule="evenodd">  <path fill="#000" fill-opacity=".5" d="M83.2304 19.0686L83.2304 20.2956C82.8444 19.9146 82.4234 19.5826 81.9614 19.3406 81.1124 18.8956 80.1924 18.6716 79.2284 18.6716 78.5344 18.6716 77.8684 18.7736 77.2364 18.9806L74.2024 18.9806 67.4874 18.9786C67.0274 18.8636 66.5494 18.8036 66.0564 18.8036 64.2034 18.8036 62.6954 19.3826 61.5444 20.3906L61.5444 15.4576 54.9304 15.4576 51.9004 22.7016 48.8704 15.4576 42.2564 15.4576 42.2564 36.0066 61.5444 36.0066 61.5444 34.7516C62.6954 35.7586 64.2034 36.3386 66.0564 36.3386 66.5204 36.3386 66.9744 36.2776 67.4174 36.1626L71.4604 36.1626 71.4604 41.4856 78.6494 39.9136 78.6494 36.2936C78.8524 36.3096 79.0604 36.3176 79.2754 36.3176 80.2474 36.3176 81.1684 36.0996 82.0104 35.6636 82.4534 35.4346 82.8594 35.1476 83.2304 34.8096L83.2304 36.0066 88.1084 36.0066 90.4434 36.0066 92.9614 36.0066 95.2964 36.0066 100.1504 36.0066 100.1504 34.7256C101.3054 35.7496 102.8214 36.3386 104.6904 36.3386 105.1544 36.3386 105.6084 36.2776 106.0514 36.1626L112.8364 36.1626 117.6414 36.1616 117.6414 26.0316 119.5834 27.7746 120.0964 26.4786 122.3604 32.8866 119.6714 40.5976 127.2314 40.5976 134.8344 19.0686 127.0934 19.0686 126.1924 21.9276 125.2904 19.0686 119.9594 19.0686C119.8984 19.0446 119.8404 19.0116 119.7764 18.9906 119.2364 18.8116 118.6754 18.6716 118.1024 18.6716 117.4484 18.6716 116.8104 18.7736 116.1974 18.9806L112.8364 18.9806 106.1214 18.9786C105.6614 18.8636 105.1834 18.8036 104.6904 18.8036 102.8214 18.8036 101.3054 19.3926 100.1504 20.4166L100.1504 13.7666 95.2964 15.4416 95.2964 13.7666 89.5184 15.7596C89.4784 15.7146 89.4494 15.6646 89.4074 15.6206 88.7154 14.8976 87.8174 14.5016 86.8254 14.5016 85.7924 14.5016 84.8624 14.9076 84.1804 15.6756 83.5554 16.3806 83.2304 17.2526 83.2304 18.1986L83.2304 19.0686zM39.8891 35.345C39.8501 35.276 39.5011 34.644 38.8021 33.375 38.8531 33.468 37.1111 30.307 36.5581 29.306 34.3491 25.301 33.2921 23.388 33.1761 23.197 32.9351 22.799 32.5951 22.489 32.2091 22.258 32.2331 21.82 32.1611 21.37 31.9641 20.941 31.8551 20.702 31.0841 19.31 29.3241 16.151 29.2421 16.003 26.8051 11.632 26.7751 11.575 25.6331 9.408 22.4741 9.446 21.6331 11.879L21.2171 13.082 20.4621 15.266 19.2011 18.915C15.6491 20.089 12.5871 21.093 12.1361 21.22 9.7131 21.901 9.1671 25.087 11.4591 26.313 11.6551 26.418 20.6331 31.11 21.1621 31.385 21.6181 31.622 22.1121 31.721 22.5951 31.699 22.8601 32.106 23.2321 32.459 23.7241 32.706 24.1181 32.905 35.6301 38.908 36.1041 39.16 38.5621 40.468 41.2941 37.827 39.8891 35.345"/>  <path fill="#FFF" d="M59.5444 17.4573L59.5444 34.0073 56.3554 34.0073 56.3554 25.3973 52.7684 34.0073 51.0334 34.0073 47.4454 25.3973 47.4454 34.0073 44.2564 34.0073 44.2564 17.4573 47.5394 17.4573 51.9004 27.8843 56.2614 17.4573 59.5444 17.4573zM73.4614 21.0683L76.2514 21.0683 76.2514 22.1443C76.4384 21.7623 76.8134 21.4363 77.3764 21.1643 77.9384 20.8943 78.5564 20.7583 79.2284 20.7583 79.8694 20.7583 80.4704 20.9053 81.0344 21.2003 81.5964 21.4953 82.0854 21.9303 82.4994 22.5033 82.9134 23.0773 83.2424 23.7873 83.4844 24.6323 83.7264 25.4773 83.8474 26.4413 83.8474 27.5253 83.8474 28.6423 83.7304 29.6223 83.4964 30.4673 83.2614 31.3123 82.9404 32.0213 82.5344 32.5963 82.1284 33.1703 81.6474 33.6003 81.0924 33.8873 80.5384 34.1743 79.9314 34.3173 79.2754 34.3173 78.5724 34.3173 78.0044 34.2063 77.5754 33.9823 77.1454 33.7603 76.8364 33.4803 76.6494 33.1453L76.6494 38.3033 73.4614 39.0013 73.4614 21.0683zM78.4784 31.2323C80.0254 31.2323 80.7994 30.0053 80.7994 27.5503 80.7994 26.3533 80.6084 25.4453 80.2244 24.8233 79.8414 24.2013 79.2914 23.8913 78.5724 23.8913 78.0404 23.8913 77.5984 24.0783 77.2474 24.4523 76.8954 24.8273 76.6264 25.2693 76.4384 25.7793L76.4384 29.4633C76.6574 30.0533 76.9504 30.4953 77.3174 30.7903 77.6844 31.0853 78.0714 31.2323 78.4784 31.2323zM85.2304 34.0073L88.4434 34.0073 88.4434 21.0693 85.2304 21.0693 85.2304 34.0073zM85.2304 18.1983C85.2304 17.7363 85.3794 17.3383 85.6764 17.0033 85.9734 16.6683 86.3564 16.5013 86.8254 16.5013 87.2624 16.5013 87.6414 16.6683 87.9624 17.0033 88.2834 17.3383 88.4434 17.7363 88.4434 18.1983 88.4434 18.6453 88.2834 19.0233 87.9624 19.3353 87.6414 19.6453 87.2624 19.8013 86.8254 19.8013 86.3564 19.8013 85.9734 19.6453 85.6764 19.3353 85.3794 19.0233 85.2304 18.6453 85.2304 18.1983zM90.1074 17.6733L93.2964 16.5723 93.2964 34.0073 90.1074 34.0073 90.1074 17.6733zM94.9614 17.6733L98.1504 16.5723 98.1504 34.0073 94.9614 34.0073 94.9614 17.6733zM115.4534 21.0683L115.4534 21.9533C115.6714 21.5873 116.0324 21.2963 116.5324 21.0803 117.0324 20.8653 117.5554 20.7583 118.1034 20.7583 118.4624 20.7583 118.8104 20.8133 119.1464 20.9253 119.4824 21.0363 119.7444 21.2203 119.9314 21.4753L118.7834 24.3693C118.3924 24.0183 117.9614 23.8433 117.4934 23.8433 117.1024 23.8433 116.7474 23.9903 116.4264 24.2853 116.1064 24.5803 115.8444 25.0383 115.6414 25.6603L115.6414 34.0073 112.4524 34.0073 112.4524 21.0683 115.4534 21.0683zM107.5864 33.0633C106.7374 33.8153 105.7474 34.3383 104.6904 34.3383 101.0314 34.3383 99.4984 31.3093 99.4984 27.5703 99.4984 23.8333 101.0314 20.8043 104.6904 20.8043 105.8284 20.8043 106.7954 21.2903 107.5864 22.0213L107.5864 20.9783 110.8364 20.9783 110.8364 34.1623 107.5864 34.1623 107.5864 33.0633zM107.5864 29.7963C107.1794 30.6943 106.4614 31.2563 105.4204 31.2733 103.4554 31.3093 102.7014 29.6583 102.6654 27.6063 102.6294 25.5553 103.3274 23.8793 105.2934 23.8443 106.3064 23.8263 107.1284 24.4803 107.5864 25.5343L107.5864 29.7963zM68.9534 33.0633C68.1034 33.8153 67.1134 34.3383 66.0564 34.3383 62.3974 34.3383 60.8634 31.3093 60.8634 27.5703 60.8634 23.8333 62.3974 20.8043 66.0564 20.8043 67.1944 20.8043 68.1614 21.2903 68.9534 22.0213L68.9534 20.9783 72.2024 20.9783 72.2024 34.1623 68.9534 34.1623 68.9534 33.0633zM68.9534 29.7963C68.5454 30.6943 67.8264 31.2563 66.7874 31.2733 64.8214 31.3093 64.0664 29.6583 64.0314 27.6063 63.9964 25.5553 64.6924 23.8793 66.6584 23.8443 67.6724 23.8263 68.4944 24.4803 68.9534 25.5343L68.9534 29.7963zM125.8164 38.5993L122.4874 38.5993 124.4804 32.8833 120.3064 21.0683 123.8244 21.0683 126.1924 28.5783 128.5604 21.0683 132.0064 21.0683 125.8164 38.5993zM24.624 30.9201C24.146 30.6801 24.03 30.2671 24.286 29.8181 24.416 29.5911 24.697 29.1371 24.927 28.7711 25.242 28.2671 25.703 28.2661 25.962 28.4151 26.222 28.5651 29.897 30.4701 30.135 30.5991 30.696 30.9031 31.523 30.2061 31.152 29.5951 30.975 29.3031 29.426 26.5171 28.934 25.5991 28.71 25.1811 28.771 24.8051 29.27 24.5551 29.518 24.4321 29.959 24.1731 30.343 23.9431 30.734 23.7091 31.255 23.8861 31.467 24.2341 31.678 24.5831 37.949 35.9761 38.149 36.3291 38.546 37.0321 37.773 37.7831 37.043 37.3951 36.678 37.2001 25.102 31.1601 24.624 30.9201M12.402 24.5491C11.786 24.2201 11.899 23.3631 12.677 23.1461 13.335 22.9601 18.686 21.1911 20.305 20.6561 20.597 20.5601 20.825 20.3371 20.923 20.0541 21.475 18.4581 23.316 13.1301 23.523 12.5321 23.766 11.8291 24.646 11.8261 25.005 12.5081 25.133 12.7491 29.978 21.4071 30.146 21.7741 30.315 22.1421 30.206 22.5491 29.824 22.7831 29.442 23.0181 28.819 23.3691 28.602 23.5021 28.209 23.7421 27.832 23.5751 27.653 23.2021 27.474 22.8291 26.092 20.4241 25.528 19.4021 25.247 18.8921 24.398 18.6951 24.112 19.5211 23.906 20.1171 23.425 21.5091 23.175 22.2321 23.079 22.5101 22.836 22.7481 22.553 22.8411 21.849 23.0701 20.512 23.5081 19.731 23.7631 19.174 23.9441 18.903 24.7861 19.655 25.1411 19.812 25.2141 23.199 27.0061 23.549 27.1701 23.898 27.3341 24.093 27.8071 23.888 28.1431 23.609 28.6001 23.251 29.1801 23.122 29.3681 22.897 29.6941 22.456 29.8031 22.085 29.6101 21.714 29.4181 12.623 24.6671 12.402 24.5491"/></g>  </svg>  "); bottom: 0px; height: 52px; left: 50%; margin-left: -73px; position: absolute; - transition: opacity .2s ease-in-out; + transition: opacity 0.2s ease-in-out; width: 157px; z-index: 1; - pointer-events: none; } .mapillary-cover-compact .mapillary-cover-logo { @@ -111,7 +110,7 @@ animation: rotate 1s linear infinite; background-repeat: no-repeat; background-size: 100%; - background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI4NCIgaGVpZ2h0PSI4NCIgdmlld0JveD0iMCAwIDg0IDg0Ij48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPiAgPHBhdGggZD0iTTQyLDg0IEM2NS4xOTYsODQgODQsNjUuMTk2IDg0LDQyIEM4NCwxOC44MDQgNjUuMTk2LDAgNDIsMCBDMTguODA0LDAgMCwxOC44MDQgMCw0MiBDMCw2NS4xOTYgMTguODA0LDg0IDQyLDg0Ii8+ICA8cGF0aCBmaWxsPSIjRkZGIiBmaWxsLXJ1bGU9Im5vbnplcm8iIGQ9Ik00Miw4My45OTg1MTA0IEM0MC4zNDMxNDU4LDgzLjk5ODUxMDQgMzksODIuNjU1MzY0NiAzOSw4MC45OTg1MTA0IEMzOSw3OS4zNDE2NTYxIDQwLjM0MzE0NTgsNzcuOTk4NTEwNCA0Miw3Ny45OTg1MTA0IEM2MS44ODIyODg2LDc3Ljk5ODUxMDQgNzgsNjEuODgwNzk5IDc4LDQxLjk5ODUxMDQgQzc4LDIyLjIzNDkyOTQgNjIuMDY2MzMxNiw2LjE3MDg3ODA2IDQyLjMxODc2ODIsNS45OTk4ODk5NCBDNDAuNjYxOTc2LDUuOTg1NTQ0MjggMzkuMzMwNTEwMSw0LjYzMDgxOTQyIDM5LjM0NDg1NTgsMi45NzQwMjcyOCBDMzkuMzU5MjAxNCwxLjMxNzIzNTE0IDQwLjcxMzkyNjMsLTAuMDE0MjMwODE0NiA0Mi4zNzA3MTg0LDAuMDAwMTE0ODQyOTUyIEM2NS40MTA5MTU3LDAuMTk5NjEyODggODQsMTguOTQwODA5MSA4NCw0MS45OTg1MTA0IEM4NCw2NS4xOTQ1MDc1IDY1LjE5NTk5NzEsODMuOTk4NTEwNCA0Miw4My45OTg1MTA0IFoiLz48L2c+ICA8L3N2Zz4gIA=='); + background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI4NCIgaGVpZ2h0PSI4NCIgdmlld0JveD0iMCAwIDg0IDg0Ij48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPiAgPHBhdGggZD0iTTQyLDg0IEM2NS4xOTYsODQgODQsNjUuMTk2IDg0LDQyIEM4NCwxOC44MDQgNjUuMTk2LDAgNDIsMCBDMTguODA0LDAgMCwxOC44MDQgMCw0MiBDMCw2NS4xOTYgMTguODA0LDg0IDQyLDg0Ii8+ICA8cGF0aCBmaWxsPSIjRkZGIiBmaWxsLXJ1bGU9Im5vbnplcm8iIGQ9Ik00Miw4My45OTg1MTA0IEM0MC4zNDMxNDU4LDgzLjk5ODUxMDQgMzksODIuNjU1MzY0NiAzOSw4MC45OTg1MTA0IEMzOSw3OS4zNDE2NTYxIDQwLjM0MzE0NTgsNzcuOTk4NTEwNCA0Miw3Ny45OTg1MTA0IEM2MS44ODIyODg2LDc3Ljk5ODUxMDQgNzgsNjEuODgwNzk5IDc4LDQxLjk5ODUxMDQgQzc4LDIyLjIzNDkyOTQgNjIuMDY2MzMxNiw2LjE3MDg3ODA2IDQyLjMxODc2ODIsNS45OTk4ODk5NCBDNDAuNjYxOTc2LDUuOTg1NTQ0MjggMzkuMzMwNTEwMSw0LjYzMDgxOTQyIDM5LjM0NDg1NTgsMi45NzQwMjcyOCBDMzkuMzU5MjAxNCwxLjMxNzIzNTE0IDQwLjcxMzkyNjMsLTAuMDE0MjMwODE0NiA0Mi4zNzA3MTg0LDAuMDAwMTE0ODQyOTUyIEM2NS40MTA5MTU3LDAuMTk5NjEyODggODQsMTguOTQwODA5MSA4NCw0MS45OTg1MTA0IEM4NCw2NS4xOTQ1MDc1IDY1LjE5NTk5NzEsODMuOTk4NTEwNCA0Miw4My45OTg1MTA0IFoiLz48L2c+ICA8L3N2Zz4gIA=="); height: 32px; left: 50%; margin-left: -16px; @@ -123,7 +122,7 @@ } @keyframes rotate { - 100% { - transform: rotate(360deg); - } + 100% { + transform: rotate(360deg); + } } diff --git a/test/helper/ConfigurationServiceMockCreator.ts b/test/helper/ConfigurationServiceMockCreator.ts new file mode 100644 index 000000000..619cd9e5e --- /dev/null +++ b/test/helper/ConfigurationServiceMockCreator.ts @@ -0,0 +1,26 @@ +import { Subject } from "rxjs"; + +import { MockCreator } from "./MockCreator"; +import { MockCreatorBase } from "./MockCreatorBase"; + +import { ConfigurationService } from "../../src/viewer/ConfigurationService"; + +export class ConfigurationServiceMockCreator extends + MockCreatorBase { + public create(): ConfigurationService { + const mock: ConfigurationService = + new MockCreator() + .create(ConfigurationService, "ConfigurationService"); + + this._mockProperty( + mock, + "exploreUrl$", + new Subject()); + this._mockProperty( + mock, + "imageTiling$", + new Subject()); + + return mock; + } +} diff --git a/test/helper/ContainerMockCreator.ts b/test/helper/ContainerMockCreator.ts index 9ecd9ab0d..6e90151c6 100644 --- a/test/helper/ContainerMockCreator.ts +++ b/test/helper/ContainerMockCreator.ts @@ -1,4 +1,6 @@ import { Container } from "../../src/viewer/Container"; +import { ConfigurationServiceMockCreator } + from "./ConfigurationServiceMockCreator"; import { DOMRendererMockCreator } from "./DOMRendererMockCreator"; import { GLRendererMockCreator } from "./GLRendererMockCreator"; import { KeyboardServiceMockCreator } from "./KeyboardServiceMockCreator"; @@ -14,6 +16,10 @@ export class ContainerMockCreator extends MockCreatorBase { const mock: Container = new MockCreator().create(Container, "Container"); this._mockProperty(mock, "canvasContainer", document.createElement("canvas")); + this._mockProperty( + mock, + "configurationService", + new ConfigurationServiceMockCreator().create()); this._mockProperty(mock, "domRenderer", new DOMRendererMockCreator().create()); this._mockProperty(mock, "container", document.createElement("div")); this._mockProperty(mock, "glRenderer", new GLRendererMockCreator().create()); diff --git a/test/util/ViewerConfiguration.test.ts b/test/util/ViewerConfiguration.test.ts deleted file mode 100644 index ff229100a..000000000 --- a/test/util/ViewerConfiguration.test.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { ViewerConfiguration } from "../../src/viewer/ViewerConfiguration"; -import { ViewerOptions } from "../../src/viewer/options/ViewerOptions"; - -describe("Urls.setOptions", () => { - it("should set all option properties", () => { - const options: ViewerOptions = { - container: "container-id", - imageTiling: false, - url: { - exploreHost: "test-explore", - scheme: "test-scheme", - }, - }; - - expect(ViewerConfiguration.imageTiling).toBe(true); - expect(ViewerConfiguration.explore).toBe("https://www.mapillary.com"); - - ViewerConfiguration.setOptions(options); - - expect(ViewerConfiguration.imageTiling).toBe(false); - expect(ViewerConfiguration.explore).not.toContain("https"); - expect(ViewerConfiguration.explore).not.toContain("mapillary"); - expect(ViewerConfiguration.explore).toContain(options.url.scheme); - expect(ViewerConfiguration.explore).toContain(options.url.exploreHost); - }); -}); diff --git a/test/viewer/ConfigurationService.test.ts b/test/viewer/ConfigurationService.test.ts new file mode 100644 index 000000000..349f07549 --- /dev/null +++ b/test/viewer/ConfigurationService.test.ts @@ -0,0 +1,89 @@ +import { ConfigurationService } from "../../src/viewer/ConfigurationService"; +import { ViewerOptions } from "../../src/viewer/options/ViewerOptions"; + +describe("ConfigurationService.ctor", () => { + it("should set all option properties", () => { + const options: ViewerOptions = { container: "container-id" }; + const service = new ConfigurationService(options); + + expect(service).toBeDefined(); + + }); +}); + +describe("ConfigurationService.exploreHost$", () => { + it("should emit default URL on each subscription", () => { + const options: ViewerOptions = { container: "container-id" }; + + const service = new ConfigurationService(options); + + let count = 0; + service.exploreUrl$.subscribe( + url => { + count++; + expect(url).toBe("https://www.mapillary.com"); + }); + service.exploreUrl$.subscribe( + url => { + count++; + expect(url).toBe("https://www.mapillary.com"); + }); + + expect(count).toBe(2); + }); + + it("should emit configured URL", (done: Function) => { + const options: ViewerOptions = { + container: "container-id", + url: { + exploreHost: "test-explore", + scheme: "test-scheme", + }, + }; + + const service = new ConfigurationService(options); + + service.exploreUrl$.subscribe( + url => { + expect(url).toBe("test-scheme://test-explore"); + done(); + }); + }); +}); + +describe("ConfigurationService.imageTiling$", () => { + it("should emit default value on each subscription", () => { + const options: ViewerOptions = { container: "container-id" }; + + const service = new ConfigurationService(options); + + let count = 0; + service.imageTiling$.subscribe( + active => { + count++; + expect(active).toBe(true); + }); + service.imageTiling$.subscribe( + active => { + count++; + expect(active).toBe(true); + }); + + expect(count).toBe(2); + }); + + it("should emit configured value", (done: Function) => { + const options: ViewerOptions = { + container: "container-id", + imageTiling: false, + }; + + const service = new ConfigurationService(options); + + service.imageTiling$.subscribe( + active => { + expect(active).toBe(false); + done(); + }); + }); +});