CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 21:48:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve formatting for imagery capture dates

Browse Source
This commit is contained in:
Bryan Housel
2017-07-01 00:47:16 -04:00
parent 150985a57d
commit 0d27743b81
5 changed files with 71 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/80_app.css
+2 -1
View File
@@ -2720,7 +2720,8 @@ img.tile-removing {
padding: 10px 0;
}
.panel-content-location .location-name {
.panel-content-location .imagery-info,
.panel-content-location .location-info {
padding-top: 10px;
}
data/core.yaml
+1
View File
@@ -288,6 +288,7 @@ en:
key: L
title: Location
zoom: Zoom
imagery_capture_dates: Imagery Capture Dates
unknown_location: Unknown Location
unknown_imagery_age: Unknown Imagery Age
measurement:
dist/locales/en.json
Vendored
+1
View File
@@ -365,6 +365,7 @@
"key": "L",
"title": "Location",
"zoom": "Zoom",
"imagery_capture_dates": "Imagery Capture Dates",
"unknown_location": "Unknown Location",
"unknown_imagery_age": "Unknown Imagery Age"
},
modules/renderer/background_source.js
+12 -5
View File
@@ -165,15 +165,22 @@ rendererBackgroundSource.Bing = function(data, dispatch) {
'?zl=' + zoom + '&key=' + key + '&jsonp={callback}';
jsonpRequest(url, function(result) {
var error = (!result && 'Unknown Error') || result.errorDetails;
if (error) {
return callback(error);
var err = (!result && 'Unknown Error') || result.errorDetails;
if (err) {
return callback(err);
} else {
return callback(null, {
start: result.resourceSets[0].resources[0].vintageStart,
end: result.resourceSets[0].resources[0].vintageEnd
start: localeDateString(result.resourceSets[0].resources[0].vintageStart),
end: localeDateString(result.resourceSets[0].resources[0].vintageEnd)
});
}
function localeDateString(s) {
if (!s) return null;
var d = new Date(s);
if (isNaN(d.getTime())) return null;
return d.toLocaleDateString();
}
});
};
modules/ui/panels/location.js
+55 -30
View File
@@ -5,8 +5,10 @@ import { services } from '../../services';
export function uiPanelLocation(context) {
var lastLocation = '';
var lastImagery = '';
var background = context.background();
var currLocation = '';
var currImagerySource = null;
var currImageryDates = '';
var OSM_PRECISION = 7;
@@ -47,57 +49,80 @@ export function uiPanelLocation(context) {
.append('li')
.text(t('infobox.location.zoom') + ': ' + context.map().zoom().toFixed(2));
// Date of Imagery
selection
.append('p')
.attr('class', 'imagery-vintage')
.text(lastImagery);
// Location Name
selection
.append('p')
.attr('class', 'location-name')
.text(lastLocation);
// Imagery Info
if (currImagerySource !== background.baseLayerSource().name()) {
currImagerySource = background.baseLayerSource().name();
currImageryDates = '';
}
debouncedLocation(selection, coord);
var imageryList = selection
.append('ul')
.attr('class', 'imagery-info');
imageryList
.append('li')
.text(currImagerySource);
imageryList
.append('li')
.text(t('infobox.location.imagery_capture_dates') + ':');
imageryList
.append('li')
.attr('class', 'imagery-dates')
.text(currImageryDates || ' ');
if (!currImageryDates) {
debouncedGetImageryDates(selection);
}
// Location Info
selection
.append('div')
.attr('class', 'location-info')
.text(currLocation || ' ');
debouncedGetLocation(selection, coord);
}
var debouncedLocation = _.debounce(updateLocation, 250);
function updateLocation(selection, coord) {
var debouncedGetLocation = _.debounce(getLocation, 250);
function getLocation(selection, coord) {
if (!services.geocoder) {
lastLocation = t('infobox.location.unknown_location');
selection.selectAll('.location-name')
.text(lastLocation);
currLocation = t('infobox.location.unknown_location');
selection.selectAll('.location-info')
.text(currLocation);
} else {
services.geocoder.reverse(coord, function(err, result) {
lastLocation = result ? result.display_name : t('infobox.location.unknown_location');
selection.selectAll('.location-name')
.text(lastLocation);
currLocation = result ? result.display_name : t('infobox.location.unknown_location');
selection.selectAll('.location-info')
.text(currLocation);
});
}
}
var debouncedImageryVintage = _.debounce(updateImageryVintage, 250);
function updateImageryVintage(selection) {
var debouncedGetImageryDates = _.debounce(getImageryDates, 250);
function getImageryDates(selection) {
var tiledata = d3.select('.layer-background img').datum(),
zoom = tiledata[2] || Math.floor(context.map().zoom()),
center = context.map().center();
context.background().baseLayerSource().getVintage(center, zoom, function(err, result) {
background.baseLayerSource().getVintage(center, zoom, function(err, result) {
if (!result) {
lastImagery = t('infobox.location.unknown_imagery_age');
currImageryDates = t('infobox.location.unknown_imagery_age');
} else {
if (result.start || result.end) {
lastImagery = (result.start || '?') + ' - ' + (result.end || '?');
currImageryDates = (result.start || '?') + ' - ' + (result.end || '?');
} else {
lastImagery = t('infobox.location.unknown_imagery_age');
currImageryDates = t('infobox.location.unknown_imagery_age');
}
}
selection.selectAll('.imagery-vintage')
.text(lastImagery);
selection.selectAll('.imagery-dates')
.text(currImageryDates);
});
}
@@ -115,7 +140,7 @@ export function uiPanelLocation(context) {
selection.call(redraw);
})
.on('move.info-location', function() {
selection.call(debouncedImageryVintage);
selection.call(debouncedGetImageryDates);
});
};