CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch from bundled editor-layer-index to fetched imagery-index

Browse Source
This commit is contained in:
Bryan Housel
2020-03-12 14:27:49 -04:00
parent b5856e2415
commit dbe643aeac
4 changed files with 221 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/data.js
View File

@@ -13,7 +13,8 @@ export function coreData(context) {
'address_formats': 'data/address_formats.min.json',
'deprecated': 'data/deprecated.min.json',
'discarded': 'data/discarded.min.json',
'imagery': 'data/imagery.min.json',
'imagery_features': 'https://cdn.jsdelivr.net/npm/@ideditor/imagery-index@0.1/dist/featureCollection.min.json',
'imagery_sources': 'https://cdn.jsdelivr.net/npm/@ideditor/imagery-index@0.1/dist/sources.min.json',
'intro_graph': 'data/intro_graph.min.json',
'keepRight': 'data/keepRight.min.json',
'languages': 'data/languages.min.json',

259
modules/renderer/background.js
View File

@@ -2,6 +2,7 @@ import { dispatch as d3_dispatch } from 'd3-dispatch';
import { interpolateNumber as d3_interpolateNumber } from 'd3-interpolate';
import { select as d3_select } from 'd3-selection';
import LocationConflation from '@ideditor/location-conflation';
import whichPolygon from 'which-polygon';
import { geoExtent, geoMetersToOffset, geoOffsetToMeters} from '../geo';
@@ -27,50 +28,50 @@ export function rendererBackground(context) {
function ensureImageryIndex() {
return context.data().get('imagery')
.then(sources => {
const data = context.data();
return Promise.all([ data.get('imagery_sources'), data.get('imagery_features') ])
.then(vals => {
if (_imageryIndex) return _imageryIndex;
_imageryIndex = {
imagery: sources,
features: {}
};
const sources = preprocessSources(Object.values(vals[0]));
const loco = new LocationConflation(vals[1]);
let features = {};
let backgrounds = [];
// use which-polygon to support efficient index and querying for imagery
const features = sources.map(source => {
if (!source.polygon) return null;
// workaround for editor-layer-index weirdness..
// Add an extra array nest to each element in `source.polygon`
// so the rings are not treated as a bunch of holes:
// what we have: [ [[outer],[hole],[hole]] ]
// what we want: [ [[outer]],[[outer]],[[outer]] ]
const rings = source.polygon.map(ring => [ring]);
const feature = {
type: 'Feature',
properties: { id: source.id },
geometry: { type: 'MultiPolygon', coordinates: rings }
};
_imageryIndex.features[source.id] = feature;
return feature;
}).filter(Boolean);
_imageryIndex.query = whichPolygon({ type: 'FeatureCollection', features: features });
// Instantiate `rendererBackgroundSource` objects for each source
_imageryIndex.backgrounds = sources.map(source => {
if (source.type === 'bing') {
return rendererBackgroundSource.Bing(source, dispatch);
} else if (/^EsriWorldImagery/.test(source.id)) {
return rendererBackgroundSource.Esri(source);
} else {
return rendererBackgroundSource(source);
// process all sources
sources.forEach(source => {
// Resolve the locationSet to a GeoJSON feature..
const resolvedFeature = loco.resolveLocationSet(source.locationSet);
let feature = features[resolvedFeature.id];
if (!feature) {
feature = JSON.parse(JSON.stringify(resolvedFeature)); // deep clone
feature.properties.sourceIDs = new Set();
features[resolvedFeature.id] = feature;
}
feature.properties.sourceIDs.add(source.id);
// Features resolved from loco should have area precalculated.
source.area = feature.properties.area || Infinity;
// Instantiate a `rendererBackgroundSource`
let background;
if (source.type === 'bing') {
background = rendererBackgroundSource.Bing(source, dispatch);
} else if (/^EsriWorldImagery/.test(source.id)) {
background = rendererBackgroundSource.Esri(source);
} else {
background = rendererBackgroundSource(source);
}
backgrounds.push(background);
});
_imageryIndex = {
features: features,
backgrounds: backgrounds,
query: whichPolygon({ type: 'FeatureCollection', features: Object.values(features) })
};
// Add 'None'
_imageryIndex.backgrounds.unshift(rendererBackgroundSource.None());
@@ -273,14 +274,16 @@ export function rendererBackground(context) {
background.sources = (extent, zoom, includeCurrent) => {
if (!_imageryIndex) return []; // called before init()?
// Gather the source ids visible in the given extent
let visible = {};
(_imageryIndex.query.bbox(extent.rectangle(), true) || [])
.forEach(d => visible[d.id] = true);
let hits = _imageryIndex.query.bbox(extent.rectangle(), true) || [];
hits.forEach(properties => {
Array.from(properties.sourceIDs).forEach(sourceID => visible[sourceID] = true);
});
const currSource = baseLayer.source();
return _imageryIndex.backgrounds.filter(source => {
if (!source.polygon) return true; // always include imagery with worldwide coverage
if (includeCurrent && currSource === source) return true; // optionally include the current imagery
if (zoom && zoom < 6) return false; // optionally exclude local imagery at low zooms
return visible[source.id]; // include imagery visible in given extent
@@ -474,7 +477,7 @@ export function rendererBackground(context) {
);
}
const locator = imageryIndex.backgrounds.find(d => d.overlay && d.default);
const locator = imageryIndex.backgrounds.find(d => d.id === 'mapbox_locator_overlay');
if (locator) {
background.toggleOverlayLayer(locator);
}
@@ -504,10 +507,178 @@ export function rendererBackground(context) {
background.offset(geoMetersToOffset(offset));
}
}
})
.catch(() => { /* ignore */ });
});
// .catch(() => { /* ignore */ });
};
return utilRebind(background, dispatch, 'on');
}
// Historically, iD has used a different imagery subset than what we pulled
// from the external imagery index. This remapping previously happened
// in the `update_imagery.js` script before the imagery was bundled with iD.
//
// Now that the client fetches imagery at runtime, it needs to happen here.
// *This code should change to be more flexible.*
//
function preprocessSources(sources) {
// ignore imagery more than 20 years old..
let cutoffDate = new Date();
cutoffDate.setFullYear(cutoffDate.getFullYear() - 20);
const discard = {
'osmbe': true, // 'OpenStreetMap (Belgian Style)'
'osmfr': true, // 'OpenStreetMap (French Style)'
'osm-mapnik-german_style': true, // 'OpenStreetMap (German Style)'
'HDM_HOT': true, // 'OpenStreetMap (HOT Style)'
'osm-mapnik-black_and_white': true, // 'OpenStreetMap (Standard Black & White)'
'osm-mapnik-no_labels': true, // 'OpenStreetMap (Mapnik, no labels)'
'OpenStreetMap-turistautak': true, // 'OpenStreetMap (turistautak)'
'hike_n_bike': true, // 'Hike & Bike'
'landsat': true, // 'Landsat'
'skobbler': true, // 'Skobbler'
'public_transport_oepnv': true, // 'Public Transport (ÖPNV)'
'tf-cycle': true, // 'Thunderforest OpenCycleMap'
'tf-landscape': true, // 'Thunderforest Landscape'
'qa_no_address': true, // 'QA No Address'
'wikimedia-map': true, // 'Wikimedia Map'
'openinframap-petroleum': true,
'openinframap-power': true,
'openinframap-telecoms': true,
'openpt_map': true,
'openrailwaymap': true,
'openseamap': true,
'opensnowmap-overlay': true,
'US-TIGER-Roads-2012': true,
'US-TIGER-Roads-2014': true,
'Waymarked_Trails-Cycling': true,
'Waymarked_Trails-Hiking': true,
'Waymarked_Trails-Horse_Riding': true,
'Waymarked_Trails-MTB': true,
'Waymarked_Trails-Skating': true,
'Waymarked_Trails-Winter_Sports': true,
'OSM_Inspector-Addresses': true,
'OSM_Inspector-Geometry': true,
'OSM_Inspector-Highways': true,
'OSM_Inspector-Multipolygon': true,
'OSM_Inspector-Places': true,
'OSM_Inspector-Routing': true,
'OSM_Inspector-Tagging': true,
'EOXAT2018CLOUDLESS': true
};
const supportedWMSProjections = {
'EPSG:4326': true,
'EPSG:3857': true,
'EPSG:900913': true,
'EPSG:3587': true,
'EPSG:54004': true,
'EPSG:41001': true,
'EPSG:102113': true,
'EPSG:102100': true,
'EPSG:3785': true
};
let keepImagery = [];
sources.forEach(source => {
if (source.type !== 'tms' && source.type !== 'wms' && source.type !== 'bing') return;
if (source.id in discard) return;
let im = {
id: source.id,
type: source.type,
name: source.name,
template: source.url, // this one renamed
locationSet: source.locationSet
};
// Maxar sources
if (source.id === 'Maxar-Premium') {
im.template = '7586487389962e3f6e31ab2ed8ca321f2f3fe2cf87f1dedce8fc918b4692efd86fcd816ab8a35303effb1be9abe39b1cce3fe6db2c740044364ae68560822c88373d2c784325baf4e1fa007c6dbedab4cea3fa0dd86ee0ae4feeef032d33dcac28e4b16c90d55a42087c6b66526423ea1b4cc7e63c613940eb1c60f48270060bf41c5fcb6a628985ebe6801e9e71f041cc9f8df06b0345600376663e7dc1cdbc7df16876d8b5d006ed5782e6af4bfe2ff5a292';
im.encrypted = true;
} else if (source.id === 'Maxar-Standard') {
im.template = '7586487389962e3f6e31ab2ed8ca321f2f3fe2cf87f1dedce8fc918b4692efd86fcd816ab8a35303effb1be9abe39b1cce3fe6db2c740044364ae68560822c88373d2c784325baf4e1fa007c6dbedab4cea3fa0dd86ee0ae4feeef032d33dcac28e4b16c90d55a42087c6b66526423ea1b4cc7e63c613940eb1c60f48270060bf41c5fcb6a628985ebe6801e9e71f010c8c9d7fb6b534560012461377dc1cdb672f16827dfe0d005bf5685b7ac4ea97cf5f795';
im.encrypted = true;
}
// A few sources support 512px tiles
if (source.id === 'Mapbox') {
im.template = im.template.replace('.jpg', '@2x.jpg');
im.tileSize = 512;
} else if (source.id === 'mtbmap-no') {
im.tileSize = 512;
} else {
im.tileSize = 256;
}
// Some WMS sources are supported, check projection
if (source.type === 'wms') {
const projection = (source.available_projections || []).find(p => supportedWMSProjections[p]);
if (!projection) return;
if (sources.some(other => other.name === source.name && other.type !== source.type)) return;
im.projection = projection;
}
let startDate, endDate, isValid;
if (source.end_date) {
endDate = new Date(source.end_date);
isValid = !isNaN(endDate.getTime());
if (isValid) {
if (endDate <= cutoffDate) return; // too old
im.endDate = endDate;
}
}
if (source.start_date) {
startDate = new Date(source.start_date);
isValid = !isNaN(startDate.getTime());
if (isValid) {
im.startDate = startDate;
}
}
im.zoomExtent = [
source.min_zoom || 0,
source.max_zoom || 24
];
if (source.id === 'mapbox_locator_overlay') {
im.overzoom = false;
}
const attribution = source.attribution || {};
if (attribution.url) { im.terms_url = attribution.url; }
if (attribution.text) { im.terms_text = attribution.text; }
if (attribution.html) { im.terms_html = attribution.html; }
if (source.icon) {
if (/^http(s)?/i.test(source.icon)) {
im.icon = source.icon;
} else {
im.icon = `https://cdn.jsdelivr.net/npm/@ideditor/imagery-index@0.1/dist/images/${source.icon}`;
}
}
if (source.best) { im.best = source.best; }
if (source.overlay) { im.overlay = source.overlay; }
if (source.description) { im.description = source.description; }
keepImagery.push(im);
});
return keepImagery;
}

6
modules/renderer/background_source.js
View File

@@ -1,4 +1,4 @@
import { geoArea as d3_geoArea, geoMercatorRaw as d3_geoMercatorRaw } from 'd3-geo';
import { geoMercatorRaw as d3_geoMercatorRaw } from 'd3-geo';
import { json as d3_json } from 'd3-fetch';
import { t } from '../util/locale';
@@ -72,9 +72,7 @@ export function rendererBackgroundSource(data) {
source.area = function() {
if (!data.polygon) return Number.MAX_VALUE; // worldwide
var area = d3_geoArea({ type: 'MultiPolygon', coordinates: [ data.polygon ] });
return isNaN(area) ? 0 : area;
return data.area || Number.MAX_VALUE;
};

3
test/spec/spec_helpers.js
View File

@@ -11,7 +11,8 @@ for (var k in iD.services) { delete iD.services[k]; }
iD.data.locales = { en: { rtl: false, languageNames: {}, scriptNames: {} }};
iD.data.locale_en = { en: {} };
// Initializing `coreContext` initializes `_background`, which tries loading:
iD.data.imagery = [];
iD.data.imagery_sources = [];
iD.data.imagery_features = { type: 'FeatureCollection', features: [] };
// Initializing `coreContext` initializes `_presets`, which tries loading:
iD.data.preset_categories = {};
iD.data.preset_defaults = {};