Fixes for Imagery Snapshotting #3963 (#4001)

* refactored compass structure and code.
* resize image wrapper
* center image properly
* Refactor imagery compass rose as SVG
* Suppress prev/next image arrows from Snapshot

Co-authored-by: Nikhil Mandlik <nikhil.k.mandlik@nasa.gov>
This commit is contained in:
Charles Hacskaylo 2021-07-09 18:03:11 -07:00 committed by GitHub
parent 254b3db966
commit 41b860a547
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 335 additions and 372 deletions

View File

@ -34,7 +34,7 @@
"git-rev-sync": "^1.4.0", "git-rev-sync": "^1.4.0",
"glob": ">= 3.0.0", "glob": ">= 3.0.0",
"html-loader": "^0.5.5", "html-loader": "^0.5.5",
"html2canvas": "^1.0.0-alpha.12", "html2canvas": "^1.0.0-rc.7",
"imports-loader": "^0.8.0", "imports-loader": "^0.8.0",
"istanbul-instrumenter-loader": "^3.0.1", "istanbul-instrumenter-loader": "^3.0.1",
"jasmine-core": "^3.1.0", "jasmine-core": "^3.1.0",

View File

@ -23,7 +23,7 @@
<template> <template>
<div <div
class="c-compass" class="c-compass"
:style="`width: ${ sizedImageDimensions.width }px; height: ${ sizedImageDimensions.height }px`" :style="`width: 100%; height: 100%`"
> >
<CompassHUD <CompassHUD
v-if="hasCameraFieldOfView" v-if="hasCameraFieldOfView"
@ -33,13 +33,12 @@
/> />
<CompassRose <CompassRose
v-if="hasCameraFieldOfView" v-if="hasCameraFieldOfView"
:heading="heading"
:sized-image-width="sizedImageDimensions.width"
:sun-heading="sunHeading"
:camera-angle-of-view="cameraAngleOfView" :camera-angle-of-view="cameraAngleOfView"
:camera-pan="cameraPan" :camera-pan="cameraPan"
:lock-compass="lockCompass" :compass-rose-sizing-classes="compassRoseSizingClasses"
@toggle-lock-compass="toggleLockCompass" :heading="heading"
:sized-image-dimensions="sizedImageDimensions"
:sun-heading="sunHeading"
/> />
</div> </div>
</template> </template>
@ -56,42 +55,20 @@ export default {
CompassRose CompassRose
}, },
props: { props: {
containerWidth: { compassRoseSizingClasses: {
type: Number, type: String,
required: true
},
containerHeight: {
type: Number,
required: true
},
naturalAspectRatio: {
type: Number,
required: true required: true
}, },
image: { image: {
type: Object, type: Object,
required: true required: true
}, },
lockCompass: { sizedImageDimensions: {
type: Boolean, type: Object,
required: true required: true
} }
}, },
computed: { computed: {
sizedImageDimensions() {
let sizedImageDimensions = {};
if ((this.containerWidth / this.containerHeight) > this.naturalAspectRatio) {
// container is wider than image
sizedImageDimensions.width = this.containerHeight * this.naturalAspectRatio;
sizedImageDimensions.height = this.containerHeight;
} else {
// container is taller than image
sizedImageDimensions.width = this.containerWidth;
sizedImageDimensions.height = this.containerWidth * this.naturalAspectRatio;
}
return sizedImageDimensions;
},
hasCameraFieldOfView() { hasCameraFieldOfView() {
return this.cameraPan !== undefined && this.cameraAngleOfView > 0; return this.cameraPan !== undefined && this.cameraAngleOfView > 0;
}, },

View File

@ -21,152 +21,203 @@
*****************************************************************************/ *****************************************************************************/
<template> <template>
<div <div ref="compassRoseWrapper"
class="w-direction-rose" class="w-direction-rose"
:class="compassRoseSizingClasses" :class="compassRoseSizingClasses"
>
<div
class="c-direction-rose"
@click="toggleLockCompass" @click="toggleLockCompass"
> >
<div <svg ref="compassRoseSvg"
class="c-nsew" class="c-compass-rose-svg"
:style="compassRoseStyle"
>
<svg
class="c-nsew__minor-ticks"
viewBox="0 0 100 100" viewBox="0 0 100 100"
> >
<rect <mask id="mask0"
class="c-nsew__tick c-tick-ne" mask-type="alpha"
x="49" maskUnits="userSpaceOnUse"
x="0"
y="0" y="0"
width="2" width="100"
height="5" height="100"
/>
<rect
class="c-nsew__tick c-tick-se"
x="95"
y="49"
width="5"
height="2"
/>
<rect
class="c-nsew__tick c-tick-sw"
x="49"
y="95"
width="2"
height="5"
/>
<rect
class="c-nsew__tick c-tick-nw"
x="0"
y="49"
width="5"
height="2"
/>
</svg>
<svg
class="c-nsew__ticks"
viewBox="0 0 100 100"
> >
<polygon <circle cx="50"
class="c-nsew__tick c-tick-n" cy="50"
points="50,0 60,10 40,10" r="50"
fill="black"
/> />
<rect </mask>
class="c-nsew__tick c-tick-e" <g class="c-cr__compass-wrapper">
x="95" <g class="c-cr__compass-main"
y="49" mask="url(#mask0)"
width="5"
height="2"
/>
<rect
class="c-nsew__tick c-tick-w"
x="0"
y="49"
width="5"
height="2"
/>
<rect
class="c-nsew__tick c-tick-s"
x="49"
y="95"
width="2"
height="5"
/>
<text
class="c-nsew__label c-label-n"
text-anchor="middle"
:transform="northTextTransform"
>N</text>
<text
class="c-nsew__label c-label-e"
text-anchor="middle"
:transform="eastTextTransform"
>E</text>
<text
class="c-nsew__label c-label-w"
text-anchor="middle"
:transform="southTextTransform"
>W</text>
<text
class="c-nsew__label c-label-s"
text-anchor="middle"
:transform="westTextTransform"
>S</text>
</svg>
</div>
<div
v-if="hasHeading"
class="c-spacecraft-body"
:style="headingStyle"
> >
</div> <!-- Background and clipped elements -->
<rect class="c-cr__bg"
<div width="100"
v-if="hasSunHeading" height="100"
class="c-sun" fill="black"
/>
<rect class="c-cr__edge"
width="100"
height="100"
fill="url(#paint0_radial)"
/>
<rect v-if="hasSunHeading"
class="c-cr__sun"
width="100"
height="100"
fill="url(#paint1_radial)"
:style="sunHeadingStyle" :style="sunHeadingStyle"
></div> />
<div <!-- Camera FOV -->
class="c-cam-field" <mask id="mask2"
class="c-cr__cam-fov-l-mask"
mask-type="alpha"
maskUnits="userSpaceOnUse"
x="0"
y="0"
width="50"
height="100"
>
<rect width="51"
height="100"
/>
</mask>
<mask id="mask1"
class="c-cr__cam-fov-r-mask"
mask-type="alpha"
maskUnits="userSpaceOnUse"
x="50"
y="0"
width="50"
height="100"
>
<rect x="49"
width="51"
height="100"
/>
</mask>
<g class="c-cr__cam-fov"
:style="cameraPanStyle" :style="cameraPanStyle"
> >
<div class="cam-field-half cam-field-half-l"> <g mask="url(#mask2)">
<div <rect class="c-cr__cam-fov-r"
class="cam-field-area" x="49"
:style="cameraFOVStyleLeftHalf" width="51"
></div> height="100"
</div>
<div class="cam-field-half cam-field-half-r">
<div
class="cam-field-area"
:style="cameraFOVStyleRightHalf" :style="cameraFOVStyleRightHalf"
></div> />
</div> </g>
</div> <g mask="url(#mask1)">
</div> <rect class="c-cr__cam-fov-l"
width="51"
height="100"
:style="cameraFOVStyleLeftHalf"
/>
</g>
</g>
</g>
<!-- Spacecraft body -->
<path v-if="hasHeading"
class="c-cr__spacecraft-body"
fill-rule="evenodd"
clip-rule="evenodd"
d="M37 49C35.3431 49 34 50.3431 34 52V82C34 83.6569 35.3431 85 37 85H63C64.6569 85 66 83.6569 66 82V52C66 50.3431 64.6569 49 63 49H37ZM50 52L58 60H55V67H45V60H42L50 52Z"
:style="headingStyle"
/>
<!-- NSEW and ticks -->
<g class="c-cr__nsew"
:style="compassRoseStyle"
>
<g class="c-cr__ticks-major">
<path d="M50 3L43 10H57L50 3Z" />
<path d="M4 51V49H10V51H4Z"
class="--hide-min"
/>
<path d="M49 96V90H51V96H49Z"
class="--hide-min"
/>
<path d="M90 49V51H96V49H90Z"
class="--hide-min"
/>
</g>
<g class="c-cr__ticks-minor --hide-small">
<path d="M4 51V49H10V51H4Z" />
<path d="M90 51V49H96V51H90Z" />
<path d="M51 96H49V90H51V96Z" />
<path d="M51 10L49 10V4L51 4V10Z" />
</g>
<g class="c-cr__nsew-text">
<path :style="cardinalTextRotateW"
class="c-cr__nsew-w --hide-small"
d="M56.7418 45.004H54.1378L52.7238 52.312H52.6958L51.2258 45.004H48.7758L47.3058 52.312H47.2778L45.8638 45.004H43.2598L45.9618 55H48.6078L49.9798 48.112H50.0078L51.3798 55H53.9838L56.7418 45.004Z"
/>
<path :style="cardinalTextRotateE"
class="c-cr__nsew-e --hide-small"
d="M46.104 55H54.21V52.76H48.708V50.856H53.608V48.84H48.708V47.09H54.07V45.004H46.104V55Z"
/>
<path :style="cardinalTextRotateS"
class="c-cr__nsew-s --hide-small"
d="M45.6531 51.64C45.6671 54.202 47.6971 55.21 49.9931 55.21C52.1911 55.21 54.3471 54.398 54.3471 51.864C54.3471 50.058 52.8911 49.386 51.4491 48.98C49.9931 48.574 48.5511 48.434 48.5511 47.664C48.5511 47.006 49.2511 46.81 49.8111 46.81C50.6091 46.81 51.4631 47.104 51.4211 48.014H54.0251C54.0111 45.76 52.0091 44.794 50.0211 44.794C48.1451 44.794 45.9471 45.648 45.9471 47.832C45.9471 49.666 47.4451 50.31 48.8731 50.716C50.3151 51.122 51.7431 51.29 51.7431 52.172C51.7431 52.914 50.9311 53.194 50.1471 53.194C49.0411 53.194 48.3131 52.816 48.2571 51.64H45.6531Z"
/>
<path :style="cardinalTextRotateN"
class="c-cr__nsew-n"
d="M42.5935 60H46.7935V49.32H46.8415L52.7935 60H57.3775V42.864H53.1775V53.424H53.1295L47.1775 42.864H42.5935V60Z"
/>
</g>
</g>
</g>
<defs>
<radialGradient id="paint0_radial"
cx="0"
cy="0"
r="1"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(50 50) rotate(90) scale(50)"
>
<stop offset="0.751387"
stop-opacity="0"
/>
<stop offset="1"
stop-color="white"
/>
</radialGradient>
<radialGradient id="paint1_radial"
cx="0"
cy="0"
r="1"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(50 -7) rotate(-90) scale(18.5)"
>
<stop offset="0.716377"
stop-color="#FFCC00"
/>
<stop offset="1"
stop-color="#FF9900"
stop-opacity="0"
/>
</radialGradient>
</defs>
</svg>
</div> </div>
</template> </template>
<script> <script>
import { rotate } from './utils'; import { rotate } from './utils';
import { throttle } from 'lodash';
export default { export default {
props: { props: {
sizedImageWidth: { compassRoseSizingClasses: {
type: Number, type: String,
required: true required: true
}, },
heading: { heading: {
type: Number, type: Number,
required: true required: true,
default() {
return 0;
}
}, },
sunHeading: { sunHeading: {
type: Number, type: Number,
@ -178,58 +229,39 @@ export default {
}, },
cameraPan: { cameraPan: {
type: Number, type: Number,
required: true required: true,
default() {
return 0;
}
}, },
lockCompass: { sizedImageDimensions: {
type: Boolean, type: Object,
required: true required: true
} }
}, },
data() {
return {
lockCompass: true
};
},
computed: { computed: {
compassRoseSizingClasses() {
let compassRoseSizingClasses = '';
if (this.sizedImageWidth < 300) {
compassRoseSizingClasses = '--rose-small --rose-min';
} else if (this.sizedImageWidth < 500) {
compassRoseSizingClasses = '--rose-small';
} else if (this.sizedImageWidth > 1000) {
compassRoseSizingClasses = '--rose-max';
}
return compassRoseSizingClasses;
},
compassRoseStyle() { compassRoseStyle() {
return { transform: `rotate(${ this.north }deg)` }; return { transform: `rotate(${ this.north }deg)` };
}, },
north() { north() {
return this.lockCompass ? rotate(-this.cameraPan) : 0; return this.lockCompass ? rotate(-this.cameraPan) : 0;
}, },
northTextTransform() { cardinalTextRotateN() {
return this.cardinalPointsTextTransform.north; return { transform: `translateY(-27%) rotate(${ -this.north }deg)` };
}, },
eastTextTransform() { cardinalTextRotateS() {
return this.cardinalPointsTextTransform.east; return { transform: `translateY(30%) rotate(${ -this.north }deg)` };
}, },
southTextTransform() { cardinalTextRotateE() {
return this.cardinalPointsTextTransform.south; return { transform: `translateX(30%) rotate(${ -this.north }deg)` };
}, },
westTextTransform() { cardinalTextRotateW() {
return this.cardinalPointsTextTransform.west; return { transform: `translateX(-30%) rotate(${ -this.north }deg)` };
},
cardinalPointsTextTransform() {
/**
* cardinal points text must be rotated
* in the opposite direction that north is rotated
* to keep text vertically oriented
*/
const rotation = `rotate(${ -this.north })`;
return {
north: `translate(50,23) ${ rotation }`,
east: `translate(82,50) ${ rotation }`,
south: `translate(18,50) ${ rotation }`,
west: `translate(50,82) ${ rotation }`
};
}, },
hasHeading() { hasHeading() {
return this.heading !== undefined; return this.heading !== undefined;
@ -238,7 +270,7 @@ export default {
const rotation = rotate(this.north, this.heading); const rotation = rotate(this.north, this.heading);
return { return {
transform: `translateX(-50%) rotate(${ rotation }deg)` transform: `rotate(${ rotation }deg)`
}; };
}, },
hasSunHeading() { hasSunHeading() {
@ -262,20 +294,37 @@ export default {
// rotated counter-clockwise from camera pan angle // rotated counter-clockwise from camera pan angle
cameraFOVStyleLeftHalf() { cameraFOVStyleLeftHalf() {
return { return {
transform: `translateX(50%) rotate(${ -this.cameraAngleOfView / 2 }deg)` transform: `rotate(${ this.cameraAngleOfView / 2 }deg)`
}; };
}, },
// right half of camera field of view // right half of camera field of view
// rotated clockwise from camera pan angle // rotated clockwise from camera pan angle
cameraFOVStyleRightHalf() { cameraFOVStyleRightHalf() {
return { return {
transform: `translateX(-50%) rotate(${ this.cameraAngleOfView / 2 }deg)` transform: `rotate(${ -this.cameraAngleOfView / 2 }deg)`
}; };
} }
}, },
watch: {
sizedImageDimensions() {
this.debounceResizeSvg();
}
},
mounted() {
this.debounceResizeSvg = throttle(this.resizeSvg, 100);
this.$nextTick(() => {
this.debounceResizeSvg();
});
},
methods: { methods: {
resizeSvg() {
const svg = this.$refs.compassRoseSvg;
svg.setAttribute('width', this.$refs.compassRoseWrapper.clientWidth);
svg.setAttribute('height', this.$refs.compassRoseWrapper.clientHeight);
},
toggleLockCompass() { toggleLockCompass() {
this.$emit('toggle-lock-compass'); this.lockCompass = !this.lockCompass;
} }
} }
}; };

View File

@ -12,9 +12,8 @@ $elemBg: rgba(black, 0.7);
.c-compass { .c-compass {
pointer-events: none; // This allows the image element to receive a browser-level context click pointer-events: none; // This allows the image element to receive a browser-level context click
position: absolute; position: absolute;
left: 50%; left: 0;
top: 50%; top: 0;
transform: translate(-50%, -50%);
z-index: 1; z-index: 1;
@include userSelectNone; @include userSelectNone;
} }
@ -81,114 +80,55 @@ $elemBg: rgba(black, 0.7);
transform: translateX(-50%); transform: translateX(-50%);
z-index: 1; z-index: 1;
} }
} }
/***************************** COMPASS DIRECTIONS */ /***************************** COMPASS SVG */
.c-nsew { .c-compass-rose-svg {
$color: $interfaceKeyColor; $color: $interfaceKeyColor;
$inset: 5%; position: absolute;
$tickHeightPerc: 15%; top: 0; left: 0;
text-shadow: black 0 0 10px;
top: $inset;
right: $inset;
bottom: $inset;
left: $inset;
z-index: 3;
&__tick, g, path, rect {
&__label { // In an SVG, rotation occurs about the center of the SVG, not the element
transform-origin: center;
}
.c-cr {
&__bg {
fill: #000;
opacity: 0.8;
}
&__edge {
opacity: 0.1;
}
&__sun {
opacity: 0.7;
}
&__cam-fov-l,
&__cam-fov-r {
// Cam FOV indication
opacity: 0.2;
fill: #fff;
}
&__nsew-text,
&__spacecraft-body,
&__ticks-major,
&__ticks-minor {
fill: $color; fill: $color;
} }
&__minor-ticks { &__ticks-minor {
opacity: 0.5; opacity: 0.5;
transform-origin: center;
transform: rotate(45deg); transform: rotate(45deg);
} }
&__label { &__spacecraft-body {
dominant-baseline: central;
font-size: 1.25em;
font-weight: bold;
}
.c-label-n {
font-size: 2em;
}
}
/***************************** CAMERA FIELD ANGLE */
.c-cam-field {
$color: white;
opacity: 0.3; opacity: 0.3;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 2;
.cam-field-half {
top: 0;
right: 0;
bottom: 0;
left: 0;
.cam-field-area {
background: $color;
top: -30%;
right: 0;
bottom: -30%;
left: 0;
} }
// clip-paths overlap a bit to avoid a gap between halves
&-l {
clip-path: polygon(0 0, 50.5% 0, 50.5% 100%, 0 100%);
.cam-field-area {
transform-origin: left center;
}
}
&-r {
clip-path: polygon(49.5% 0, 100% 0, 100% 100%, 49.5% 100%);
.cam-field-area {
transform-origin: right center;
}
}
}
}
/***************************** SPACECRAFT BODY */
.c-spacecraft-body {
$color: $interfaceKeyColor;
$s: 30%;
background: $color;
border-radius: 3px;
height: $s;
width: $s;
left: 50%;
top: 50%;
opacity: 0.4;
transform-origin: center top;
transform: translateX(-50%); // center by default, overridden by CompassRose.vue / headingStyle()
&:before {
// Direction arrow
$color: rgba(black, 0.5);
$arwPointerY: 60%;
$arwBodyOffset: 25%;
background: $color;
content: '';
display: block;
position: absolute;
top: 10%;
right: 20%;
bottom: 50%;
left: 20%;
clip-path: polygon(50% 0, 100% $arwPointerY, 100%-$arwBodyOffset $arwPointerY, 100%-$arwBodyOffset 100%, $arwBodyOffset 100%, $arwBodyOffset $arwPointerY, 0 $arwPointerY);
} }
} }
@ -196,32 +136,28 @@ $elemBg: rgba(black, 0.7);
.w-direction-rose { .w-direction-rose {
$s: 10%; $s: 10%;
$m: 2%; $m: 2%;
cursor: pointer;
pointer-events: all;
position: absolute; position: absolute;
bottom: $m; bottom: $m;
left: $m; left: $m;
width: $s; width: $s;
padding-top: $s; padding-top: $s;
z-index: 2;
&.--rose-min { &.--rose-min {
$s: 30px; $s: 30px;
width: $s; width: $s;
padding-top: $s; padding-top: $s;
.--hide-min {
display: none;
}
} }
&.--rose-small { &.--rose-small {
.c-nsew__minor-ticks, .--hide-small {
.c-tick-w,
.c-tick-s,
.c-tick-e,
.c-label-w,
.c-label-s,
.c-label-e {
display: none; display: none;
} }
.c-label-n {
font-size: 2.5em;
}
} }
&.--rose-max { &.--rose-max {
@ -230,44 +166,3 @@ $elemBg: rgba(black, 0.7);
padding-top: $s; padding-top: $s;
} }
} }
.c-direction-rose {
$c2: rgba(white, 0.1);
background: $elemBg;
background-image: radial-gradient(circle closest-side, transparent, transparent 80%, $c2);
transform-origin: 0 0;
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
clip-path: circle(50% at 50% 50%);
border-radius: 100%;
pointer-events: all;
svg, div {
position: absolute;
}
// Sun
.c-sun {
top: 0;
right: 0;
bottom: 0;
left: 0;
&:before {
$s: 35%;
@include sun();
content: '';
display: block;
position: absolute;
opacity: 0.7;
top: 0;
left: 50%;
height: $s;
width: $s;
transform: translate(-50%, -60%);
}
}
}

View File

@ -55,11 +55,17 @@
></a> ></a>
</span> </span>
</div> </div>
<div class="c-imagery__main-image__bg" <div ref="imageBG"
class="c-imagery__main-image__bg"
:class="{'paused unnsynced': isPaused,'stale':false }" :class="{'paused unnsynced': isPaused,'stale':false }"
> >
<img <div class="image-wrapper"
ref="focusedImage" :style="{
'width': `${sizedImageDimensions.width}px`,
'height': `${sizedImageDimensions.height}px`
}"
>
<img ref="focusedImage"
class="c-imagery__main-image__image js-imageryView-image" class="c-imagery__main-image__image js-imageryView-image"
:src="imageUrl" :src="imageUrl"
:style="{ :style="{
@ -70,14 +76,13 @@
> >
<Compass <Compass
v-if="shouldDisplayCompass" v-if="shouldDisplayCompass"
:container-width="imageContainerWidth" :compass-rose-sizing-classes="compassRoseSizingClasses"
:container-height="imageContainerHeight"
:natural-aspect-ratio="focusedImageNaturalAspectRatio"
:image="focusedImage" :image="focusedImage"
:lock-compass="lockCompass" :natural-aspect-ratio="focusedImageNaturalAspectRatio"
@toggle-lock-compass="toggleLockCompass" :sized-image-dimensions="sizedImageDimensions"
/> />
</div> </div>
</div>
<div class="c-local-controls c-local-controls--show-on-hover c-imagery__prev-next-buttons"> <div class="c-local-controls c-local-controls--show-on-hover c-imagery__prev-next-buttons">
<button class="c-nav c-nav--prev" <button class="c-nav c-nav--prev"
title="Previous image" title="Previous image"
@ -224,6 +229,18 @@ export default {
}; };
}, },
computed: { computed: {
compassRoseSizingClasses() {
let compassRoseSizingClasses = '';
if (this.sizedImageDimensions.width < 300) {
compassRoseSizingClasses = '--rose-small --rose-min';
} else if (this.sizedImageDimensions.width < 500) {
compassRoseSizingClasses = '--rose-small';
} else if (this.sizedImageDimensions.width > 1000) {
compassRoseSizingClasses = '--rose-max';
}
return compassRoseSizingClasses;
},
time() { time() {
return this.formatTime(this.focusedImage); return this.formatTime(this.focusedImage);
}, },
@ -347,6 +364,20 @@ export default {
} }
return isFresh; return isFresh;
},
sizedImageDimensions() {
let sizedImageDimensions = {};
if ((this.imageContainerWidth / this.imageContainerHeight) > this.focusedImageNaturalAspectRatio) {
// container is wider than image
sizedImageDimensions.width = this.imageContainerHeight * this.focusedImageNaturalAspectRatio;
sizedImageDimensions.height = this.imageContainerHeight;
} else {
// container is taller than image
sizedImageDimensions.width = this.imageContainerWidth;
sizedImageDimensions.height = this.imageContainerWidth * this.focusedImageNaturalAspectRatio;
}
return sizedImageDimensions;
} }
}, },
watch: { watch: {
@ -395,7 +426,7 @@ export default {
_.debounce(this.resizeImageContainer, 400); _.debounce(this.resizeImageContainer, 400);
this.imageContainerResizeObserver = new ResizeObserver(this.resizeImageContainer); this.imageContainerResizeObserver = new ResizeObserver(this.resizeImageContainer);
this.imageContainerResizeObserver.observe(this.$refs.focusedImage); this.imageContainerResizeObserver.observe(this.$refs.imageBG);
// For adjusting scroll bar size and position when resizing thumbs wrapper // For adjusting scroll bar size and position when resizing thumbs wrapper
this.handleScroll = _.debounce(this.handleScroll, SCROLL_LATENCY); this.handleScroll = _.debounce(this.handleScroll, SCROLL_LATENCY);
@ -833,12 +864,12 @@ export default {
}, { once: true }); }, { once: true });
}, },
resizeImageContainer() { resizeImageContainer() {
if (this.$refs.focusedImage.clientWidth !== this.imageContainerWidth) { if (this.$refs.imageBG.clientWidth !== this.imageContainerWidth) {
this.imageContainerWidth = this.$refs.focusedImage.clientWidth; this.imageContainerWidth = this.$refs.imageBG.clientWidth;
} }
if (this.$refs.focusedImage.clientHeight !== this.imageContainerHeight) { if (this.$refs.imageBG.clientHeight !== this.imageContainerHeight) {
this.imageContainerHeight = this.$refs.focusedImage.clientHeight; this.imageContainerHeight = this.$refs.imageBG.clientHeight;
} }
}, },
handleThumbWindowResizeStart() { handleThumbWindowResizeStart() {
@ -858,9 +889,6 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.resizingWindow = false; this.resizingWindow = false;
}); });
},
toggleLockCompass() {
this.lockCompass = !this.lockCompass;
} }
} }
}; };

View File

@ -22,6 +22,9 @@
&__bg { &__bg {
background-color: $colorPlotBg; background-color: $colorPlotBg;
border: 1px solid transparent; border: 1px solid transparent;
display: flex;
align-items: center;
justify-content: center;
flex: 1 1 auto; flex: 1 1 auto;
height: 0; height: 0;
@ -33,7 +36,6 @@
&__image { &__image {
height: 100%; height: 100%;
width: 100%; width: 100%;
object-fit: contain;
} }
} }
@ -192,6 +194,10 @@
margin-right: $interiorMarginSm; margin-right: $interiorMarginSm;
} }
} }
.s-status-taking-snapshot & {
display: none;
}
} }
&__lc { &__lc {
@ -273,6 +279,10 @@
content: $glyph-icon-play; content: $glyph-icon-play;
} }
} }
.s-status-taking-snapshot & {
display: none;
}
} }
.c-imagery__prev-next-buttons { .c-imagery__prev-next-buttons {
@ -287,6 +297,10 @@
.c-nav { .c-nav {
pointer-events: all; pointer-events: all;
} }
.s-status-taking-snapshot & {
display: none;
}
} }
.c-nav { .c-nav {