mirror of
https://github.com/FoggedLens/iD.git
synced 2026-02-12 16:52:50 +00:00
Add error message in photoviewer when invalid id
and update input.js
This commit is contained in:
@@ -76,6 +76,18 @@
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.photoviewer .error-handler {
|
||||
border-radius: 0;
|
||||
padding: 15px;
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
top: 75px;
|
||||
transform: translate(-50%, -50%);
|
||||
z-index: 50;
|
||||
color: red;
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
|
||||
.photo-wrapper {
|
||||
width: 100%;
|
||||
|
||||
@@ -789,6 +789,7 @@ en:
|
||||
set_photo_from_viewer: "Store this photo on the currently selected map object"
|
||||
set_photo_from_field: "Use the currently displayed photo"
|
||||
show_photo_from_field: "Open image in viewer"
|
||||
show_photo_from_field_error: "Invalid ID"
|
||||
background:
|
||||
title: Background
|
||||
description: Background Settings
|
||||
|
||||
@@ -19,7 +19,7 @@ const trafficSignTileUrl = `${baseTileUrl}/mly_map_feature_traffic_sign/2/{z}/{x
|
||||
const viewercss = 'mapillary-js/mapillary.css';
|
||||
const viewerjs = 'mapillary-js/mapillary.js';
|
||||
const minZoom = 14;
|
||||
const dispatch = d3_dispatch('change', 'loadedImages', 'loadedSigns', 'loadedMapFeatures', 'bearingChanged', 'imageChanged');
|
||||
const dispatch = d3_dispatch('change', 'loadedImages', 'loadedSigns', 'loadedMapFeatures', 'bearingChanged', 'imageChanged', 'error');
|
||||
|
||||
let _loadViewerPromise;
|
||||
let _mlyActiveImage;
|
||||
@@ -606,6 +606,7 @@ export default {
|
||||
_mlyViewer.moveTo(imageId)
|
||||
.catch(function(e) {
|
||||
console.error('mly3', e); // eslint-disable-line no-console
|
||||
dispatch.call('error', undefined, e);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -384,7 +384,7 @@ export function uiFieldText(field, context) {
|
||||
utilGetSetValue(input, image.id);
|
||||
change()();
|
||||
});
|
||||
mapillarySetButton.node().blur();
|
||||
mapillarySetButton.node()?.blur();
|
||||
})
|
||||
.merge(mapillarySetButton)
|
||||
.classed('disabled', _debounce(() => {
|
||||
@@ -412,13 +412,13 @@ export function uiFieldText(field, context) {
|
||||
|
||||
if (isHidden) {
|
||||
if (!utilGetSetValue(input).trim()) return;
|
||||
|
||||
service
|
||||
.ensureViewerLoaded(context)
|
||||
.then(function() {
|
||||
service
|
||||
.showViewer(context)
|
||||
.selectImage(context, utilGetSetValue(input).trim())
|
||||
.initViewer(context);
|
||||
.showViewer(context);
|
||||
});
|
||||
} else {
|
||||
if (!utilGetSetValue(input).trim()) return;
|
||||
@@ -430,11 +430,10 @@ export function uiFieldText(field, context) {
|
||||
.ensureViewerLoaded(context)
|
||||
.then(function() {
|
||||
service
|
||||
.selectImage(context, utilGetSetValue(input).trim())
|
||||
.initViewer(context);
|
||||
.selectImage(context, utilGetSetValue(input).trim());
|
||||
});
|
||||
}
|
||||
mapillaryViewButton.node().blur();
|
||||
mapillaryViewButton.node()?.blur();
|
||||
})
|
||||
.merge(mapillaryViewButton)
|
||||
.classed('disabled', _debounce(() => {
|
||||
|
||||
@@ -143,6 +143,24 @@ export function uiPhotoviewer(context) {
|
||||
}
|
||||
}
|
||||
|
||||
// error message handler
|
||||
const errorHandler = selection
|
||||
.append('div')
|
||||
.attr('class', 'error-handler')
|
||||
.append('div')
|
||||
.style('opacity', '0');
|
||||
|
||||
|
||||
services.mapillary
|
||||
.on('error', function(e) {
|
||||
errorHandler
|
||||
.text(t('inspector.show_photo_from_field_error'))
|
||||
.style('opacity', '1')
|
||||
.transition()
|
||||
.duration(1000)
|
||||
.style('opacity', '0');
|
||||
});
|
||||
|
||||
function buildResizeListener(target, eventName, dispatch, options) {
|
||||
|
||||
var resizeOnX = !!options.resizeOnX;
|
||||
|
||||
Reference in New Issue
Block a user