CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-27 18:32:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use live bound object for imagery array, remove context.imagery() accessor

Browse Source 
Also update documentation, closes #3359
This commit is contained in:
Bryan Housel
2016-11-14 11:15:03 -05:00
parent 9c8037ca4e
commit 93d50b4e87
12 changed files with 97 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/renderer/background.js
+7 -5
View File
@@ -1,10 +1,11 @@
import * as d3 from 'd3';
import _ from 'lodash';
import { utilRebind } from '../util/rebind';
import { data } from '../../data/index';
import { geoExtent, geoMetersToOffset, geoOffsetToMeters} from '../geo/index';
import { utilQsString, utilStringQs } from '../util/index';
import { rendererBackgroundSource } from './background_source';
import { rendererTileLayer } from './tile_layer';
import { utilQsString, utilStringQs } from '../util/index';
import { utilRebind } from '../util/rebind';
export function rendererBackground(context) {
@@ -191,7 +192,7 @@ export function rendererBackground(context) {
};
background.load = function(imagery) {
background.init = function() {
function parseMap(qmap) {
if (!qmap) return false;
var args = qmap.split('/').map(Number);
@@ -199,12 +200,13 @@ export function rendererBackground(context) {
return geoExtent([args[1], args[2]]);
}
var q = utilStringQs(window.location.hash.substring(1)),
var dataImagery = data.imagery || [],
q = utilStringQs(window.location.hash.substring(1)),
chosen = q.background || q.layer,
extent = parseMap(q.map),
best;
backgroundSources = imagery.map(function(source) {
backgroundSources = dataImagery.map(function(source) {
if (source.type === 'bing') {
return rendererBackgroundSource.Bing(source, dispatch);
} else {