" + (escaped ? code : escape4(code, true)) + "' + (escaped ? code : escape4(code, true)) + "-${quote2}-`; - } - html(html2) { - return html2; + var currMouse = context.map().mouse(d3_event); + var currAngle = Math.atan2(currMouse[1] - _pivot[1], currMouse[0] - _pivot[0]); + if (typeof _prevAngle === "undefined") _prevAngle = currAngle; + var delta = currAngle - _prevAngle; + fn(actionRotate(entityIDs, _pivot, delta, projection2)); + _prevTransform = currTransform; + _prevAngle = currAngle; + _prevGraph = context.graph(); } - heading(text2, level, raw, slugger) { - if (this.options.headerIds) { - const id2 = this.options.headerPrefix + slugger.slug(raw); - return `
\n" : "
\n"; - } - list(body, ordered, start2) { - const type3 = ordered ? "ol" : "ul", startatt = ordered && start2 !== 1 ? ' start="' + start2 + '"' : ""; - return "<" + type3 + startatt + ">\n" + body + "\n"; - } - listitem(text2) { - return `
${text2}
-`; - } - table(header, body) { - if (body) - body = `${body}`; - return "${text2}`;
+ function finish(d3_event) {
+ d3_event.stopPropagation();
+ context.replace(actionNoop(), annotation);
+ context.enter(modeSelect(context, entityIDs));
}
- br() {
- return this.options.xhtml ? "" : "
"; + function cancel() { + if (_prevGraph) context.pop(); + context.enter(modeSelect(context, entityIDs)); } - del(text2) { - return `
An error occurred:
" + escape4(e.message + "", true) + ""; + function keyup(d3_event) { + if (d3_event.keyCode === utilKeybinding.modifierCodes.alt) { + if (context.surface().classed("nope-suppressed")) { + context.surface().classed("nope", true); + } + context.surface().classed("nope-suppressed", false).classed("nope-disabled", false); } - throw e; } - try { - const tokens = Lexer.lex(src, opt); - if (opt.walkTokens) { - if (opt.async) { - return Promise.all(marked.walkTokens(tokens, opt.walkTokens)).then(() => { - return Parser.parse(tokens, opt); - }).catch(onError); + function start2(d3_event, entity) { + _wasMidpoint = entity.type === "midpoint"; + var hasHidden = context.features().hasHiddenConnections(entity, context.graph()); + _isCancelled = !context.editable() || d3_event.shiftKey || hasHidden; + if (_isCancelled) { + if (hasHidden) { + context.ui().flash.duration(4e3).iconName("#iD-icon-no").label(_t.append("modes.drag_node.connected_to_hidden"))(); } - marked.walkTokens(tokens, opt.walkTokens); + return drag.cancel(); + } + if (_wasMidpoint) { + var midpoint = entity; + entity = osmNode(); + context.perform(actionAddMidpoint(midpoint, entity)); + entity = context.entity(entity.id); + var vertex = context.surface().selectAll("." + entity.id); + drag.targetNode(vertex.node()).targetEntity(entity); + } else { + context.perform(actionNoop()); } - return Parser.parse(tokens, opt); - } catch (e) { - onError(e); + _activeEntity = entity; + _startLoc = entity.loc; + hover.ignoreVertex(entity.geometry(context.graph()) === "vertex"); + context.surface().selectAll("." + _activeEntity.id).classed("active", true); + context.enter(mode); } - } - marked.options = marked.setOptions = function(opt) { - merge2(marked.defaults, opt); - changeDefaults(marked.defaults); - return marked; - }; - marked.getDefaults = getDefaults; - marked.defaults = defaults; - marked.use = function(...args) { - const opts = merge2({}, ...args); - const extensions = marked.defaults.extensions || { renderers: {}, childTokens: {} }; - let hasExtensions; - args.forEach((pack) => { - if (pack.extensions) { - hasExtensions = true; - pack.extensions.forEach((ext) => { - if (!ext.name) { - throw new Error("extension name required"); - } - if (ext.renderer) { - const prevRenderer = extensions.renderers ? extensions.renderers[ext.name] : null; - if (prevRenderer) { - extensions.renderers[ext.name] = function(...args2) { - let ret = ext.renderer.apply(this, args2); - if (ret === false) { - ret = prevRenderer.apply(this, args2); - } - return ret; - }; - } else { - extensions.renderers[ext.name] = ext.renderer; - } - } - if (ext.tokenizer) { - if (!ext.level || ext.level !== "block" && ext.level !== "inline") { - throw new Error("extension level must be 'block' or 'inline'"); - } - if (extensions[ext.level]) { - extensions[ext.level].unshift(ext.tokenizer); - } else { - extensions[ext.level] = [ext.tokenizer]; - } - if (ext.start) { - if (ext.level === "block") { - if (extensions.startBlock) { - extensions.startBlock.push(ext.start); - } else { - extensions.startBlock = [ext.start]; - } - } else if (ext.level === "inline") { - if (extensions.startInline) { - extensions.startInline.push(ext.start); - } else { - extensions.startInline = [ext.start]; - } - } - } + function datum2(d3_event) { + if (!d3_event || d3_event.altKey) { + return {}; + } else { + var d2 = d3_event.target.__data__; + return d2 && d2.properties && d2.properties.target ? d2 : {}; + } + } + function doMove(d3_event, entity, nudge) { + nudge = nudge || [0, 0]; + var currPoint = d3_event && d3_event.point || context.projection(_lastLoc); + var currMouse = geoVecSubtract(currPoint, nudge); + var loc = context.projection.invert(currMouse); + var target, edge; + if (!_nudgeInterval) { + var d2 = datum2(d3_event); + target = d2 && d2.properties && d2.properties.entity; + var targetLoc = target && target.loc; + var targetNodes = d2 && d2.properties && d2.properties.nodes; + if (targetLoc) { + if (shouldSnapToNode(target)) { + loc = targetLoc; } - if (ext.childTokens) { - extensions.childTokens[ext.name] = ext.childTokens; + } else if (targetNodes) { + edge = geoChooseEdge(targetNodes, context.map().mouse(), context.projection, end.id); + if (edge) { + loc = edge.loc; } - }); - } - if (pack.renderer) { - const renderer = marked.defaults.renderer || new Renderer(); - for (const prop in pack.renderer) { - const prevRenderer = renderer[prop]; - renderer[prop] = (...args2) => { - let ret = pack.renderer[prop].apply(renderer, args2); - if (ret === false) { - ret = prevRenderer.apply(renderer, args2); - } - return ret; - }; } - opts.renderer = renderer; } - if (pack.tokenizer) { - const tokenizer = marked.defaults.tokenizer || new Tokenizer(); - for (const prop in pack.tokenizer) { - const prevTokenizer = tokenizer[prop]; - tokenizer[prop] = (...args2) => { - let ret = pack.tokenizer[prop].apply(tokenizer, args2); - if (ret === false) { - ret = prevTokenizer.apply(tokenizer, args2); - } - return ret; - }; + context.replace( + actionMoveNode(entity.id, loc) + ); + var isInvalid = false; + if (target) { + isInvalid = hasRelationConflict(entity, target, edge, context.graph()); + } + if (!isInvalid) { + isInvalid = hasInvalidGeometry(entity, context.graph()); + } + var nope = context.surface().classed("nope"); + if (isInvalid === "relation" || isInvalid === "restriction") { + if (!nope) { + context.ui().flash.duration(4e3).iconName("#iD-icon-no").label(_t.append( + "operations.connect." + isInvalid, + { relation: _mainPresetIndex.item("type/restriction").name() } + ))(); + } + } else if (isInvalid) { + var errorID = isInvalid === "line" ? "lines" : "areas"; + context.ui().flash.duration(3e3).iconName("#iD-icon-no").label(_t.append("self_intersection.error." + errorID))(); + } else { + if (nope) { + context.ui().flash.duration(1).label("")(); } - opts.tokenizer = tokenizer; } - if (pack.walkTokens) { - const walkTokens2 = marked.defaults.walkTokens; - opts.walkTokens = function(token) { - let values = []; - values.push(pack.walkTokens.call(this, token)); - if (walkTokens2) { - values = values.concat(walkTokens2.call(this, token)); - } - return values; - }; + var nopeDisabled = context.surface().classed("nope-disabled"); + if (nopeDisabled) { + context.surface().classed("nope", false).classed("nope-suppressed", isInvalid); + } else { + context.surface().classed("nope", isInvalid).classed("nope-suppressed", false); } - if (hasExtensions) { - opts.extensions = extensions; + _lastLoc = loc; + } + function hasRelationConflict(entity, target, edge, graph) { + var testGraph = graph.update(); + if (edge) { + var midpoint = osmNode(); + var action = actionAddMidpoint({ + loc: edge.loc, + edge: [target.nodes[edge.index - 1], target.nodes[edge.index]] + }, midpoint); + testGraph = action(testGraph); + target = midpoint; } - marked.setOptions(opts); - }); - }; - marked.walkTokens = function(tokens, callback) { - let values = []; - for (const token of tokens) { - values = values.concat(callback.call(marked, token)); - switch (token.type) { - case "table": { - for (const cell of token.header) { - values = values.concat(marked.walkTokens(cell.tokens, callback)); + var ids = [entity.id, target.id]; + return actionConnect(ids).disabled(testGraph); + } + function hasInvalidGeometry(entity, graph) { + var parents = graph.parentWays(entity); + var i3, j2, k2; + for (i3 = 0; i3 < parents.length; i3++) { + var parent = parents[i3]; + var nodes = []; + var activeIndex = null; + var relations = graph.parentRelations(parent); + for (j2 = 0; j2 < relations.length; j2++) { + if (!relations[j2].isMultipolygon()) continue; + var rings = osmJoinWays(relations[j2].members, graph); + for (k2 = 0; k2 < rings.length; k2++) { + nodes = rings[k2].nodes; + if (nodes.find(function(n3) { + return n3.id === entity.id; + })) { + activeIndex = k2; + if (geoHasSelfIntersections(nodes, entity.id)) { + return "multipolygonMember"; + } + } + rings[k2].coords = nodes.map(function(n3) { + return n3.loc; + }); } - for (const row of token.rows) { - for (const cell of row) { - values = values.concat(marked.walkTokens(cell.tokens, callback)); + for (k2 = 0; k2 < rings.length; k2++) { + if (k2 === activeIndex) continue; + if (geoHasLineIntersections(rings[activeIndex].nodes, rings[k2].nodes, entity.id)) { + return "multipolygonRing"; } } - break; - } - case "list": { - values = values.concat(marked.walkTokens(token.items, callback)); - break; } - default: { - if (marked.defaults.extensions && marked.defaults.extensions.childTokens && marked.defaults.extensions.childTokens[token.type]) { - marked.defaults.extensions.childTokens[token.type].forEach(function(childTokens) { - values = values.concat(marked.walkTokens(token[childTokens], callback)); - }); - } else if (token.tokens) { - values = values.concat(marked.walkTokens(token.tokens, callback)); + if (activeIndex === null) { + nodes = parent.nodes.map(function(nodeID) { + return graph.entity(nodeID); + }); + if (nodes.length && geoHasSelfIntersections(nodes, entity.id)) { + return parent.geometry(graph); } } } + return false; } - return values; - }; - marked.parseInline = function(src, opt) { - if (typeof src === "undefined" || src === null) { - throw new Error("marked.parseInline(): input parameter is undefined or null"); - } - if (typeof src !== "string") { - throw new Error("marked.parseInline(): input parameter is of type " + Object.prototype.toString.call(src) + ", string expected"); + function move(d3_event, entity, point) { + if (_isCancelled) return; + d3_event.stopPropagation(); + context.surface().classed("nope-disabled", d3_event.altKey); + _lastLoc = context.projection.invert(point); + doMove(d3_event, entity); + var nudge = geoViewportEdge(point, context.map().dimensions()); + if (nudge) { + startNudge(d3_event, entity, nudge); + } else { + stopNudge(); + } } - opt = merge2({}, marked.defaults, opt || {}); - checkSanitizeDeprecation(opt); - try { - const tokens = Lexer.lexInline(src, opt); - if (opt.walkTokens) { - marked.walkTokens(tokens, opt.walkTokens); + function end(d3_event, entity) { + if (_isCancelled) return; + var wasPoint = entity.geometry(context.graph()) === "point"; + var d2 = datum2(d3_event); + var nope = d2 && d2.properties && d2.properties.nope || context.surface().classed("nope"); + var target = d2 && d2.properties && d2.properties.entity; + if (nope) { + context.perform( + _actionBounceBack(entity.id, _startLoc) + ); + } else if (target && target.type === "way") { + var choice = geoChooseEdge(context.graph().childNodes(target), context.map().mouse(), context.projection, entity.id); + context.replace( + actionAddMidpoint({ + loc: choice.loc, + edge: [target.nodes[choice.index - 1], target.nodes[choice.index]] + }, entity), + connectAnnotation(entity, target) + ); + } else if (target && target.type === "node" && shouldSnapToNode(target)) { + context.replace( + actionConnect([target.id, entity.id]), + connectAnnotation(entity, target) + ); + } else if (_wasMidpoint) { + context.replace( + actionNoop(), + _t("operations.add.annotation.vertex") + ); + } else { + context.replace( + actionNoop(), + moveAnnotation(entity) + ); } - return Parser.parseInline(tokens, opt); - } catch (e) { - e.message += "\nPlease report this to https://github.com/markedjs/marked."; - if (opt.silent) { - return "
An error occurred:
" + escape4(e.message + "", true) + ""; + if (wasPoint) { + context.enter(modeSelect(context, [entity.id])); + } else { + var reselection = _restoreSelectedIDs.filter(function(id2) { + return context.graph().hasEntity(id2); + }); + if (reselection.length) { + context.enter(modeSelect(context, reselection)); + } else { + context.enter(modeBrowse(context)); + } } - throw e; } - }; - marked.Parser = Parser; - marked.parser = Parser.parse; - marked.Renderer = Renderer; - marked.TextRenderer = TextRenderer; - marked.Lexer = Lexer; - marked.lexer = Lexer.lex; - marked.Tokenizer = Tokenizer; - marked.Slugger = Slugger; - marked.parse = marked; - var options = marked.options; - var setOptions = marked.setOptions; - var use = marked.use; - var walkTokens = marked.walkTokens; - var parseInline = marked.parseInline; - var parser2 = Parser.parse; - var lexer = Lexer.lex; - - // modules/services/osmose.js - var tiler3 = utilTiler(); - var dispatch4 = dispatch_default("loaded"); - var _tileZoom3 = 14; - var _osmoseUrlRoot = "https://osmose.openstreetmap.fr/api/0.3"; - var _osmoseData = { icons: {}, items: [] }; - var _cache3; - function abortRequest3(controller) { - if (controller) { - controller.abort(); + function _actionBounceBack(nodeID, toLoc) { + var moveNode = actionMoveNode(nodeID, toLoc); + var action = function(graph, t2) { + if (t2 === 1) context.pop(); + return moveNode(graph, t2); + }; + action.transitionable = true; + return action; } + function cancel() { + drag.cancel(); + context.enter(modeBrowse(context)); + } + var drag = behaviorDrag().selector(".layer-touch.points .target").surface(context.container().select(".main-map").node()).origin(origin).on("start", start2).on("move", move).on("end", end); + mode.enter = function() { + context.install(hover); + context.install(edit2); + select_default2(window).on("keydown.dragNode", keydown).on("keyup.dragNode", keyup); + context.history().on("undone.drag-node", cancel); + }; + mode.exit = function() { + context.ui().sidebar.hover.cancel(); + context.uninstall(hover); + context.uninstall(edit2); + select_default2(window).on("keydown.dragNode", null).on("keyup.dragNode", null); + context.history().on("undone.drag-node", null); + _activeEntity = null; + context.surface().classed("nope", false).classed("nope-suppressed", false).classed("nope-disabled", false).selectAll(".active").classed("active", false); + stopNudge(); + }; + mode.selectedIDs = function() { + if (!arguments.length) return _activeEntity ? [_activeEntity.id] : []; + return mode; + }; + mode.activeID = function() { + if (!arguments.length) return _activeEntity && _activeEntity.id; + return mode; + }; + mode.restoreSelectedIDs = function(_2) { + if (!arguments.length) return _restoreSelectedIDs; + _restoreSelectedIDs = _2; + return mode; + }; + mode.behavior = drag; + return mode; } - function abortUnwantedRequests3(cache, tiles) { - Object.keys(cache.inflightTile).forEach((k) => { - let wanted = tiles.find((tile) => k === tile.id); - if (!wanted) { - abortRequest3(cache.inflightTile[k]); - delete cache.inflightTile[k]; - } - }); - } - function encodeIssueRtree3(d) { - return { minX: d.loc[0], minY: d.loc[1], maxX: d.loc[0], maxY: d.loc[1], data: d }; + + // node_modules/quickselect/index.js + function quickselect2(arr, k2, left, right, compare2) { + quickselectStep(arr, k2, left || 0, right || arr.length - 1, compare2 || defaultCompare); } - function updateRtree3(item, replace) { - _cache3.rtree.remove(item, (a, b) => a.data.id === b.data.id); - if (replace) { - _cache3.rtree.insert(item); + function quickselectStep(arr, k2, left, right, compare2) { + while (right > left) { + if (right - left > 600) { + var n3 = right - left + 1; + var m2 = k2 - left + 1; + var z2 = Math.log(n3); + var s2 = 0.5 * Math.exp(2 * z2 / 3); + var sd = 0.5 * Math.sqrt(z2 * s2 * (n3 - s2) / n3) * (m2 - n3 / 2 < 0 ? -1 : 1); + var newLeft = Math.max(left, Math.floor(k2 - m2 * s2 / n3 + sd)); + var newRight = Math.min(right, Math.floor(k2 + (n3 - m2) * s2 / n3 + sd)); + quickselectStep(arr, k2, newLeft, newRight, compare2); + } + var t2 = arr[k2]; + var i3 = left; + var j2 = right; + swap2(arr, left, k2); + if (compare2(arr[right], t2) > 0) swap2(arr, left, right); + while (i3 < j2) { + swap2(arr, i3, j2); + i3++; + j2--; + while (compare2(arr[i3], t2) < 0) i3++; + while (compare2(arr[j2], t2) > 0) j2--; + } + if (compare2(arr[left], t2) === 0) swap2(arr, left, j2); + else { + j2++; + swap2(arr, j2, right); + } + if (j2 <= k2) left = j2 + 1; + if (k2 <= j2) right = j2 - 1; } } - function preventCoincident2(loc) { - let coincident = false; - do { - let delta = coincident ? [1e-5, 0] : [0, 1e-5]; - loc = geoVecAdd(loc, delta); - let bbox2 = geoExtent(loc).bbox(); - coincident = _cache3.rtree.search(bbox2).length; - } while (coincident); - return loc; + function swap2(arr, i3, j2) { + var tmp = arr[i3]; + arr[i3] = arr[j2]; + arr[j2] = tmp; } - var osmose_default = { - title: "osmose", - init() { - _mainFileFetcher.get("qa_data").then((d) => { - _osmoseData = d.osmose; - _osmoseData.items = Object.keys(d.osmose.icons).map((s) => s.split("-")[0]).reduce((unique, item) => unique.indexOf(item) !== -1 ? unique : [...unique, item], []); - }); - if (!_cache3) { - this.reset(); - } - this.event = utilRebind(this, dispatch4, "on"); - }, - reset() { - let _strings = {}; - let _colors = {}; - if (_cache3) { - Object.values(_cache3.inflightTile).forEach(abortRequest3); - _strings = _cache3.strings; - _colors = _cache3.colors; + function defaultCompare(a2, b2) { + return a2 < b2 ? -1 : a2 > b2 ? 1 : 0; + } + + // node_modules/rbush/index.js + var RBush = class { + constructor(maxEntries = 9) { + this._maxEntries = Math.max(4, maxEntries); + this._minEntries = Math.max(2, Math.ceil(this._maxEntries * 0.4)); + this.clear(); + } + all() { + return this._all(this.data, []); + } + search(bbox2) { + let node = this.data; + const result = []; + if (!intersects(bbox2, node)) return result; + const toBBox = this.toBBox; + const nodesToSearch = []; + while (node) { + for (let i3 = 0; i3 < node.children.length; i3++) { + const child = node.children[i3]; + const childBBox = node.leaf ? toBBox(child) : child; + if (intersects(bbox2, childBBox)) { + if (node.leaf) result.push(child); + else if (contains(bbox2, childBBox)) this._all(child, result); + else nodesToSearch.push(child); + } + } + node = nodesToSearch.pop(); } - _cache3 = { - data: {}, + return result; + } + collides(bbox2) { + let node = this.data; + if (!intersects(bbox2, node)) return false; + const nodesToSearch = []; + while (node) { + for (let i3 = 0; i3 < node.children.length; i3++) { + const child = node.children[i3]; + const childBBox = node.leaf ? this.toBBox(child) : child; + if (intersects(bbox2, childBBox)) { + if (node.leaf || contains(bbox2, childBBox)) return true; + nodesToSearch.push(child); + } + } + node = nodesToSearch.pop(); + } + return false; + } + load(data) { + if (!(data && data.length)) return this; + if (data.length < this._minEntries) { + for (let i3 = 0; i3 < data.length; i3++) { + this.insert(data[i3]); + } + return this; + } + let node = this._build(data.slice(), 0, data.length - 1, 0); + if (!this.data.children.length) { + this.data = node; + } else if (this.data.height === node.height) { + this._splitRoot(this.data, node); + } else { + if (this.data.height < node.height) { + const tmpNode = this.data; + this.data = node; + node = tmpNode; + } + this._insert(node, this.data.height - node.height - 1, true); + } + return this; + } + insert(item) { + if (item) this._insert(item, this.data.height - 1); + return this; + } + clear() { + this.data = createNode([]); + return this; + } + remove(item, equalsFn) { + if (!item) return this; + let node = this.data; + const bbox2 = this.toBBox(item); + const path = []; + const indexes = []; + let i3, parent, goingUp; + while (node || path.length) { + if (!node) { + node = path.pop(); + parent = path[path.length - 1]; + i3 = indexes.pop(); + goingUp = true; + } + if (node.leaf) { + const index = findItem(item, node.children, equalsFn); + if (index !== -1) { + node.children.splice(index, 1); + path.push(node); + this._condense(path); + return this; + } + } + if (!goingUp && !node.leaf && contains(node, bbox2)) { + path.push(node); + indexes.push(i3); + i3 = 0; + parent = node; + node = node.children[0]; + } else if (parent) { + i3++; + node = parent.children[i3]; + goingUp = false; + } else node = null; + } + return this; + } + toBBox(item) { + return item; + } + compareMinX(a2, b2) { + return a2.minX - b2.minX; + } + compareMinY(a2, b2) { + return a2.minY - b2.minY; + } + toJSON() { + return this.data; + } + fromJSON(data) { + this.data = data; + return this; + } + _all(node, result) { + const nodesToSearch = []; + while (node) { + if (node.leaf) result.push(...node.children); + else nodesToSearch.push(...node.children); + node = nodesToSearch.pop(); + } + return result; + } + _build(items, left, right, height) { + const N2 = right - left + 1; + let M2 = this._maxEntries; + let node; + if (N2 <= M2) { + node = createNode(items.slice(left, right + 1)); + calcBBox(node, this.toBBox); + return node; + } + if (!height) { + height = Math.ceil(Math.log(N2) / Math.log(M2)); + M2 = Math.ceil(N2 / Math.pow(M2, height - 1)); + } + node = createNode([]); + node.leaf = false; + node.height = height; + const N22 = Math.ceil(N2 / M2); + const N1 = N22 * Math.ceil(Math.sqrt(M2)); + multiSelect(items, left, right, N1, this.compareMinX); + for (let i3 = left; i3 <= right; i3 += N1) { + const right2 = Math.min(i3 + N1 - 1, right); + multiSelect(items, i3, right2, N22, this.compareMinY); + for (let j2 = i3; j2 <= right2; j2 += N22) { + const right3 = Math.min(j2 + N22 - 1, right2); + node.children.push(this._build(items, j2, right3, height - 1)); + } + } + calcBBox(node, this.toBBox); + return node; + } + _chooseSubtree(bbox2, node, level, path) { + while (true) { + path.push(node); + if (node.leaf || path.length - 1 === level) break; + let minArea = Infinity; + let minEnlargement = Infinity; + let targetNode; + for (let i3 = 0; i3 < node.children.length; i3++) { + const child = node.children[i3]; + const area = bboxArea(child); + const enlargement = enlargedArea(bbox2, child) - area; + if (enlargement < minEnlargement) { + minEnlargement = enlargement; + minArea = area < minArea ? area : minArea; + targetNode = child; + } else if (enlargement === minEnlargement) { + if (area < minArea) { + minArea = area; + targetNode = child; + } + } + } + node = targetNode || node.children[0]; + } + return node; + } + _insert(item, level, isNode) { + const bbox2 = isNode ? item : this.toBBox(item); + const insertPath = []; + const node = this._chooseSubtree(bbox2, this.data, level, insertPath); + node.children.push(item); + extend2(node, bbox2); + while (level >= 0) { + if (insertPath[level].children.length > this._maxEntries) { + this._split(insertPath, level); + level--; + } else break; + } + this._adjustParentBBoxes(bbox2, insertPath, level); + } + // split overflowed node into two + _split(insertPath, level) { + const node = insertPath[level]; + const M2 = node.children.length; + const m2 = this._minEntries; + this._chooseSplitAxis(node, m2, M2); + const splitIndex = this._chooseSplitIndex(node, m2, M2); + const newNode = createNode(node.children.splice(splitIndex, node.children.length - splitIndex)); + newNode.height = node.height; + newNode.leaf = node.leaf; + calcBBox(node, this.toBBox); + calcBBox(newNode, this.toBBox); + if (level) insertPath[level - 1].children.push(newNode); + else this._splitRoot(node, newNode); + } + _splitRoot(node, newNode) { + this.data = createNode([node, newNode]); + this.data.height = node.height + 1; + this.data.leaf = false; + calcBBox(this.data, this.toBBox); + } + _chooseSplitIndex(node, m2, M2) { + let index; + let minOverlap = Infinity; + let minArea = Infinity; + for (let i3 = m2; i3 <= M2 - m2; i3++) { + const bbox1 = distBBox(node, 0, i3, this.toBBox); + const bbox2 = distBBox(node, i3, M2, this.toBBox); + const overlap = intersectionArea(bbox1, bbox2); + const area = bboxArea(bbox1) + bboxArea(bbox2); + if (overlap < minOverlap) { + minOverlap = overlap; + index = i3; + minArea = area < minArea ? area : minArea; + } else if (overlap === minOverlap) { + if (area < minArea) { + minArea = area; + index = i3; + } + } + } + return index || M2 - m2; + } + // sorts node children by the best axis for split + _chooseSplitAxis(node, m2, M2) { + const compareMinX = node.leaf ? this.compareMinX : compareNodeMinX; + const compareMinY = node.leaf ? this.compareMinY : compareNodeMinY; + const xMargin = this._allDistMargin(node, m2, M2, compareMinX); + const yMargin = this._allDistMargin(node, m2, M2, compareMinY); + if (xMargin < yMargin) node.children.sort(compareMinX); + } + // total margin of all possible split distributions where each node is at least m full + _allDistMargin(node, m2, M2, compare2) { + node.children.sort(compare2); + const toBBox = this.toBBox; + const leftBBox = distBBox(node, 0, m2, toBBox); + const rightBBox = distBBox(node, M2 - m2, M2, toBBox); + let margin = bboxMargin(leftBBox) + bboxMargin(rightBBox); + for (let i3 = m2; i3 < M2 - m2; i3++) { + const child = node.children[i3]; + extend2(leftBBox, node.leaf ? toBBox(child) : child); + margin += bboxMargin(leftBBox); + } + for (let i3 = M2 - m2 - 1; i3 >= m2; i3--) { + const child = node.children[i3]; + extend2(rightBBox, node.leaf ? toBBox(child) : child); + margin += bboxMargin(rightBBox); + } + return margin; + } + _adjustParentBBoxes(bbox2, path, level) { + for (let i3 = level; i3 >= 0; i3--) { + extend2(path[i3], bbox2); + } + } + _condense(path) { + for (let i3 = path.length - 1, siblings; i3 >= 0; i3--) { + if (path[i3].children.length === 0) { + if (i3 > 0) { + siblings = path[i3 - 1].children; + siblings.splice(siblings.indexOf(path[i3]), 1); + } else this.clear(); + } else calcBBox(path[i3], this.toBBox); + } + } + }; + function findItem(item, items, equalsFn) { + if (!equalsFn) return items.indexOf(item); + for (let i3 = 0; i3 < items.length; i3++) { + if (equalsFn(item, items[i3])) return i3; + } + return -1; + } + function calcBBox(node, toBBox) { + distBBox(node, 0, node.children.length, toBBox, node); + } + function distBBox(node, k2, p2, toBBox, destNode) { + if (!destNode) destNode = createNode(null); + destNode.minX = Infinity; + destNode.minY = Infinity; + destNode.maxX = -Infinity; + destNode.maxY = -Infinity; + for (let i3 = k2; i3 < p2; i3++) { + const child = node.children[i3]; + extend2(destNode, node.leaf ? toBBox(child) : child); + } + return destNode; + } + function extend2(a2, b2) { + a2.minX = Math.min(a2.minX, b2.minX); + a2.minY = Math.min(a2.minY, b2.minY); + a2.maxX = Math.max(a2.maxX, b2.maxX); + a2.maxY = Math.max(a2.maxY, b2.maxY); + return a2; + } + function compareNodeMinX(a2, b2) { + return a2.minX - b2.minX; + } + function compareNodeMinY(a2, b2) { + return a2.minY - b2.minY; + } + function bboxArea(a2) { + return (a2.maxX - a2.minX) * (a2.maxY - a2.minY); + } + function bboxMargin(a2) { + return a2.maxX - a2.minX + (a2.maxY - a2.minY); + } + function enlargedArea(a2, b2) { + return (Math.max(b2.maxX, a2.maxX) - Math.min(b2.minX, a2.minX)) * (Math.max(b2.maxY, a2.maxY) - Math.min(b2.minY, a2.minY)); + } + function intersectionArea(a2, b2) { + const minX = Math.max(a2.minX, b2.minX); + const minY = Math.max(a2.minY, b2.minY); + const maxX = Math.min(a2.maxX, b2.maxX); + const maxY = Math.min(a2.maxY, b2.maxY); + return Math.max(0, maxX - minX) * Math.max(0, maxY - minY); + } + function contains(a2, b2) { + return a2.minX <= b2.minX && a2.minY <= b2.minY && b2.maxX <= a2.maxX && b2.maxY <= a2.maxY; + } + function intersects(a2, b2) { + return b2.minX <= a2.maxX && b2.minY <= a2.maxY && b2.maxX >= a2.minX && b2.maxY >= a2.minY; + } + function createNode(children2) { + return { + children: children2, + height: 1, + leaf: true, + minX: Infinity, + minY: Infinity, + maxX: -Infinity, + maxY: -Infinity + }; + } + function multiSelect(arr, left, right, n3, compare2) { + const stack = [left, right]; + while (stack.length) { + right = stack.pop(); + left = stack.pop(); + if (right - left <= n3) continue; + const mid = left + Math.ceil((right - left) / n3 / 2) * n3; + quickselect2(arr, mid, left, right, compare2); + stack.push(left, mid, mid, right); + } + } + + // node_modules/d3-fetch/src/text.js + function responseText(response) { + if (!response.ok) throw new Error(response.status + " " + response.statusText); + return response.text(); + } + function text_default3(input, init2) { + return fetch(input, init2).then(responseText); + } + + // node_modules/d3-fetch/src/json.js + function responseJson(response) { + if (!response.ok) throw new Error(response.status + " " + response.statusText); + if (response.status === 204 || response.status === 205) return; + return response.json(); + } + function json_default(input, init2) { + return fetch(input, init2).then(responseJson); + } + + // node_modules/d3-fetch/src/xml.js + function parser(type2) { + return (input, init2) => text_default3(input, init2).then((text) => new DOMParser().parseFromString(text, type2)); + } + var xml_default = parser("application/xml"); + var html = parser("text/html"); + var svg = parser("image/svg+xml"); + + // modules/services/keepRight.js + var tiler = utilTiler(); + var dispatch2 = dispatch_default("loaded"); + var _tileZoom = 14; + var _krUrlRoot = "https://www.keepright.at"; + var _krData = { errorTypes: {}, localizeStrings: {} }; + var _cache; + var _krRuleset = [ + // no 20 - multiple node on same spot - these are mostly boundaries overlapping roads + 30, + 40, + 50, + 60, + 70, + 90, + 100, + 110, + 120, + 130, + 150, + 160, + 170, + 180, + 190, + 191, + 192, + 193, + 194, + 195, + 196, + 197, + 198, + 200, + 201, + 202, + 203, + 204, + 205, + 206, + 207, + 208, + 210, + 220, + 230, + 231, + 232, + 270, + 280, + 281, + 282, + 283, + 284, + 285, + 290, + 291, + 292, + 293, + 294, + 295, + 296, + 297, + 298, + 300, + 310, + 311, + 312, + 313, + 320, + 350, + 360, + 370, + 380, + 390, + 400, + 401, + 402, + 410, + 411, + 412, + 413 + ]; + function abortRequest(controller) { + if (controller) { + controller.abort(); + } + } + function abortUnwantedRequests(cache, tiles) { + Object.keys(cache.inflightTile).forEach((k2) => { + const wanted = tiles.find((tile) => k2 === tile.id); + if (!wanted) { + abortRequest(cache.inflightTile[k2]); + delete cache.inflightTile[k2]; + } + }); + } + function encodeIssueRtree(d2) { + return { minX: d2.loc[0], minY: d2.loc[1], maxX: d2.loc[0], maxY: d2.loc[1], data: d2 }; + } + function updateRtree(item, replace) { + _cache.rtree.remove(item, (a2, b2) => a2.data.id === b2.data.id); + if (replace) { + _cache.rtree.insert(item); + } + } + function tokenReplacements(d2) { + if (!(d2 instanceof QAItem)) return; + const replacements = {}; + const issueTemplate = _krData.errorTypes[d2.whichType]; + if (!issueTemplate) { + console.log("No Template: ", d2.whichType); + console.log(" ", d2.description); + return; + } + if (!issueTemplate.regex) return; + const errorRegex = new RegExp(issueTemplate.regex, "i"); + const errorMatch = errorRegex.exec(d2.description); + if (!errorMatch) { + console.log("Unmatched: ", d2.whichType); + console.log(" ", d2.description); + console.log(" ", errorRegex); + return; + } + for (let i3 = 1; i3 < errorMatch.length; i3++) { + let capture = errorMatch[i3]; + let idType; + idType = "IDs" in issueTemplate ? issueTemplate.IDs[i3 - 1] : ""; + if (idType && capture) { + capture = parseError(capture, idType); + } else { + const compare2 = capture.toLowerCase(); + if (_krData.localizeStrings[compare2]) { + capture = _t("QA.keepRight.error_parts." + _krData.localizeStrings[compare2]); + } else { + capture = unescape_default(capture); + } + } + replacements["var" + i3] = capture; + } + return replacements; + } + function parseError(capture, idType) { + const compare2 = capture.toLowerCase(); + if (_krData.localizeStrings[compare2]) { + capture = _t("QA.keepRight.error_parts." + _krData.localizeStrings[compare2]); + } + switch (idType) { + // link a string like "this node" + case "this": + capture = linkErrorObject(capture); + break; + case "url": + capture = linkURL(capture); + break; + // link an entity ID + case "n": + case "w": + case "r": + capture = linkEntity(idType + capture); + break; + // some errors have more complex ID lists/variance + case "20": + capture = parse20(capture); + break; + case "211": + capture = parse211(capture); + break; + case "231": + capture = parse231(capture); + break; + case "294": + capture = parse294(capture); + break; + case "370": + capture = parse370(capture); + break; + } + return capture; + function linkErrorObject(d2) { + return { html: ''.concat(d2, "") }; + } + function linkEntity(d2) { + return { html: ''.concat(d2, "") }; + } + function linkURL(d2) { + return { html: '').concat(d2, "") }; + } + function parse211(capture2) { + let newList = []; + const items = capture2.split(", "); + items.forEach((item) => { + let id2 = linkEntity("n" + item.slice(1)); + newList.push(id2); + }); + return newList.join(", "); + } + function parse231(capture2) { + let newList = []; + const items = capture2.split("),"); + items.forEach((item) => { + const match = item.match(/\#(\d+)\((.+)\)?/); + if (match !== null && match.length > 2) { + newList.push( + linkEntity("w" + match[1]) + " " + _t("QA.keepRight.errorTypes.231.layer", { layer: match[2] }) + ); + } + }); + return newList.join(", "); + } + function parse294(capture2) { + let newList = []; + const items = capture2.split(","); + items.forEach((item) => { + item = item.split(" "); + const role = '"'.concat(item[0], '"'); + const idType2 = item[1].slice(0, 1); + let id2 = item[2].slice(1); + id2 = linkEntity(idType2 + id2); + newList.push("".concat(role, " ").concat(item[1], " ").concat(id2)); + }); + return newList.join(", "); + } + function parse370(capture2) { + if (!capture2) return ""; + const match = capture2.match(/\(including the name (\'.+\')\)/); + if (match && match.length) { + return _t("QA.keepRight.errorTypes.370.including_the_name", { name: match[1] }); + } + return ""; + } + function parse20(capture2) { + let newList = []; + const items = capture2.split(","); + items.forEach((item) => { + const id2 = linkEntity("n" + item.slice(1)); + newList.push(id2); + }); + return newList.join(", "); + } + } + var keepRight_default = { + title: "keepRight", + init() { + _mainFileFetcher.get("keepRight").then((d2) => _krData = d2); + if (!_cache) { + this.reset(); + } + this.event = utilRebind(this, dispatch2, "on"); + }, + reset() { + if (_cache) { + Object.values(_cache.inflightTile).forEach(abortRequest); + } + _cache = { + data: {}, loadedTile: {}, inflightTile: {}, inflightPost: {}, closed: {}, - rtree: new import_rbush3.default(), - strings: _strings, - colors: _colors + rtree: new RBush() }; }, + // KeepRight API: http://osm.mueschelsoft.de/keepright/interfacing.php loadIssues(projection2) { - let params = { - item: _osmoseData.items + const options2 = { + format: "geojson", + ch: _krRuleset }; - let tiles = tiler3.zoomExtent([_tileZoom3, _tileZoom3]).getTiles(projection2); - abortUnwantedRequests3(_cache3, tiles); + const tiles = tiler.zoomExtent([_tileZoom, _tileZoom]).getTiles(projection2); + abortUnwantedRequests(_cache, tiles); tiles.forEach((tile) => { - if (_cache3.loadedTile[tile.id] || _cache3.inflightTile[tile.id]) - return; - let [x, y, z] = tile.xyz; - let url = `${_osmoseUrlRoot}/issues/${z}/${x}/${y}.geojson?` + utilQsString(params); - let controller = new AbortController(); - _cache3.inflightTile[tile.id] = controller; + if (_cache.loadedTile[tile.id] || _cache.inflightTile[tile.id]) return; + const [left, top, right, bottom] = tile.extent.rectangle(); + const params = Object.assign({}, options2, { left, bottom, right, top }); + const url = "".concat(_krUrlRoot, "/export.php?") + utilQsString(params); + const controller = new AbortController(); + _cache.inflightTile[tile.id] = controller; json_default(url, { signal: controller.signal }).then((data) => { - delete _cache3.inflightTile[tile.id]; - _cache3.loadedTile[tile.id] = true; - if (data.features) { - data.features.forEach((issue) => { - const { item, class: cl, uuid: id2 } = issue.properties; - const itemType = `${item}-${cl}`; - if (itemType in _osmoseData.icons) { - let loc = issue.geometry.coordinates; - loc = preventCoincident2(loc); - let d = new QAItem(loc, this, itemType, id2, { item }); - if (item === 8300 || item === 8360) { - d.elems = []; - } - _cache3.data[d.id] = d; - _cache3.rtree.insert(encodeIssueRtree3(d)); + delete _cache.inflightTile[tile.id]; + _cache.loadedTile[tile.id] = true; + if (!data || !data.features || !data.features.length) { + throw new Error("No Data"); + } + data.features.forEach((feature3) => { + const { + properties: { + error_type: itemType, + error_id: id2, + comment = null, + object_id: objectId, + object_type: objectType, + schema, + title } + } = feature3; + let { + geometry: { coordinates: loc }, + properties: { description = "" } + } = feature3; + const issueTemplate = _krData.errorTypes[itemType]; + const parentIssueType = (Math.floor(itemType / 10) * 10).toString(); + const whichType = issueTemplate ? itemType : parentIssueType; + const whichTemplate = _krData.errorTypes[whichType]; + switch (whichType) { + case "170": + description = "This feature has a FIXME tag: ".concat(description); + break; + case "292": + case "293": + description = description.replace("A turn-", "This turn-"); + break; + case "294": + case "295": + case "296": + case "297": + case "298": + description = "This turn-restriction~".concat(description); + break; + case "300": + description = "This highway is missing a maxspeed tag"; + break; + case "411": + case "412": + case "413": + description = "This feature~".concat(description); + break; + } + let coincident = false; + do { + let delta = coincident ? [1e-5, 0] : [0, 1e-5]; + loc = geoVecAdd(loc, delta); + let bbox2 = geoExtent(loc).bbox(); + coincident = _cache.rtree.search(bbox2).length; + } while (coincident); + let d2 = new QAItem(loc, this, itemType, id2, { + comment, + description, + whichType, + parentIssueType, + severity: whichTemplate.severity || "error", + objectId, + objectType, + schema, + title }); - } - dispatch4.call("loaded"); + d2.replacements = tokenReplacements(d2); + _cache.data[id2] = d2; + _cache.rtree.insert(encodeIssueRtree(d2)); + }); + dispatch2.call("loaded"); }).catch(() => { - delete _cache3.inflightTile[tile.id]; - _cache3.loadedTile[tile.id] = true; + delete _cache.inflightTile[tile.id]; + _cache.loadedTile[tile.id] = true; }); }); }, - loadIssueDetail(issue) { - if (issue.elems !== void 0) { - return Promise.resolve(issue); - } - const url = `${_osmoseUrlRoot}/issue/${issue.id}?langs=${_mainLocalizer.localeCode()}`; - const cacheDetails = (data) => { - issue.elems = data.elems.map((e) => e.type.substring(0, 1) + e.id); - issue.detail = data.subtitle ? marked(data.subtitle.auto) : ""; - this.replaceItem(issue); - }; - return json_default(url).then(cacheDetails).then(() => issue); - }, - loadStrings(locale2 = _mainLocalizer.localeCode()) { - const items = Object.keys(_osmoseData.icons); - if (locale2 in _cache3.strings && Object.keys(_cache3.strings[locale2]).length === items.length) { - return Promise.resolve(_cache3.strings[locale2]); + postUpdate(d2, callback) { + if (_cache.inflightPost[d2.id]) { + return callback({ message: "Error update already inflight", status: -2 }, d2); } - if (!(locale2 in _cache3.strings)) { - _cache3.strings[locale2] = {}; + const params = { schema: d2.schema, id: d2.id }; + if (d2.newStatus) { + params.st = d2.newStatus; } - const allRequests = items.map((itemType) => { - if (itemType in _cache3.strings[locale2]) - return null; - const cacheData = (data) => { - const [cat = { items: [] }] = data.categories; - const [item2 = { class: [] }] = cat.items; - const [cl2 = null] = item2.class; - if (!cl2) { - console.log(`Osmose strings request (${itemType}) had unexpected data`); - return; - } - const { item: itemInt, color: color2 } = item2; - if (/^#[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}/.test(color2)) { - _cache3.colors[itemInt] = color2; - } - const { title, detail, fix, trap } = cl2; - let issueStrings = {}; - if (title) - issueStrings.title = title.auto; - if (detail) - issueStrings.detail = marked(detail.auto); - if (trap) - issueStrings.trap = marked(trap.auto); - if (fix) - issueStrings.fix = marked(fix.auto); - _cache3.strings[locale2][itemType] = issueStrings; - }; - const [item, cl] = itemType.split("-"); - const url = `${_osmoseUrlRoot}/items/${item}/class/${cl}?langs=${locale2}`; - return json_default(url).then(cacheData); - }).filter(Boolean); - return Promise.all(allRequests).then(() => _cache3.strings[locale2]); - }, - getStrings(itemType, locale2 = _mainLocalizer.localeCode()) { - return locale2 in _cache3.strings ? _cache3.strings[locale2][itemType] : {}; - }, - getColor(itemType) { - return itemType in _cache3.colors ? _cache3.colors[itemType] : "#FFFFFF"; - }, - postUpdate(issue, callback) { - if (_cache3.inflightPost[issue.id]) { - return callback({ message: "Issue update already inflight", status: -2 }, issue); + if (d2.newComment !== void 0) { + params.co = d2.newComment; } - const url = `${_osmoseUrlRoot}/issue/${issue.id}/${issue.newStatus}`; + const url = "".concat(_krUrlRoot, "/comment.php?") + utilQsString(params); const controller = new AbortController(); - const after = () => { - delete _cache3.inflightPost[issue.id]; - this.removeItem(issue); - if (issue.newStatus === "done") { - if (!(issue.item in _cache3.closed)) { - _cache3.closed[issue.item] = 0; - } - _cache3.closed[issue.item] += 1; + _cache.inflightPost[d2.id] = controller; + json_default(url, { signal: controller.signal }).finally(() => { + delete _cache.inflightPost[d2.id]; + if (d2.newStatus === "ignore") { + this.removeItem(d2); + } else if (d2.newStatus === "ignore_t") { + this.removeItem(d2); + _cache.closed["".concat(d2.schema, ":").concat(d2.id)] = true; + } else { + d2 = this.replaceItem(d2.update({ + comment: d2.newComment, + newComment: void 0, + newState: void 0 + })); } - if (callback) - callback(null, issue); - }; - _cache3.inflightPost[issue.id] = controller; - fetch(url, { signal: controller.signal }).then(after).catch((err) => { - delete _cache3.inflightPost[issue.id]; - if (callback) - callback(err.message); + if (callback) callback(null, d2); }); }, + // Get all cached QAItems covering the viewport getItems(projection2) { const viewport = projection2.clipExtent(); const min3 = [viewport[0][0], viewport[1][1]]; const max3 = [viewport[1][0], viewport[0][1]]; const bbox2 = geoExtent(projection2.invert(min3), projection2.invert(max3)).bbox(); - return _cache3.rtree.search(bbox2).map((d) => d.data); + return _cache.rtree.search(bbox2).map((d2) => d2.data); }, + // Get a QAItem from cache + // NOTE: Don't change method name until UI v3 is merged getError(id2) { - return _cache3.data[id2]; - }, - getIcon(itemType) { - return _osmoseData.icons[itemType]; + return _cache.data[id2]; }, + // Replace a single QAItem in the cache replaceItem(item) { - if (!(item instanceof QAItem) || !item.id) - return; - _cache3.data[item.id] = item; - updateRtree3(encodeIssueRtree3(item), true); + if (!(item instanceof QAItem) || !item.id) return; + _cache.data[item.id] = item; + updateRtree(encodeIssueRtree(item), true); return item; }, + // Remove a single QAItem from the cache removeItem(item) { - if (!(item instanceof QAItem) || !item.id) - return; - delete _cache3.data[item.id]; - updateRtree3(encodeIssueRtree3(item), false); + if (!(item instanceof QAItem) || !item.id) return; + delete _cache.data[item.id]; + updateRtree(encodeIssueRtree(item), false); }, - getClosedCounts() { - return _cache3.closed; + issueURL(item) { + return "".concat(_krUrlRoot, "/report_map.php?schema=").concat(item.schema, "&error=").concat(item.id); }, - itemURL(item) { - return `https://osmose.openstreetmap.fr/en/error/${item.id}`; + // Get an array of issues closed during this session. + // Used to populate `closed:keepright` changeset tag + getClosedIDs() { + return Object.keys(_cache.closed).sort(); } }; - // modules/services/mapillary.js - var import_pbf = __toESM(require_pbf()); - var import_rbush4 = __toESM(require_rbush_min()); - var import_vector_tile = __toESM(require_vector_tile()); - var accessToken = "MLY|4100327730013843|5bb78b81720791946a9a7b956c57b7cf"; - var apiUrl = "https://graph.mapillary.com/"; - var baseTileUrl = "https://tiles.mapillary.com/maps/vtp"; - var mapFeatureTileUrl = `${baseTileUrl}/mly_map_feature_point/2/{z}/{x}/{y}?access_token=${accessToken}`; - var tileUrl = `${baseTileUrl}/mly1_public/2/{z}/{x}/{y}?access_token=${accessToken}`; - var trafficSignTileUrl = `${baseTileUrl}/mly_map_feature_traffic_sign/2/{z}/{x}/{y}?access_token=${accessToken}`; - var viewercss = "mapillary-js/mapillary.css"; - var viewerjs = "mapillary-js/mapillary.js"; - var minZoom = 14; - var dispatch5 = dispatch_default("change", "loadedImages", "loadedSigns", "loadedMapFeatures", "bearingChanged", "imageChanged"); - var _loadViewerPromise; - var _mlyActiveImage; - var _mlyCache; - var _mlyFallback = false; - var _mlyHighlightedDetection; - var _mlyShowFeatureDetections = false; - var _mlyShowSignDetections = false; - var _mlyViewer; - var _mlyViewerFilter = ["all"]; - function loadTiles(which, url, maxZoom2, projection2) { - const tiler8 = utilTiler().zoomExtent([minZoom, maxZoom2]).skipNullIsland(true); - const tiles = tiler8.getTiles(projection2); - tiles.forEach(function(tile) { - loadTile(which, url, tile); - }); + // node_modules/marked/lib/marked.esm.js + function _getDefaults() { + return { + async: false, + breaks: false, + extensions: null, + gfm: true, + hooks: null, + pedantic: false, + renderer: null, + silent: false, + tokenizer: null, + walkTokens: null + }; } - function loadTile(which, url, tile) { - const cache = _mlyCache.requests; - const tileId = `${tile.id}-${which}`; - if (cache.loaded[tileId] || cache.inflight[tileId]) - return; - const controller = new AbortController(); - cache.inflight[tileId] = controller; - const requestUrl = url.replace("{x}", tile.xyz[0]).replace("{y}", tile.xyz[1]).replace("{z}", tile.xyz[2]); - fetch(requestUrl, { signal: controller.signal }).then(function(response) { - if (!response.ok) { - throw new Error(response.status + " " + response.statusText); + var _defaults = _getDefaults(); + function changeDefaults(newDefaults) { + _defaults = newDefaults; + } + var escapeTest = /[&<>"']/; + var escapeReplace = new RegExp(escapeTest.source, "g"); + var escapeTestNoEncode = /[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/; + var escapeReplaceNoEncode = new RegExp(escapeTestNoEncode.source, "g"); + var escapeReplacements = { + "&": "&", + "<": "<", + ">": ">", + '"': """, + "'": "'" + }; + var getEscapeReplacement = (ch) => escapeReplacements[ch]; + function escape$1(html3, encode) { + if (encode) { + if (escapeTest.test(html3)) { + return html3.replace(escapeReplace, getEscapeReplacement); } - cache.loaded[tileId] = true; - delete cache.inflight[tileId]; - return response.arrayBuffer(); - }).then(function(data) { - if (!data) { - throw new Error("No Data"); + } else { + if (escapeTestNoEncode.test(html3)) { + return html3.replace(escapeReplaceNoEncode, getEscapeReplacement); } - loadTileDataToCache(data, tile, which); - if (which === "images") { - dispatch5.call("loadedImages"); - } else if (which === "signs") { - dispatch5.call("loadedSigns"); - } else if (which === "points") { - dispatch5.call("loadedMapFeatures"); + } + return html3; + } + var caret = /(^|[^\[])\^/g; + function edit(regex, opt) { + let source = typeof regex === "string" ? regex : regex.source; + opt = opt || ""; + const obj = { + replace: (name, val) => { + let valSource = typeof val === "string" ? val : val.source; + valSource = valSource.replace(caret, "$1"); + source = source.replace(name, valSource); + return obj; + }, + getRegex: () => { + return new RegExp(source, opt); } - }).catch(function() { - cache.loaded[tileId] = true; - delete cache.inflight[tileId]; - }); + }; + return obj; } - function loadTileDataToCache(data, tile, which) { - const vectorTile = new import_vector_tile.VectorTile(new import_pbf.default(data)); - let features2, cache, layer, i2, feature3, loc, d; - if (vectorTile.layers.hasOwnProperty("image")) { - features2 = []; - cache = _mlyCache.images; - layer = vectorTile.layers.image; - for (i2 = 0; i2 < layer.length; i2++) { - feature3 = layer.feature(i2).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]); - loc = feature3.geometry.coordinates; - d = { - loc, - captured_at: feature3.properties.captured_at, - ca: feature3.properties.compass_angle, - id: feature3.properties.id, - is_pano: feature3.properties.is_pano, - sequence_id: feature3.properties.sequence_id - }; - cache.forImageId[d.id] = d; - features2.push({ - minX: loc[0], - minY: loc[1], - maxX: loc[0], - maxY: loc[1], - data: d - }); + function cleanUrl(href) { + try { + href = encodeURI(href).replace(/%25/g, "%"); + } catch { + return null; + } + return href; + } + var noopTest = { exec: () => null }; + function splitCells(tableRow, count) { + const row = tableRow.replace(/\|/g, (match, offset, str) => { + let escaped = false; + let curr = offset; + while (--curr >= 0 && str[curr] === "\\") + escaped = !escaped; + if (escaped) { + return "|"; + } else { + return " |"; } - if (cache.rtree) { - cache.rtree.load(features2); + }), cells = row.split(/ \|/); + let i3 = 0; + if (!cells[0].trim()) { + cells.shift(); + } + if (cells.length > 0 && !cells[cells.length - 1].trim()) { + cells.pop(); + } + if (count) { + if (cells.length > count) { + cells.splice(count); + } else { + while (cells.length < count) + cells.push(""); } } - if (vectorTile.layers.hasOwnProperty("sequence")) { - features2 = []; - cache = _mlyCache.sequences; - layer = vectorTile.layers.sequence; - for (i2 = 0; i2 < layer.length; i2++) { - feature3 = layer.feature(i2).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]); - if (cache.lineString[feature3.properties.id]) { - cache.lineString[feature3.properties.id].push(feature3); - } else { - cache.lineString[feature3.properties.id] = [feature3]; + for (; i3 < cells.length; i3++) { + cells[i3] = cells[i3].trim().replace(/\\\|/g, "|"); + } + return cells; + } + function rtrim(str, c2, invert) { + const l2 = str.length; + if (l2 === 0) { + return ""; + } + let suffLen = 0; + while (suffLen < l2) { + const currChar = str.charAt(l2 - suffLen - 1); + if (currChar === c2 && !invert) { + suffLen++; + } else if (currChar !== c2 && invert) { + suffLen++; + } else { + break; + } + } + return str.slice(0, l2 - suffLen); + } + function findClosingBracket(str, b2) { + if (str.indexOf(b2[1]) === -1) { + return -1; + } + let level = 0; + for (let i3 = 0; i3 < str.length; i3++) { + if (str[i3] === "\\") { + i3++; + } else if (str[i3] === b2[0]) { + level++; + } else if (str[i3] === b2[1]) { + level--; + if (level < 0) { + return i3; } } } - if (vectorTile.layers.hasOwnProperty("point")) { - features2 = []; - cache = _mlyCache[which]; - layer = vectorTile.layers.point; - for (i2 = 0; i2 < layer.length; i2++) { - feature3 = layer.feature(i2).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]); - loc = feature3.geometry.coordinates; - d = { - loc, - id: feature3.properties.id, - first_seen_at: feature3.properties.first_seen_at, - last_seen_at: feature3.properties.last_seen_at, - value: feature3.properties.value - }; - features2.push({ - minX: loc[0], - minY: loc[1], - maxX: loc[0], - maxY: loc[1], - data: d - }); + return -1; + } + function outputLink(cap, link3, raw, lexer2) { + const href = link3.href; + const title = link3.title ? escape$1(link3.title) : null; + const text = cap[1].replace(/\\([\[\]])/g, "$1"); + if (cap[0].charAt(0) !== "!") { + lexer2.state.inLink = true; + const token = { + type: "link", + raw, + href, + title, + text, + tokens: lexer2.inlineTokens(text) + }; + lexer2.state.inLink = false; + return token; + } + return { + type: "image", + raw, + href, + title, + text: escape$1(text) + }; + } + function indentCodeCompensation(raw, text) { + const matchIndentToCode = raw.match(/^(\s+)(?:```)/); + if (matchIndentToCode === null) { + return text; + } + const indentToCode = matchIndentToCode[1]; + return text.split("\n").map((node) => { + const matchIndentInNode = node.match(/^\s+/); + if (matchIndentInNode === null) { + return node; } - if (cache.rtree) { - cache.rtree.load(features2); + const [indentInNode] = matchIndentInNode; + if (indentInNode.length >= indentToCode.length) { + return node.slice(indentToCode.length); } + return node; + }).join("\n"); + } + var _Tokenizer = class { + // set by the lexer + constructor(options2) { + __publicField(this, "options"); + __publicField(this, "rules"); + // set by the lexer + __publicField(this, "lexer"); + this.options = options2 || _defaults; } - if (vectorTile.layers.hasOwnProperty("traffic_sign")) { - features2 = []; - cache = _mlyCache[which]; - layer = vectorTile.layers.traffic_sign; - for (i2 = 0; i2 < layer.length; i2++) { - feature3 = layer.feature(i2).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]); - loc = feature3.geometry.coordinates; - d = { - loc, - id: feature3.properties.id, - first_seen_at: feature3.properties.first_seen_at, - last_seen_at: feature3.properties.last_seen_at, - value: feature3.properties.value + space(src) { + const cap = this.rules.block.newline.exec(src); + if (cap && cap[0].length > 0) { + return { + type: "space", + raw: cap[0] }; - features2.push({ - minX: loc[0], - minY: loc[1], - maxX: loc[0], - maxY: loc[1], - data: d - }); } - if (cache.rtree) { - cache.rtree.load(features2); + } + code(src) { + const cap = this.rules.block.code.exec(src); + if (cap) { + const text = cap[0].replace(/^ {1,4}/gm, ""); + return { + type: "code", + raw: cap[0], + codeBlockStyle: "indented", + text: !this.options.pedantic ? rtrim(text, "\n") : text + }; } } - } - function loadData(url) { - return fetch(url).then(function(response) { - if (!response.ok) { - throw new Error(response.status + " " + response.statusText); + fences(src) { + const cap = this.rules.block.fences.exec(src); + if (cap) { + const raw = cap[0]; + const text = indentCodeCompensation(raw, cap[3] || ""); + return { + type: "code", + raw, + lang: cap[2] ? cap[2].trim().replace(this.rules.inline.anyPunctuation, "$1") : cap[2], + text + }; } - return response.json(); - }).then(function(result) { - if (!result) { - return []; + } + heading(src) { + const cap = this.rules.block.heading.exec(src); + if (cap) { + let text = cap[2].trim(); + if (/#$/.test(text)) { + const trimmed = rtrim(text, "#"); + if (this.options.pedantic) { + text = trimmed.trim(); + } else if (!trimmed || / $/.test(trimmed)) { + text = trimmed.trim(); + } + } + return { + type: "heading", + raw: cap[0], + depth: cap[1].length, + text, + tokens: this.lexer.inline(text) + }; } - return result.data || []; - }); - } - function partitionViewport(projection2) { - const z = geoScaleToZoom(projection2.scale()); - const z2 = Math.ceil(z * 2) / 2 + 2.5; - const tiler8 = utilTiler().zoomExtent([z2, z2]); - return tiler8.getTiles(projection2).map(function(tile) { - return tile.extent; - }); - } - function searchLimited(limit, projection2, rtree) { - limit = limit || 5; - return partitionViewport(projection2).reduce(function(result, extent) { - const found = rtree.search(extent.bbox()).slice(0, limit).map(function(d) { - return d.data; - }); - return found.length ? result.concat(found) : result; - }, []); - } - var mapillary_default = { - init: function() { - if (!_mlyCache) { - this.reset(); + } + hr(src) { + const cap = this.rules.block.hr.exec(src); + if (cap) { + return { + type: "hr", + raw: rtrim(cap[0], "\n") + }; } - this.event = utilRebind(this, dispatch5, "on"); - }, - reset: function() { - if (_mlyCache) { - Object.values(_mlyCache.requests.inflight).forEach(function(request3) { - request3.abort(); - }); + } + blockquote(src) { + const cap = this.rules.block.blockquote.exec(src); + if (cap) { + let lines = rtrim(cap[0], "\n").split("\n"); + let raw = ""; + let text = ""; + const tokens = []; + while (lines.length > 0) { + let inBlockquote = false; + const currentLines = []; + let i3; + for (i3 = 0; i3 < lines.length; i3++) { + if (/^ {0,3}>/.test(lines[i3])) { + currentLines.push(lines[i3]); + inBlockquote = true; + } else if (!inBlockquote) { + currentLines.push(lines[i3]); + } else { + break; + } + } + lines = lines.slice(i3); + const currentRaw = currentLines.join("\n"); + const currentText = currentRaw.replace(/\n {0,3}((?:=+|-+) *)(?=\n|$)/g, "\n $1").replace(/^ {0,3}>[ \t]?/gm, ""); + raw = raw ? "".concat(raw, "\n").concat(currentRaw) : currentRaw; + text = text ? "".concat(text, "\n").concat(currentText) : currentText; + const top = this.lexer.state.top; + this.lexer.state.top = true; + this.lexer.blockTokens(currentText, tokens, true); + this.lexer.state.top = top; + if (lines.length === 0) { + break; + } + const lastToken = tokens[tokens.length - 1]; + if ((lastToken == null ? void 0 : lastToken.type) === "code") { + break; + } else if ((lastToken == null ? void 0 : lastToken.type) === "blockquote") { + const oldToken = lastToken; + const newText = oldToken.raw + "\n" + lines.join("\n"); + const newToken = this.blockquote(newText); + tokens[tokens.length - 1] = newToken; + raw = raw.substring(0, raw.length - oldToken.raw.length) + newToken.raw; + text = text.substring(0, text.length - oldToken.text.length) + newToken.text; + break; + } else if ((lastToken == null ? void 0 : lastToken.type) === "list") { + const oldToken = lastToken; + const newText = oldToken.raw + "\n" + lines.join("\n"); + const newToken = this.list(newText); + tokens[tokens.length - 1] = newToken; + raw = raw.substring(0, raw.length - lastToken.raw.length) + newToken.raw; + text = text.substring(0, text.length - oldToken.raw.length) + newToken.raw; + lines = newText.substring(tokens[tokens.length - 1].raw.length).split("\n"); + continue; + } + } + return { + type: "blockquote", + raw, + tokens, + text + }; } - _mlyCache = { - images: { rtree: new import_rbush4.default(), forImageId: {} }, - image_detections: { forImageId: {} }, - signs: { rtree: new import_rbush4.default() }, - points: { rtree: new import_rbush4.default() }, - sequences: { rtree: new import_rbush4.default(), lineString: {} }, - requests: { loaded: {}, inflight: {} } - }; - _mlyActiveImage = null; - }, - images: function(projection2) { - const limit = 5; - return searchLimited(limit, projection2, _mlyCache.images.rtree); - }, - signs: function(projection2) { - const limit = 5; - return searchLimited(limit, projection2, _mlyCache.signs.rtree); - }, - mapFeatures: function(projection2) { - const limit = 5; - return searchLimited(limit, projection2, _mlyCache.points.rtree); - }, - cachedImage: function(imageId) { - return _mlyCache.images.forImageId[imageId]; - }, - sequences: function(projection2) { - const viewport = projection2.clipExtent(); - const min3 = [viewport[0][0], viewport[1][1]]; - const max3 = [viewport[1][0], viewport[0][1]]; - const bbox2 = geoExtent(projection2.invert(min3), projection2.invert(max3)).bbox(); - const sequenceIds = {}; - let lineStrings = []; - _mlyCache.images.rtree.search(bbox2).forEach(function(d) { - if (d.data.sequence_id) { - sequenceIds[d.data.sequence_id] = true; + } + list(src) { + let cap = this.rules.block.list.exec(src); + if (cap) { + let bull = cap[1].trim(); + const isordered = bull.length > 1; + const list2 = { + type: "list", + raw: "", + ordered: isordered, + start: isordered ? +bull.slice(0, -1) : "", + loose: false, + items: [] + }; + bull = isordered ? "\\d{1,9}\\".concat(bull.slice(-1)) : "\\".concat(bull); + if (this.options.pedantic) { + bull = isordered ? bull : "[*+-]"; } - }); - Object.keys(sequenceIds).forEach(function(sequenceId) { - if (_mlyCache.sequences.lineString[sequenceId]) { - lineStrings = lineStrings.concat(_mlyCache.sequences.lineString[sequenceId]); + const itemRegex = new RegExp("^( {0,3}".concat(bull, ")((?:[ ][^\\n]*)?(?:\\n|$))")); + let endsWithBlankLine = false; + while (src) { + let endEarly = false; + let raw = ""; + let itemContents = ""; + if (!(cap = itemRegex.exec(src))) { + break; + } + if (this.rules.block.hr.test(src)) { + break; + } + raw = cap[0]; + src = src.substring(raw.length); + let line = cap[2].split("\n", 1)[0].replace(/^\t+/, (t2) => " ".repeat(3 * t2.length)); + let nextLine = src.split("\n", 1)[0]; + let blankLine = !line.trim(); + let indent = 0; + if (this.options.pedantic) { + indent = 2; + itemContents = line.trimStart(); + } else if (blankLine) { + indent = cap[1].length + 1; + } else { + indent = cap[2].search(/[^ ]/); + indent = indent > 4 ? 1 : indent; + itemContents = line.slice(indent); + indent += cap[1].length; + } + if (blankLine && /^ *$/.test(nextLine)) { + raw += nextLine + "\n"; + src = src.substring(nextLine.length + 1); + endEarly = true; + } + if (!endEarly) { + const nextBulletRegex = new RegExp("^ {0,".concat(Math.min(3, indent - 1), "}(?:[*+-]|\\d{1,9}[.)])((?:[ ][^\\n]*)?(?:\\n|$))")); + const hrRegex = new RegExp("^ {0,".concat(Math.min(3, indent - 1), "}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)")); + const fencesBeginRegex = new RegExp("^ {0,".concat(Math.min(3, indent - 1), "}(?:```|~~~)")); + const headingBeginRegex = new RegExp("^ {0,".concat(Math.min(3, indent - 1), "}#")); + while (src) { + const rawLine = src.split("\n", 1)[0]; + nextLine = rawLine; + if (this.options.pedantic) { + nextLine = nextLine.replace(/^ {1,4}(?=( {4})*[^ ])/g, " "); + } + if (fencesBeginRegex.test(nextLine)) { + break; + } + if (headingBeginRegex.test(nextLine)) { + break; + } + if (nextBulletRegex.test(nextLine)) { + break; + } + if (hrRegex.test(src)) { + break; + } + if (nextLine.search(/[^ ]/) >= indent || !nextLine.trim()) { + itemContents += "\n" + nextLine.slice(indent); + } else { + if (blankLine) { + break; + } + if (line.search(/[^ ]/) >= 4) { + break; + } + if (fencesBeginRegex.test(line)) { + break; + } + if (headingBeginRegex.test(line)) { + break; + } + if (hrRegex.test(line)) { + break; + } + itemContents += "\n" + nextLine; + } + if (!blankLine && !nextLine.trim()) { + blankLine = true; + } + raw += rawLine + "\n"; + src = src.substring(rawLine.length + 1); + line = nextLine.slice(indent); + } + } + if (!list2.loose) { + if (endsWithBlankLine) { + list2.loose = true; + } else if (/\n *\n *$/.test(raw)) { + endsWithBlankLine = true; + } + } + let istask = null; + let ischecked; + if (this.options.gfm) { + istask = /^\[[ xX]\] /.exec(itemContents); + if (istask) { + ischecked = istask[0] !== "[ ] "; + itemContents = itemContents.replace(/^\[[ xX]\] +/, ""); + } + } + list2.items.push({ + type: "list_item", + raw, + task: !!istask, + checked: ischecked, + loose: false, + text: itemContents, + tokens: [] + }); + list2.raw += raw; } - }); - return lineStrings; - }, - loadImages: function(projection2) { - loadTiles("images", tileUrl, 14, projection2); - }, - loadSigns: function(projection2) { - loadTiles("signs", trafficSignTileUrl, 14, projection2); - }, - loadMapFeatures: function(projection2) { - loadTiles("points", mapFeatureTileUrl, 14, projection2); - }, - ensureViewerLoaded: function(context) { - if (_loadViewerPromise) - return _loadViewerPromise; - const wrap2 = context.container().select(".photoviewer").selectAll(".mly-wrapper").data([0]); - wrap2.enter().append("div").attr("id", "ideditor-mly").attr("class", "photo-wrapper mly-wrapper").classed("hide", true); - const that = this; - _loadViewerPromise = new Promise((resolve, reject) => { - let loadedCount = 0; - function loaded() { - loadedCount += 1; - if (loadedCount === 2) - resolve(); + list2.items[list2.items.length - 1].raw = list2.items[list2.items.length - 1].raw.trimEnd(); + list2.items[list2.items.length - 1].text = list2.items[list2.items.length - 1].text.trimEnd(); + list2.raw = list2.raw.trimEnd(); + for (let i3 = 0; i3 < list2.items.length; i3++) { + this.lexer.state.top = false; + list2.items[i3].tokens = this.lexer.blockTokens(list2.items[i3].text, []); + if (!list2.loose) { + const spacers = list2.items[i3].tokens.filter((t2) => t2.type === "space"); + const hasMultipleLineBreaks = spacers.length > 0 && spacers.some((t2) => /\n.*\n/.test(t2.raw)); + list2.loose = hasMultipleLineBreaks; + } } - const head = select_default2("head"); - head.selectAll("#ideditor-mapillary-viewercss").data([0]).enter().append("link").attr("id", "ideditor-mapillary-viewercss").attr("rel", "stylesheet").attr("crossorigin", "anonymous").attr("href", context.asset(viewercss)).on("load.serviceMapillary", loaded).on("error.serviceMapillary", function() { - reject(); - }); - head.selectAll("#ideditor-mapillary-viewerjs").data([0]).enter().append("script").attr("id", "ideditor-mapillary-viewerjs").attr("crossorigin", "anonymous").attr("src", context.asset(viewerjs)).on("load.serviceMapillary", loaded).on("error.serviceMapillary", function() { - reject(); - }); - }).catch(function() { - _loadViewerPromise = null; - }).then(function() { - that.initViewer(context); - }); - return _loadViewerPromise; - }, - loadSignResources: function(context) { - context.ui().svgDefs.addSprites(["mapillary-sprite"], false); - return this; - }, - loadObjectResources: function(context) { - context.ui().svgDefs.addSprites(["mapillary-object-sprite"], false); - return this; - }, - resetTags: function() { - if (_mlyViewer && !_mlyFallback) { - _mlyViewer.getComponent("tag").removeAll(); - } - }, - showFeatureDetections: function(value) { - _mlyShowFeatureDetections = value; - if (!_mlyShowFeatureDetections && !_mlyShowSignDetections) { - this.resetTags(); - } - }, - showSignDetections: function(value) { - _mlyShowSignDetections = value; - if (!_mlyShowFeatureDetections && !_mlyShowSignDetections) { - this.resetTags(); + if (list2.loose) { + for (let i3 = 0; i3 < list2.items.length; i3++) { + list2.items[i3].loose = true; + } + } + return list2; } - }, - filterViewer: function(context) { - const showsPano = context.photos().showsPanoramic(); - const showsFlat = context.photos().showsFlat(); - const fromDate = context.photos().fromDate(); - const toDate = context.photos().toDate(); - const filter2 = ["all"]; - if (!showsPano) - filter2.push(["!=", "cameraType", "spherical"]); - if (!showsFlat && showsPano) - filter2.push(["==", "pano", true]); - if (fromDate) { - filter2.push([">=", "capturedAt", new Date(fromDate).getTime()]); + } + html(src) { + const cap = this.rules.block.html.exec(src); + if (cap) { + const token = { + type: "html", + block: true, + raw: cap[0], + pre: cap[1] === "pre" || cap[1] === "script" || cap[1] === "style", + text: cap[0] + }; + return token; } - if (toDate) { - filter2.push([">=", "capturedAt", new Date(toDate).getTime()]); + } + def(src) { + const cap = this.rules.block.def.exec(src); + if (cap) { + const tag2 = cap[1].toLowerCase().replace(/\s+/g, " "); + const href = cap[2] ? cap[2].replace(/^<(.*)>$/, "$1").replace(this.rules.inline.anyPunctuation, "$1") : ""; + const title = cap[3] ? cap[3].substring(1, cap[3].length - 1).replace(this.rules.inline.anyPunctuation, "$1") : cap[3]; + return { + type: "def", + tag: tag2, + raw: cap[0], + href, + title + }; } - if (_mlyViewer) { - _mlyViewer.setFilter(filter2); + } + table(src) { + const cap = this.rules.block.table.exec(src); + if (!cap) { + return; } - _mlyViewerFilter = filter2; - return filter2; - }, - showViewer: function(context) { - const wrap2 = context.container().select(".photoviewer").classed("hide", false); - const isHidden = wrap2.selectAll(".photo-wrapper.mly-wrapper.hide").size(); - if (isHidden && _mlyViewer) { - wrap2.selectAll(".photo-wrapper:not(.mly-wrapper)").classed("hide", true); - wrap2.selectAll(".photo-wrapper.mly-wrapper").classed("hide", false); - _mlyViewer.resize(); + if (!/[:|]/.test(cap[2])) { + return; } - return this; - }, - hideViewer: function(context) { - _mlyActiveImage = null; - if (!_mlyFallback && _mlyViewer) { - _mlyViewer.getComponent("sequence").stop(); + const headers = splitCells(cap[1]); + const aligns = cap[2].replace(/^\||\| *$/g, "").split("|"); + const rows = cap[3] && cap[3].trim() ? cap[3].replace(/\n[ \t]*$/, "").split("\n") : []; + const item = { + type: "table", + raw: cap[0], + header: [], + align: [], + rows: [] + }; + if (headers.length !== aligns.length) { + return; } - const viewer = context.container().select(".photoviewer"); - if (!viewer.empty()) - viewer.datum(null); - viewer.classed("hide", true).selectAll(".photo-wrapper").classed("hide", true); - this.updateUrlImage(null); - dispatch5.call("imageChanged"); - dispatch5.call("loadedMapFeatures"); - dispatch5.call("loadedSigns"); - return this.setStyles(context, null); - }, - updateUrlImage: function(imageId) { - if (!window.mocha) { - const hash = utilStringQs(window.location.hash); - if (imageId) { - hash.photo = "mapillary/" + imageId; + for (const align of aligns) { + if (/^ *-+: *$/.test(align)) { + item.align.push("right"); + } else if (/^ *:-+: *$/.test(align)) { + item.align.push("center"); + } else if (/^ *:-+ *$/.test(align)) { + item.align.push("left"); } else { - delete hash.photo; + item.align.push(null); } - window.location.replace("#" + utilQsString(hash, true)); } - }, - highlightDetection: function(detection) { - if (detection) { - _mlyHighlightedDetection = detection.id; + for (let i3 = 0; i3 < headers.length; i3++) { + item.header.push({ + text: headers[i3], + tokens: this.lexer.inline(headers[i3]), + header: true, + align: item.align[i3] + }); } - return this; - }, - initViewer: function(context) { - const that = this; - if (!window.mapillary) - return; - const opts = { - accessToken, - component: { - cover: false, - keyboard: false, - tag: true - }, - container: "ideditor-mly" - }; - if (!mapillary.isSupported() && mapillary.isFallbackSupported()) { - _mlyFallback = true; - opts.component = { - cover: false, - direction: false, - imagePlane: false, - keyboard: false, - mouse: false, - sequence: false, - tag: false, - image: true, - navigation: true - }; - } - _mlyViewer = new mapillary.Viewer(opts); - _mlyViewer.on("image", imageChanged); - _mlyViewer.on("bearing", bearingChanged); - if (_mlyViewerFilter) { - _mlyViewer.setFilter(_mlyViewerFilter); + for (const row of rows) { + item.rows.push(splitCells(row, item.header.length).map((cell, i3) => { + return { + text: cell, + tokens: this.lexer.inline(cell), + header: false, + align: item.align[i3] + }; + })); } - context.ui().photoviewer.on("resize.mapillary", function() { - if (_mlyViewer) - _mlyViewer.resize(); - }); - function imageChanged(node) { - that.resetTags(); - const image = node.image; - that.setActiveImage(image); - that.setStyles(context, null); - const loc = [image.originalLngLat.lng, image.originalLngLat.lat]; - context.map().centerEase(loc); - that.updateUrlImage(image.id); - if (_mlyShowFeatureDetections || _mlyShowSignDetections) { - that.updateDetections(image.id, `${apiUrl}/${image.id}/detections?access_token=${accessToken}&fields=id,image,geometry,value`); - } - dispatch5.call("imageChanged"); + return item; + } + lheading(src) { + const cap = this.rules.block.lheading.exec(src); + if (cap) { + return { + type: "heading", + raw: cap[0], + depth: cap[2].charAt(0) === "=" ? 1 : 2, + text: cap[1], + tokens: this.lexer.inline(cap[1]) + }; } - function bearingChanged(e) { - dispatch5.call("bearingChanged", void 0, e); + } + paragraph(src) { + const cap = this.rules.block.paragraph.exec(src); + if (cap) { + const text = cap[1].charAt(cap[1].length - 1) === "\n" ? cap[1].slice(0, -1) : cap[1]; + return { + type: "paragraph", + raw: cap[0], + text, + tokens: this.lexer.inline(text) + }; } - }, - selectImage: function(context, imageId) { - if (_mlyViewer && imageId) { - _mlyViewer.moveTo(imageId).catch(function(e) { - console.error("mly3", e); - }); + } + text(src) { + const cap = this.rules.block.text.exec(src); + if (cap) { + return { + type: "text", + raw: cap[0], + text: cap[0], + tokens: this.lexer.inline(cap[0]) + }; } - return this; - }, - getActiveImage: function() { - return _mlyActiveImage; - }, - getDetections: function(id2) { - return loadData(`${apiUrl}/${id2}/detections?access_token=${accessToken}&fields=id,value,image`); - }, - setActiveImage: function(image) { - if (image) { - _mlyActiveImage = { - ca: image.originalCompassAngle, - id: image.id, - loc: [image.originalLngLat.lng, image.originalLngLat.lat], - is_pano: image.cameraType === "spherical", - sequence_id: image.sequenceId + } + escape(src) { + const cap = this.rules.inline.escape.exec(src); + if (cap) { + return { + type: "escape", + raw: cap[0], + text: escape$1(cap[1]) }; - } else { - _mlyActiveImage = null; } - }, - setStyles: function(context, hovered) { - const hoveredImageId = hovered && hovered.id; - const hoveredSequenceId = hovered && hovered.sequence_id; - const selectedSequenceId = _mlyActiveImage && _mlyActiveImage.sequence_id; - context.container().selectAll(".layer-mapillary .viewfield-group").classed("highlighted", function(d) { - return d.sequence_id === selectedSequenceId || d.id === hoveredImageId; - }).classed("hovered", function(d) { - return d.id === hoveredImageId; - }); - context.container().selectAll(".layer-mapillary .sequence").classed("highlighted", function(d) { - return d.properties.id === hoveredSequenceId; - }).classed("currentView", function(d) { - return d.properties.id === selectedSequenceId; - }); - return this; - }, - updateDetections: function(imageId, url) { - if (!_mlyViewer || _mlyFallback) - return; - if (!imageId) - return; - const cache = _mlyCache.image_detections; - if (cache.forImageId[imageId]) { - showDetections(_mlyCache.image_detections.forImageId[imageId]); - } else { - loadData(url).then((detections) => { - detections.forEach(function(detection) { - if (!cache.forImageId[imageId]) { - cache.forImageId[imageId] = []; - } - cache.forImageId[imageId].push({ - geometry: detection.geometry, - id: detection.id, - image_id: imageId, - value: detection.value - }); - }); - showDetections(_mlyCache.image_detections.forImageId[imageId] || []); - }); + } + tag(src) { + const cap = this.rules.inline.tag.exec(src); + if (cap) { + if (!this.lexer.state.inLink && /^/i.test(cap[0])) { + this.lexer.state.inLink = false; + } + if (!this.lexer.state.inRawBlock && /^<(pre|code|kbd|script)(\s|>)/i.test(cap[0])) { + this.lexer.state.inRawBlock = true; + } else if (this.lexer.state.inRawBlock && /^<\/(pre|code|kbd|script)(\s|>)/i.test(cap[0])) { + this.lexer.state.inRawBlock = false; + } + return { + type: "html", + raw: cap[0], + inLink: this.lexer.state.inLink, + inRawBlock: this.lexer.state.inRawBlock, + block: false, + text: cap[0] + }; } - function showDetections(detections) { - const tagComponent = _mlyViewer.getComponent("tag"); - detections.forEach(function(data) { - const tag = makeTag(data); - if (tag) { - tagComponent.add([tag]); + } + link(src) { + const cap = this.rules.inline.link.exec(src); + if (cap) { + const trimmedUrl = cap[2].trim(); + if (!this.options.pedantic && /^$/.test(trimmedUrl)) { + return; } - }); - } - function makeTag(data) { - const valueParts = data.value.split("--"); - if (!valueParts.length) - return; - let tag; - let text2; - let color2 = 16777215; - if (_mlyHighlightedDetection === data.id) { - color2 = 16776960; - text2 = valueParts[1]; - if (text2 === "flat" || text2 === "discrete" || text2 === "sign") { - text2 = valueParts[2]; + const rtrimSlash = rtrim(trimmedUrl.slice(0, -1), "\\"); + if ((trimmedUrl.length - rtrimSlash.length) % 2 === 0) { + return; + } + } else { + const lastParenIndex = findClosingBracket(cap[2], "()"); + if (lastParenIndex > -1) { + const start2 = cap[0].indexOf("!") === 0 ? 5 : 4; + const linkLen = start2 + cap[1].length + lastParenIndex; + cap[2] = cap[2].substring(0, lastParenIndex); + cap[0] = cap[0].substring(0, linkLen).trim(); + cap[3] = ""; } - text2 = text2.replace(/-/g, " "); - text2 = text2.charAt(0).toUpperCase() + text2.slice(1); - _mlyHighlightedDetection = null; } - var decodedGeometry = window.atob(data.geometry); - var uintArray = new Uint8Array(decodedGeometry.length); - for (var i2 = 0; i2 < decodedGeometry.length; i2++) { - uintArray[i2] = decodedGeometry.charCodeAt(i2); + let href = cap[2]; + let title = ""; + if (this.options.pedantic) { + const link3 = /^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(href); + if (link3) { + href = link3[1]; + title = link3[3]; + } + } else { + title = cap[3] ? cap[3].slice(1, -1) : ""; } - const tile = new import_vector_tile.VectorTile(new import_pbf.default(uintArray.buffer)); - const layer = tile.layers["mpy-or"]; - const geometries = layer.feature(0).loadGeometry(); - const polygon2 = geometries.map((ring) => ring.map((point2) => [point2.x / layer.extent, point2.y / layer.extent])); - tag = new mapillary.OutlineTag( - data.id, - new mapillary.PolygonGeometry(polygon2[0]), - { - text: text2, - textColor: color2, - lineColor: color2, - lineWidth: 2, - fillColor: color2, - fillOpacity: 0.3 + href = href.trim(); + if (/^$/.test(trimmedUrl)) { + href = href.slice(1); + } else { + href = href.slice(1, -1); } - ); - return tag; + } + return outputLink(cap, { + href: href ? href.replace(this.rules.inline.anyPunctuation, "$1") : href, + title: title ? title.replace(this.rules.inline.anyPunctuation, "$1") : title + }, cap[0], this.lexer); } - }, - cache: function() { - return _mlyCache; } - }; - - // modules/core/validation/models.js - function validationIssue(attrs) { - this.type = attrs.type; - this.subtype = attrs.subtype; - this.severity = attrs.severity; - this.message = attrs.message; - this.reference = attrs.reference; - this.entityIds = attrs.entityIds; - this.loc = attrs.loc; - this.data = attrs.data; - this.dynamicFixes = attrs.dynamicFixes; - this.hash = attrs.hash; - this.id = generateID.apply(this); - this.key = generateKey.apply(this); - this.autoFix = null; - function generateID() { - var parts = [this.type]; - if (this.hash) { - parts.push(this.hash); - } - if (this.subtype) { - parts.push(this.subtype); - } - if (this.entityIds) { - var entityKeys = this.entityIds.slice().sort(); - parts.push.apply(parts, entityKeys); + reflink(src, links) { + let cap; + if ((cap = this.rules.inline.reflink.exec(src)) || (cap = this.rules.inline.nolink.exec(src))) { + const linkString = (cap[2] || cap[1]).replace(/\s+/g, " "); + const link3 = links[linkString.toLowerCase()]; + if (!link3) { + const text = cap[0].charAt(0); + return { + type: "text", + raw: text, + text + }; + } + return outputLink(cap, link3, cap[0], this.lexer); } - return parts.join(":"); - } - function generateKey() { - return this.id + ":" + Date.now().toString(); } - this.extent = function(resolver) { - if (this.loc) { - return geoExtent(this.loc); - } - if (this.entityIds && this.entityIds.length) { - return this.entityIds.reduce(function(extent, entityId) { - return extent.extend(resolver.entity(entityId).extent(resolver)); - }, geoExtent()); - } - return null; - }; - this.fixes = function(context) { - var fixes = this.dynamicFixes ? this.dynamicFixes(context) : []; - var issue = this; - if (issue.severity === "warning") { - fixes.push(new validationIssueFix({ - title: _t.append("issues.fix.ignore_issue.title"), - icon: "iD-icon-close", - onClick: function() { - context.validator().ignoreIssue(this.issue.id); + emStrong(src, maskedSrc, prevChar = "") { + let match = this.rules.inline.emStrongLDelim.exec(src); + if (!match) + return; + if (match[3] && prevChar.match(/[\p{L}\p{N}]/u)) + return; + const nextChar = match[1] || match[2] || ""; + if (!nextChar || !prevChar || this.rules.inline.punctuation.exec(prevChar)) { + const lLength = [...match[0]].length - 1; + let rDelim, rLength, delimTotal = lLength, midDelimTotal = 0; + const endReg = match[0][0] === "*" ? this.rules.inline.emStrongRDelimAst : this.rules.inline.emStrongRDelimUnd; + endReg.lastIndex = 0; + maskedSrc = maskedSrc.slice(-1 * src.length + lLength); + while ((match = endReg.exec(maskedSrc)) != null) { + rDelim = match[1] || match[2] || match[3] || match[4] || match[5] || match[6]; + if (!rDelim) + continue; + rLength = [...rDelim].length; + if (match[3] || match[4]) { + delimTotal += rLength; + continue; + } else if (match[5] || match[6]) { + if (lLength % 3 && !((lLength + rLength) % 3)) { + midDelimTotal += rLength; + continue; + } } - })); + delimTotal -= rLength; + if (delimTotal > 0) + continue; + rLength = Math.min(rLength, rLength + delimTotal + midDelimTotal); + const lastCharLength = [...match[0]][0].length; + const raw = src.slice(0, lLength + match.index + lastCharLength + rLength); + if (Math.min(lLength, rLength) % 2) { + const text2 = raw.slice(1, -1); + return { + type: "em", + raw, + text: text2, + tokens: this.lexer.inlineTokens(text2) + }; + } + const text = raw.slice(2, -2); + return { + type: "strong", + raw, + text, + tokens: this.lexer.inlineTokens(text) + }; + } } - fixes.forEach(function(fix) { - fix.id = fix.title.stringId; - fix.issue = issue; - if (fix.autoArgs) { - issue.autoFix = fix; + } + codespan(src) { + const cap = this.rules.inline.code.exec(src); + if (cap) { + let text = cap[2].replace(/\n/g, " "); + const hasNonSpaceChars = /[^ ]/.test(text); + const hasSpaceCharsOnBothEnds = /^ /.test(text) && / $/.test(text); + if (hasNonSpaceChars && hasSpaceCharsOnBothEnds) { + text = text.substring(1, text.length - 1); } - }); - return fixes; - }; - } - function validationIssueFix(attrs) { - this.title = attrs.title; - this.onClick = attrs.onClick; - this.disabledReason = attrs.disabledReason; - this.icon = attrs.icon; - this.entityIds = attrs.entityIds || []; - this.autoArgs = attrs.autoArgs; - this.issue = null; - } - - // modules/services/maprules.js - var buildRuleChecks = function() { - return { - equals: function(equals) { - return function(tags) { - return Object.keys(equals).every(function(k) { - return equals[k] === tags[k]; - }); - }; - }, - notEquals: function(notEquals) { - return function(tags) { - return Object.keys(notEquals).some(function(k) { - return notEquals[k] !== tags[k]; - }); - }; - }, - absence: function(absence) { - return function(tags) { - return Object.keys(tags).indexOf(absence) === -1; - }; - }, - presence: function(presence) { - return function(tags) { - return Object.keys(tags).indexOf(presence) > -1; - }; - }, - greaterThan: function(greaterThan) { - var key = Object.keys(greaterThan)[0]; - var value = greaterThan[key]; - return function(tags) { - return tags[key] > value; + text = escape$1(text, true); + return { + type: "codespan", + raw: cap[0], + text }; - }, - greaterThanEqual: function(greaterThanEqual) { - var key = Object.keys(greaterThanEqual)[0]; - var value = greaterThanEqual[key]; - return function(tags) { - return tags[key] >= value; + } + } + br(src) { + const cap = this.rules.inline.br.exec(src); + if (cap) { + return { + type: "br", + raw: cap[0] }; - }, - lessThan: function(lessThan) { - var key = Object.keys(lessThan)[0]; - var value = lessThan[key]; - return function(tags) { - return tags[key] < value; + } + } + del(src) { + const cap = this.rules.inline.del.exec(src); + if (cap) { + return { + type: "del", + raw: cap[0], + text: cap[2], + tokens: this.lexer.inlineTokens(cap[2]) }; - }, - lessThanEqual: function(lessThanEqual) { - var key = Object.keys(lessThanEqual)[0]; - var value = lessThanEqual[key]; - return function(tags) { - return tags[key] <= value; + } + } + autolink(src) { + const cap = this.rules.inline.autolink.exec(src); + if (cap) { + let text, href; + if (cap[2] === "@") { + text = escape$1(cap[1]); + href = "mailto:" + text; + } else { + text = escape$1(cap[1]); + href = text; + } + return { + type: "link", + raw: cap[0], + text, + href, + tokens: [ + { + type: "text", + raw: text, + text + } + ] }; - }, - positiveRegex: function(positiveRegex) { - var tagKey = Object.keys(positiveRegex)[0]; - var expression = positiveRegex[tagKey].join("|"); - var regex = new RegExp(expression); - return function(tags) { - return regex.test(tags[tagKey]); + } + } + url(src) { + var _a3, _b3; + let cap; + if (cap = this.rules.inline.url.exec(src)) { + let text, href; + if (cap[2] === "@") { + text = escape$1(cap[0]); + href = "mailto:" + text; + } else { + let prevCapZero; + do { + prevCapZero = cap[0]; + cap[0] = (_b3 = (_a3 = this.rules.inline._backpedal.exec(cap[0])) == null ? void 0 : _a3[0]) != null ? _b3 : ""; + } while (prevCapZero !== cap[0]); + text = escape$1(cap[0]); + if (cap[1] === "www.") { + href = "http://" + cap[0]; + } else { + href = cap[0]; + } + } + return { + type: "link", + raw: cap[0], + text, + href, + tokens: [ + { + type: "text", + raw: text, + text + } + ] }; - }, - negativeRegex: function(negativeRegex) { - var tagKey = Object.keys(negativeRegex)[0]; - var expression = negativeRegex[tagKey].join("|"); - var regex = new RegExp(expression); - return function(tags) { - return !regex.test(tags[tagKey]); + } + } + inlineText(src) { + const cap = this.rules.inline.text.exec(src); + if (cap) { + let text; + if (this.lexer.state.inRawBlock) { + text = cap[0]; + } else { + text = escape$1(cap[0]); + } + return { + type: "text", + raw: cap[0], + text }; } - }; + } }; - var buildLineKeys = function() { - return { - highway: { - rest_area: true, - services: true - }, - railway: { - roundhouse: true, - station: true, - traverser: true, - turntable: true, - wash: true - } - }; + var newline = /^(?: *(?:\n|$))+/; + var blockCode = /^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/; + var fences = /^ {0,3}(`{3,}(?=[^`\n]*(?:\n|$))|~{3,})([^\n]*)(?:\n|$)(?:|([\s\S]*?)(?:\n|$))(?: {0,3}\1[~`]* *(?=\n|$)|$)/; + var hr = /^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/; + var heading = /^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/; + var bullet = /(?:[*+-]|\d{1,9}[.)])/; + var lheading = edit(/^(?!bull |blockCode|fences|blockquote|heading|html)((?:.|\n(?!\s*?\n|bull |blockCode|fences|blockquote|heading|html))+?)\n {0,3}(=+|-+) *(?:\n+|$)/).replace(/bull/g, bullet).replace(/blockCode/g, / {4}/).replace(/fences/g, / {0,3}(?:`{3,}|~{3,})/).replace(/blockquote/g, / {0,3}>/).replace(/heading/g, / {0,3}#{1,6}/).replace(/html/g, / {0,3}<[^\n>]+>\n/).getRegex(); + var _paragraph = /^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html|table| +\n)[^\n]+)*)/; + var blockText = /^[^\n]+/; + var _blockLabel = /(?!\s*\])(?:\\.|[^\[\]\\])+/; + var def = edit(/^ {0,3}\[(label)\]: *(?:\n *)?([^<\s][^\s]*|<.*?>)(?:(?: +(?:\n *)?| *\n *)(title))? *(?:\n+|$)/).replace("label", _blockLabel).replace("title", /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/).getRegex(); + var list = edit(/^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/).replace(/bull/g, bullet).getRegex(); + var _tag = "address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|search|section|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul"; + var _comment = /|$))/; + var html2 = edit("^ {0,3}(?:<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?(?:\\?>\\n*|$)|\\n*|$)|\\n*|$)|)[\\s\\S]*?(?:(?:\\n *)+\\n|$)|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)|(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$))", "i").replace("comment", _comment).replace("tag", _tag).replace("attribute", / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(); + var paragraph = edit(_paragraph).replace("hr", hr).replace("heading", " {0,3}#{1,6}(?:\\s|$)").replace("|lheading", "").replace("|table", "").replace("blockquote", " {0,3}>").replace("fences", " {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list", " {0,3}(?:[*+-]|1[.)]) ").replace("html", ")|<(?:script|pre|style|textarea|!--)").replace("tag", _tag).getRegex(); + var blockquote = edit(/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/).replace("paragraph", paragraph).getRegex(); + var blockNormal = { + blockquote, + code: blockCode, + def, + fences, + heading, + hr, + html: html2, + lheading, + list, + newline, + paragraph, + table: noopTest, + text: blockText }; - var maprules_default = { - init: function() { - this._ruleChecks = buildRuleChecks(); - this._validationRules = []; - this._areaKeys = osmAreaKeys; - this._lineKeys = buildLineKeys(); - }, - filterRuleChecks: function(selector) { - var _ruleChecks = this._ruleChecks; - return Object.keys(selector).reduce(function(rules, key) { - if (["geometry", "error", "warning"].indexOf(key) === -1) { - rules.push(_ruleChecks[key](selector[key])); - } - return rules; - }, []); - }, - buildTagMap: function(selector) { - var getRegexValues = function(regexes) { - return regexes.map(function(regex) { - return regex.replace(/\$|\^/g, ""); - }); + var gfmTable = edit("^ *([^\\n ].*)\\n {0,3}((?:\\| *)?:?-+:? *(?:\\| *:?-+:? *)*(?:\\| *)?)(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)").replace("hr", hr).replace("heading", " {0,3}#{1,6}(?:\\s|$)").replace("blockquote", " {0,3}>").replace("code", " {4}[^\\n]").replace("fences", " {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list", " {0,3}(?:[*+-]|1[.)]) ").replace("html", ")|<(?:script|pre|style|textarea|!--)").replace("tag", _tag).getRegex(); + var blockGfm = { + ...blockNormal, + table: gfmTable, + paragraph: edit(_paragraph).replace("hr", hr).replace("heading", " {0,3}#{1,6}(?:\\s|$)").replace("|lheading", "").replace("table", gfmTable).replace("blockquote", " {0,3}>").replace("fences", " {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list", " {0,3}(?:[*+-]|1[.)]) ").replace("html", ")|<(?:script|pre|style|textarea|!--)").replace("tag", _tag).getRegex() + }; + var blockPedantic = { + ...blockNormal, + html: edit("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+? *(?:\\n{2,}|\\s*$)|
" + (escaped ? code : escape$1(code, true)) + "' + (escaped ? code : escape$1(code, true)) + "\n".concat(body, "\n"); + } + html({ text }) { + return text; + } + heading({ tokens, depth }) { + return "
\n"; + } + list(token) { + const ordered = token.ordered; + const start2 = token.start; + let body = ""; + for (let j2 = 0; j2 < token.items.length; j2++) { + const item = token.items[j2]; + body += this.listitem(item); + } + const type2 = ordered ? "ol" : "ul"; + const startAttr = ordered && start2 !== 1 ? ' start="' + start2 + '"' : ""; + return "<" + type2 + startAttr + ">\n" + body + "\n"; + } + listitem(item) { + let itemBody = ""; + if (item.task) { + const checkbox = this.checkbox({ checked: !!item.checked }); + if (item.loose) { + if (item.tokens.length > 0 && item.tokens[0].type === "paragraph") { + item.tokens[0].text = checkbox + " " + item.tokens[0].text; + if (item.tokens[0].tokens && item.tokens[0].tokens.length > 0 && item.tokens[0].tokens[0].type === "text") { + item.tokens[0].tokens[0].text = checkbox + " " + item.tokens[0].tokens[0].text; + } + } else { + item.tokens.unshift({ + type: "text", + raw: checkbox + " ", + text: checkbox + " " + }); + } } else { - return callback("Unable to geocode", null); + itemBody += checkbox + " "; } - }); - }, - reverse: function(loc, callback) { - var cached = _nominatimCache.search( - { minX: loc[0], minY: loc[1], maxX: loc[0], maxY: loc[1] } - ); - if (cached.length > 0) { - if (callback) - callback(null, cached[0].data); - return; } - var params = { zoom: 13, format: "json", addressdetails: 1, lat: loc[1], lon: loc[0] }; - var url = apibase + "reverse?" + utilQsString(params); - if (_inflight[url]) - return; - var controller = new AbortController(); - _inflight[url] = controller; - json_default(url, { signal: controller.signal }).then(function(result) { - delete _inflight[url]; - if (result && result.error) { - throw new Error(result.error); - } - var extent = geoExtent(loc).padByMeters(200); - _nominatimCache.insert(Object.assign(extent.bbox(), { data: result })); - if (callback) - callback(null, result); - }).catch(function(err) { - delete _inflight[url]; - if (err.name === "AbortError") - return; - if (callback) - callback(err.message); - }); - }, - search: function(val, callback) { - var searchVal = encodeURIComponent(val); - var url = apibase + "search/" + searchVal + "?limit=10&format=json"; - if (_inflight[url]) - return; - var controller = new AbortController(); - _inflight[url] = controller; - json_default(url, { signal: controller.signal }).then(function(result) { - delete _inflight[url]; - if (result && result.error) { - throw new Error(result.error); + itemBody += this.parser.parse(item.tokens, !!item.loose); + return "
".concat(this.parser.parseInline(tokens), "
\n"); + } + table(token) { + let header = ""; + let cell = ""; + for (let j2 = 0; j2 < token.header.length; j2++) { + cell += this.tablecell(token.header[j2]); + } + header += this.tablerow({ text: cell }); + let body = ""; + for (let j2 = 0; j2 < token.rows.length; j2++) { + const row = token.rows[j2]; + cell = ""; + for (let k2 = 0; k2 < row.length; k2++) { + cell += this.tablecell(row[k2]); } - if (callback) - callback(null, result); - }).catch(function(err) { - delete _inflight[url]; - if (err.name === "AbortError") - return; - if (callback) - callback(err.message); - }); + body += this.tablerow({ text: cell }); + } + if (body) + body = "".concat(body, ""); + return "".concat(text, "");
+ }
+ br(token) {
+ return ""; + } + del({ tokens }) { + return "
An error occurred:
" + escape$1(e3.message + "", true) + ""; + if (async) { + return Promise.resolve(msg); } + return msg; } - addParents(head.parentWays(entity), result); - addParents(head.parentRelations(entity), result); - } - return result; - function addParents(parents, result2) { - for (var i3 = 0; i3 < parents.length; i3++) { - var parent = parents[i3]; - if (parent.id in result2) - continue; - result2[parent.id] = parent; - addParents(head.parentRelations(parent), result2); + if (async) { + return Promise.reject(e3); } - } - }; - return _diff; + throw e3; + }; + } + }; + var markedInstance = new Marked(); + function marked(src, opt) { + return markedInstance.parse(src, opt); } + marked.options = marked.setOptions = function(options2) { + markedInstance.setOptions(options2); + marked.defaults = markedInstance.defaults; + changeDefaults(marked.defaults); + return marked; + }; + marked.getDefaults = _getDefaults; + marked.defaults = _defaults; + marked.use = function(...args) { + markedInstance.use(...args); + marked.defaults = markedInstance.defaults; + changeDefaults(marked.defaults); + return marked; + }; + marked.walkTokens = function(tokens, callback) { + return markedInstance.walkTokens(tokens, callback); + }; + marked.parseInline = markedInstance.parseInline; + marked.Parser = _Parser; + marked.parser = _Parser.parse; + marked.Renderer = _Renderer; + marked.TextRenderer = _TextRenderer; + marked.Lexer = _Lexer; + marked.lexer = _Lexer.lex; + marked.Tokenizer = _Tokenizer; + marked.Hooks = _Hooks; + marked.parse = marked; + var options = marked.options; + var setOptions = marked.setOptions; + var use = marked.use; + var walkTokens = marked.walkTokens; + var parseInline = marked.parseInline; + var parser2 = _Parser.parse; + var lexer = _Lexer.lex; - // modules/core/tree.js - var import_rbush6 = __toESM(require_rbush_min()); - function coreTree(head) { - var _rtree = new import_rbush6.default(); - var _bboxes = {}; - var _segmentsRTree = new import_rbush6.default(); - var _segmentsBBoxes = {}; - var _segmentsByWayId = {}; - var tree = {}; - function entityBBox(entity) { - var bbox2 = entity.extent(head).bbox(); - bbox2.id = entity.id; - _bboxes[entity.id] = bbox2; - return bbox2; - } - function segmentBBox(segment) { - var extent = segment.extent(head); - if (!extent) - return null; - var bbox2 = extent.bbox(); - bbox2.segment = segment; - _segmentsBBoxes[segment.id] = bbox2; - return bbox2; + // modules/services/osmose.js + var tiler2 = utilTiler(); + var dispatch3 = dispatch_default("loaded"); + var _tileZoom2 = 14; + var _osmoseUrlRoot = "https://osmose.openstreetmap.fr/api/0.3"; + var _osmoseData = { icons: {}, items: [] }; + var _cache2; + function abortRequest2(controller) { + if (controller) { + controller.abort(); } - function removeEntity(entity) { - _rtree.remove(_bboxes[entity.id]); - delete _bboxes[entity.id]; - if (_segmentsByWayId[entity.id]) { - _segmentsByWayId[entity.id].forEach(function(segment) { - _segmentsRTree.remove(_segmentsBBoxes[segment.id]); - delete _segmentsBBoxes[segment.id]; - }); - delete _segmentsByWayId[entity.id]; + } + function abortUnwantedRequests2(cache, tiles) { + Object.keys(cache.inflightTile).forEach((k2) => { + let wanted = tiles.find((tile) => k2 === tile.id); + if (!wanted) { + abortRequest2(cache.inflightTile[k2]); + delete cache.inflightTile[k2]; } + }); + } + function encodeIssueRtree2(d2) { + return { minX: d2.loc[0], minY: d2.loc[1], maxX: d2.loc[0], maxY: d2.loc[1], data: d2 }; + } + function updateRtree2(item, replace) { + _cache2.rtree.remove(item, (a2, b2) => a2.data.id === b2.data.id); + if (replace) { + _cache2.rtree.insert(item); } - function loadEntities(entities) { - _rtree.load(entities.map(entityBBox)); - var segments = []; - entities.forEach(function(entity) { - if (entity.segments) { - var entitySegments = entity.segments(head); - _segmentsByWayId[entity.id] = entitySegments; - segments = segments.concat(entitySegments); - } - }); - if (segments.length) - _segmentsRTree.load(segments.map(segmentBBox).filter(Boolean)); - } - function updateParents(entity, insertions, memo) { - head.parentWays(entity).forEach(function(way) { - if (_bboxes[way.id]) { - removeEntity(way); - insertions[way.id] = way; - } - updateParents(way, insertions, memo); - }); - head.parentRelations(entity).forEach(function(relation) { - if (memo[entity.id]) - return; - memo[entity.id] = true; - if (_bboxes[relation.id]) { - removeEntity(relation); - insertions[relation.id] = relation; - } - updateParents(relation, insertions, memo); + } + function preventCoincident(loc) { + let coincident = false; + do { + let delta = coincident ? [1e-5, 0] : [0, 1e-5]; + loc = geoVecAdd(loc, delta); + let bbox2 = geoExtent(loc).bbox(); + coincident = _cache2.rtree.search(bbox2).length; + } while (coincident); + return loc; + } + var osmose_default = { + title: "osmose", + init() { + _mainFileFetcher.get("qa_data").then((d2) => { + _osmoseData = d2.osmose; + _osmoseData.items = Object.keys(d2.osmose.icons).map((s2) => s2.split("-")[0]).reduce((unique, item) => unique.indexOf(item) !== -1 ? unique : [...unique, item], []); }); - } - tree.rebase = function(entities, force) { - var insertions = {}; - for (var i2 = 0; i2 < entities.length; i2++) { - var entity = entities[i2]; - if (!entity.visible) - continue; - if (head.entities.hasOwnProperty(entity.id) || _bboxes[entity.id]) { - if (!force) { - continue; - } else if (_bboxes[entity.id]) { - removeEntity(entity); - } - } - insertions[entity.id] = entity; - updateParents(entity, insertions, {}); + if (!_cache2) { + this.reset(); } - loadEntities(Object.values(insertions)); - return tree; - }; - function updateToGraph(graph) { - if (graph === head) - return; - var diff = coreDifference(head, graph); - head = graph; - var changed = diff.didChange; - if (!changed.addition && !changed.deletion && !changed.geometry) - return; - var insertions = {}; - if (changed.deletion) { - diff.deleted().forEach(function(entity) { - removeEntity(entity); - }); + this.event = utilRebind(this, dispatch3, "on"); + }, + reset() { + let _strings = {}; + let _colors = {}; + if (_cache2) { + Object.values(_cache2.inflightTile).forEach(abortRequest2); + _strings = _cache2.strings; + _colors = _cache2.colors; } - if (changed.geometry) { - diff.modified().forEach(function(entity) { - removeEntity(entity); - insertions[entity.id] = entity; - updateParents(entity, insertions, {}); + _cache2 = { + data: {}, + loadedTile: {}, + inflightTile: {}, + inflightPost: {}, + closed: {}, + rtree: new RBush(), + strings: _strings, + colors: _colors + }; + }, + loadIssues(projection2) { + let params = { + // Tiles return a maximum # of issues + // So we want to filter our request for only types iD supports + item: _osmoseData.items + }; + let tiles = tiler2.zoomExtent([_tileZoom2, _tileZoom2]).getTiles(projection2); + abortUnwantedRequests2(_cache2, tiles); + tiles.forEach((tile) => { + if (_cache2.loadedTile[tile.id] || _cache2.inflightTile[tile.id]) return; + let [x2, y2, z2] = tile.xyz; + let url = "".concat(_osmoseUrlRoot, "/issues/").concat(z2, "/").concat(x2, "/").concat(y2, ".geojson?") + utilQsString(params); + let controller = new AbortController(); + _cache2.inflightTile[tile.id] = controller; + json_default(url, { signal: controller.signal }).then((data) => { + delete _cache2.inflightTile[tile.id]; + _cache2.loadedTile[tile.id] = true; + if (data.features) { + data.features.forEach((issue) => { + const { item, class: cl, uuid: id2 } = issue.properties; + const itemType = "".concat(item, "-").concat(cl); + if (itemType in _osmoseData.icons) { + let loc = issue.geometry.coordinates; + loc = preventCoincident(loc); + let d2 = new QAItem(loc, this, itemType, id2, { item }); + if (item === 8300 || item === 8360) { + d2.elems = []; + } + _cache2.data[d2.id] = d2; + _cache2.rtree.insert(encodeIssueRtree2(d2)); + } + }); + } + dispatch3.call("loaded"); + }).catch(() => { + delete _cache2.inflightTile[tile.id]; + _cache2.loadedTile[tile.id] = true; }); + }); + }, + loadIssueDetail(issue) { + if (issue.elems !== void 0) { + return Promise.resolve(issue); } - if (changed.addition) { - diff.created().forEach(function(entity) { - insertions[entity.id] = entity; - }); + const url = "".concat(_osmoseUrlRoot, "/issue/").concat(issue.id, "?langs=").concat(_mainLocalizer.localeCode()); + const cacheDetails = (data) => { + issue.elems = data.elems.map((e3) => e3.type.substring(0, 1) + e3.id); + issue.detail = data.subtitle ? marked(data.subtitle.auto) : ""; + this.replaceItem(issue); + }; + return json_default(url).then(cacheDetails).then(() => issue); + }, + loadStrings(locale2 = _mainLocalizer.localeCode()) { + const items = Object.keys(_osmoseData.icons); + if (locale2 in _cache2.strings && Object.keys(_cache2.strings[locale2]).length === items.length) { + return Promise.resolve(_cache2.strings[locale2]); } - loadEntities(Object.values(insertions)); - } - tree.intersects = function(extent, graph) { - updateToGraph(graph); - return _rtree.search(extent.bbox()).map(function(bbox2) { - return graph.entity(bbox2.id); - }); - }; - tree.waySegments = function(extent, graph) { - updateToGraph(graph); - return _segmentsRTree.search(extent.bbox()).map(function(bbox2) { - return bbox2.segment; - }); - }; - return tree; - } - - // modules/svg/icon.js - function svgIcon(name, svgklass, useklass) { - return function drawIcon(selection2) { - selection2.selectAll("svg.icon" + (svgklass ? "." + svgklass.split(" ")[0] : "")).data([0]).enter().append("svg").attr("class", "icon " + (svgklass || "")).append("use").attr("xlink:href", name).attr("class", useklass); - }; - } - - // modules/ui/modal.js - function uiModal(selection2, blocking) { - let keybinding = utilKeybinding("modal"); - let previous = selection2.select("div.modal"); - let animate = previous.empty(); - previous.transition().duration(200).style("opacity", 0).remove(); - let shaded = selection2.append("div").attr("class", "shaded").style("opacity", 0); - shaded.close = () => { - shaded.transition().duration(200).style("opacity", 0).remove(); - modal.transition().duration(200).style("top", "0px"); - select_default2(document).call(keybinding.unbind); - }; - let modal = shaded.append("div").attr("class", "modal fillL"); - modal.append("input").attr("class", "keytrap keytrap-first").on("focus.keytrap", moveFocusToLast); - if (!blocking) { - shaded.on("click.remove-modal", (d3_event) => { - if (d3_event.target === this) { - shaded.close(); + if (!(locale2 in _cache2.strings)) { + _cache2.strings[locale2] = {}; + } + const allRequests = items.map((itemType) => { + if (itemType in _cache2.strings[locale2]) return null; + const cacheData = (data) => { + const [cat = { items: [] }] = data.categories; + const [item2 = { class: [] }] = cat.items; + const [cl2 = null] = item2.class; + if (!cl2) { + console.log("Osmose strings request (".concat(itemType, ") had unexpected data")); + return; + } + const { item: itemInt, color: color2 } = item2; + if (/^#[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3}/.test(color2)) { + _cache2.colors[itemInt] = color2; + } + const { title, detail, fix, trap } = cl2; + let issueStrings = {}; + if (title) issueStrings.title = title.auto; + if (detail) issueStrings.detail = marked(detail.auto); + if (trap) issueStrings.trap = marked(trap.auto); + if (fix) issueStrings.fix = marked(fix.auto); + _cache2.strings[locale2][itemType] = issueStrings; + }; + const [item, cl] = itemType.split("-"); + const url = "".concat(_osmoseUrlRoot, "/items/").concat(item, "/class/").concat(cl, "?langs=").concat(locale2); + return json_default(url).then(cacheData); + }).filter(Boolean); + return Promise.all(allRequests).then(() => _cache2.strings[locale2]); + }, + getStrings(itemType, locale2 = _mainLocalizer.localeCode()) { + return locale2 in _cache2.strings ? _cache2.strings[locale2][itemType] : {}; + }, + getColor(itemType) { + return itemType in _cache2.colors ? _cache2.colors[itemType] : "#FFFFFF"; + }, + postUpdate(issue, callback) { + if (_cache2.inflightPost[issue.id]) { + return callback({ message: "Issue update already inflight", status: -2 }, issue); + } + const url = "".concat(_osmoseUrlRoot, "/issue/").concat(issue.id, "/").concat(issue.newStatus); + const controller = new AbortController(); + const after = () => { + delete _cache2.inflightPost[issue.id]; + this.removeItem(issue); + if (issue.newStatus === "done") { + if (!(issue.item in _cache2.closed)) { + _cache2.closed[issue.item] = 0; + } + _cache2.closed[issue.item] += 1; } + if (callback) callback(null, issue); + }; + _cache2.inflightPost[issue.id] = controller; + fetch(url, { signal: controller.signal }).then(after).catch((err) => { + delete _cache2.inflightPost[issue.id]; + if (callback) callback(err.message); }); - modal.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", shaded.close).call(svgIcon("#iD-icon-close")); - keybinding.on("\u232B", shaded.close).on("\u238B", shaded.close); - select_default2(document).call(keybinding); + }, + // Get all cached QAItems covering the viewport + getItems(projection2) { + const viewport = projection2.clipExtent(); + const min3 = [viewport[0][0], viewport[1][1]]; + const max3 = [viewport[1][0], viewport[0][1]]; + const bbox2 = geoExtent(projection2.invert(min3), projection2.invert(max3)).bbox(); + return _cache2.rtree.search(bbox2).map((d2) => d2.data); + }, + // Get a QAItem from cache + // NOTE: Don't change method name until UI v3 is merged + getError(id2) { + return _cache2.data[id2]; + }, + // get the name of the icon to display for this item + getIcon(itemType) { + return _osmoseData.icons[itemType]; + }, + // Replace a single QAItem in the cache + replaceItem(item) { + if (!(item instanceof QAItem) || !item.id) return; + _cache2.data[item.id] = item; + updateRtree2(encodeIssueRtree2(item), true); + return item; + }, + // Remove a single QAItem from the cache + removeItem(item) { + if (!(item instanceof QAItem) || !item.id) return; + delete _cache2.data[item.id]; + updateRtree2(encodeIssueRtree2(item), false); + }, + // Used to populate `closed:osmose:*` changeset tags + getClosedCounts() { + return _cache2.closed; + }, + itemURL(item) { + return "https://osmose.openstreetmap.fr/en/error/".concat(item.id); } - modal.append("div").attr("class", "content"); - modal.append("input").attr("class", "keytrap keytrap-last").on("focus.keytrap", moveFocusToFirst); - if (animate) { - shaded.transition().style("opacity", 1); - } else { - shaded.style("opacity", 1); + }; + + // node_modules/pbf/index.js + var SHIFT_LEFT_32 = (1 << 16) * (1 << 16); + var SHIFT_RIGHT_32 = 1 / SHIFT_LEFT_32; + var TEXT_DECODER_MIN_LENGTH = 12; + var utf8TextDecoder = typeof TextDecoder === "undefined" ? null : new TextDecoder("utf-8"); + var PBF_VARINT = 0; + var PBF_FIXED64 = 1; + var PBF_BYTES = 2; + var PBF_FIXED32 = 5; + var Pbf = class { + /** + * @param {Uint8Array | ArrayBuffer} [buf] + */ + constructor(buf = new Uint8Array(16)) { + this.buf = ArrayBuffer.isView(buf) ? buf : new Uint8Array(buf); + this.dataView = new DataView(this.buf.buffer); + this.pos = 0; + this.type = 0; + this.length = this.buf.length; + } + // === READING ================================================================= + /** + * @template T + * @param {(tag: number, result: T, pbf: Pbf) => void} readField + * @param {T} result + * @param {number} [end] + */ + readFields(readField, result, end = this.length) { + while (this.pos < end) { + const val = this.readVarint(), tag2 = val >> 3, startPos = this.pos; + this.type = val & 7; + readField(tag2, result, this); + if (this.pos === startPos) this.skip(val); + } + return result; } - return shaded; - function moveFocusToFirst() { - let node = modal.select("a, button, input:not(.keytrap), select, textarea").node(); - if (node) { - node.focus(); - } else { - select_default2(this).node().blur(); + /** + * @template T + * @param {(tag: number, result: T, pbf: Pbf) => void} readField + * @param {T} result + */ + readMessage(readField, result) { + return this.readFields(readField, result, this.readVarint() + this.pos); + } + readFixed32() { + const val = this.dataView.getUint32(this.pos, true); + this.pos += 4; + return val; + } + readSFixed32() { + const val = this.dataView.getInt32(this.pos, true); + this.pos += 4; + return val; + } + // 64-bit int handling is based on github.com/dpw/node-buffer-more-ints (MIT-licensed) + readFixed64() { + const val = this.dataView.getUint32(this.pos, true) + this.dataView.getUint32(this.pos + 4, true) * SHIFT_LEFT_32; + this.pos += 8; + return val; + } + readSFixed64() { + const val = this.dataView.getUint32(this.pos, true) + this.dataView.getInt32(this.pos + 4, true) * SHIFT_LEFT_32; + this.pos += 8; + return val; + } + readFloat() { + const val = this.dataView.getFloat32(this.pos, true); + this.pos += 4; + return val; + } + readDouble() { + const val = this.dataView.getFloat64(this.pos, true); + this.pos += 8; + return val; + } + /** + * @param {boolean} [isSigned] + */ + readVarint(isSigned) { + const buf = this.buf; + let val, b2; + b2 = buf[this.pos++]; + val = b2 & 127; + if (b2 < 128) return val; + b2 = buf[this.pos++]; + val |= (b2 & 127) << 7; + if (b2 < 128) return val; + b2 = buf[this.pos++]; + val |= (b2 & 127) << 14; + if (b2 < 128) return val; + b2 = buf[this.pos++]; + val |= (b2 & 127) << 21; + if (b2 < 128) return val; + b2 = buf[this.pos]; + val |= (b2 & 15) << 28; + return readVarintRemainder(val, isSigned, this); + } + readVarint64() { + return this.readVarint(true); + } + readSVarint() { + const num = this.readVarint(); + return num % 2 === 1 ? (num + 1) / -2 : num / 2; + } + readBoolean() { + return Boolean(this.readVarint()); + } + readString() { + const end = this.readVarint() + this.pos; + const pos = this.pos; + this.pos = end; + if (end - pos >= TEXT_DECODER_MIN_LENGTH && utf8TextDecoder) { + return utf8TextDecoder.decode(this.buf.subarray(pos, end)); + } + return readUtf8(this.buf, pos, end); + } + readBytes() { + const end = this.readVarint() + this.pos, buffer = this.buf.subarray(this.pos, end); + this.pos = end; + return buffer; + } + // verbose for performance reasons; doesn't affect gzipped size + /** + * @param {number[]} [arr] + * @param {boolean} [isSigned] + */ + readPackedVarint(arr = [], isSigned) { + const end = this.readPackedEnd(); + while (this.pos < end) arr.push(this.readVarint(isSigned)); + return arr; + } + /** @param {number[]} [arr] */ + readPackedSVarint(arr = []) { + const end = this.readPackedEnd(); + while (this.pos < end) arr.push(this.readSVarint()); + return arr; + } + /** @param {boolean[]} [arr] */ + readPackedBoolean(arr = []) { + const end = this.readPackedEnd(); + while (this.pos < end) arr.push(this.readBoolean()); + return arr; + } + /** @param {number[]} [arr] */ + readPackedFloat(arr = []) { + const end = this.readPackedEnd(); + while (this.pos < end) arr.push(this.readFloat()); + return arr; + } + /** @param {number[]} [arr] */ + readPackedDouble(arr = []) { + const end = this.readPackedEnd(); + while (this.pos < end) arr.push(this.readDouble()); + return arr; + } + /** @param {number[]} [arr] */ + readPackedFixed32(arr = []) { + const end = this.readPackedEnd(); + while (this.pos < end) arr.push(this.readFixed32()); + return arr; + } + /** @param {number[]} [arr] */ + readPackedSFixed32(arr = []) { + const end = this.readPackedEnd(); + while (this.pos < end) arr.push(this.readSFixed32()); + return arr; + } + /** @param {number[]} [arr] */ + readPackedFixed64(arr = []) { + const end = this.readPackedEnd(); + while (this.pos < end) arr.push(this.readFixed64()); + return arr; + } + /** @param {number[]} [arr] */ + readPackedSFixed64(arr = []) { + const end = this.readPackedEnd(); + while (this.pos < end) arr.push(this.readSFixed64()); + return arr; + } + readPackedEnd() { + return this.type === PBF_BYTES ? this.readVarint() + this.pos : this.pos + 1; + } + /** @param {number} val */ + skip(val) { + const type2 = val & 7; + if (type2 === PBF_VARINT) while (this.buf[this.pos++] > 127) { + } + else if (type2 === PBF_BYTES) this.pos = this.readVarint() + this.pos; + else if (type2 === PBF_FIXED32) this.pos += 4; + else if (type2 === PBF_FIXED64) this.pos += 8; + else throw new Error("Unimplemented type: ".concat(type2)); + } + // === WRITING ================================================================= + /** + * @param {number} tag + * @param {number} type + */ + writeTag(tag2, type2) { + this.writeVarint(tag2 << 3 | type2); + } + /** @param {number} min */ + realloc(min3) { + let length2 = this.length || 16; + while (length2 < this.pos + min3) length2 *= 2; + if (length2 !== this.length) { + const buf = new Uint8Array(length2); + buf.set(this.buf); + this.buf = buf; + this.dataView = new DataView(buf.buffer); + this.length = length2; + } + } + finish() { + this.length = this.pos; + this.pos = 0; + return this.buf.subarray(0, this.length); + } + /** @param {number} val */ + writeFixed32(val) { + this.realloc(4); + this.dataView.setInt32(this.pos, val, true); + this.pos += 4; + } + /** @param {number} val */ + writeSFixed32(val) { + this.realloc(4); + this.dataView.setInt32(this.pos, val, true); + this.pos += 4; + } + /** @param {number} val */ + writeFixed64(val) { + this.realloc(8); + this.dataView.setInt32(this.pos, val & -1, true); + this.dataView.setInt32(this.pos + 4, Math.floor(val * SHIFT_RIGHT_32), true); + this.pos += 8; + } + /** @param {number} val */ + writeSFixed64(val) { + this.realloc(8); + this.dataView.setInt32(this.pos, val & -1, true); + this.dataView.setInt32(this.pos + 4, Math.floor(val * SHIFT_RIGHT_32), true); + this.pos += 8; + } + /** @param {number} val */ + writeVarint(val) { + val = +val || 0; + if (val > 268435455 || val < 0) { + writeBigVarint(val, this); + return; } + this.realloc(4); + this.buf[this.pos++] = val & 127 | (val > 127 ? 128 : 0); + if (val <= 127) return; + this.buf[this.pos++] = (val >>>= 7) & 127 | (val > 127 ? 128 : 0); + if (val <= 127) return; + this.buf[this.pos++] = (val >>>= 7) & 127 | (val > 127 ? 128 : 0); + if (val <= 127) return; + this.buf[this.pos++] = val >>> 7 & 127; + } + /** @param {number} val */ + writeSVarint(val) { + this.writeVarint(val < 0 ? -val * 2 - 1 : val * 2); + } + /** @param {boolean} val */ + writeBoolean(val) { + this.writeVarint(+val); + } + /** @param {string} str */ + writeString(str) { + str = String(str); + this.realloc(str.length * 4); + this.pos++; + const startPos = this.pos; + this.pos = writeUtf8(this.buf, str, this.pos); + const len = this.pos - startPos; + if (len >= 128) makeRoomForExtraLength(startPos, len, this); + this.pos = startPos - 1; + this.writeVarint(len); + this.pos += len; + } + /** @param {number} val */ + writeFloat(val) { + this.realloc(4); + this.dataView.setFloat32(this.pos, val, true); + this.pos += 4; + } + /** @param {number} val */ + writeDouble(val) { + this.realloc(8); + this.dataView.setFloat64(this.pos, val, true); + this.pos += 8; + } + /** @param {Uint8Array} buffer */ + writeBytes(buffer) { + const len = buffer.length; + this.writeVarint(len); + this.realloc(len); + for (let i3 = 0; i3 < len; i3++) this.buf[this.pos++] = buffer[i3]; + } + /** + * @template T + * @param {(obj: T, pbf: Pbf) => void} fn + * @param {T} obj + */ + writeRawMessage(fn, obj) { + this.pos++; + const startPos = this.pos; + fn(obj, this); + const len = this.pos - startPos; + if (len >= 128) makeRoomForExtraLength(startPos, len, this); + this.pos = startPos - 1; + this.writeVarint(len); + this.pos += len; + } + /** + * @template T + * @param {number} tag + * @param {(obj: T, pbf: Pbf) => void} fn + * @param {T} obj + */ + writeMessage(tag2, fn, obj) { + this.writeTag(tag2, PBF_BYTES); + this.writeRawMessage(fn, obj); + } + /** + * @param {number} tag + * @param {number[]} arr + */ + writePackedVarint(tag2, arr) { + if (arr.length) this.writeMessage(tag2, writePackedVarint, arr); + } + /** + * @param {number} tag + * @param {number[]} arr + */ + writePackedSVarint(tag2, arr) { + if (arr.length) this.writeMessage(tag2, writePackedSVarint, arr); + } + /** + * @param {number} tag + * @param {boolean[]} arr + */ + writePackedBoolean(tag2, arr) { + if (arr.length) this.writeMessage(tag2, writePackedBoolean, arr); + } + /** + * @param {number} tag + * @param {number[]} arr + */ + writePackedFloat(tag2, arr) { + if (arr.length) this.writeMessage(tag2, writePackedFloat, arr); + } + /** + * @param {number} tag + * @param {number[]} arr + */ + writePackedDouble(tag2, arr) { + if (arr.length) this.writeMessage(tag2, writePackedDouble, arr); + } + /** + * @param {number} tag + * @param {number[]} arr + */ + writePackedFixed32(tag2, arr) { + if (arr.length) this.writeMessage(tag2, writePackedFixed32, arr); + } + /** + * @param {number} tag + * @param {number[]} arr + */ + writePackedSFixed32(tag2, arr) { + if (arr.length) this.writeMessage(tag2, writePackedSFixed32, arr); + } + /** + * @param {number} tag + * @param {number[]} arr + */ + writePackedFixed64(tag2, arr) { + if (arr.length) this.writeMessage(tag2, writePackedFixed64, arr); + } + /** + * @param {number} tag + * @param {number[]} arr + */ + writePackedSFixed64(tag2, arr) { + if (arr.length) this.writeMessage(tag2, writePackedSFixed64, arr); + } + /** + * @param {number} tag + * @param {Uint8Array} buffer + */ + writeBytesField(tag2, buffer) { + this.writeTag(tag2, PBF_BYTES); + this.writeBytes(buffer); + } + /** + * @param {number} tag + * @param {number} val + */ + writeFixed32Field(tag2, val) { + this.writeTag(tag2, PBF_FIXED32); + this.writeFixed32(val); + } + /** + * @param {number} tag + * @param {number} val + */ + writeSFixed32Field(tag2, val) { + this.writeTag(tag2, PBF_FIXED32); + this.writeSFixed32(val); + } + /** + * @param {number} tag + * @param {number} val + */ + writeFixed64Field(tag2, val) { + this.writeTag(tag2, PBF_FIXED64); + this.writeFixed64(val); + } + /** + * @param {number} tag + * @param {number} val + */ + writeSFixed64Field(tag2, val) { + this.writeTag(tag2, PBF_FIXED64); + this.writeSFixed64(val); + } + /** + * @param {number} tag + * @param {number} val + */ + writeVarintField(tag2, val) { + this.writeTag(tag2, PBF_VARINT); + this.writeVarint(val); + } + /** + * @param {number} tag + * @param {number} val + */ + writeSVarintField(tag2, val) { + this.writeTag(tag2, PBF_VARINT); + this.writeSVarint(val); + } + /** + * @param {number} tag + * @param {string} str + */ + writeStringField(tag2, str) { + this.writeTag(tag2, PBF_BYTES); + this.writeString(str); + } + /** + * @param {number} tag + * @param {number} val + */ + writeFloatField(tag2, val) { + this.writeTag(tag2, PBF_FIXED32); + this.writeFloat(val); + } + /** + * @param {number} tag + * @param {number} val + */ + writeDoubleField(tag2, val) { + this.writeTag(tag2, PBF_FIXED64); + this.writeDouble(val); + } + /** + * @param {number} tag + * @param {boolean} val + */ + writeBooleanField(tag2, val) { + this.writeVarintField(tag2, +val); } - function moveFocusToLast() { - let nodes = modal.selectAll("a, button, input:not(.keytrap), select, textarea").nodes(); - if (nodes.length) { - nodes[nodes.length - 1].focus(); + }; + function readVarintRemainder(l2, s2, p2) { + const buf = p2.buf; + let h2, b2; + b2 = buf[p2.pos++]; + h2 = (b2 & 112) >> 4; + if (b2 < 128) return toNum(l2, h2, s2); + b2 = buf[p2.pos++]; + h2 |= (b2 & 127) << 3; + if (b2 < 128) return toNum(l2, h2, s2); + b2 = buf[p2.pos++]; + h2 |= (b2 & 127) << 10; + if (b2 < 128) return toNum(l2, h2, s2); + b2 = buf[p2.pos++]; + h2 |= (b2 & 127) << 17; + if (b2 < 128) return toNum(l2, h2, s2); + b2 = buf[p2.pos++]; + h2 |= (b2 & 127) << 24; + if (b2 < 128) return toNum(l2, h2, s2); + b2 = buf[p2.pos++]; + h2 |= (b2 & 1) << 31; + if (b2 < 128) return toNum(l2, h2, s2); + throw new Error("Expected varint not more than 10 bytes"); + } + function toNum(low, high, isSigned) { + return isSigned ? high * 4294967296 + (low >>> 0) : (high >>> 0) * 4294967296 + (low >>> 0); + } + function writeBigVarint(val, pbf) { + let low, high; + if (val >= 0) { + low = val % 4294967296 | 0; + high = val / 4294967296 | 0; + } else { + low = ~(-val % 4294967296); + high = ~(-val / 4294967296); + if (low ^ 4294967295) { + low = low + 1 | 0; } else { - select_default2(this).node().blur(); + low = 0; + high = high + 1 | 0; + } + } + if (val >= 18446744073709552e3 || val < -18446744073709552e3) { + throw new Error("Given varint doesn't fit into 10 bytes"); + } + pbf.realloc(10); + writeBigVarintLow(low, high, pbf); + writeBigVarintHigh(high, pbf); + } + function writeBigVarintLow(low, high, pbf) { + pbf.buf[pbf.pos++] = low & 127 | 128; + low >>>= 7; + pbf.buf[pbf.pos++] = low & 127 | 128; + low >>>= 7; + pbf.buf[pbf.pos++] = low & 127 | 128; + low >>>= 7; + pbf.buf[pbf.pos++] = low & 127 | 128; + low >>>= 7; + pbf.buf[pbf.pos] = low & 127; + } + function writeBigVarintHigh(high, pbf) { + const lsb = (high & 7) << 4; + pbf.buf[pbf.pos++] |= lsb | ((high >>>= 3) ? 128 : 0); + if (!high) return; + pbf.buf[pbf.pos++] = high & 127 | ((high >>>= 7) ? 128 : 0); + if (!high) return; + pbf.buf[pbf.pos++] = high & 127 | ((high >>>= 7) ? 128 : 0); + if (!high) return; + pbf.buf[pbf.pos++] = high & 127 | ((high >>>= 7) ? 128 : 0); + if (!high) return; + pbf.buf[pbf.pos++] = high & 127 | ((high >>>= 7) ? 128 : 0); + if (!high) return; + pbf.buf[pbf.pos++] = high & 127; + } + function makeRoomForExtraLength(startPos, len, pbf) { + const extraLen = len <= 16383 ? 1 : len <= 2097151 ? 2 : len <= 268435455 ? 3 : Math.floor(Math.log(len) / (Math.LN2 * 7)); + pbf.realloc(extraLen); + for (let i3 = pbf.pos - 1; i3 >= startPos; i3--) pbf.buf[i3 + extraLen] = pbf.buf[i3]; + } + function writePackedVarint(arr, pbf) { + for (let i3 = 0; i3 < arr.length; i3++) pbf.writeVarint(arr[i3]); + } + function writePackedSVarint(arr, pbf) { + for (let i3 = 0; i3 < arr.length; i3++) pbf.writeSVarint(arr[i3]); + } + function writePackedFloat(arr, pbf) { + for (let i3 = 0; i3 < arr.length; i3++) pbf.writeFloat(arr[i3]); + } + function writePackedDouble(arr, pbf) { + for (let i3 = 0; i3 < arr.length; i3++) pbf.writeDouble(arr[i3]); + } + function writePackedBoolean(arr, pbf) { + for (let i3 = 0; i3 < arr.length; i3++) pbf.writeBoolean(arr[i3]); + } + function writePackedFixed32(arr, pbf) { + for (let i3 = 0; i3 < arr.length; i3++) pbf.writeFixed32(arr[i3]); + } + function writePackedSFixed32(arr, pbf) { + for (let i3 = 0; i3 < arr.length; i3++) pbf.writeSFixed32(arr[i3]); + } + function writePackedFixed64(arr, pbf) { + for (let i3 = 0; i3 < arr.length; i3++) pbf.writeFixed64(arr[i3]); + } + function writePackedSFixed64(arr, pbf) { + for (let i3 = 0; i3 < arr.length; i3++) pbf.writeSFixed64(arr[i3]); + } + function readUtf8(buf, pos, end) { + let str = ""; + let i3 = pos; + while (i3 < end) { + const b0 = buf[i3]; + let c2 = null; + let bytesPerSequence = b0 > 239 ? 4 : b0 > 223 ? 3 : b0 > 191 ? 2 : 1; + if (i3 + bytesPerSequence > end) break; + let b1, b2, b3; + if (bytesPerSequence === 1) { + if (b0 < 128) { + c2 = b0; + } + } else if (bytesPerSequence === 2) { + b1 = buf[i3 + 1]; + if ((b1 & 192) === 128) { + c2 = (b0 & 31) << 6 | b1 & 63; + if (c2 <= 127) { + c2 = null; + } + } + } else if (bytesPerSequence === 3) { + b1 = buf[i3 + 1]; + b2 = buf[i3 + 2]; + if ((b1 & 192) === 128 && (b2 & 192) === 128) { + c2 = (b0 & 15) << 12 | (b1 & 63) << 6 | b2 & 63; + if (c2 <= 2047 || c2 >= 55296 && c2 <= 57343) { + c2 = null; + } + } + } else if (bytesPerSequence === 4) { + b1 = buf[i3 + 1]; + b2 = buf[i3 + 2]; + b3 = buf[i3 + 3]; + if ((b1 & 192) === 128 && (b2 & 192) === 128 && (b3 & 192) === 128) { + c2 = (b0 & 15) << 18 | (b1 & 63) << 12 | (b2 & 63) << 6 | b3 & 63; + if (c2 <= 65535 || c2 >= 1114112) { + c2 = null; + } + } + } + if (c2 === null) { + c2 = 65533; + bytesPerSequence = 1; + } else if (c2 > 65535) { + c2 -= 65536; + str += String.fromCharCode(c2 >>> 10 & 1023 | 55296); + c2 = 56320 | c2 & 1023; + } + str += String.fromCharCode(c2); + i3 += bytesPerSequence; + } + return str; + } + function writeUtf8(buf, str, pos) { + for (let i3 = 0, c2, lead; i3 < str.length; i3++) { + c2 = str.charCodeAt(i3); + if (c2 > 55295 && c2 < 57344) { + if (lead) { + if (c2 < 56320) { + buf[pos++] = 239; + buf[pos++] = 191; + buf[pos++] = 189; + lead = c2; + continue; + } else { + c2 = lead - 55296 << 10 | c2 - 56320 | 65536; + lead = null; + } + } else { + if (c2 > 56319 || i3 + 1 === str.length) { + buf[pos++] = 239; + buf[pos++] = 191; + buf[pos++] = 189; + } else { + lead = c2; + } + continue; + } + } else if (lead) { + buf[pos++] = 239; + buf[pos++] = 191; + buf[pos++] = 189; + lead = null; + } + if (c2 < 128) { + buf[pos++] = c2; + } else { + if (c2 < 2048) { + buf[pos++] = c2 >> 6 | 192; + } else { + if (c2 < 65536) { + buf[pos++] = c2 >> 12 | 224; + } else { + buf[pos++] = c2 >> 18 | 240; + buf[pos++] = c2 >> 12 & 63 | 128; + } + buf[pos++] = c2 >> 6 & 63 | 128; + } + buf[pos++] = c2 & 63 | 128; } } + return pos; } - // modules/ui/loading.js - function uiLoading(context) { - let _modalSelection = select_default2(null); - let _message = ""; - let _blocking = false; - let loading = (selection2) => { - _modalSelection = uiModal(selection2, _blocking); - let loadertext = _modalSelection.select(".content").classed("loading-modal", true).append("div").attr("class", "modal-section fillL"); - loadertext.append("img").attr("class", "loader").attr("src", context.imagePath("loader-white.gif")); - loadertext.append("h3").html(_message); - _modalSelection.select("button.close").attr("class", "hide"); - return loading; - }; - loading.message = function(val) { - if (!arguments.length) - return _message; - _message = val; - return loading; - }; - loading.blocking = function(val) { - if (!arguments.length) - return _blocking; - _blocking = val; - return loading; - }; - loading.close = () => { - _modalSelection.remove(); - }; - loading.isShown = () => { - return _modalSelection && !_modalSelection.empty() && _modalSelection.node().parentNode; - }; - return loading; - } + // node_modules/@mapbox/point-geometry/index.js + function Point(x2, y2) { + this.x = x2; + this.y = y2; + } + Point.prototype = { + /** + * Clone this point, returning a new point that can be modified + * without affecting the old one. + * @return {Point} the clone + */ + clone() { + return new Point(this.x, this.y); + }, + /** + * Add this point's x & y coordinates to another point, + * yielding a new point. + * @param {Point} p the other point + * @return {Point} output point + */ + add(p2) { + return this.clone()._add(p2); + }, + /** + * Subtract this point's x & y coordinates to from point, + * yielding a new point. + * @param {Point} p the other point + * @return {Point} output point + */ + sub(p2) { + return this.clone()._sub(p2); + }, + /** + * Multiply this point's x & y coordinates by point, + * yielding a new point. + * @param {Point} p the other point + * @return {Point} output point + */ + multByPoint(p2) { + return this.clone()._multByPoint(p2); + }, + /** + * Divide this point's x & y coordinates by point, + * yielding a new point. + * @param {Point} p the other point + * @return {Point} output point + */ + divByPoint(p2) { + return this.clone()._divByPoint(p2); + }, + /** + * Multiply this point's x & y coordinates by a factor, + * yielding a new point. + * @param {number} k factor + * @return {Point} output point + */ + mult(k2) { + return this.clone()._mult(k2); + }, + /** + * Divide this point's x & y coordinates by a factor, + * yielding a new point. + * @param {number} k factor + * @return {Point} output point + */ + div(k2) { + return this.clone()._div(k2); + }, + /** + * Rotate this point around the 0, 0 origin by an angle a, + * given in radians + * @param {number} a angle to rotate around, in radians + * @return {Point} output point + */ + rotate(a2) { + return this.clone()._rotate(a2); + }, + /** + * Rotate this point around p point by an angle a, + * given in radians + * @param {number} a angle to rotate around, in radians + * @param {Point} p Point to rotate around + * @return {Point} output point + */ + rotateAround(a2, p2) { + return this.clone()._rotateAround(a2, p2); + }, + /** + * Multiply this point by a 4x1 transformation matrix + * @param {[number, number, number, number]} m transformation matrix + * @return {Point} output point + */ + matMult(m2) { + return this.clone()._matMult(m2); + }, + /** + * Calculate this point but as a unit vector from 0, 0, meaning + * that the distance from the resulting point to the 0, 0 + * coordinate will be equal to 1 and the angle from the resulting + * point to the 0, 0 coordinate will be the same as before. + * @return {Point} unit vector point + */ + unit() { + return this.clone()._unit(); + }, + /** + * Compute a perpendicular point, where the new y coordinate + * is the old x coordinate and the new x coordinate is the old y + * coordinate multiplied by -1 + * @return {Point} perpendicular point + */ + perp() { + return this.clone()._perp(); + }, + /** + * Return a version of this point with the x & y coordinates + * rounded to integers. + * @return {Point} rounded point + */ + round() { + return this.clone()._round(); + }, + /** + * Return the magnitude of this point: this is the Euclidean + * distance from the 0, 0 coordinate to this point's x and y + * coordinates. + * @return {number} magnitude + */ + mag() { + return Math.sqrt(this.x * this.x + this.y * this.y); + }, + /** + * Judge whether this point is equal to another point, returning + * true or false. + * @param {Point} other the other point + * @return {boolean} whether the points are equal + */ + equals(other) { + return this.x === other.x && this.y === other.y; + }, + /** + * Calculate the distance from this point to another point + * @param {Point} p the other point + * @return {number} distance + */ + dist(p2) { + return Math.sqrt(this.distSqr(p2)); + }, + /** + * Calculate the distance from this point to another point, + * without the square root step. Useful if you're comparing + * relative distances. + * @param {Point} p the other point + * @return {number} distance + */ + distSqr(p2) { + const dx = p2.x - this.x, dy = p2.y - this.y; + return dx * dx + dy * dy; + }, + /** + * Get the angle from the 0, 0 coordinate to this point, in radians + * coordinates. + * @return {number} angle + */ + angle() { + return Math.atan2(this.y, this.x); + }, + /** + * Get the angle from this point to another point, in radians + * @param {Point} b the other point + * @return {number} angle + */ + angleTo(b2) { + return Math.atan2(this.y - b2.y, this.x - b2.x); + }, + /** + * Get the angle between this point and another point, in radians + * @param {Point} b the other point + * @return {number} angle + */ + angleWith(b2) { + return this.angleWithSep(b2.x, b2.y); + }, + /** + * Find the angle of the two vectors, solving the formula for + * the cross product a x b = |a||b|sin(θ) for θ. + * @param {number} x the x-coordinate + * @param {number} y the y-coordinate + * @return {number} the angle in radians + */ + angleWithSep(x2, y2) { + return Math.atan2( + this.x * y2 - this.y * x2, + this.x * x2 + this.y * y2 + ); + }, + /** @param {[number, number, number, number]} m */ + _matMult(m2) { + const x2 = m2[0] * this.x + m2[1] * this.y, y2 = m2[2] * this.x + m2[3] * this.y; + this.x = x2; + this.y = y2; + return this; + }, + /** @param {Point} p */ + _add(p2) { + this.x += p2.x; + this.y += p2.y; + return this; + }, + /** @param {Point} p */ + _sub(p2) { + this.x -= p2.x; + this.y -= p2.y; + return this; + }, + /** @param {number} k */ + _mult(k2) { + this.x *= k2; + this.y *= k2; + return this; + }, + /** @param {number} k */ + _div(k2) { + this.x /= k2; + this.y /= k2; + return this; + }, + /** @param {Point} p */ + _multByPoint(p2) { + this.x *= p2.x; + this.y *= p2.y; + return this; + }, + /** @param {Point} p */ + _divByPoint(p2) { + this.x /= p2.x; + this.y /= p2.y; + return this; + }, + _unit() { + this._div(this.mag()); + return this; + }, + _perp() { + const y2 = this.y; + this.y = this.x; + this.x = -y2; + return this; + }, + /** @param {number} angle */ + _rotate(angle2) { + const cos2 = Math.cos(angle2), sin2 = Math.sin(angle2), x2 = cos2 * this.x - sin2 * this.y, y2 = sin2 * this.x + cos2 * this.y; + this.x = x2; + this.y = y2; + return this; + }, + /** + * @param {number} angle + * @param {Point} p + */ + _rotateAround(angle2, p2) { + const cos2 = Math.cos(angle2), sin2 = Math.sin(angle2), x2 = p2.x + cos2 * (this.x - p2.x) - sin2 * (this.y - p2.y), y2 = p2.y + sin2 * (this.x - p2.x) + cos2 * (this.y - p2.y); + this.x = x2; + this.y = y2; + return this; + }, + _round() { + this.x = Math.round(this.x); + this.y = Math.round(this.y); + return this; + }, + constructor: Point + }; + Point.convert = function(p2) { + if (p2 instanceof Point) { + return ( + /** @type {Point} */ + p2 + ); + } + if (Array.isArray(p2)) { + return new Point(+p2[0], +p2[1]); + } + if (p2.x !== void 0 && p2.y !== void 0) { + return new Point(+p2.x, +p2.y); + } + throw new Error("Expected [x, y] or {x, y} point format"); + }; - // modules/core/history.js - function coreHistory(context) { - var dispatch10 = dispatch_default("reset", "change", "merge", "restore", "undone", "redone", "storage_error"); - var lock = utilSessionMutex("lock"); - var _hasUnresolvedRestorableChanges = lock.lock() && !!corePreferences(getKey("saved_history")); - var duration = 150; - var _imageryUsed = []; - var _photoOverlaysUsed = []; - var _checkpoints = {}; - var _pausedGraph; - var _stack; - var _index; - var _tree; - function _act(actions, t) { - actions = Array.prototype.slice.call(actions); - var annotation; - if (typeof actions[actions.length - 1] !== "function") { - annotation = actions.pop(); + // node_modules/@mapbox/vector-tile/index.js + var VectorTileFeature = class { + /** + * @param {Pbf} pbf + * @param {number} end + * @param {number} extent + * @param {string[]} keys + * @param {unknown[]} values + */ + constructor(pbf, end, extent, keys2, values) { + this.properties = {}; + this.extent = extent; + this.type = 0; + this.id = void 0; + this._pbf = pbf; + this._geometry = -1; + this._keys = keys2; + this._values = values; + pbf.readFields(readFeature, this, end); + } + loadGeometry() { + const pbf = this._pbf; + pbf.pos = this._geometry; + const end = pbf.readVarint() + pbf.pos; + const lines = []; + let line; + let cmd = 1; + let length2 = 0; + let x2 = 0; + let y2 = 0; + while (pbf.pos < end) { + if (length2 <= 0) { + const cmdLen = pbf.readVarint(); + cmd = cmdLen & 7; + length2 = cmdLen >> 3; + } + length2--; + if (cmd === 1 || cmd === 2) { + x2 += pbf.readSVarint(); + y2 += pbf.readSVarint(); + if (cmd === 1) { + if (line) lines.push(line); + line = []; + } + if (line) line.push(new Point(x2, y2)); + } else if (cmd === 7) { + if (line) { + line.push(line[0].clone()); + } + } else { + throw new Error("unknown command ".concat(cmd)); + } + } + if (line) lines.push(line); + return lines; + } + bbox() { + const pbf = this._pbf; + pbf.pos = this._geometry; + const end = pbf.readVarint() + pbf.pos; + let cmd = 1, length2 = 0, x2 = 0, y2 = 0, x12 = Infinity, x22 = -Infinity, y12 = Infinity, y22 = -Infinity; + while (pbf.pos < end) { + if (length2 <= 0) { + const cmdLen = pbf.readVarint(); + cmd = cmdLen & 7; + length2 = cmdLen >> 3; + } + length2--; + if (cmd === 1 || cmd === 2) { + x2 += pbf.readSVarint(); + y2 += pbf.readSVarint(); + if (x2 < x12) x12 = x2; + if (x2 > x22) x22 = x2; + if (y2 < y12) y12 = y2; + if (y2 > y22) y22 = y2; + } else if (cmd !== 7) { + throw new Error("unknown command ".concat(cmd)); + } + } + return [x12, y12, x22, y22]; + } + /** + * @param {number} x + * @param {number} y + * @param {number} z + * @return {Feature} + */ + toGeoJSON(x2, y2, z2) { + const size = this.extent * Math.pow(2, z2), x05 = this.extent * x2, y05 = this.extent * y2, vtCoords = this.loadGeometry(); + function projectPoint(p2) { + return [ + (p2.x + x05) * 360 / size - 180, + 360 / Math.PI * Math.atan(Math.exp((1 - (p2.y + y05) * 2 / size) * Math.PI)) - 90 + ]; } - var graph = _stack[_index].graph; - for (var i2 = 0; i2 < actions.length; i2++) { - graph = actions[i2](graph, t); + function projectLine(line) { + return line.map(projectPoint); + } + let geometry; + if (this.type === 1) { + const points = []; + for (const line of vtCoords) { + points.push(line[0]); + } + const coordinates = projectLine(points); + geometry = points.length === 1 ? { type: "Point", coordinates: coordinates[0] } : { type: "MultiPoint", coordinates }; + } else if (this.type === 2) { + const coordinates = vtCoords.map(projectLine); + geometry = coordinates.length === 1 ? { type: "LineString", coordinates: coordinates[0] } : { type: "MultiLineString", coordinates }; + } else if (this.type === 3) { + const polygons = classifyRings(vtCoords); + const coordinates = []; + for (const polygon2 of polygons) { + coordinates.push(polygon2.map(projectLine)); + } + geometry = coordinates.length === 1 ? { type: "Polygon", coordinates: coordinates[0] } : { type: "MultiPolygon", coordinates }; + } else { + throw new Error("unknown feature type"); } - return { - graph, - annotation, - imageryUsed: _imageryUsed, - photoOverlaysUsed: _photoOverlaysUsed, - transform: context.projection.transform(), - selectedIDs: context.selectedIDs() + const result = { + type: "Feature", + geometry, + properties: this.properties }; + if (this.id != null) { + result.id = this.id; + } + return result; } - function _perform(args, t) { - var previous = _stack[_index].graph; - _stack = _stack.slice(0, _index + 1); - var actionResult = _act(args, t); - _stack.push(actionResult); - _index++; - return change(previous); + }; + VectorTileFeature.types = ["Unknown", "Point", "LineString", "Polygon"]; + function readFeature(tag2, feature3, pbf) { + if (tag2 === 1) feature3.id = pbf.readVarint(); + else if (tag2 === 2) readTag(pbf, feature3); + else if (tag2 === 3) feature3.type = /** @type {0 | 1 | 2 | 3} */ + pbf.readVarint(); + else if (tag2 === 4) feature3._geometry = pbf.pos; + } + function readTag(pbf, feature3) { + const end = pbf.readVarint() + pbf.pos; + while (pbf.pos < end) { + const key = feature3._keys[pbf.readVarint()], value = feature3._values[pbf.readVarint()]; + feature3.properties[key] = value; + } + } + function classifyRings(rings) { + const len = rings.length; + if (len <= 1) return [rings]; + const polygons = []; + let polygon2, ccw; + for (let i3 = 0; i3 < len; i3++) { + const area = signedArea(rings[i3]); + if (area === 0) continue; + if (ccw === void 0) ccw = area < 0; + if (ccw === area < 0) { + if (polygon2) polygons.push(polygon2); + polygon2 = [rings[i3]]; + } else if (polygon2) { + polygon2.push(rings[i3]); + } + } + if (polygon2) polygons.push(polygon2); + return polygons; + } + function signedArea(ring) { + let sum = 0; + for (let i3 = 0, len = ring.length, j2 = len - 1, p1, p2; i3 < len; j2 = i3++) { + p1 = ring[i3]; + p2 = ring[j2]; + sum += (p2.x - p1.x) * (p1.y + p2.y); + } + return sum; + } + var VectorTileLayer = class { + /** + * @param {Pbf} pbf + * @param {number} [end] + */ + constructor(pbf, end) { + this.version = 1; + this.name = ""; + this.extent = 4096; + this.length = 0; + this._pbf = pbf; + this._keys = []; + this._values = []; + this._features = []; + pbf.readFields(readLayer, this, end); + this.length = this._features.length; + } + /** return feature `i` from this layer as a `VectorTileFeature` + * @param {number} i + */ + feature(i3) { + if (i3 < 0 || i3 >= this._features.length) throw new Error("feature index out of bounds"); + this._pbf.pos = this._features[i3]; + const end = this._pbf.readVarint() + this._pbf.pos; + return new VectorTileFeature(this._pbf, end, this.extent, this._keys, this._values); } - function _replace(args, t) { - var previous = _stack[_index].graph; - var actionResult = _act(args, t); - _stack[_index] = actionResult; - return change(previous); + }; + function readLayer(tag2, layer, pbf) { + if (tag2 === 15) layer.version = pbf.readVarint(); + else if (tag2 === 1) layer.name = pbf.readString(); + else if (tag2 === 5) layer.extent = pbf.readVarint(); + else if (tag2 === 2) layer._features.push(pbf.pos); + else if (tag2 === 3) layer._keys.push(pbf.readString()); + else if (tag2 === 4) layer._values.push(readValueMessage(pbf)); + } + function readValueMessage(pbf) { + let value = null; + const end = pbf.readVarint() + pbf.pos; + while (pbf.pos < end) { + const tag2 = pbf.readVarint() >> 3; + value = tag2 === 1 ? pbf.readString() : tag2 === 2 ? pbf.readFloat() : tag2 === 3 ? pbf.readDouble() : tag2 === 4 ? pbf.readVarint64() : tag2 === 5 ? pbf.readVarint() : tag2 === 6 ? pbf.readSVarint() : tag2 === 7 ? pbf.readBoolean() : null; } - function _overwrite(args, t) { - var previous = _stack[_index].graph; - if (_index > 0) { - _index--; - _stack.pop(); + return value; + } + var VectorTile = class { + /** + * @param {Pbf} pbf + * @param {number} [end] + */ + constructor(pbf, end) { + this.layers = pbf.readFields(readTile, {}, end); + } + }; + function readTile(tag2, layers, pbf) { + if (tag2 === 3) { + const layer = new VectorTileLayer(pbf, pbf.readVarint() + pbf.pos); + if (layer.length) layers[layer.name] = layer; + } + } + + // modules/services/mapillary.js + var accessToken = "MLY|4100327730013843|5bb78b81720791946a9a7b956c57b7cf"; + var apiUrl = "https://graph.mapillary.com/"; + var baseTileUrl = "https://tiles.mapillary.com/maps/vtp"; + var mapFeatureTileUrl = "".concat(baseTileUrl, "/mly_map_feature_point/2/{z}/{x}/{y}?access_token=").concat(accessToken); + var tileUrl = "".concat(baseTileUrl, "/mly1_public/2/{z}/{x}/{y}?access_token=").concat(accessToken); + var trafficSignTileUrl = "".concat(baseTileUrl, "/mly_map_feature_traffic_sign/2/{z}/{x}/{y}?access_token=").concat(accessToken); + var viewercss = "mapillary-js/mapillary.css"; + var viewerjs = "mapillary-js/mapillary.js"; + var minZoom = 14; + var dispatch4 = dispatch_default("change", "loadedImages", "loadedSigns", "loadedMapFeatures", "bearingChanged", "imageChanged"); + var _loadViewerPromise; + var _mlyActiveImage; + var _mlyCache; + var _mlyFallback = false; + var _mlyHighlightedDetection; + var _mlyShowFeatureDetections = false; + var _mlyShowSignDetections = false; + var _mlyViewer; + var _mlyViewerFilter = ["all"]; + var _isViewerOpen = false; + function loadTiles(which, url, maxZoom2, projection2) { + const tiler8 = utilTiler().zoomExtent([minZoom, maxZoom2]).skipNullIsland(true); + const tiles = tiler8.getTiles(projection2); + tiles.forEach(function(tile) { + loadTile(which, url, tile); + }); + } + function loadTile(which, url, tile) { + const cache = _mlyCache.requests; + const tileId = "".concat(tile.id, "-").concat(which); + if (cache.loaded[tileId] || cache.inflight[tileId]) return; + const controller = new AbortController(); + cache.inflight[tileId] = controller; + const requestUrl = url.replace("{x}", tile.xyz[0]).replace("{y}", tile.xyz[1]).replace("{z}", tile.xyz[2]); + fetch(requestUrl, { signal: controller.signal }).then(function(response) { + if (!response.ok) { + throw new Error(response.status + " " + response.statusText); + } + cache.loaded[tileId] = true; + delete cache.inflight[tileId]; + return response.arrayBuffer(); + }).then(function(data) { + if (!data) { + throw new Error("No Data"); + } + loadTileDataToCache(data, tile, which); + if (which === "images") { + dispatch4.call("loadedImages"); + } else if (which === "signs") { + dispatch4.call("loadedSigns"); + } else if (which === "points") { + dispatch4.call("loadedMapFeatures"); + } + }).catch(function() { + cache.loaded[tileId] = true; + delete cache.inflight[tileId]; + }); + } + function loadTileDataToCache(data, tile, which) { + const vectorTile = new VectorTile(new Pbf(data)); + let features, cache, layer, i3, feature3, loc, d2; + if (vectorTile.layers.hasOwnProperty("image")) { + features = []; + cache = _mlyCache.images; + layer = vectorTile.layers.image; + for (i3 = 0; i3 < layer.length; i3++) { + feature3 = layer.feature(i3).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]); + loc = feature3.geometry.coordinates; + d2 = { + loc, + captured_at: feature3.properties.captured_at, + ca: feature3.properties.compass_angle, + id: feature3.properties.id, + is_pano: feature3.properties.is_pano, + sequence_id: feature3.properties.sequence_id + }; + cache.forImageId[d2.id] = d2; + features.push({ + minX: loc[0], + minY: loc[1], + maxX: loc[0], + maxY: loc[1], + data: d2 + }); + } + if (cache.rtree) { + cache.rtree.load(features); } - _stack = _stack.slice(0, _index + 1); - var actionResult = _act(args, t); - _stack.push(actionResult); - _index++; - return change(previous); } - function change(previous) { - var difference = coreDifference(previous, history.graph()); - if (!_pausedGraph) { - dispatch10.call("change", this, difference); + if (vectorTile.layers.hasOwnProperty("sequence")) { + features = []; + cache = _mlyCache.sequences; + layer = vectorTile.layers.sequence; + for (i3 = 0; i3 < layer.length; i3++) { + feature3 = layer.feature(i3).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]); + if (cache.lineString[feature3.properties.id]) { + cache.lineString[feature3.properties.id].push(feature3); + } else { + cache.lineString[feature3.properties.id] = [feature3]; + } + } + } + if (vectorTile.layers.hasOwnProperty("point")) { + features = []; + cache = _mlyCache[which]; + layer = vectorTile.layers.point; + for (i3 = 0; i3 < layer.length; i3++) { + feature3 = layer.feature(i3).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]); + loc = feature3.geometry.coordinates; + d2 = { + loc, + id: feature3.properties.id, + first_seen_at: feature3.properties.first_seen_at, + last_seen_at: feature3.properties.last_seen_at, + value: feature3.properties.value + }; + features.push({ + minX: loc[0], + minY: loc[1], + maxX: loc[0], + maxY: loc[1], + data: d2 + }); + } + if (cache.rtree) { + cache.rtree.load(features); } - return difference; } - function getKey(n2) { - return "iD_" + window.location.origin + "_" + n2; + if (vectorTile.layers.hasOwnProperty("traffic_sign")) { + features = []; + cache = _mlyCache[which]; + layer = vectorTile.layers.traffic_sign; + for (i3 = 0; i3 < layer.length; i3++) { + feature3 = layer.feature(i3).toGeoJSON(tile.xyz[0], tile.xyz[1], tile.xyz[2]); + loc = feature3.geometry.coordinates; + d2 = { + loc, + id: feature3.properties.id, + first_seen_at: feature3.properties.first_seen_at, + last_seen_at: feature3.properties.last_seen_at, + value: feature3.properties.value + }; + features.push({ + minX: loc[0], + minY: loc[1], + maxX: loc[0], + maxY: loc[1], + data: d2 + }); + } + if (cache.rtree) { + cache.rtree.load(features); + } } - var history = { - graph: function() { - return _stack[_index].graph; - }, - tree: function() { - return _tree; - }, - base: function() { - return _stack[0].graph; - }, - merge: function(entities) { - var stack = _stack.map(function(state) { - return state.graph; + } + function loadData(url) { + return fetch(url).then(function(response) { + if (!response.ok) { + throw new Error(response.status + " " + response.statusText); + } + return response.json(); + }).then(function(result) { + if (!result) { + return []; + } + return result.data || []; + }); + } + function partitionViewport(projection2) { + const z2 = geoScaleToZoom(projection2.scale()); + const z22 = Math.ceil(z2 * 2) / 2 + 2.5; + const tiler8 = utilTiler().zoomExtent([z22, z22]); + return tiler8.getTiles(projection2).map(function(tile) { + return tile.extent; + }); + } + function searchLimited(limit, projection2, rtree) { + limit = limit || 5; + return partitionViewport(projection2).reduce(function(result, extent) { + const found = rtree.search(extent.bbox()).slice(0, limit).map(function(d2) { + return d2.data; + }); + return found.length ? result.concat(found) : result; + }, []); + } + var mapillary_default = { + // Initialize Mapillary + init: function() { + if (!_mlyCache) { + this.reset(); + } + this.event = utilRebind(this, dispatch4, "on"); + }, + // Reset cache and state + reset: function() { + if (_mlyCache) { + Object.values(_mlyCache.requests.inflight).forEach(function(request3) { + request3.abort(); }); - _stack[0].graph.rebase(entities, stack, false); - _tree.rebase(entities, false); - dispatch10.call("merge", this, entities); - }, - perform: function() { - select_default2(document).interrupt("history.perform"); - var transitionable = false; - var action0 = arguments[0]; - if (arguments.length === 1 || arguments.length === 2 && typeof arguments[1] !== "function") { - transitionable = !!action0.transitionable; - } - if (transitionable) { - var origArguments = arguments; - select_default2(document).transition("history.perform").duration(duration).ease(linear2).tween("history.tween", function() { - return function(t) { - if (t < 1) - _overwrite([action0], t); - }; - }).on("start", function() { - _perform([action0], 0); - }).on("end interrupt", function() { - _overwrite(origArguments, 1); - }); - } else { - return _perform(arguments); + } + _mlyCache = { + images: { rtree: new RBush(), forImageId: {} }, + image_detections: { forImageId: {} }, + signs: { rtree: new RBush() }, + points: { rtree: new RBush() }, + sequences: { rtree: new RBush(), lineString: {} }, + requests: { loaded: {}, inflight: {} } + }; + _mlyActiveImage = null; + }, + // Get visible images + images: function(projection2) { + const limit = 5; + return searchLimited(limit, projection2, _mlyCache.images.rtree); + }, + // Get visible traffic signs + signs: function(projection2) { + const limit = 5; + return searchLimited(limit, projection2, _mlyCache.signs.rtree); + }, + // Get visible map (point) features + mapFeatures: function(projection2) { + const limit = 5; + return searchLimited(limit, projection2, _mlyCache.points.rtree); + }, + // Get cached image by id + cachedImage: function(imageId) { + return _mlyCache.images.forImageId[imageId]; + }, + // Get visible sequences + sequences: function(projection2) { + const viewport = projection2.clipExtent(); + const min3 = [viewport[0][0], viewport[1][1]]; + const max3 = [viewport[1][0], viewport[0][1]]; + const bbox2 = geoExtent(projection2.invert(min3), projection2.invert(max3)).bbox(); + const sequenceIds = {}; + let lineStrings = []; + _mlyCache.images.rtree.search(bbox2).forEach(function(d2) { + if (d2.data.sequence_id) { + sequenceIds[d2.data.sequence_id] = true; } - }, - replace: function() { - select_default2(document).interrupt("history.perform"); - return _replace(arguments, 1); - }, - overwrite: function() { - select_default2(document).interrupt("history.perform"); - return _overwrite(arguments, 1); - }, - pop: function(n2) { - select_default2(document).interrupt("history.perform"); - var previous = _stack[_index].graph; - if (isNaN(+n2) || +n2 < 0) { - n2 = 1; + }); + Object.keys(sequenceIds).forEach(function(sequenceId) { + if (_mlyCache.sequences.lineString[sequenceId]) { + lineStrings = lineStrings.concat(_mlyCache.sequences.lineString[sequenceId]); } - while (n2-- > 0 && _index > 0) { - _index--; - _stack.pop(); + }); + return lineStrings; + }, + // Load images in the visible area + loadImages: function(projection2) { + loadTiles("images", tileUrl, 14, projection2); + }, + // Load traffic signs in the visible area + loadSigns: function(projection2) { + loadTiles("signs", trafficSignTileUrl, 14, projection2); + }, + // Load map (point) features in the visible area + loadMapFeatures: function(projection2) { + loadTiles("points", mapFeatureTileUrl, 14, projection2); + }, + // Return a promise that resolves when the image viewer (Mapillary JS) library has finished loading + ensureViewerLoaded: function(context) { + if (_loadViewerPromise) return _loadViewerPromise; + const wrap2 = context.container().select(".photoviewer").selectAll(".mly-wrapper").data([0]); + wrap2.enter().append("div").attr("id", "ideditor-mly").attr("class", "photo-wrapper mly-wrapper").classed("hide", true); + const that = this; + _loadViewerPromise = new Promise((resolve, reject) => { + let loadedCount = 0; + function loaded() { + loadedCount += 1; + if (loadedCount === 2) resolve(); } - return change(previous); - }, - undo: function() { - select_default2(document).interrupt("history.perform"); - var previousStack = _stack[_index]; - var previous = previousStack.graph; - while (_index > 0) { - _index--; - if (_stack[_index].annotation) - break; + const head = select_default2("head"); + head.selectAll("#ideditor-mapillary-viewercss").data([0]).enter().append("link").attr("id", "ideditor-mapillary-viewercss").attr("rel", "stylesheet").attr("crossorigin", "anonymous").attr("href", context.asset(viewercss)).on("load.serviceMapillary", loaded).on("error.serviceMapillary", function() { + reject(); + }); + head.selectAll("#ideditor-mapillary-viewerjs").data([0]).enter().append("script").attr("id", "ideditor-mapillary-viewerjs").attr("crossorigin", "anonymous").attr("src", context.asset(viewerjs)).on("load.serviceMapillary", loaded).on("error.serviceMapillary", function() { + reject(); + }); + }).catch(function() { + _loadViewerPromise = null; + }).then(function() { + that.initViewer(context); + }); + return _loadViewerPromise; + }, + // Load traffic sign image sprites + loadSignResources: function(context) { + context.ui().svgDefs.addSprites( + ["mapillary-sprite"], + false + /* don't override colors */ + ); + return this; + }, + // Load map (point) feature image sprites + loadObjectResources: function(context) { + context.ui().svgDefs.addSprites( + ["mapillary-object-sprite"], + false + /* don't override colors */ + ); + return this; + }, + // Remove previous detections in image viewer + resetTags: function() { + if (_mlyViewer && !_mlyFallback) { + _mlyViewer.getComponent("tag").removeAll(); + } + }, + // Show map feature detections in image viewer + showFeatureDetections: function(value) { + _mlyShowFeatureDetections = value; + if (!_mlyShowFeatureDetections && !_mlyShowSignDetections) { + this.resetTags(); + } + }, + // Show traffic sign detections in image viewer + showSignDetections: function(value) { + _mlyShowSignDetections = value; + if (!_mlyShowFeatureDetections && !_mlyShowSignDetections) { + this.resetTags(); + } + }, + // Apply filter to image viewer + filterViewer: function(context) { + const showsPano = context.photos().showsPanoramic(); + const showsFlat = context.photos().showsFlat(); + const fromDate = context.photos().fromDate(); + const toDate = context.photos().toDate(); + const filter2 = ["all"]; + if (!showsPano) filter2.push(["!=", "cameraType", "spherical"]); + if (!showsFlat && showsPano) filter2.push(["==", "pano", true]); + if (fromDate) { + filter2.push([">=", "capturedAt", new Date(fromDate).getTime()]); + } + if (toDate) { + filter2.push([">=", "capturedAt", new Date(toDate).getTime()]); + } + if (_mlyViewer) { + _mlyViewer.setFilter(filter2); + } + _mlyViewerFilter = filter2; + return filter2; + }, + // Make the image viewer visible + showViewer: function(context) { + const wrap2 = context.container().select(".photoviewer").classed("hide", false); + const isHidden = wrap2.selectAll(".photo-wrapper.mly-wrapper.hide").size(); + if (isHidden && _mlyViewer) { + wrap2.selectAll(".photo-wrapper:not(.mly-wrapper)").classed("hide", true); + wrap2.selectAll(".photo-wrapper.mly-wrapper").classed("hide", false); + _mlyViewer.resize(); + } + _isViewerOpen = true; + return this; + }, + // Hide the image viewer and resets map markers + hideViewer: function(context) { + _mlyActiveImage = null; + if (!_mlyFallback && _mlyViewer) { + _mlyViewer.getComponent("sequence").stop(); + } + const viewer = context.container().select(".photoviewer"); + if (!viewer.empty()) viewer.datum(null); + viewer.classed("hide", true).selectAll(".photo-wrapper").classed("hide", true); + this.updateUrlImage(null); + dispatch4.call("imageChanged"); + dispatch4.call("loadedMapFeatures"); + dispatch4.call("loadedSigns"); + _isViewerOpen = false; + return this.setStyles(context, null); + }, + // Get viewer status + isViewerOpen: function() { + return _isViewerOpen; + }, + // Update the URL with current image id + updateUrlImage: function(imageId) { + if (!window.mocha) { + const hash = utilStringQs(window.location.hash); + if (imageId) { + hash.photo = "mapillary/" + imageId; + } else { + delete hash.photo; } - dispatch10.call("undone", this, _stack[_index], previousStack); - return change(previous); - }, - redo: function() { - select_default2(document).interrupt("history.perform"); - var previousStack = _stack[_index]; - var previous = previousStack.graph; - var tryIndex = _index; - while (tryIndex < _stack.length - 1) { - tryIndex++; - if (_stack[tryIndex].annotation) { - _index = tryIndex; - dispatch10.call("redone", this, _stack[_index], previousStack); - break; + window.location.replace("#" + utilQsString(hash, true)); + } + }, + // Highlight the detection in the viewer that is related to the clicked map feature + highlightDetection: function(detection) { + if (detection) { + _mlyHighlightedDetection = detection.id; + } + return this; + }, + // Initialize image viewer (Mapillar JS) + initViewer: function(context) { + const that = this; + if (!window.mapillary) return; + const opts = { + accessToken, + component: { + cover: false, + keyboard: false, + tag: true + }, + container: "ideditor-mly" + }; + if (!mapillary.isSupported() && mapillary.isFallbackSupported()) { + _mlyFallback = true; + opts.component = { + cover: false, + direction: false, + imagePlane: false, + keyboard: false, + mouse: false, + sequence: false, + tag: false, + image: true, + // fallback + navigation: true + // fallback + }; + } + _mlyViewer = new mapillary.Viewer(opts); + _mlyViewer.on("image", imageChanged); + _mlyViewer.on("bearing", bearingChanged); + if (_mlyViewerFilter) { + _mlyViewer.setFilter(_mlyViewerFilter); + } + context.ui().photoviewer.on("resize.mapillary", function() { + if (_mlyViewer) _mlyViewer.resize(); + }); + function imageChanged(node) { + that.resetTags(); + const image = node.image; + that.setActiveImage(image); + that.setStyles(context, null); + const loc = [image.originalLngLat.lng, image.originalLngLat.lat]; + context.map().centerEase(loc); + that.updateUrlImage(image.id); + if (_mlyShowFeatureDetections || _mlyShowSignDetections) { + that.updateDetections(image.id, "".concat(apiUrl, "/").concat(image.id, "/detections?access_token=").concat(accessToken, "&fields=id,image,geometry,value")); + } + dispatch4.call("imageChanged"); + } + function bearingChanged(e3) { + dispatch4.call("bearingChanged", void 0, e3); + } + }, + // Move to an image + selectImage: function(context, imageId) { + if (_mlyViewer && imageId) { + _mlyViewer.moveTo(imageId).catch(function(e3) { + console.error("mly3", e3); + }); + } + return this; + }, + // Return the currently displayed image + getActiveImage: function() { + return _mlyActiveImage; + }, + // Return a list of detection objects for the given id + getDetections: function(id2) { + return loadData("".concat(apiUrl, "/").concat(id2, "/detections?access_token=").concat(accessToken, "&fields=id,value,image")); + }, + // Set the currently visible image + setActiveImage: function(image) { + if (image) { + _mlyActiveImage = { + ca: image.originalCompassAngle, + id: image.id, + loc: [image.originalLngLat.lng, image.originalLngLat.lat], + is_pano: image.cameraType === "spherical", + sequence_id: image.sequenceId + }; + } else { + _mlyActiveImage = null; + } + }, + // Update the currently highlighted sequence and selected bubble. + setStyles: function(context, hovered) { + const hoveredImageId = hovered && hovered.id; + const hoveredSequenceId = hovered && hovered.sequence_id; + const selectedSequenceId = _mlyActiveImage && _mlyActiveImage.sequence_id; + context.container().selectAll(".layer-mapillary .viewfield-group").classed("highlighted", function(d2) { + return d2.sequence_id === selectedSequenceId || d2.id === hoveredImageId; + }).classed("hovered", function(d2) { + return d2.id === hoveredImageId; + }); + context.container().selectAll(".layer-mapillary .sequence").classed("highlighted", function(d2) { + return d2.properties.id === hoveredSequenceId; + }).classed("currentView", function(d2) { + return d2.properties.id === selectedSequenceId; + }); + return this; + }, + // Get detections for the current image and shows them in the image viewer + updateDetections: function(imageId, url) { + if (!_mlyViewer || _mlyFallback) return; + if (!imageId) return; + const cache = _mlyCache.image_detections; + if (cache.forImageId[imageId]) { + showDetections(_mlyCache.image_detections.forImageId[imageId]); + } else { + loadData(url).then((detections) => { + detections.forEach(function(detection) { + if (!cache.forImageId[imageId]) { + cache.forImageId[imageId] = []; + } + cache.forImageId[imageId].push({ + geometry: detection.geometry, + id: detection.id, + image_id: imageId, + value: detection.value + }); + }); + showDetections(_mlyCache.image_detections.forImageId[imageId] || []); + }); + } + function showDetections(detections) { + const tagComponent = _mlyViewer.getComponent("tag"); + detections.forEach(function(data) { + const tag2 = makeTag(data); + if (tag2) { + tagComponent.add([tag2]); + } + }); + } + function makeTag(data) { + const valueParts = data.value.split("--"); + if (!valueParts.length) return; + let tag2; + let text; + let color2 = 16777215; + if (_mlyHighlightedDetection === data.id) { + color2 = 16776960; + text = valueParts[1]; + if (text === "flat" || text === "discrete" || text === "sign") { + text = valueParts[2]; } + text = text.replace(/-/g, " "); + text = text.charAt(0).toUpperCase() + text.slice(1); + _mlyHighlightedDetection = null; } - return change(previous); - }, - pauseChangeDispatch: function() { - if (!_pausedGraph) { - _pausedGraph = _stack[_index].graph; + var decodedGeometry = window.atob(data.geometry); + var uintArray = new Uint8Array(decodedGeometry.length); + for (var i3 = 0; i3 < decodedGeometry.length; i3++) { + uintArray[i3] = decodedGeometry.charCodeAt(i3); } - }, - resumeChangeDispatch: function() { - if (_pausedGraph) { - var previous = _pausedGraph; - _pausedGraph = null; - return change(previous); + const tile = new VectorTile(new Pbf(uintArray.buffer)); + const layer = tile.layers["mpy-or"]; + const geometries = layer.feature(0).loadGeometry(); + const polygon2 = geometries.map((ring) => ring.map((point) => [point.x / layer.extent, point.y / layer.extent])); + tag2 = new mapillary.OutlineTag( + data.id, + new mapillary.PolygonGeometry(polygon2[0]), + { + text, + textColor: color2, + lineColor: color2, + lineWidth: 2, + fillColor: color2, + fillOpacity: 0.3 + } + ); + return tag2; + } + }, + // Return the current cache + cache: function() { + return _mlyCache; + } + }; + + // modules/core/validation/models.js + function validationIssue(attrs) { + this.type = attrs.type; + this.subtype = attrs.subtype; + this.severity = attrs.severity; + this.message = attrs.message; + this.reference = attrs.reference; + this.entityIds = attrs.entityIds; + this.loc = attrs.loc; + this.data = attrs.data; + this.dynamicFixes = attrs.dynamicFixes; + this.hash = attrs.hash; + this.id = generateID.apply(this); + this.key = generateKey.apply(this); + this.autoFix = null; + function generateID() { + var parts = [this.type]; + if (this.hash) { + parts.push(this.hash); + } + if (this.subtype) { + parts.push(this.subtype); + } + if (this.entityIds) { + var entityKeys = this.entityIds.slice().sort(); + parts.push.apply(parts, entityKeys); + } + return parts.join(":"); + } + function generateKey() { + return this.id + ":" + Date.now().toString(); + } + this.extent = function(resolver) { + if (this.loc) { + return geoExtent(this.loc); + } + if (this.entityIds && this.entityIds.length) { + return this.entityIds.reduce(function(extent, entityId) { + return extent.extend(resolver.entity(entityId).extent(resolver)); + }, geoExtent()); + } + return null; + }; + this.fixes = function(context) { + var fixes = this.dynamicFixes ? this.dynamicFixes(context) : []; + var issue = this; + if (issue.severity === "warning") { + fixes.push(new validationIssueFix({ + title: _t.append("issues.fix.ignore_issue.title"), + icon: "iD-icon-close", + onClick: function() { + context.validator().ignoreIssue(this.issue.id); + } + })); + } + fixes.forEach(function(fix) { + fix.id = fix.title.stringId; + fix.issue = issue; + if (fix.autoArgs) { + issue.autoFix = fix; } + }); + return fixes; + }; + } + function validationIssueFix(attrs) { + this.title = attrs.title; + this.onClick = attrs.onClick; + this.disabledReason = attrs.disabledReason; + this.icon = attrs.icon; + this.entityIds = attrs.entityIds || []; + this.autoArgs = attrs.autoArgs; + this.issue = null; + } + + // modules/services/maprules.js + var buildRuleChecks = function() { + return { + equals: function(equals) { + return function(tags) { + return Object.keys(equals).every(function(k2) { + return equals[k2] === tags[k2]; + }); + }; }, - undoAnnotation: function() { - var i2 = _index; - while (i2 >= 0) { - if (_stack[i2].annotation) - return _stack[i2].annotation; - i2--; - } + notEquals: function(notEquals) { + return function(tags) { + return Object.keys(notEquals).some(function(k2) { + return notEquals[k2] !== tags[k2]; + }); + }; }, - redoAnnotation: function() { - var i2 = _index + 1; - while (i2 <= _stack.length - 1) { - if (_stack[i2].annotation) - return _stack[i2].annotation; - i2++; - } + absence: function(absence) { + return function(tags) { + return Object.keys(tags).indexOf(absence) === -1; + }; }, - intersects: function(extent) { - return _tree.intersects(extent, _stack[_index].graph); + presence: function(presence) { + return function(tags) { + return Object.keys(tags).indexOf(presence) > -1; + }; }, - difference: function() { - var base = _stack[0].graph; - var head = _stack[_index].graph; - return coreDifference(base, head); + greaterThan: function(greaterThan) { + var key = Object.keys(greaterThan)[0]; + var value = greaterThan[key]; + return function(tags) { + return tags[key] > value; + }; }, - changes: function(action) { - var base = _stack[0].graph; - var head = _stack[_index].graph; - if (action) { - head = action(head); - } - var difference = coreDifference(base, head); - return { - modified: difference.modified(), - created: difference.created(), - deleted: difference.deleted() + greaterThanEqual: function(greaterThanEqual) { + var key = Object.keys(greaterThanEqual)[0]; + var value = greaterThanEqual[key]; + return function(tags) { + return tags[key] >= value; }; }, - hasChanges: function() { - return this.difference().length() > 0; + lessThan: function(lessThan) { + var key = Object.keys(lessThan)[0]; + var value = lessThan[key]; + return function(tags) { + return tags[key] < value; + }; }, - imageryUsed: function(sources) { - if (sources) { - _imageryUsed = sources; - return history; - } else { - var s = /* @__PURE__ */ new Set(); - _stack.slice(1, _index + 1).forEach(function(state) { - state.imageryUsed.forEach(function(source) { - if (source !== "Custom") { - s.add(source); - } - }); - }); - return Array.from(s); - } + lessThanEqual: function(lessThanEqual) { + var key = Object.keys(lessThanEqual)[0]; + var value = lessThanEqual[key]; + return function(tags) { + return tags[key] <= value; + }; }, - photoOverlaysUsed: function(sources) { - if (sources) { - _photoOverlaysUsed = sources; - return history; - } else { - var s = /* @__PURE__ */ new Set(); - _stack.slice(1, _index + 1).forEach(function(state) { - if (state.photoOverlaysUsed && Array.isArray(state.photoOverlaysUsed)) { - state.photoOverlaysUsed.forEach(function(photoOverlay) { - s.add(photoOverlay); - }); - } - }); - return Array.from(s); - } + positiveRegex: function(positiveRegex) { + var tagKey = Object.keys(positiveRegex)[0]; + var expression = positiveRegex[tagKey].join("|"); + var regex = new RegExp(expression); + return function(tags) { + return regex.test(tags[tagKey]); + }; }, - checkpoint: function(key) { - _checkpoints[key] = { - stack: _stack, - index: _index + negativeRegex: function(negativeRegex) { + var tagKey = Object.keys(negativeRegex)[0]; + var expression = negativeRegex[tagKey].join("|"); + var regex = new RegExp(expression); + return function(tags) { + return !regex.test(tags[tagKey]); }; - return history; + } + }; + }; + var buildLineKeys = function() { + return { + highway: { + rest_area: true, + services: true }, - reset: function(key) { - if (key !== void 0 && _checkpoints.hasOwnProperty(key)) { - _stack = _checkpoints[key].stack; - _index = _checkpoints[key].index; - } else { - _stack = [{ graph: coreGraph() }]; - _index = 0; - _tree = coreTree(_stack[0].graph); - _checkpoints = {}; + railway: { + roundhouse: true, + station: true, + traverser: true, + turntable: true, + wash: true + } + }; + }; + var maprules_default = { + init: function() { + this._ruleChecks = buildRuleChecks(); + this._validationRules = []; + this._areaKeys = osmAreaKeys; + this._lineKeys = buildLineKeys(); + }, + // list of rules only relevant to tag checks... + filterRuleChecks: function(selector) { + var _ruleChecks = this._ruleChecks; + return Object.keys(selector).reduce(function(rules, key) { + if (["geometry", "error", "warning"].indexOf(key) === -1) { + rules.push(_ruleChecks[key](selector[key])); } - dispatch10.call("reset"); - dispatch10.call("change"); - return history; - }, - toIntroGraph: function() { - var nextID = { n: 0, r: 0, w: 0 }; - var permIDs = {}; - var graph = this.graph(); - var baseEntities = {}; - Object.values(graph.base().entities).forEach(function(entity) { - var copy2 = copyIntroEntity(entity); - baseEntities[copy2.id] = copy2; - }); - Object.keys(graph.entities).forEach(function(id2) { - var entity = graph.entities[id2]; - if (entity) { - var copy2 = copyIntroEntity(entity); - baseEntities[copy2.id] = copy2; - } else { - delete baseEntities[id2]; - } - }); - Object.values(baseEntities).forEach(function(entity) { - if (Array.isArray(entity.nodes)) { - entity.nodes = entity.nodes.map(function(node) { - return permIDs[node] || node; - }); - } - if (Array.isArray(entity.members)) { - entity.members = entity.members.map(function(member) { - member.id = permIDs[member.id] || member.id; - return member; - }); - } + return rules; + }, []); + }, + // builds tagMap from mapcss-parse selector object... + buildTagMap: function(selector) { + var getRegexValues = function(regexes) { + return regexes.map(function(regex) { + return regex.replace(/\$|\^/g, ""); }); - return JSON.stringify({ dataIntroGraph: baseEntities }); - function copyIntroEntity(source) { - var copy2 = utilObjectOmit(source, ["type", "user", "v", "version", "visible"]); - if (copy2.tags && !Object.keys(copy2.tags)) { - delete copy2.tags; + }; + var tagMap = Object.keys(selector).reduce(function(expectedTags, key) { + var values; + var isRegex = /regex/gi.test(key); + var isEqual4 = /equals/gi.test(key); + if (isRegex || isEqual4) { + Object.keys(selector[key]).forEach(function(selectorKey) { + values = isEqual4 ? [selector[key][selectorKey]] : getRegexValues(selector[key][selectorKey]); + if (expectedTags.hasOwnProperty(selectorKey)) { + values = values.concat(expectedTags[selectorKey]); + } + expectedTags[selectorKey] = values; + }); + } else if (/(greater|less)Than(Equal)?|presence/g.test(key)) { + var tagKey = /presence/.test(key) ? selector[key] : Object.keys(selector[key])[0]; + values = [selector[key][tagKey]]; + if (expectedTags.hasOwnProperty(tagKey)) { + values = values.concat(expectedTags[tagKey]); } - if (Array.isArray(copy2.loc)) { - copy2.loc[0] = +copy2.loc[0].toFixed(6); - copy2.loc[1] = +copy2.loc[1].toFixed(6); + expectedTags[tagKey] = values; + } + return expectedTags; + }, {}); + return tagMap; + }, + // inspired by osmWay#isArea() + inferGeometry: function(tagMap) { + var _lineKeys = this._lineKeys; + var _areaKeys = this._areaKeys; + var keyValueDoesNotImplyArea = function(key2) { + return utilArrayIntersection(tagMap[key2], Object.keys(_areaKeys[key2])).length > 0; + }; + var keyValueImpliesLine = function(key2) { + return utilArrayIntersection(tagMap[key2], Object.keys(_lineKeys[key2])).length > 0; + }; + if (tagMap.hasOwnProperty("area")) { + if (tagMap.area.indexOf("yes") > -1) { + return "area"; + } + if (tagMap.area.indexOf("no") > -1) { + return "line"; + } + } + for (var key in tagMap) { + if (key in _areaKeys && !keyValueDoesNotImplyArea(key)) { + return "area"; + } + if (key in _lineKeys && keyValueImpliesLine(key)) { + return "area"; + } + } + return "line"; + }, + // adds from mapcss-parse selector check... + addRule: function(selector) { + var rule = { + // checks relevant to mapcss-selector + checks: this.filterRuleChecks(selector), + // true if all conditions for a tag error are true.. + matches: function(entity) { + return this.checks.every(function(check) { + return check(entity.tags); + }); + }, + // borrowed from Way#isArea() + inferredGeometry: this.inferGeometry(this.buildTagMap(selector), this._areaKeys), + geometryMatches: function(entity, graph) { + if (entity.type === "node" || entity.type === "relation") { + return selector.geometry === entity.type; + } else if (entity.type === "way") { + return this.inferredGeometry === entity.geometry(graph); } - var match = source.id.match(/([nrw])-\d*/); - if (match !== null) { - var nrw = match[1]; - var permID; - do { - permID = nrw + ++nextID[nrw]; - } while (baseEntities.hasOwnProperty(permID)); - copy2.id = permIDs[source.id] = permID; + }, + // when geometries match and tag matches are present, return a warning... + findIssues: function(entity, graph, issues) { + if (this.geometryMatches(entity, graph) && this.matches(entity)) { + var severity = Object.keys(selector).indexOf("error") > -1 ? "error" : "warning"; + var message = selector[severity]; + issues.push(new validationIssue({ + type: "maprules", + severity, + message: function() { + return message; + }, + entityIds: [entity.id] + })); } - return copy2; } - }, - toJSON: function() { - if (!this.hasChanges()) + }; + this._validationRules.push(rule); + }, + clearRules: function() { + this._validationRules = []; + }, + // returns validationRules... + validationRules: function() { + return this._validationRules; + }, + // returns ruleChecks + ruleChecks: function() { + return this._ruleChecks; + } + }; + + // modules/core/difference.js + var import_fast_deep_equal3 = __toESM(require_fast_deep_equal()); + function coreDifference(base, head) { + var _changes = {}; + var _didChange = {}; + var _diff = {}; + function checkEntityID(id2) { + var h2 = head.entities[id2]; + var b2 = base.entities[id2]; + if (h2 === b2) return; + if (_changes[id2]) return; + if (!h2 && b2) { + _changes[id2] = { base: b2, head: h2 }; + _didChange.deletion = true; + return; + } + if (h2 && !b2) { + _changes[id2] = { base: b2, head: h2 }; + _didChange.addition = true; + return; + } + if (h2 && b2) { + if (h2.members && b2.members && !(0, import_fast_deep_equal3.default)(h2.members, b2.members)) { + _changes[id2] = { base: b2, head: h2 }; + _didChange.geometry = true; + _didChange.properties = true; return; - var allEntities = {}; - var baseEntities = {}; - var base = _stack[0]; - var s = _stack.map(function(i2) { - var modified = []; - var deleted = []; - Object.keys(i2.graph.entities).forEach(function(id2) { - var entity = i2.graph.entities[id2]; - if (entity) { - var key = osmEntity.key(entity); - allEntities[key] = entity; - modified.push(key); - } else { - deleted.push(id2); - } - if (id2 in base.graph.entities) { - baseEntities[id2] = base.graph.entities[id2]; - } - if (entity && entity.nodes) { - entity.nodes.forEach(function(nodeID) { - if (nodeID in base.graph.entities) { - baseEntities[nodeID] = base.graph.entities[nodeID]; - } - }); - } - var baseParents = base.graph._parentWays[id2]; - if (baseParents) { - baseParents.forEach(function(parentID) { - if (parentID in base.graph.entities) { - baseEntities[parentID] = base.graph.entities[parentID]; - } - }); + } + if (h2.loc && b2.loc && !geoVecEqual(h2.loc, b2.loc)) { + _changes[id2] = { base: b2, head: h2 }; + _didChange.geometry = true; + } + if (h2.nodes && b2.nodes && !(0, import_fast_deep_equal3.default)(h2.nodes, b2.nodes)) { + _changes[id2] = { base: b2, head: h2 }; + _didChange.geometry = true; + } + if (h2.tags && b2.tags && !(0, import_fast_deep_equal3.default)(h2.tags, b2.tags)) { + _changes[id2] = { base: b2, head: h2 }; + _didChange.properties = true; + } + } + } + function load() { + var ids = utilArrayUniq(Object.keys(head.entities).concat(Object.keys(base.entities))); + for (var i3 = 0; i3 < ids.length; i3++) { + checkEntityID(ids[i3]); + } + } + load(); + _diff.length = function length2() { + return Object.keys(_changes).length; + }; + _diff.changes = function changes() { + return _changes; + }; + _diff.didChange = _didChange; + _diff.extantIDs = function extantIDs(includeRelMembers) { + var result = /* @__PURE__ */ new Set(); + Object.keys(_changes).forEach(function(id2) { + if (_changes[id2].head) { + result.add(id2); + } + var h2 = _changes[id2].head; + var b2 = _changes[id2].base; + var entity = h2 || b2; + if (includeRelMembers && entity.type === "relation") { + var mh = h2 ? h2.members.map(function(m2) { + return m2.id; + }) : []; + var mb = b2 ? b2.members.map(function(m2) { + return m2.id; + }) : []; + utilArrayUnion(mh, mb).forEach(function(memberID) { + if (head.hasEntity(memberID)) { + result.add(memberID); } }); - var x = {}; - if (modified.length) - x.modified = modified; - if (deleted.length) - x.deleted = deleted; - if (i2.imageryUsed) - x.imageryUsed = i2.imageryUsed; - if (i2.photoOverlaysUsed) - x.photoOverlaysUsed = i2.photoOverlaysUsed; - if (i2.annotation) - x.annotation = i2.annotation; - if (i2.transform) - x.transform = i2.transform; - if (i2.selectedIDs) - x.selectedIDs = i2.selectedIDs; - return x; - }); - return JSON.stringify({ - version: 3, - entities: Object.values(allEntities), - baseEntities: Object.values(baseEntities), - stack: s, - nextIDs: osmEntity.id.next, - index: _index, - timestamp: new Date().getTime() - }); - }, - fromJSON: function(json, loadChildNodes) { - var h = JSON.parse(json); - var loadComplete = true; - osmEntity.id.next = h.nextIDs; - _index = h.index; - if (h.version === 2 || h.version === 3) { - var allEntities = {}; - h.entities.forEach(function(entity) { - allEntities[osmEntity.key(entity)] = osmEntity(entity); - }); - if (h.version === 3) { - var baseEntities = h.baseEntities.map(function(d) { - return osmEntity(d); - }); - var stack = _stack.map(function(state) { - return state.graph; - }); - _stack[0].graph.rebase(baseEntities, stack, true); - _tree.rebase(baseEntities, true); - if (loadChildNodes) { - var osm = context.connection(); - var baseWays = baseEntities.filter(function(e) { - return e.type === "way"; - }); - var nodeIDs = baseWays.reduce(function(acc, way) { - return utilArrayUnion(acc, way.nodes); - }, []); - var missing = nodeIDs.filter(function(n2) { - return !_stack[0].graph.hasEntity(n2); - }); - if (missing.length && osm) { - loadComplete = false; - context.map().redrawEnable(false); - var loading = uiLoading(context).blocking(true); - context.container().call(loading); - var childNodesLoaded = function(err, result) { - if (!err) { - var visibleGroups = utilArrayGroupBy(result.data, "visible"); - var visibles = visibleGroups.true || []; - var invisibles = visibleGroups.false || []; - if (visibles.length) { - var visibleIDs = visibles.map(function(entity) { - return entity.id; - }); - var stack2 = _stack.map(function(state) { - return state.graph; - }); - missing = utilArrayDifference(missing, visibleIDs); - _stack[0].graph.rebase(visibles, stack2, true); - _tree.rebase(visibles, true); - } - invisibles.forEach(function(entity) { - osm.loadEntityVersion(entity.id, +entity.version - 1, childNodesLoaded); - }); - } - if (err || !missing.length) { - loading.close(); - context.map().redrawEnable(true); - dispatch10.call("change"); - dispatch10.call("restore", this); - } - }; - osm.loadMultiple(missing, childNodesLoaded); - } - } + } + }); + return Array.from(result); + }; + _diff.modified = function modified() { + var result = []; + Object.values(_changes).forEach(function(change) { + if (change.base && change.head) { + result.push(change.head); + } + }); + return result; + }; + _diff.created = function created() { + var result = []; + Object.values(_changes).forEach(function(change) { + if (!change.base && change.head) { + result.push(change.head); + } + }); + return result; + }; + _diff.deleted = function deleted() { + var result = []; + Object.values(_changes).forEach(function(change) { + if (change.base && !change.head) { + result.push(change.base); + } + }); + return result; + }; + _diff.summary = function summary() { + var relevant = {}; + var keys2 = Object.keys(_changes); + for (var i3 = 0; i3 < keys2.length; i3++) { + var change = _changes[keys2[i3]]; + if (change.head && change.head.geometry(head) !== "vertex") { + addEntity(change.head, head, change.base ? "modified" : "created"); + } else if (change.base && change.base.geometry(base) !== "vertex") { + addEntity(change.base, base, "deleted"); + } else if (change.base && change.head) { + var moved = !(0, import_fast_deep_equal3.default)(change.base.loc, change.head.loc); + var retagged = !(0, import_fast_deep_equal3.default)(change.base.tags, change.head.tags); + if (moved) { + addParents(change.head); } - _stack = h.stack.map(function(d) { - var entities = {}, entity; - if (d.modified) { - d.modified.forEach(function(key) { - entity = allEntities[key]; - entities[entity.id] = entity; - }); - } - if (d.deleted) { - d.deleted.forEach(function(id2) { - entities[id2] = void 0; - }); - } - return { - graph: coreGraph(_stack[0].graph).load(entities), - annotation: d.annotation, - imageryUsed: d.imageryUsed, - photoOverlaysUsed: d.photoOverlaysUsed, - transform: d.transform, - selectedIDs: d.selectedIDs - }; - }); - } else { - _stack = h.stack.map(function(d) { - var entities = {}; - for (var i2 in d.entities) { - var entity = d.entities[i2]; - entities[i2] = entity === "undefined" ? void 0 : osmEntity(entity); - } - d.graph = coreGraph(_stack[0].graph).load(entities); - return d; - }); + if (retagged || moved && change.head.hasInterestingTags()) { + addEntity(change.head, head, "modified"); + } + } else if (change.head && change.head.hasInterestingTags()) { + addEntity(change.head, head, "created"); + } else if (change.base && change.base.hasInterestingTags()) { + addEntity(change.base, base, "deleted"); } - var transform2 = _stack[_index].transform; - if (transform2) { - context.map().transformEase(transform2, 0); + } + return Object.values(relevant); + function addEntity(entity, graph, changeType) { + relevant[entity.id] = { + entity, + graph, + changeType + }; + } + function addParents(entity) { + var parents = head.parentWays(entity); + for (var j2 = parents.length - 1; j2 >= 0; j2--) { + var parent = parents[j2]; + if (!(parent.id in relevant)) { + addEntity(parent, head, "modified"); + } } - if (loadComplete) { - dispatch10.call("change"); - dispatch10.call("restore", this); + } + }; + _diff.complete = function complete(extent) { + var result = {}; + var id2, change; + for (id2 in _changes) { + change = _changes[id2]; + var h2 = change.head; + var b2 = change.base; + var entity = h2 || b2; + var i3; + if (extent && (!h2 || !h2.intersects(extent, head)) && (!b2 || !b2.intersects(extent, base))) { + continue; } - return history; - }, - lock: function() { - return lock.lock(); - }, - unlock: function() { - lock.unlock(); - }, - save: function() { - if (lock.locked() && !_hasUnresolvedRestorableChanges) { - const success = corePreferences(getKey("saved_history"), history.toJSON() || null); - if (!success) - dispatch10.call("storage_error"); + result[id2] = h2; + if (entity.type === "way") { + var nh = h2 ? h2.nodes : []; + var nb = b2 ? b2.nodes : []; + var diff; + diff = utilArrayDifference(nh, nb); + for (i3 = 0; i3 < diff.length; i3++) { + result[diff[i3]] = head.hasEntity(diff[i3]); + } + diff = utilArrayDifference(nb, nh); + for (i3 = 0; i3 < diff.length; i3++) { + result[diff[i3]] = head.hasEntity(diff[i3]); + } } - return history; - }, - clearSaved: function() { - context.debouncedSave.cancel(); - if (lock.locked()) { - _hasUnresolvedRestorableChanges = false; - corePreferences(getKey("saved_history"), null); - corePreferences("comment", null); - corePreferences("hashtags", null); - corePreferences("source", null); + if (entity.type === "relation" && entity.isMultipolygon()) { + var mh = h2 ? h2.members.map(function(m2) { + return m2.id; + }) : []; + var mb = b2 ? b2.members.map(function(m2) { + return m2.id; + }) : []; + var ids = utilArrayUnion(mh, mb); + for (i3 = 0; i3 < ids.length; i3++) { + var member = head.hasEntity(ids[i3]); + if (!member) continue; + if (extent && !member.intersects(extent, head)) continue; + result[ids[i3]] = member; + } } - return history; - }, - savedHistoryJSON: function() { - return corePreferences(getKey("saved_history")); - }, - hasRestorableChanges: function() { - return _hasUnresolvedRestorableChanges; - }, - restore: function() { - if (lock.locked()) { - _hasUnresolvedRestorableChanges = false; - var json = this.savedHistoryJSON(); - if (json) - history.fromJSON(json, true); + addParents(head.parentWays(entity), result); + addParents(head.parentRelations(entity), result); + } + return result; + function addParents(parents, result2) { + for (var i4 = 0; i4 < parents.length; i4++) { + var parent = parents[i4]; + if (parent.id in result2) continue; + result2[parent.id] = parent; + addParents(head.parentRelations(parent), result2); } - }, - _getKey: getKey + } }; - history.reset(); - return utilRebind(history, dispatch10, "on"); + return _diff; } - // modules/validations/index.js - var validations_exports = {}; - __export(validations_exports, { - validationAlmostJunction: () => validationAlmostJunction, - validationCloseNodes: () => validationCloseNodes, - validationCrossingWays: () => validationCrossingWays, - validationDisconnectedWay: () => validationDisconnectedWay, - validationFormatting: () => validationFormatting, - validationHelpRequest: () => validationHelpRequest, - validationImpossibleOneway: () => validationImpossibleOneway, - validationIncompatibleSource: () => validationIncompatibleSource, - validationMaprules: () => validationMaprules, - validationMismatchedGeometry: () => validationMismatchedGeometry, - validationMissingRole: () => validationMissingRole, - validationMissingTag: () => validationMissingTag, - validationOutdatedTags: () => validationOutdatedTags, - validationPrivateData: () => validationPrivateData, - validationSuspiciousName: () => validationSuspiciousName, - validationUnsquareWay: () => validationUnsquareWay - }); - - // modules/validations/almost_junction.js - function validationAlmostJunction(context) { - const type3 = "almost_junction"; - const EXTEND_TH_METERS = 5; - const WELD_TH_METERS = 0.75; - const CLOSE_NODE_TH = EXTEND_TH_METERS - WELD_TH_METERS; - const SIG_ANGLE_TH = Math.atan(WELD_TH_METERS / EXTEND_TH_METERS); - function isHighway(entity) { - return entity.type === "way" && osmRoutableHighwayTagValues[entity.tags.highway]; + // modules/core/tree.js + function coreTree(head) { + var _rtree = new RBush(); + var _bboxes = {}; + var _segmentsRTree = new RBush(); + var _segmentsBBoxes = {}; + var _segmentsByWayId = {}; + var tree = {}; + function entityBBox(entity) { + var bbox2 = entity.extent(head).bbox(); + bbox2.id = entity.id; + _bboxes[entity.id] = bbox2; + return bbox2; } - function isTaggedAsNotContinuing(node) { - return node.tags.noexit === "yes" || node.tags.amenity === "parking_entrance" || node.tags.entrance && node.tags.entrance !== "no"; + function segmentBBox(segment) { + var extent = segment.extent(head); + if (!extent) return null; + var bbox2 = extent.bbox(); + bbox2.segment = segment; + _segmentsBBoxes[segment.id] = bbox2; + return bbox2; } - const validation = function checkAlmostJunction(entity, graph) { - if (!isHighway(entity)) - return []; - if (entity.isDegenerate()) - return []; - const tree = context.history().tree(); - const extendableNodeInfos = findConnectableEndNodesByExtension(entity); - let issues = []; - extendableNodeInfos.forEach((extendableNodeInfo) => { - issues.push(new validationIssue({ - type: type3, - subtype: "highway-highway", - severity: "warning", - message: function(context2) { - const entity1 = context2.hasEntity(this.entityIds[0]); - if (this.entityIds[0] === this.entityIds[2]) { - return entity1 ? _t.append("issues.almost_junction.self.message", { - feature: utilDisplayLabel(entity1, context2.graph()) - }) : ""; - } else { - const entity2 = context2.hasEntity(this.entityIds[2]); - return entity1 && entity2 ? _t.append("issues.almost_junction.message", { - feature: utilDisplayLabel(entity1, context2.graph()), - feature2: utilDisplayLabel(entity2, context2.graph()) - }) : ""; - } - }, - reference: showReference, - entityIds: [ - entity.id, - extendableNodeInfo.node.id, - extendableNodeInfo.wid - ], - loc: extendableNodeInfo.node.loc, - hash: JSON.stringify(extendableNodeInfo.node.loc), - data: { - midId: extendableNodeInfo.mid.id, - edge: extendableNodeInfo.edge, - cross_loc: extendableNodeInfo.cross_loc - }, - dynamicFixes: makeFixes - })); - }); - return issues; - function makeFixes(context2) { - let fixes = [new validationIssueFix({ - icon: "iD-icon-abutment", - title: _t.append("issues.fix.connect_features.title"), - onClick: function(context3) { - const annotation = _t("issues.fix.connect_almost_junction.annotation"); - const [, endNodeId, crossWayId] = this.issue.entityIds; - const midNode = context3.entity(this.issue.data.midId); - const endNode = context3.entity(endNodeId); - const crossWay = context3.entity(crossWayId); - const nearEndNodes = findNearbyEndNodes(endNode, crossWay); - if (nearEndNodes.length > 0) { - const collinear = findSmallJoinAngle(midNode, endNode, nearEndNodes); - if (collinear) { - context3.perform( - actionMergeNodes([collinear.id, endNode.id], collinear.loc), - annotation - ); - return; - } - } - const targetEdge = this.issue.data.edge; - const crossLoc = this.issue.data.cross_loc; - const edgeNodes = [context3.entity(targetEdge[0]), context3.entity(targetEdge[1])]; - const closestNodeInfo = geoSphericalClosestNode(edgeNodes, crossLoc); - if (closestNodeInfo.distance < WELD_TH_METERS) { - context3.perform( - actionMergeNodes([closestNodeInfo.node.id, endNode.id], closestNodeInfo.node.loc), - annotation - ); - } else { - context3.perform( - actionAddMidpoint({ loc: crossLoc, edge: targetEdge }, endNode), - annotation - ); - } - } - })]; - const node = context2.hasEntity(this.entityIds[1]); - if (node && !node.hasInterestingTags()) { - fixes.push(new validationIssueFix({ - icon: "maki-barrier", - title: _t.append("issues.fix.tag_as_disconnected.title"), - onClick: function(context3) { - const nodeID = this.issue.entityIds[1]; - const tags = Object.assign({}, context3.entity(nodeID).tags); - tags.noexit = "yes"; - context3.perform( - actionChangeTags(nodeID, tags), - _t("issues.fix.tag_as_disconnected.annotation") - ); - } - })); - } - return fixes; - } - function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.almost_junction.highway-highway.reference")); + function removeEntity(entity) { + _rtree.remove(_bboxes[entity.id]); + delete _bboxes[entity.id]; + if (_segmentsByWayId[entity.id]) { + _segmentsByWayId[entity.id].forEach(function(segment) { + _segmentsRTree.remove(_segmentsBBoxes[segment.id]); + delete _segmentsBBoxes[segment.id]; + }); + delete _segmentsByWayId[entity.id]; } - function isExtendableCandidate(node, way) { - const osm = services.osm; - if (osm && !osm.isDataLoaded(node.loc)) { - return false; + } + function loadEntities(entities) { + _rtree.load(entities.map(entityBBox)); + var segments = []; + entities.forEach(function(entity) { + if (entity.segments) { + var entitySegments = entity.segments(head); + _segmentsByWayId[entity.id] = entitySegments; + segments = segments.concat(entitySegments); } - if (isTaggedAsNotContinuing(node) || graph.parentWays(node).length !== 1) { - return false; + }); + if (segments.length) _segmentsRTree.load(segments.map(segmentBBox).filter(Boolean)); + } + function updateParents(entity, insertions, memo) { + head.parentWays(entity).forEach(function(way) { + if (_bboxes[way.id]) { + removeEntity(way); + insertions[way.id] = way; } - let occurrences = 0; - for (const index in way.nodes) { - if (way.nodes[index] === node.id) { - occurrences += 1; - if (occurrences > 1) { - return false; - } + updateParents(way, insertions, memo); + }); + head.parentRelations(entity).forEach(function(relation) { + if (memo[relation.id]) return; + memo[relation.id] = true; + if (_bboxes[relation.id]) { + removeEntity(relation); + insertions[relation.id] = relation; + } + updateParents(relation, insertions, memo); + }); + } + tree.rebase = function(entities, force) { + var insertions = {}; + for (var i3 = 0; i3 < entities.length; i3++) { + var entity = entities[i3]; + if (!entity.visible) continue; + if (head.entities.hasOwnProperty(entity.id) || _bboxes[entity.id]) { + if (!force) { + continue; + } else if (_bboxes[entity.id]) { + removeEntity(entity); } } - return true; + insertions[entity.id] = entity; + updateParents(entity, insertions, {}); } - function findConnectableEndNodesByExtension(way) { - let results = []; - if (way.isClosed()) - return results; - let testNodes; - const indices = [0, way.nodes.length - 1]; - indices.forEach((nodeIndex) => { - const nodeID = way.nodes[nodeIndex]; - const node = graph.entity(nodeID); - if (!isExtendableCandidate(node, way)) - return; - const connectionInfo = canConnectByExtend(way, nodeIndex); - if (!connectionInfo) - return; - testNodes = graph.childNodes(way).slice(); - testNodes[nodeIndex] = testNodes[nodeIndex].move(connectionInfo.cross_loc); - if (geoHasSelfIntersections(testNodes, nodeID)) - return; - results.push(connectionInfo); + loadEntities(Object.values(insertions)); + return tree; + }; + function updateToGraph(graph) { + if (graph === head) return; + var diff = coreDifference(head, graph); + head = graph; + var changed = diff.didChange; + if (!changed.addition && !changed.deletion && !changed.geometry) return; + var insertions = {}; + if (changed.deletion) { + diff.deleted().forEach(function(entity) { + removeEntity(entity); }); - return results; } - function findNearbyEndNodes(node, way) { - return [ - way.nodes[0], - way.nodes[way.nodes.length - 1] - ].map((d) => graph.entity(d)).filter((d) => { - return d.id !== node.id && geoSphericalDistance(node.loc, d.loc) <= CLOSE_NODE_TH; + if (changed.geometry) { + diff.modified().forEach(function(entity) { + removeEntity(entity); + insertions[entity.id] = entity; + updateParents(entity, insertions, {}); }); } - function findSmallJoinAngle(midNode, tipNode, endNodes) { - let joinTo; - let minAngle = Infinity; - endNodes.forEach((endNode) => { - const a1 = geoAngle(midNode, tipNode, context.projection) + Math.PI; - const a2 = geoAngle(midNode, endNode, context.projection) + Math.PI; - const diff = Math.max(a1, a2) - Math.min(a1, a2); - if (diff < minAngle) { - joinTo = endNode; - minAngle = diff; - } + if (changed.addition) { + diff.created().forEach(function(entity) { + insertions[entity.id] = entity; }); - if (minAngle <= SIG_ANGLE_TH) - return joinTo; - return null; - } - function hasTag(tags, key) { - return tags[key] !== void 0 && tags[key] !== "no"; - } - function canConnectWays(way, way2) { - if (way.id === way2.id) - return true; - if ((hasTag(way.tags, "bridge") || hasTag(way2.tags, "bridge")) && !(hasTag(way.tags, "bridge") && hasTag(way2.tags, "bridge"))) - return false; - if ((hasTag(way.tags, "tunnel") || hasTag(way2.tags, "tunnel")) && !(hasTag(way.tags, "tunnel") && hasTag(way2.tags, "tunnel"))) - return false; - const layer1 = way.tags.layer || "0", layer2 = way2.tags.layer || "0"; - if (layer1 !== layer2) - return false; - const level1 = way.tags.level || "0", level2 = way2.tags.level || "0"; - if (level1 !== level2) - return false; - return true; } - function canConnectByExtend(way, endNodeIdx) { - const tipNid = way.nodes[endNodeIdx]; - const midNid = endNodeIdx === 0 ? way.nodes[1] : way.nodes[way.nodes.length - 2]; - const tipNode = graph.entity(tipNid); - const midNode = graph.entity(midNid); - const lon = tipNode.loc[0]; - const lat = tipNode.loc[1]; - const lon_range = geoMetersToLon(EXTEND_TH_METERS, lat) / 2; - const lat_range = geoMetersToLat(EXTEND_TH_METERS) / 2; - const queryExtent = geoExtent([ - [lon - lon_range, lat - lat_range], - [lon + lon_range, lat + lat_range] - ]); - const edgeLen = geoSphericalDistance(midNode.loc, tipNode.loc); - const t = EXTEND_TH_METERS / edgeLen + 1; - const extTipLoc = geoVecInterp(midNode.loc, tipNode.loc, t); - const segmentInfos = tree.waySegments(queryExtent, graph); - for (let i2 = 0; i2 < segmentInfos.length; i2++) { - let segmentInfo = segmentInfos[i2]; - let way2 = graph.entity(segmentInfo.wayId); - if (!isHighway(way2)) - continue; - if (!canConnectWays(way, way2)) - continue; - let nAid = segmentInfo.nodes[0], nBid = segmentInfo.nodes[1]; - if (nAid === tipNid || nBid === tipNid) - continue; - let nA = graph.entity(nAid), nB = graph.entity(nBid); - let crossLoc = geoLineIntersection([tipNode.loc, extTipLoc], [nA.loc, nB.loc]); - if (crossLoc) { - return { - mid: midNode, - node: tipNode, - wid: way2.id, - edge: [nA.id, nB.id], - cross_loc: crossLoc - }; - } + loadEntities(Object.values(insertions)); + } + tree.intersects = function(extent, graph) { + updateToGraph(graph); + return _rtree.search(extent.bbox()).map(function(bbox2) { + return graph.entity(bbox2.id); + }); + }; + tree.waySegments = function(extent, graph) { + updateToGraph(graph); + return _segmentsRTree.search(extent.bbox()).map(function(bbox2) { + return bbox2.segment; + }); + }; + return tree; + } + + // modules/svg/icon.js + function svgIcon(name, svgklass, useklass) { + return function drawIcon(selection2) { + selection2.selectAll("svg.icon" + (svgklass ? "." + svgklass.split(" ")[0] : "")).data([0]).enter().append("svg").attr("class", "icon " + (svgklass || "")).append("use").attr("xlink:href", name).attr("class", useklass); + }; + } + + // modules/ui/modal.js + function uiModal(selection2, blocking) { + let keybinding = utilKeybinding("modal"); + let previous = selection2.select("div.modal"); + let animate = previous.empty(); + previous.transition().duration(200).style("opacity", 0).remove(); + let shaded = selection2.append("div").attr("class", "shaded").style("opacity", 0); + shaded.close = () => { + shaded.transition().duration(200).style("opacity", 0).remove(); + modal.transition().duration(200).style("top", "0px"); + select_default2(document).call(keybinding.unbind); + }; + let modal = shaded.append("div").attr("class", "modal fillL"); + modal.append("input").attr("class", "keytrap keytrap-first").on("focus.keytrap", moveFocusToLast); + if (!blocking) { + shaded.on("click.remove-modal", (d3_event) => { + if (d3_event.target === this) { + shaded.close(); } - return null; + }); + modal.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", shaded.close).call(svgIcon("#iD-icon-close")); + keybinding.on("\u232B", shaded.close).on("\u238B", shaded.close); + select_default2(document).call(keybinding); + } + modal.append("div").attr("class", "content"); + modal.append("input").attr("class", "keytrap keytrap-last").on("focus.keytrap", moveFocusToFirst); + if (animate) { + shaded.transition().style("opacity", 1); + } else { + shaded.style("opacity", 1); + } + return shaded; + function moveFocusToFirst() { + let node = modal.select("a, button, input:not(.keytrap), select, textarea").node(); + if (node) { + node.focus(); + } else { + select_default2(this).node().blur(); + } + } + function moveFocusToLast() { + let nodes = modal.selectAll("a, button, input:not(.keytrap), select, textarea").nodes(); + if (nodes.length) { + nodes[nodes.length - 1].focus(); + } else { + select_default2(this).node().blur(); } + } + } + + // modules/ui/loading.js + function uiLoading(context) { + let _modalSelection = select_default2(null); + let _message = ""; + let _blocking = false; + let loading = (selection2) => { + _modalSelection = uiModal(selection2, _blocking); + let loadertext = _modalSelection.select(".content").classed("loading-modal", true).append("div").attr("class", "modal-section fillL"); + loadertext.append("img").attr("class", "loader").attr("src", context.imagePath("loader-white.gif")); + loadertext.append("h3").html(_message); + _modalSelection.select("button.close").attr("class", "hide"); + return loading; }; - validation.type = type3; - return validation; + loading.message = function(val) { + if (!arguments.length) return _message; + _message = val; + return loading; + }; + loading.blocking = function(val) { + if (!arguments.length) return _blocking; + _blocking = val; + return loading; + }; + loading.close = () => { + _modalSelection.remove(); + }; + loading.isShown = () => { + return _modalSelection && !_modalSelection.empty() && _modalSelection.node().parentNode; + }; + return loading; } - // modules/validations/close_nodes.js - function validationCloseNodes(context) { - var type3 = "close_nodes"; - var pointThresholdMeters = 0.2; - var validation = function(entity, graph) { - if (entity.type === "node") { - return getIssuesForNode(entity); - } else if (entity.type === "way") { - return getIssuesForWay(entity); + // modules/core/history.js + function coreHistory(context) { + var dispatch14 = dispatch_default("reset", "change", "merge", "restore", "undone", "redone", "storage_error"); + var lock = utilSessionMutex("lock"); + var _hasUnresolvedRestorableChanges = lock.lock() && !!corePreferences(getKey("saved_history")); + var duration = 150; + var _imageryUsed = []; + var _photoOverlaysUsed = []; + var _checkpoints = {}; + var _pausedGraph; + var _stack; + var _index; + var _tree; + function _act(actions, t2) { + actions = Array.prototype.slice.call(actions); + var annotation; + if (typeof actions[actions.length - 1] !== "function") { + annotation = actions.pop(); } - return []; - function getIssuesForNode(node) { - var parentWays = graph.parentWays(node); - if (parentWays.length) { - return getIssuesForVertex(node, parentWays); - } else { - return getIssuesForDetachedPoint(node); - } + var graph = _stack[_index].graph; + for (var i3 = 0; i3 < actions.length; i3++) { + graph = actions[i3](graph, t2); } - function wayTypeFor(way) { - if (way.tags.boundary && way.tags.boundary !== "no") - return "boundary"; - if (way.tags.indoor && way.tags.indoor !== "no") - return "indoor"; - if (way.tags.building && way.tags.building !== "no" || way.tags["building:part"] && way.tags["building:part"] !== "no") - return "building"; - if (osmPathHighwayTagValues[way.tags.highway]) - return "path"; - var parentRelations = graph.parentRelations(way); - for (var i2 in parentRelations) { - var relation = parentRelations[i2]; - if (relation.tags.type === "boundary") - return "boundary"; - if (relation.isMultipolygon()) { - if (relation.tags.indoor && relation.tags.indoor !== "no") - return "indoor"; - if (relation.tags.building && relation.tags.building !== "no" || relation.tags["building:part"] && relation.tags["building:part"] !== "no") - return "building"; - } - } - return "other"; + return { + graph, + annotation, + imageryUsed: _imageryUsed, + photoOverlaysUsed: _photoOverlaysUsed, + transform: context.projection.transform(), + selectedIDs: context.selectedIDs() + }; + } + function _perform(args, t2) { + var previous = _stack[_index].graph; + _stack = _stack.slice(0, _index + 1); + var actionResult = _act(args, t2); + _stack.push(actionResult); + _index++; + return change(previous); + } + function _replace(args, t2) { + var previous = _stack[_index].graph; + var actionResult = _act(args, t2); + _stack[_index] = actionResult; + return change(previous); + } + function _overwrite(args, t2) { + var previous = _stack[_index].graph; + if (_index > 0) { + _index--; + _stack.pop(); } - function shouldCheckWay(way) { - if (way.nodes.length <= 2 || way.isClosed() && way.nodes.length <= 4) - return false; - var bbox2 = way.extent(graph).bbox(); - var hypotenuseMeters = geoSphericalDistance([bbox2.minX, bbox2.minY], [bbox2.maxX, bbox2.maxY]); - if (hypotenuseMeters < 1.5) - return false; - return true; + _stack = _stack.slice(0, _index + 1); + var actionResult = _act(args, t2); + _stack.push(actionResult); + _index++; + return change(previous); + } + function change(previous) { + var difference2 = coreDifference(previous, history.graph()); + if (!_pausedGraph) { + dispatch14.call("change", this, difference2); } - function getIssuesForWay(way) { - if (!shouldCheckWay(way)) - return []; - var issues = [], nodes = graph.childNodes(way); - for (var i2 = 0; i2 < nodes.length - 1; i2++) { - var node1 = nodes[i2]; - var node2 = nodes[i2 + 1]; - var issue = getWayIssueIfAny(node1, node2, way); - if (issue) - issues.push(issue); + return difference2; + } + function getKey(n3) { + return "iD_" + window.location.origin + "_" + n3; + } + var history = { + graph: function() { + return _stack[_index].graph; + }, + tree: function() { + return _tree; + }, + base: function() { + return _stack[0].graph; + }, + merge: function(entities) { + var stack = _stack.map(function(state) { + return state.graph; + }); + _stack[0].graph.rebase(entities, stack, false); + _tree.rebase(entities, false); + dispatch14.call("merge", this, entities); + }, + perform: function() { + select_default2(document).interrupt("history.perform"); + var transitionable = false; + var action0 = arguments[0]; + if (arguments.length === 1 || arguments.length === 2 && typeof arguments[1] !== "function") { + transitionable = !!action0.transitionable; } - return issues; - } - function getIssuesForVertex(node, parentWays) { - var issues = []; - function checkForCloseness(node1, node2, way) { - var issue = getWayIssueIfAny(node1, node2, way); - if (issue) - issues.push(issue); + if (transitionable) { + var origArguments = arguments; + select_default2(document).transition("history.perform").duration(duration).ease(linear2).tween("history.tween", function() { + return function(t2) { + if (t2 < 1) _overwrite([action0], t2); + }; + }).on("start", function() { + _perform([action0], 0); + }).on("end interrupt", function() { + _overwrite(origArguments, 1); + }); + } else { + return _perform(arguments); } - for (var i2 = 0; i2 < parentWays.length; i2++) { - var parentWay = parentWays[i2]; - if (!shouldCheckWay(parentWay)) - continue; - var lastIndex = parentWay.nodes.length - 1; - for (var j2 = 0; j2 < parentWay.nodes.length; j2++) { - if (j2 !== 0) { - if (parentWay.nodes[j2 - 1] === node.id) { - checkForCloseness(node, graph.entity(parentWay.nodes[j2]), parentWay); - } - } - if (j2 !== lastIndex) { - if (parentWay.nodes[j2 + 1] === node.id) { - checkForCloseness(graph.entity(parentWay.nodes[j2]), node, parentWay); - } - } + }, + replace: function() { + select_default2(document).interrupt("history.perform"); + return _replace(arguments, 1); + }, + // Same as calling pop and then perform + overwrite: function() { + select_default2(document).interrupt("history.perform"); + return _overwrite(arguments, 1); + }, + pop: function(n3) { + select_default2(document).interrupt("history.perform"); + var previous = _stack[_index].graph; + if (isNaN(+n3) || +n3 < 0) { + n3 = 1; + } + while (n3-- > 0 && _index > 0) { + _index--; + _stack.pop(); + } + return change(previous); + }, + // Back to the previous annotated state or _index = 0. + undo: function() { + select_default2(document).interrupt("history.perform"); + var previousStack = _stack[_index]; + var previous = previousStack.graph; + while (_index > 0) { + _index--; + if (_stack[_index].annotation) break; + } + dispatch14.call("undone", this, _stack[_index], previousStack); + return change(previous); + }, + // Forward to the next annotated state. + redo: function() { + select_default2(document).interrupt("history.perform"); + var previousStack = _stack[_index]; + var previous = previousStack.graph; + var tryIndex = _index; + while (tryIndex < _stack.length - 1) { + tryIndex++; + if (_stack[tryIndex].annotation) { + _index = tryIndex; + dispatch14.call("redone", this, _stack[_index], previousStack); + break; } } - return issues; - } - function thresholdMetersForWay(way) { - if (!shouldCheckWay(way)) - return 0; - var wayType = wayTypeFor(way); - if (wayType === "boundary") - return 0; - if (wayType === "indoor") - return 0.01; - if (wayType === "building") - return 0.05; - if (wayType === "path") - return 0.1; - return 0.2; - } - function getIssuesForDetachedPoint(node) { - var issues = []; - var lon = node.loc[0]; - var lat = node.loc[1]; - var lon_range = geoMetersToLon(pointThresholdMeters, lat) / 2; - var lat_range = geoMetersToLat(pointThresholdMeters) / 2; - var queryExtent = geoExtent([ - [lon - lon_range, lat - lat_range], - [lon + lon_range, lat + lat_range] - ]); - var intersected = context.history().tree().intersects(queryExtent, graph); - for (var j2 = 0; j2 < intersected.length; j2++) { - var nearby = intersected[j2]; - if (nearby.id === node.id) - continue; - if (nearby.type !== "node" || nearby.geometry(graph) !== "point") - continue; - if (nearby.loc === node.loc || geoSphericalDistance(node.loc, nearby.loc) < pointThresholdMeters) { - if ("memorial:type" in node.tags && "memorial:type" in nearby.tags && node.tags["memorial:type"] === "stolperstein" && nearby.tags["memorial:type"] === "stolperstein") - continue; - if ("memorial" in node.tags && "memorial" in nearby.tags && node.tags.memorial === "stolperstein" && nearby.tags.memorial === "stolperstein") - continue; - var zAxisKeys = { layer: true, level: true, "addr:housenumber": true, "addr:unit": true }; - var zAxisDifferentiates = false; - for (var key in zAxisKeys) { - var nodeValue = node.tags[key] || "0"; - var nearbyValue = nearby.tags[key] || "0"; - if (nodeValue !== nearbyValue) { - zAxisDifferentiates = true; - break; - } - } - if (zAxisDifferentiates) - continue; - issues.push(new validationIssue({ - type: type3, - subtype: "detached", - severity: "warning", - message: function(context2) { - var entity2 = context2.hasEntity(this.entityIds[0]), entity22 = context2.hasEntity(this.entityIds[1]); - return entity2 && entity22 ? _t.append("issues.close_nodes.detached.message", { - feature: utilDisplayLabel(entity2, context2.graph()), - feature2: utilDisplayLabel(entity22, context2.graph()) - }) : ""; - }, - reference: showReference, - entityIds: [node.id, nearby.id], - dynamicFixes: function() { - return [ - new validationIssueFix({ - icon: "iD-operation-disconnect", - title: _t.append("issues.fix.move_points_apart.title") - }), - new validationIssueFix({ - icon: "iD-icon-layers", - title: _t.append("issues.fix.use_different_layers_or_levels.title") - }) - ]; - } - })); - } + return change(previous); + }, + pauseChangeDispatch: function() { + if (!_pausedGraph) { + _pausedGraph = _stack[_index].graph; } - return issues; - function showReference(selection2) { - var referenceText = _t("issues.close_nodes.detached.reference"); - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").html(referenceText); + }, + resumeChangeDispatch: function() { + if (_pausedGraph) { + var previous = _pausedGraph; + _pausedGraph = null; + return change(previous); } - } - function getWayIssueIfAny(node1, node2, way) { - if (node1.id === node2.id || node1.hasInterestingTags() && node2.hasInterestingTags()) { - return null; + }, + undoAnnotation: function() { + var i3 = _index; + while (i3 >= 0) { + if (_stack[i3].annotation) return _stack[i3].annotation; + i3--; } - if (node1.loc !== node2.loc) { - var parentWays1 = graph.parentWays(node1); - var parentWays2 = new Set(graph.parentWays(node2)); - var sharedWays = parentWays1.filter(function(parentWay) { - return parentWays2.has(parentWay); + }, + redoAnnotation: function() { + var i3 = _index + 1; + while (i3 <= _stack.length - 1) { + if (_stack[i3].annotation) return _stack[i3].annotation; + i3++; + } + }, + // Returns the entities from the active graph with bounding boxes + // overlapping the given `extent`. + intersects: function(extent) { + return _tree.intersects(extent, _stack[_index].graph); + }, + difference: function() { + var base = _stack[0].graph; + var head = _stack[_index].graph; + return coreDifference(base, head); + }, + changes: function(action) { + var base = _stack[0].graph; + var head = _stack[_index].graph; + if (action) { + head = action(head); + } + var difference2 = coreDifference(base, head); + return { + modified: difference2.modified(), + created: difference2.created(), + deleted: difference2.deleted() + }; + }, + hasChanges: function() { + return this.difference().length() > 0; + }, + imageryUsed: function(sources) { + if (sources) { + _imageryUsed = sources; + return history; + } else { + var s2 = /* @__PURE__ */ new Set(); + _stack.slice(1, _index + 1).forEach(function(state) { + state.imageryUsed.forEach(function(source) { + if (source !== "Custom") { + s2.add(source); + } + }); }); - var thresholds = sharedWays.map(function(parentWay) { - return thresholdMetersForWay(parentWay); + return Array.from(s2); + } + }, + photoOverlaysUsed: function(sources) { + if (sources) { + _photoOverlaysUsed = sources; + return history; + } else { + var s2 = /* @__PURE__ */ new Set(); + _stack.slice(1, _index + 1).forEach(function(state) { + if (state.photoOverlaysUsed && Array.isArray(state.photoOverlaysUsed)) { + state.photoOverlaysUsed.forEach(function(photoOverlay) { + s2.add(photoOverlay); + }); + } }); - var threshold = Math.min(...thresholds); - var distance = geoSphericalDistance(node1.loc, node2.loc); - if (distance > threshold) - return null; + return Array.from(s2); } - return new validationIssue({ - type: type3, - subtype: "vertices", - severity: "warning", - message: function(context2) { - var entity2 = context2.hasEntity(this.entityIds[0]); - return entity2 ? _t.append("issues.close_nodes.message", { way: utilDisplayLabel(entity2, context2.graph()) }) : ""; - }, - reference: showReference, - entityIds: [way.id, node1.id, node2.id], - loc: node1.loc, - dynamicFixes: function() { - return [ - new validationIssueFix({ - icon: "iD-icon-plus", - title: _t.append("issues.fix.merge_points.title"), - onClick: function(context2) { - var entityIds = this.issue.entityIds; - var action = actionMergeNodes([entityIds[1], entityIds[2]]); - context2.perform(action, _t("issues.fix.merge_close_vertices.annotation")); - } - }), - new validationIssueFix({ - icon: "iD-operation-disconnect", - title: _t.append("issues.fix.move_points_apart.title") - }) - ]; + }, + // save the current history state + checkpoint: function(key) { + _checkpoints[key] = { + stack: _stack, + index: _index + }; + return history; + }, + // restore history state to a given checkpoint or reset completely + reset: function(key) { + if (key !== void 0 && _checkpoints.hasOwnProperty(key)) { + _stack = _checkpoints[key].stack; + _index = _checkpoints[key].index; + } else { + _stack = [{ graph: coreGraph() }]; + _index = 0; + _tree = coreTree(_stack[0].graph); + _checkpoints = {}; + } + dispatch14.call("reset"); + dispatch14.call("change"); + return history; + }, + // `toIntroGraph()` is used to export the intro graph used by the walkthrough. + // + // To use it: + // 1. Start the walkthrough. + // 2. Get to a "free editing" tutorial step + // 3. Make your edits to the walkthrough map + // 4. In your browser dev console run: + // `id.history().toIntroGraph()` + // 5. This outputs stringified JSON to the browser console + // 6. Copy it to `data/intro_graph.json` and prettify it in your code editor + toIntroGraph: function() { + var nextID = { n: 0, r: 0, w: 0 }; + var permIDs = {}; + var graph = this.graph(); + var baseEntities = {}; + Object.values(graph.base().entities).forEach(function(entity) { + var copy2 = copyIntroEntity(entity); + baseEntities[copy2.id] = copy2; + }); + Object.keys(graph.entities).forEach(function(id2) { + var entity = graph.entities[id2]; + if (entity) { + var copy2 = copyIntroEntity(entity); + baseEntities[copy2.id] = copy2; + } else { + delete baseEntities[id2]; } }); - function showReference(selection2) { - var referenceText = _t("issues.close_nodes.reference"); - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").html(referenceText); - } - } - }; - validation.type = type3; - return validation; - } - - // modules/validations/crossing_ways.js - function validationCrossingWays(context) { - var type3 = "crossing_ways"; - function getFeatureWithFeatureTypeTagsForWay(way, graph) { - if (getFeatureType(way, graph) === null) { - var parentRels = graph.parentRelations(way); - for (var i2 = 0; i2 < parentRels.length; i2++) { - var rel = parentRels[i2]; - if (getFeatureType(rel, graph) !== null) { - return rel; + Object.values(baseEntities).forEach(function(entity) { + if (Array.isArray(entity.nodes)) { + entity.nodes = entity.nodes.map(function(node) { + return permIDs[node] || node; + }); } - } - } - return way; - } - function hasTag(tags, key) { - return tags[key] !== void 0 && tags[key] !== "no"; - } - function taggedAsIndoor(tags) { - return hasTag(tags, "indoor") || hasTag(tags, "level") || tags.highway === "corridor"; - } - function allowsBridge(featureType) { - return featureType === "highway" || featureType === "railway" || featureType === "waterway"; - } - function allowsTunnel(featureType) { - return featureType === "highway" || featureType === "railway" || featureType === "waterway"; - } - var ignoredBuildings = { - demolished: true, - dismantled: true, - proposed: true, - razed: true - }; - function getFeatureType(entity, graph) { - var geometry = entity.geometry(graph); - if (geometry !== "line" && geometry !== "area") - return null; - var tags = entity.tags; - if (hasTag(tags, "building") && !ignoredBuildings[tags.building]) - return "building"; - if (hasTag(tags, "highway") && osmRoutableHighwayTagValues[tags.highway]) - return "highway"; - if (geometry !== "line") - return null; - if (hasTag(tags, "railway") && osmRailwayTrackTagValues[tags.railway]) - return "railway"; - if (hasTag(tags, "waterway") && osmFlowingWaterwayTagValues[tags.waterway]) - return "waterway"; - return null; - } - function isLegitCrossing(tags1, featureType1, tags2, featureType2) { - var level1 = tags1.level || "0"; - var level2 = tags2.level || "0"; - if (taggedAsIndoor(tags1) && taggedAsIndoor(tags2) && level1 !== level2) { - return true; - } - var layer1 = tags1.layer || "0"; - var layer2 = tags2.layer || "0"; - if (allowsBridge(featureType1) && allowsBridge(featureType2)) { - if (hasTag(tags1, "bridge") && !hasTag(tags2, "bridge")) - return true; - if (!hasTag(tags1, "bridge") && hasTag(tags2, "bridge")) - return true; - if (hasTag(tags1, "bridge") && hasTag(tags2, "bridge") && layer1 !== layer2) - return true; - } else if (allowsBridge(featureType1) && hasTag(tags1, "bridge")) - return true; - else if (allowsBridge(featureType2) && hasTag(tags2, "bridge")) - return true; - if (allowsTunnel(featureType1) && allowsTunnel(featureType2)) { - if (hasTag(tags1, "tunnel") && !hasTag(tags2, "tunnel")) - return true; - if (!hasTag(tags1, "tunnel") && hasTag(tags2, "tunnel")) - return true; - if (hasTag(tags1, "tunnel") && hasTag(tags2, "tunnel") && layer1 !== layer2) - return true; - } else if (allowsTunnel(featureType1) && hasTag(tags1, "tunnel")) - return true; - else if (allowsTunnel(featureType2) && hasTag(tags2, "tunnel")) - return true; - if (featureType1 === "waterway" && featureType2 === "highway" && tags2.man_made === "pier") - return true; - if (featureType2 === "waterway" && featureType1 === "highway" && tags1.man_made === "pier") - return true; - if (featureType1 === "building" || featureType2 === "building" || taggedAsIndoor(tags1) || taggedAsIndoor(tags2)) { - if (layer1 !== layer2) - return true; - } - return false; - } - var highwaysDisallowingFords = { - motorway: true, - motorway_link: true, - trunk: true, - trunk_link: true, - primary: true, - primary_link: true, - secondary: true, - secondary_link: true - }; - var nonCrossingHighways = { track: true }; - function tagsForConnectionNodeIfAllowed(entity1, entity2, graph) { - var featureType1 = getFeatureType(entity1, graph); - var featureType2 = getFeatureType(entity2, graph); - var geometry1 = entity1.geometry(graph); - var geometry2 = entity2.geometry(graph); - var bothLines = geometry1 === "line" && geometry2 === "line"; - if (featureType1 === featureType2) { - if (featureType1 === "highway") { - var entity1IsPath = osmPathHighwayTagValues[entity1.tags.highway]; - var entity2IsPath = osmPathHighwayTagValues[entity2.tags.highway]; - if ((entity1IsPath || entity2IsPath) && entity1IsPath !== entity2IsPath) { - var roadFeature = entity1IsPath ? entity2 : entity1; - if (nonCrossingHighways[roadFeature.tags.highway]) { - return {}; - } - var pathFeature = entity1IsPath ? entity1 : entity2; - if (["marked", "unmarked", "traffic_signals"].indexOf(pathFeature.tags.crossing) !== -1) { - return bothLines ? { highway: "crossing", crossing: pathFeature.tags.crossing } : {}; - } - return bothLines ? { highway: "crossing" } : {}; + if (Array.isArray(entity.members)) { + entity.members = entity.members.map(function(member) { + member.id = permIDs[member.id] || member.id; + return member; + }); } - return {}; + }); + return JSON.stringify({ dataIntroGraph: baseEntities }); + function copyIntroEntity(source) { + var copy2 = utilObjectOmit(source, ["type", "user", "v", "version", "visible"]); + if (copy2.tags && !Object.keys(copy2.tags)) { + delete copy2.tags; + } + if (Array.isArray(copy2.loc)) { + copy2.loc[0] = +copy2.loc[0].toFixed(6); + copy2.loc[1] = +copy2.loc[1].toFixed(6); + } + var match = source.id.match(/([nrw])-\d*/); + if (match !== null) { + var nrw = match[1]; + var permID; + do { + permID = nrw + ++nextID[nrw]; + } while (baseEntities.hasOwnProperty(permID)); + copy2.id = permIDs[source.id] = permID; + } + return copy2; } - if (featureType1 === "waterway") - return {}; - if (featureType1 === "railway") - return {}; - } else { - var featureTypes = [featureType1, featureType2]; - if (featureTypes.indexOf("highway") !== -1) { - if (featureTypes.indexOf("railway") !== -1) { - if (!bothLines) - return {}; - var isTram = entity1.tags.railway === "tram" || entity2.tags.railway === "tram"; - if (osmPathHighwayTagValues[entity1.tags.highway] || osmPathHighwayTagValues[entity2.tags.highway]) { - if (isTram) - return { railway: "tram_crossing" }; - return { railway: "crossing" }; + }, + toJSON: function() { + if (!this.hasChanges()) return; + var allEntities = {}; + var baseEntities = {}; + var base = _stack[0]; + var s2 = _stack.map(function(i3) { + var modified = []; + var deleted = []; + Object.keys(i3.graph.entities).forEach(function(id2) { + var entity = i3.graph.entities[id2]; + if (entity) { + var key = osmEntity.key(entity); + allEntities[key] = entity; + modified.push(key); } else { - if (isTram) - return { railway: "tram_level_crossing" }; - return { railway: "level_crossing" }; + deleted.push(id2); } - } - if (featureTypes.indexOf("waterway") !== -1) { - if (hasTag(entity1.tags, "tunnel") && hasTag(entity2.tags, "tunnel")) - return null; - if (hasTag(entity1.tags, "bridge") && hasTag(entity2.tags, "bridge")) - return null; - if (highwaysDisallowingFords[entity1.tags.highway] || highwaysDisallowingFords[entity2.tags.highway]) { - return null; + if (id2 in base.graph.entities) { + baseEntities[id2] = base.graph.entities[id2]; } - return bothLines ? { ford: "yes" } : {}; - } - } - } - return null; - } - function findCrossingsByWay(way1, graph, tree) { - var edgeCrossInfos = []; - if (way1.type !== "way") - return edgeCrossInfos; - var taggedFeature1 = getFeatureWithFeatureTypeTagsForWay(way1, graph); - var way1FeatureType = getFeatureType(taggedFeature1, graph); - if (way1FeatureType === null) - return edgeCrossInfos; - var checkedSingleCrossingWays = {}; - var i2, j2; - var extent; - var n1, n2, nA, nB, nAId, nBId; - var segment1, segment2; - var oneOnly; - var segmentInfos, segment2Info, way2, taggedFeature2, way2FeatureType; - var way1Nodes = graph.childNodes(way1); - var comparedWays = {}; - for (i2 = 0; i2 < way1Nodes.length - 1; i2++) { - n1 = way1Nodes[i2]; - n2 = way1Nodes[i2 + 1]; - extent = geoExtent([ - [ - Math.min(n1.loc[0], n2.loc[0]), - Math.min(n1.loc[1], n2.loc[1]) - ], - [ - Math.max(n1.loc[0], n2.loc[0]), - Math.max(n1.loc[1], n2.loc[1]) - ] - ]); - segmentInfos = tree.waySegments(extent, graph); - for (j2 = 0; j2 < segmentInfos.length; j2++) { - segment2Info = segmentInfos[j2]; - if (segment2Info.wayId === way1.id) - continue; - if (checkedSingleCrossingWays[segment2Info.wayId]) - continue; - comparedWays[segment2Info.wayId] = true; - way2 = graph.hasEntity(segment2Info.wayId); - if (!way2) - continue; - taggedFeature2 = getFeatureWithFeatureTypeTagsForWay(way2, graph); - way2FeatureType = getFeatureType(taggedFeature2, graph); - if (way2FeatureType === null || isLegitCrossing(taggedFeature1.tags, way1FeatureType, taggedFeature2.tags, way2FeatureType)) { - continue; - } - oneOnly = way1FeatureType === "building" || way2FeatureType === "building"; - nAId = segment2Info.nodes[0]; - nBId = segment2Info.nodes[1]; - if (nAId === n1.id || nAId === n2.id || nBId === n1.id || nBId === n2.id) { - continue; - } - nA = graph.hasEntity(nAId); - if (!nA) - continue; - nB = graph.hasEntity(nBId); - if (!nB) - continue; - segment1 = [n1.loc, n2.loc]; - segment2 = [nA.loc, nB.loc]; - var point2 = geoLineIntersection(segment1, segment2); - if (point2) { - edgeCrossInfos.push({ - wayInfos: [ - { - way: way1, - featureType: way1FeatureType, - edge: [n1.id, n2.id] - }, - { - way: way2, - featureType: way2FeatureType, - edge: [nA.id, nB.id] + if (entity && entity.nodes) { + entity.nodes.forEach(function(nodeID) { + if (nodeID in base.graph.entities) { + baseEntities[nodeID] = base.graph.entities[nodeID]; } - ], - crossPoint: point2 + }); + } + var baseParents = base.graph._parentWays[id2]; + if (baseParents) { + baseParents.forEach(function(parentID) { + if (parentID in base.graph.entities) { + baseEntities[parentID] = base.graph.entities[parentID]; + } + }); + } + }); + var x2 = {}; + if (modified.length) x2.modified = modified; + if (deleted.length) x2.deleted = deleted; + if (i3.imageryUsed) x2.imageryUsed = i3.imageryUsed; + if (i3.photoOverlaysUsed) x2.photoOverlaysUsed = i3.photoOverlaysUsed; + if (i3.annotation) x2.annotation = i3.annotation; + if (i3.transform) x2.transform = i3.transform; + if (i3.selectedIDs) x2.selectedIDs = i3.selectedIDs; + return x2; + }); + return JSON.stringify({ + version: 3, + entities: Object.values(allEntities), + baseEntities: Object.values(baseEntities), + stack: s2, + nextIDs: osmEntity.id.next, + index: _index, + // note the time the changes were saved + timestamp: (/* @__PURE__ */ new Date()).getTime() + }); + }, + fromJSON: function(json, loadChildNodes) { + var h2 = JSON.parse(json); + var loadComplete = true; + osmEntity.id.next = h2.nextIDs; + _index = h2.index; + if (h2.version === 2 || h2.version === 3) { + var allEntities = {}; + h2.entities.forEach(function(entity) { + allEntities[osmEntity.key(entity)] = osmEntity(entity); + }); + if (h2.version === 3) { + var baseEntities = h2.baseEntities.map(function(d2) { + return osmEntity(d2); }); - if (oneOnly) { - checkedSingleCrossingWays[way2.id] = true; - break; + var stack = _stack.map(function(state) { + return state.graph; + }); + _stack[0].graph.rebase(baseEntities, stack, true); + _tree.rebase(baseEntities, true); + if (loadChildNodes) { + var osm = context.connection(); + var baseWays = baseEntities.filter(function(e3) { + return e3.type === "way"; + }); + var nodeIDs = baseWays.reduce(function(acc, way) { + return utilArrayUnion(acc, way.nodes); + }, []); + var missing = nodeIDs.filter(function(n3) { + return !_stack[0].graph.hasEntity(n3); + }); + if (missing.length && osm) { + loadComplete = false; + context.map().redrawEnable(false); + var loading = uiLoading(context).blocking(true); + context.container().call(loading); + var childNodesLoaded = function(err, result) { + if (!err) { + var visibleGroups = utilArrayGroupBy(result.data, "visible"); + var visibles = visibleGroups.true || []; + var invisibles = visibleGroups.false || []; + if (visibles.length) { + var visibleIDs = visibles.map(function(entity) { + return entity.id; + }); + var stack2 = _stack.map(function(state) { + return state.graph; + }); + missing = utilArrayDifference(missing, visibleIDs); + _stack[0].graph.rebase(visibles, stack2, true); + _tree.rebase(visibles, true); + } + invisibles.forEach(function(entity) { + osm.loadEntityVersion(entity.id, +entity.version - 1, childNodesLoaded); + }); + } + if (err || !missing.length) { + loading.close(); + context.map().redrawEnable(true); + dispatch14.call("change"); + dispatch14.call("restore", this); + } + }; + osm.loadMultiple(missing, childNodesLoaded); + } } } - } - } - return edgeCrossInfos; - } - function waysToCheck(entity, graph) { - var featureType = getFeatureType(entity, graph); - if (!featureType) - return []; - if (entity.type === "way") { - return [entity]; - } else if (entity.type === "relation") { - return entity.members.reduce(function(array2, member) { - if (member.type === "way" && (!member.role || member.role === "outer" || member.role === "inner")) { - var entity2 = graph.hasEntity(member.id); - if (entity2 && array2.indexOf(entity2) === -1) { - array2.push(entity2); + _stack = h2.stack.map(function(d2) { + var entities = {}, entity; + if (d2.modified) { + d2.modified.forEach(function(key) { + entity = allEntities[key]; + entities[entity.id] = entity; + }); } - } - return array2; - }, []); - } - return []; - } - var validation = function checkCrossingWays(entity, graph) { - var tree = context.history().tree(); - var ways = waysToCheck(entity, graph); - var issues = []; - var wayIndex, crossingIndex, crossings; - for (wayIndex in ways) { - crossings = findCrossingsByWay(ways[wayIndex], graph, tree); - for (crossingIndex in crossings) { - issues.push(createIssue(crossings[crossingIndex], graph)); - } - } - return issues; - }; - function createIssue(crossing, graph) { - crossing.wayInfos.sort(function(way1Info, way2Info) { - var type1 = way1Info.featureType; - var type22 = way2Info.featureType; - if (type1 === type22) { - return utilDisplayLabel(way1Info.way, graph) > utilDisplayLabel(way2Info.way, graph); - } else if (type1 === "waterway") { - return true; - } else if (type22 === "waterway") { - return false; - } - return type1 < type22; - }); - var entities = crossing.wayInfos.map(function(wayInfo) { - return getFeatureWithFeatureTypeTagsForWay(wayInfo.way, graph); - }); - var edges = [crossing.wayInfos[0].edge, crossing.wayInfos[1].edge]; - var featureTypes = [crossing.wayInfos[0].featureType, crossing.wayInfos[1].featureType]; - var connectionTags = tagsForConnectionNodeIfAllowed(entities[0], entities[1], graph); - var featureType1 = crossing.wayInfos[0].featureType; - var featureType2 = crossing.wayInfos[1].featureType; - var isCrossingIndoors = taggedAsIndoor(entities[0].tags) && taggedAsIndoor(entities[1].tags); - var isCrossingTunnels = allowsTunnel(featureType1) && hasTag(entities[0].tags, "tunnel") && allowsTunnel(featureType2) && hasTag(entities[1].tags, "tunnel"); - var isCrossingBridges = allowsBridge(featureType1) && hasTag(entities[0].tags, "bridge") && allowsBridge(featureType2) && hasTag(entities[1].tags, "bridge"); - var subtype = [featureType1, featureType2].sort().join("-"); - var crossingTypeID = subtype; - if (isCrossingIndoors) { - crossingTypeID = "indoor-indoor"; - } else if (isCrossingTunnels) { - crossingTypeID = "tunnel-tunnel"; - } else if (isCrossingBridges) { - crossingTypeID = "bridge-bridge"; - } - if (connectionTags && (isCrossingIndoors || isCrossingTunnels || isCrossingBridges)) { - crossingTypeID += "_connectable"; - } - var uniqueID = crossing.crossPoint[0].toFixed(4) + "," + crossing.crossPoint[1].toFixed(4); - return new validationIssue({ - type: type3, - subtype, - severity: "warning", - message: function(context2) { - var graph2 = context2.graph(); - var entity1 = graph2.hasEntity(this.entityIds[0]), entity2 = graph2.hasEntity(this.entityIds[1]); - return entity1 && entity2 ? _t.append("issues.crossing_ways.message", { - feature: utilDisplayLabel(entity1, graph2), - feature2: utilDisplayLabel(entity2, graph2) - }) : ""; - }, - reference: showReference, - entityIds: entities.map(function(entity) { - return entity.id; - }), - data: { - edges, - featureTypes, - connectionTags - }, - hash: uniqueID, - loc: crossing.crossPoint, - dynamicFixes: function(context2) { - var mode = context2.mode(); - if (!mode || mode.id !== "select" || mode.selectedIDs().length !== 1) - return []; - var selectedIndex = this.entityIds[0] === mode.selectedIDs()[0] ? 0 : 1; - var selectedFeatureType = this.data.featureTypes[selectedIndex]; - var otherFeatureType = this.data.featureTypes[selectedIndex === 0 ? 1 : 0]; - var fixes = []; - if (connectionTags) { - fixes.push(makeConnectWaysFix(this.data.connectionTags)); - } - if (isCrossingIndoors) { - fixes.push(new validationIssueFix({ - icon: "iD-icon-layers", - title: _t.append("issues.fix.use_different_levels.title") - })); - } else if (isCrossingTunnels || isCrossingBridges || featureType1 === "building" || featureType2 === "building") { - fixes.push(makeChangeLayerFix("higher")); - fixes.push(makeChangeLayerFix("lower")); - } else if (context2.graph().geometry(this.entityIds[0]) === "line" && context2.graph().geometry(this.entityIds[1]) === "line") { - if (allowsBridge(selectedFeatureType) && selectedFeatureType !== "waterway") { - fixes.push(makeAddBridgeOrTunnelFix("add_a_bridge", "temaki-bridge", "bridge")); + if (d2.deleted) { + d2.deleted.forEach(function(id2) { + entities[id2] = void 0; + }); } - var skipTunnelFix = otherFeatureType === "waterway" && selectedFeatureType !== "waterway"; - if (allowsTunnel(selectedFeatureType) && !skipTunnelFix) { - fixes.push(makeAddBridgeOrTunnelFix("add_a_tunnel", "temaki-tunnel", "tunnel")); + return { + graph: coreGraph(_stack[0].graph).load(entities), + annotation: d2.annotation, + imageryUsed: d2.imageryUsed, + photoOverlaysUsed: d2.photoOverlaysUsed, + transform: d2.transform, + selectedIDs: d2.selectedIDs + }; + }); + } else { + _stack = h2.stack.map(function(d2) { + var entities = {}; + for (var i3 in d2.entities) { + var entity = d2.entities[i3]; + entities[i3] = entity === "undefined" ? void 0 : osmEntity(entity); } - } - fixes.push(new validationIssueFix({ - icon: "iD-operation-move", - title: _t.append("issues.fix.reposition_features.title") - })); - return fixes; + d2.graph = coreGraph(_stack[0].graph).load(entities); + return d2; + }); } - }); - function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.crossing_ways." + crossingTypeID + ".reference")); - } + var transform2 = _stack[_index].transform; + if (transform2) { + context.map().transformEase(transform2, 0); + } + if (loadComplete) { + dispatch14.call("change"); + dispatch14.call("restore", this); + } + return history; + }, + lock: function() { + return lock.lock(); + }, + unlock: function() { + lock.unlock(); + }, + save: function() { + if (lock.locked() && // don't overwrite existing, unresolved changes + !_hasUnresolvedRestorableChanges) { + const success = corePreferences(getKey("saved_history"), history.toJSON() || null); + if (!success) dispatch14.call("storage_error"); + } + return history; + }, + // delete the history version saved in localStorage + clearSaved: function() { + context.debouncedSave.cancel(); + if (lock.locked()) { + _hasUnresolvedRestorableChanges = false; + corePreferences(getKey("saved_history"), null); + corePreferences("comment", null); + corePreferences("hashtags", null); + corePreferences("source", null); + } + return history; + }, + savedHistoryJSON: function() { + return corePreferences(getKey("saved_history")); + }, + hasRestorableChanges: function() { + return _hasUnresolvedRestorableChanges; + }, + // load history from a version stored in localStorage + restore: function() { + if (lock.locked()) { + _hasUnresolvedRestorableChanges = false; + var json = this.savedHistoryJSON(); + if (json) history.fromJSON(json, true); + } + }, + _getKey: getKey + }; + history.reset(); + return utilRebind(history, dispatch14, "on"); + } + + // modules/validations/index.js + var validations_exports = {}; + __export(validations_exports, { + validationAlmostJunction: () => validationAlmostJunction, + validationCloseNodes: () => validationCloseNodes, + validationCrossingWays: () => validationCrossingWays, + validationDisconnectedWay: () => validationDisconnectedWay, + validationFormatting: () => validationFormatting, + validationHelpRequest: () => validationHelpRequest, + validationImpossibleOneway: () => validationImpossibleOneway, + validationIncompatibleSource: () => validationIncompatibleSource, + validationMaprules: () => validationMaprules, + validationMismatchedGeometry: () => validationMismatchedGeometry, + validationMissingRole: () => validationMissingRole, + validationMissingTag: () => validationMissingTag, + validationMutuallyExclusiveTags: () => validationMutuallyExclusiveTags, + validationOutdatedTags: () => validationOutdatedTags, + validationPrivateData: () => validationPrivateData, + validationSuspiciousName: () => validationSuspiciousName, + validationUnsquareWay: () => validationUnsquareWay + }); + + // modules/validations/almost_junction.js + function validationAlmostJunction(context) { + const type2 = "almost_junction"; + const EXTEND_TH_METERS = 5; + const WELD_TH_METERS = 0.75; + const CLOSE_NODE_TH = EXTEND_TH_METERS - WELD_TH_METERS; + const SIG_ANGLE_TH = Math.atan(WELD_TH_METERS / EXTEND_TH_METERS); + function isHighway(entity) { + return entity.type === "way" && osmRoutableHighwayTagValues[entity.tags.highway]; } - function makeAddBridgeOrTunnelFix(fixTitleID, iconName, bridgeOrTunnel) { - return new validationIssueFix({ - icon: iconName, - title: _t.append("issues.fix." + fixTitleID + ".title"), - onClick: function(context2) { - var mode = context2.mode(); - if (!mode || mode.id !== "select") - return; - var selectedIDs = mode.selectedIDs(); - if (selectedIDs.length !== 1) - return; - var selectedWayID = selectedIDs[0]; - if (!context2.hasEntity(selectedWayID)) - return; - var resultWayIDs = [selectedWayID]; - var edge, crossedEdge, crossedWayID; - if (this.issue.entityIds[0] === selectedWayID) { - edge = this.issue.data.edges[0]; - crossedEdge = this.issue.data.edges[1]; - crossedWayID = this.issue.entityIds[1]; - } else { - edge = this.issue.data.edges[1]; - crossedEdge = this.issue.data.edges[0]; - crossedWayID = this.issue.entityIds[0]; - } - var crossingLoc = this.issue.loc; - var projection2 = context2.projection; - var action = function actionAddStructure(graph) { - var edgeNodes = [graph.entity(edge[0]), graph.entity(edge[1])]; - var crossedWay = graph.hasEntity(crossedWayID); - var structLengthMeters = crossedWay && crossedWay.tags.width && parseFloat(crossedWay.tags.width); - if (!structLengthMeters) { - structLengthMeters = crossedWay && crossedWay.impliedLineWidthMeters(); - } - if (structLengthMeters) { - if (getFeatureType(crossedWay, graph) === "railway") { - structLengthMeters *= 2; - } + function isTaggedAsNotContinuing(node) { + return node.tags.noexit === "yes" || node.tags.amenity === "parking_entrance" || node.tags.entrance && node.tags.entrance !== "no"; + } + const validation = function checkAlmostJunction(entity, graph) { + if (!isHighway(entity)) return []; + if (entity.isDegenerate()) return []; + const tree = context.history().tree(); + const extendableNodeInfos = findConnectableEndNodesByExtension(entity); + let issues = []; + extendableNodeInfos.forEach((extendableNodeInfo) => { + issues.push(new validationIssue({ + type: type2, + subtype: "highway-highway", + severity: "warning", + message: function(context2) { + const entity1 = context2.hasEntity(this.entityIds[0]); + if (this.entityIds[0] === this.entityIds[2]) { + return entity1 ? _t.append("issues.almost_junction.self.message", { + feature: utilDisplayLabel(entity1, context2.graph()) + }) : ""; } else { - structLengthMeters = 8; - } - var a1 = geoAngle(edgeNodes[0], edgeNodes[1], projection2) + Math.PI; - var a2 = geoAngle(graph.entity(crossedEdge[0]), graph.entity(crossedEdge[1]), projection2) + Math.PI; - var crossingAngle = Math.max(a1, a2) - Math.min(a1, a2); - if (crossingAngle > Math.PI) - crossingAngle -= Math.PI; - structLengthMeters = structLengthMeters / 2 / Math.sin(crossingAngle) * 2; - structLengthMeters += 4; - structLengthMeters = Math.min(Math.max(structLengthMeters, 4), 50); - function geomToProj(geoPoint) { - return [ - geoLonToMeters(geoPoint[0], geoPoint[1]), - geoLatToMeters(geoPoint[1]) - ]; - } - function projToGeom(projPoint) { - var lat = geoMetersToLat(projPoint[1]); - return [ - geoMetersToLon(projPoint[0], lat), - lat - ]; - } - var projEdgeNode1 = geomToProj(edgeNodes[0].loc); - var projEdgeNode2 = geomToProj(edgeNodes[1].loc); - var projectedAngle = geoVecAngle(projEdgeNode1, projEdgeNode2); - var projectedCrossingLoc = geomToProj(crossingLoc); - var linearToSphericalMetersRatio = geoVecLength(projEdgeNode1, projEdgeNode2) / geoSphericalDistance(edgeNodes[0].loc, edgeNodes[1].loc); - function locSphericalDistanceFromCrossingLoc(angle2, distanceMeters) { - var lengthSphericalMeters = distanceMeters * linearToSphericalMetersRatio; - return projToGeom([ - projectedCrossingLoc[0] + Math.cos(angle2) * lengthSphericalMeters, - projectedCrossingLoc[1] + Math.sin(angle2) * lengthSphericalMeters - ]); + const entity2 = context2.hasEntity(this.entityIds[2]); + return entity1 && entity2 ? _t.append("issues.almost_junction.message", { + feature: utilDisplayLabel(entity1, context2.graph()), + feature2: utilDisplayLabel(entity2, context2.graph()) + }) : ""; } - var endpointLocGetter1 = function(lengthMeters) { - return locSphericalDistanceFromCrossingLoc(projectedAngle, lengthMeters); - }; - var endpointLocGetter2 = function(lengthMeters) { - return locSphericalDistanceFromCrossingLoc(projectedAngle + Math.PI, lengthMeters); - }; - var minEdgeLengthMeters = 0.55; - function determineEndpoint(edge2, endNode, locGetter) { - var newNode; - var idealLengthMeters = structLengthMeters / 2; - var crossingToEdgeEndDistance = geoSphericalDistance(crossingLoc, endNode.loc); - if (crossingToEdgeEndDistance - idealLengthMeters > minEdgeLengthMeters) { - var idealNodeLoc = locGetter(idealLengthMeters); - newNode = osmNode(); - graph = actionAddMidpoint({ loc: idealNodeLoc, edge: edge2 }, newNode)(graph); - } else { - var edgeCount = 0; - endNode.parentIntersectionWays(graph).forEach(function(way) { - way.nodes.forEach(function(nodeID) { - if (nodeID === endNode.id) { - if (endNode.id === way.first() && endNode.id !== way.last() || endNode.id === way.last() && endNode.id !== way.first()) { - edgeCount += 1; - } else { - edgeCount += 2; - } - } - }); - }); - if (edgeCount >= 3) { - var insetLength = crossingToEdgeEndDistance - minEdgeLengthMeters; - if (insetLength > minEdgeLengthMeters) { - var insetNodeLoc = locGetter(insetLength); - newNode = osmNode(); - graph = actionAddMidpoint({ loc: insetNodeLoc, edge: edge2 }, newNode)(graph); - } - } - } - if (!newNode) - newNode = endNode; - var splitAction = actionSplit([newNode.id]).limitWays(resultWayIDs); - graph = splitAction(graph); - if (splitAction.getCreatedWayIDs().length) { - resultWayIDs.push(splitAction.getCreatedWayIDs()[0]); + }, + reference: showReference, + entityIds: [ + entity.id, + extendableNodeInfo.node.id, + extendableNodeInfo.wid + ], + loc: extendableNodeInfo.node.loc, + hash: JSON.stringify(extendableNodeInfo.node.loc), + data: { + midId: extendableNodeInfo.mid.id, + edge: extendableNodeInfo.edge, + cross_loc: extendableNodeInfo.cross_loc + }, + dynamicFixes: makeFixes + })); + }); + return issues; + function makeFixes(context2) { + let fixes = [new validationIssueFix({ + icon: "iD-icon-abutment", + title: _t.append("issues.fix.connect_features.title"), + onClick: function(context3) { + const annotation = _t("issues.fix.connect_almost_junction.annotation"); + const [, endNodeId, crossWayId] = this.issue.entityIds; + const midNode = context3.entity(this.issue.data.midId); + const endNode = context3.entity(endNodeId); + const crossWay = context3.entity(crossWayId); + const nearEndNodes = findNearbyEndNodes(endNode, crossWay); + if (nearEndNodes.length > 0) { + const collinear = findSmallJoinAngle(midNode, endNode, nearEndNodes); + if (collinear) { + context3.perform( + actionMergeNodes([collinear.id, endNode.id], collinear.loc), + annotation + ); + return; } - return newNode; } - var structEndNode1 = determineEndpoint(edge, edgeNodes[1], endpointLocGetter1); - var structEndNode2 = determineEndpoint([edgeNodes[0].id, structEndNode1.id], edgeNodes[0], endpointLocGetter2); - var structureWay = resultWayIDs.map(function(id2) { - return graph.entity(id2); - }).find(function(way) { - return way.nodes.indexOf(structEndNode1.id) !== -1 && way.nodes.indexOf(structEndNode2.id) !== -1; - }); - var tags = Object.assign({}, structureWay.tags); - if (bridgeOrTunnel === "bridge") { - tags.bridge = "yes"; - tags.layer = "1"; + const targetEdge = this.issue.data.edge; + const crossLoc = this.issue.data.cross_loc; + const edgeNodes = [context3.entity(targetEdge[0]), context3.entity(targetEdge[1])]; + const closestNodeInfo = geoSphericalClosestNode(edgeNodes, crossLoc); + if (closestNodeInfo.distance < WELD_TH_METERS) { + context3.perform( + actionMergeNodes([closestNodeInfo.node.id, endNode.id], closestNodeInfo.node.loc), + annotation + ); } else { - var tunnelValue = "yes"; - if (getFeatureType(structureWay, graph) === "waterway") { - tunnelValue = "culvert"; - } - tags.tunnel = tunnelValue; - tags.layer = "-1"; + context3.perform( + actionAddMidpoint({ loc: crossLoc, edge: targetEdge }, endNode), + annotation + ); } - graph = actionChangeTags(structureWay.id, tags)(graph); - return graph; - }; - context2.perform(action, _t("issues.fix." + fixTitleID + ".annotation")); - context2.enter(modeSelect(context2, resultWayIDs)); + } + })]; + const node = context2.hasEntity(this.entityIds[1]); + if (node && !node.hasInterestingTags()) { + fixes.push(new validationIssueFix({ + icon: "maki-barrier", + title: _t.append("issues.fix.tag_as_disconnected.title"), + onClick: function(context3) { + const nodeID = this.issue.entityIds[1]; + const tags = Object.assign({}, context3.entity(nodeID).tags); + tags.noexit = "yes"; + context3.perform( + actionChangeTags(nodeID, tags), + _t("issues.fix.tag_as_disconnected.annotation") + ); + } + })); } - }); - } - function makeConnectWaysFix(connectionTags) { - var fixTitleID = "connect_features"; - if (connectionTags.ford) { - fixTitleID = "connect_using_ford"; + return fixes; } - return new validationIssueFix({ - icon: "iD-icon-crossing", - title: _t.append("issues.fix." + fixTitleID + ".title"), - onClick: function(context2) { - var loc = this.issue.loc; - var connectionTags2 = this.issue.data.connectionTags; - var edges = this.issue.data.edges; - context2.perform( - function actionConnectCrossingWays(graph) { - var node = osmNode({ loc, tags: connectionTags2 }); - graph = graph.replace(node); - var nodesToMerge = [node.id]; - var mergeThresholdInMeters = 0.75; - edges.forEach(function(edge) { - var edgeNodes = [graph.entity(edge[0]), graph.entity(edge[1])]; - var nearby = geoSphericalClosestNode(edgeNodes, loc); - if ((!nearby.node.hasInterestingTags() || nearby.node.isCrossing()) && nearby.distance < mergeThresholdInMeters) { - nodesToMerge.push(nearby.node.id); - } else { - graph = actionAddMidpoint({ loc, edge }, node)(graph); - } - }); - if (nodesToMerge.length > 1) { - graph = actionMergeNodes(nodesToMerge, loc)(graph); - } - return graph; - }, - _t("issues.fix.connect_crossing_features.annotation") - ); + function showReference(selection2) { + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.almost_junction.highway-highway.reference")); + } + function isExtendableCandidate(node, way) { + const osm = services.osm; + if (osm && !osm.isDataLoaded(node.loc)) { + return false; } - }); - } - function makeChangeLayerFix(higherOrLower) { - return new validationIssueFix({ - icon: "iD-icon-" + (higherOrLower === "higher" ? "up" : "down"), - title: _t.append("issues.fix.tag_this_as_" + higherOrLower + ".title"), - onClick: function(context2) { - var mode = context2.mode(); - if (!mode || mode.id !== "select") - return; - var selectedIDs = mode.selectedIDs(); - if (selectedIDs.length !== 1) - return; - var selectedID = selectedIDs[0]; - if (!this.issue.entityIds.some(function(entityId) { - return entityId === selectedID; - })) - return; - var entity = context2.hasEntity(selectedID); - if (!entity) - return; - var tags = Object.assign({}, entity.tags); - var layer = tags.layer && Number(tags.layer); - if (layer && !isNaN(layer)) { - if (higherOrLower === "higher") { - layer += 1; - } else { - layer -= 1; - } - } else { - if (higherOrLower === "higher") { - layer = 1; - } else { - layer = -1; + if (isTaggedAsNotContinuing(node) || graph.parentWays(node).length !== 1) { + return false; + } + let occurrences = 0; + for (const index in way.nodes) { + if (way.nodes[index] === node.id) { + occurrences += 1; + if (occurrences > 1) { + return false; } } - tags.layer = layer.toString(); - context2.perform( - actionChangeTags(entity.id, tags), - _t("operations.change_tags.annotation") - ); - } - }); - } - validation.type = type3; - return validation; - } - - // modules/behavior/draw_way.js - function behaviorDrawWay(context, wayID, mode, startGraph) { - const keybinding = utilKeybinding("drawWay"); - var dispatch10 = dispatch_default("rejectedSelfIntersection"); - var behavior = behaviorDraw(context); - var _nodeIndex; - var _origWay; - var _wayGeometry; - var _headNodeID; - var _annotation; - var _pointerHasMoved = false; - var _drawNode; - var _didResolveTempEdit = false; - function createDrawNode(loc) { - _drawNode = osmNode({ loc }); - context.pauseChangeDispatch(); - context.replace(function actionAddDrawNode(graph) { - var way = graph.entity(wayID); - return graph.replace(_drawNode).replace(way.addNode(_drawNode.id, _nodeIndex)); - }, _annotation); - context.resumeChangeDispatch(); - setActiveElements(); - } - function removeDrawNode() { - context.pauseChangeDispatch(); - context.replace( - function actionDeleteDrawNode(graph) { - var way = graph.entity(wayID); - return graph.replace(way.removeNode(_drawNode.id)).remove(_drawNode); - }, - _annotation - ); - _drawNode = void 0; - context.resumeChangeDispatch(); - } - function keydown(d3_event) { - if (d3_event.keyCode === utilKeybinding.modifierCodes.alt) { - if (context.surface().classed("nope")) { - context.surface().classed("nope-suppressed", true); - } - context.surface().classed("nope", false).classed("nope-disabled", true); - } - } - function keyup(d3_event) { - if (d3_event.keyCode === utilKeybinding.modifierCodes.alt) { - if (context.surface().classed("nope-suppressed")) { - context.surface().classed("nope", true); - } - context.surface().classed("nope-suppressed", false).classed("nope-disabled", false); - } - } - function allowsVertex(d) { - return d.geometry(context.graph()) === "vertex" || _mainPresetIndex.allowsVertex(d, context.graph()); - } - function move(d3_event, datum2) { - var loc = context.map().mouseCoordinates(); - if (!_drawNode) - createDrawNode(loc); - context.surface().classed("nope-disabled", d3_event.altKey); - var targetLoc = datum2 && datum2.properties && datum2.properties.entity && allowsVertex(datum2.properties.entity) && datum2.properties.entity.loc; - var targetNodes = datum2 && datum2.properties && datum2.properties.nodes; - if (targetLoc) { - loc = targetLoc; - } else if (targetNodes) { - var choice = geoChooseEdge(targetNodes, context.map().mouse(), context.projection, _drawNode.id); - if (choice) { - loc = choice.loc; - } - } - context.replace(actionMoveNode(_drawNode.id, loc), _annotation); - _drawNode = context.entity(_drawNode.id); - checkGeometry(true); - } - function checkGeometry(includeDrawNode) { - var nopeDisabled = context.surface().classed("nope-disabled"); - var isInvalid = isInvalidGeometry(includeDrawNode); - if (nopeDisabled) { - context.surface().classed("nope", false).classed("nope-suppressed", isInvalid); - } else { - context.surface().classed("nope", isInvalid).classed("nope-suppressed", false); - } - } - function isInvalidGeometry(includeDrawNode) { - var testNode = _drawNode; - var parentWay = context.graph().entity(wayID); - var nodes = context.graph().childNodes(parentWay).slice(); - if (includeDrawNode) { - if (parentWay.isClosed()) { - nodes.pop(); - } - } else { - if (parentWay.isClosed()) { - if (nodes.length < 3) - return false; - if (_drawNode) - nodes.splice(-2, 1); - testNode = nodes[nodes.length - 2]; - } else { - return false; } + return true; } - return testNode && geoHasSelfIntersections(nodes, testNode.id); - } - function undone() { - _didResolveTempEdit = true; - context.pauseChangeDispatch(); - var nextMode; - if (context.graph() === startGraph) { - nextMode = modeSelect(context, [wayID]); - } else { - context.pop(1); - nextMode = mode; + function findConnectableEndNodesByExtension(way) { + let results = []; + if (way.isClosed()) return results; + let testNodes; + const indices = [0, way.nodes.length - 1]; + indices.forEach((nodeIndex) => { + const nodeID = way.nodes[nodeIndex]; + const node = graph.entity(nodeID); + if (!isExtendableCandidate(node, way)) return; + const connectionInfo = canConnectByExtend(way, nodeIndex); + if (!connectionInfo) return; + testNodes = graph.childNodes(way).slice(); + testNodes[nodeIndex] = testNodes[nodeIndex].move(connectionInfo.cross_loc); + if (geoHasSelfIntersections(testNodes, nodeID)) return; + results.push(connectionInfo); + }); + return results; } - context.perform(actionNoop()); - context.pop(1); - context.resumeChangeDispatch(); - context.enter(nextMode); - } - function setActiveElements() { - if (!_drawNode) - return; - context.surface().selectAll("." + _drawNode.id).classed("active", true); - } - function resetToStartGraph() { - while (context.graph() !== startGraph) { - context.pop(); + function findNearbyEndNodes(node, way) { + return [ + way.nodes[0], + way.nodes[way.nodes.length - 1] + ].map((d2) => graph.entity(d2)).filter((d2) => { + return d2.id !== node.id && geoSphericalDistance(node.loc, d2.loc) <= CLOSE_NODE_TH; + }); } - } - var drawWay = function(surface) { - _drawNode = void 0; - _didResolveTempEdit = false; - _origWay = context.entity(wayID); - if (typeof _nodeIndex === "number") { - _headNodeID = _origWay.nodes[_nodeIndex]; - } else if (_origWay.isClosed()) { - _headNodeID = _origWay.nodes[_origWay.nodes.length - 2]; - } else { - _headNodeID = _origWay.nodes[_origWay.nodes.length - 1]; + function findSmallJoinAngle(midNode, tipNode, endNodes) { + let joinTo; + let minAngle = Infinity; + endNodes.forEach((endNode) => { + const a1 = geoAngle(midNode, tipNode, context.projection) + Math.PI; + const a2 = geoAngle(midNode, endNode, context.projection) + Math.PI; + const diff = Math.max(a1, a2) - Math.min(a1, a2); + if (diff < minAngle) { + joinTo = endNode; + minAngle = diff; + } + }); + if (minAngle <= SIG_ANGLE_TH) return joinTo; + return null; } - _wayGeometry = _origWay.geometry(context.graph()); - _annotation = _t( - (_origWay.nodes.length === (_origWay.isClosed() ? 2 : 1) ? "operations.start.annotation." : "operations.continue.annotation.") + _wayGeometry - ); - _pointerHasMoved = false; - context.pauseChangeDispatch(); - context.perform(actionNoop(), _annotation); - context.resumeChangeDispatch(); - behavior.hover().initialNodeID(_headNodeID); - behavior.on("move", function() { - _pointerHasMoved = true; - move.apply(this, arguments); - }).on("down", function() { - move.apply(this, arguments); - }).on("downcancel", function() { - if (_drawNode) - removeDrawNode(); - }).on("click", drawWay.add).on("clickWay", drawWay.addWay).on("clickNode", drawWay.addNode).on("undo", context.undo).on("cancel", drawWay.cancel).on("finish", drawWay.finish); - select_default2(window).on("keydown.drawWay", keydown).on("keyup.drawWay", keyup); - context.map().dblclickZoomEnable(false).on("drawn.draw", setActiveElements); - setActiveElements(); - surface.call(behavior); - context.history().on("undone.draw", undone); - }; - drawWay.off = function(surface) { - if (!_didResolveTempEdit) { - context.pauseChangeDispatch(); - resetToStartGraph(); - context.resumeChangeDispatch(); + function hasTag(tags, key) { + return tags[key] !== void 0 && tags[key] !== "no"; } - _drawNode = void 0; - _nodeIndex = void 0; - context.map().on("drawn.draw", null); - surface.call(behavior.off).selectAll(".active").classed("active", false); - surface.classed("nope", false).classed("nope-suppressed", false).classed("nope-disabled", false); - select_default2(window).on("keydown.drawWay", null).on("keyup.drawWay", null); - context.history().on("undone.draw", null); - }; - function attemptAdd(d, loc, doAdd) { - if (_drawNode) { - context.replace(actionMoveNode(_drawNode.id, loc), _annotation); - _drawNode = context.entity(_drawNode.id); - } else { - createDrawNode(loc); + function canConnectWays(way, way2) { + if (way.id === way2.id) return true; + if ((hasTag(way.tags, "bridge") || hasTag(way2.tags, "bridge")) && !(hasTag(way.tags, "bridge") && hasTag(way2.tags, "bridge"))) return false; + if ((hasTag(way.tags, "tunnel") || hasTag(way2.tags, "tunnel")) && !(hasTag(way.tags, "tunnel") && hasTag(way2.tags, "tunnel"))) return false; + const layer1 = way.tags.layer || "0", layer2 = way2.tags.layer || "0"; + if (layer1 !== layer2) return false; + const level1 = way.tags.level || "0", level2 = way2.tags.level || "0"; + if (level1 !== level2) return false; + return true; } - checkGeometry(true); - if (d && d.properties && d.properties.nope || context.surface().classed("nope")) { - if (!_pointerHasMoved) { - removeDrawNode(); + function canConnectByExtend(way, endNodeIdx) { + const tipNid = way.nodes[endNodeIdx]; + const midNid = endNodeIdx === 0 ? way.nodes[1] : way.nodes[way.nodes.length - 2]; + const tipNode = graph.entity(tipNid); + const midNode = graph.entity(midNid); + const lon = tipNode.loc[0]; + const lat = tipNode.loc[1]; + const lon_range = geoMetersToLon(EXTEND_TH_METERS, lat) / 2; + const lat_range = geoMetersToLat(EXTEND_TH_METERS) / 2; + const queryExtent = geoExtent([ + [lon - lon_range, lat - lat_range], + [lon + lon_range, lat + lat_range] + ]); + const edgeLen = geoSphericalDistance(midNode.loc, tipNode.loc); + const t2 = EXTEND_TH_METERS / edgeLen + 1; + const extTipLoc = geoVecInterp(midNode.loc, tipNode.loc, t2); + const segmentInfos = tree.waySegments(queryExtent, graph); + for (let i3 = 0; i3 < segmentInfos.length; i3++) { + let segmentInfo = segmentInfos[i3]; + let way2 = graph.entity(segmentInfo.wayId); + if (!isHighway(way2)) continue; + if (!canConnectWays(way, way2)) continue; + let nAid = segmentInfo.nodes[0], nBid = segmentInfo.nodes[1]; + if (nAid === tipNid || nBid === tipNid) continue; + let nA = graph.entity(nAid), nB = graph.entity(nBid); + let crossLoc = geoLineIntersection([tipNode.loc, extTipLoc], [nA.loc, nB.loc]); + if (crossLoc) { + return { + mid: midNode, + node: tipNode, + wid: way2.id, + edge: [nA.id, nB.id], + cross_loc: crossLoc + }; + } } - dispatch10.call("rejectedSelfIntersection", this); - return; + return null; } - context.pauseChangeDispatch(); - doAdd(); - _didResolveTempEdit = true; - context.resumeChangeDispatch(); - context.enter(mode); - } - drawWay.add = function(loc, d) { - attemptAdd(d, loc, function() { - }); - }; - drawWay.addWay = function(loc, edge, d) { - attemptAdd(d, loc, function() { - context.replace( - actionAddMidpoint({ loc, edge }, _drawNode), - _annotation - ); - }); }; - drawWay.addNode = function(node, d) { - if (node.id === _headNodeID || _origWay.isClosed() && node.id === _origWay.first()) { - drawWay.finish(); - return; + validation.type = type2; + return validation; + } + + // modules/validations/close_nodes.js + function validationCloseNodes(context) { + var type2 = "close_nodes"; + var pointThresholdMeters = 0.2; + var validation = function(entity, graph) { + if (entity.type === "node") { + return getIssuesForNode(entity); + } else if (entity.type === "way") { + return getIssuesForWay(entity); } - attemptAdd(d, node.loc, function() { - context.replace( - function actionReplaceDrawNode(graph) { - graph = graph.replace(graph.entity(wayID).removeNode(_drawNode.id)).remove(_drawNode); - return graph.replace(graph.entity(wayID).addNode(node.id, _nodeIndex)); - }, - _annotation - ); - }); - }; - function getFeatureType(ways) { - if (ways.every((way) => way.isClosed())) - return "area"; - if (ways.every((way) => !way.isClosed())) - return "line"; - return "generic"; - } - function followMode() { - if (_didResolveTempEdit) - return; - try { - const isDrawingArea = _origWay.nodes[0] === _origWay.nodes.slice(-1)[0]; - const [secondLastNodeId, lastNodeId] = _origWay.nodes.slice(isDrawingArea ? -3 : -2); - const historyGraph = context.history().graph(); - if (!lastNodeId || !secondLastNodeId || !historyGraph.hasEntity(lastNodeId) || !historyGraph.hasEntity(secondLastNodeId)) { - context.ui().flash.duration(4e3).iconName("#iD-icon-no").label(_t.append("operations.follow.error.needs_more_initial_nodes"))(); - return; - } - const lastNodesParents = historyGraph.parentWays(historyGraph.entity(lastNodeId)).filter((w) => w.id !== wayID); - const secondLastNodesParents = historyGraph.parentWays(historyGraph.entity(secondLastNodeId)).filter((w) => w.id !== wayID); - const featureType = getFeatureType(lastNodesParents); - if (lastNodesParents.length !== 1 || secondLastNodesParents.length === 0) { - context.ui().flash.duration(4e3).iconName("#iD-icon-no").label(_t.append(`operations.follow.error.intersection_of_multiple_ways.${featureType}`))(); - return; - } - if (!secondLastNodesParents.some((n2) => n2.id === lastNodesParents[0].id)) { - context.ui().flash.duration(4e3).iconName("#iD-icon-no").label(_t.append(`operations.follow.error.intersection_of_different_ways.${featureType}`))(); - return; + return []; + function getIssuesForNode(node) { + var parentWays = graph.parentWays(node); + if (parentWays.length) { + return getIssuesForVertex(node, parentWays); + } else { + return getIssuesForDetachedPoint(node); } - const way = lastNodesParents[0]; - const indexOfLast = way.nodes.indexOf(lastNodeId); - const indexOfSecondLast = way.nodes.indexOf(secondLastNodeId); - const isDescendingPastZero = indexOfLast === way.nodes.length - 2 && indexOfSecondLast === 0; - let nextNodeIndex = indexOfLast + (indexOfLast > indexOfSecondLast && !isDescendingPastZero ? 1 : -1); - if (nextNodeIndex === -1) - nextNodeIndex = indexOfSecondLast === 1 ? way.nodes.length - 2 : 1; - const nextNode = historyGraph.entity(way.nodes[nextNodeIndex]); - drawWay.addNode(nextNode, { - geometry: { type: "Point", coordinates: nextNode.loc }, - id: nextNode.id, - properties: { target: true, entity: nextNode } - }); - } catch (ex) { - context.ui().flash.duration(4e3).iconName("#iD-icon-no").label(_t.append("operations.follow.error.unknown"))(); - } - } - keybinding.on(_t("operations.follow.key"), followMode); - select_default2(document).call(keybinding); - drawWay.finish = function() { - checkGeometry(false); - if (context.surface().classed("nope")) { - dispatch10.call("rejectedSelfIntersection", this); - return; - } - context.pauseChangeDispatch(); - context.pop(1); - _didResolveTempEdit = true; - context.resumeChangeDispatch(); - var way = context.hasEntity(wayID); - if (!way || way.isDegenerate()) { - drawWay.cancel(); - return; } - window.setTimeout(function() { - context.map().dblclickZoomEnable(true); - }, 1e3); - var isNewFeature = !mode.isContinuing; - context.enter(modeSelect(context, [wayID]).newFeature(isNewFeature)); - }; - drawWay.cancel = function() { - context.pauseChangeDispatch(); - resetToStartGraph(); - context.resumeChangeDispatch(); - window.setTimeout(function() { - context.map().dblclickZoomEnable(true); - }, 1e3); - context.surface().classed("nope", false).classed("nope-disabled", false).classed("nope-suppressed", false); - context.enter(modeBrowse(context)); - }; - drawWay.nodeIndex = function(val) { - if (!arguments.length) - return _nodeIndex; - _nodeIndex = val; - return drawWay; - }; - drawWay.activeID = function() { - if (!arguments.length) - return _drawNode && _drawNode.id; - return drawWay; - }; - return utilRebind(drawWay, dispatch10, "on"); - } - - // modules/modes/draw_line.js - function modeDrawLine(context, wayID, startGraph, button, affix, continuing) { - var mode = { - button, - id: "draw-line" - }; - var behavior = behaviorDrawWay(context, wayID, mode, startGraph).on("rejectedSelfIntersection.modeDrawLine", function() { - context.ui().flash.iconName("#iD-icon-no").label(_t.append("self_intersection.error.lines"))(); - }); - mode.wayID = wayID; - mode.isContinuing = continuing; - mode.enter = function() { - behavior.nodeIndex(affix === "prefix" ? 0 : void 0); - context.install(behavior); - }; - mode.exit = function() { - context.uninstall(behavior); - }; - mode.selectedIDs = function() { - return [wayID]; - }; - mode.activeID = function() { - return behavior && behavior.activeID() || []; - }; - return mode; - } - - // modules/validations/disconnected_way.js - function validationDisconnectedWay() { - var type3 = "disconnected_way"; - function isTaggedAsHighway(entity) { - return osmRoutableHighwayTagValues[entity.tags.highway]; - } - var validation = function checkDisconnectedWay(entity, graph) { - var routingIslandWays = routingIslandForEntity(entity); - if (!routingIslandWays) - return []; - return [new validationIssue({ - type: type3, - subtype: "highway", - severity: "warning", - message: function(context) { - var entity2 = this.entityIds.length && context.hasEntity(this.entityIds[0]); - var label = entity2 && utilDisplayLabel(entity2, context.graph()); - return _t.append("issues.disconnected_way.routable.message", { count: this.entityIds.length, highway: label }); - }, - reference: showReference, - entityIds: Array.from(routingIslandWays).map(function(way) { - return way.id; - }), - dynamicFixes: makeFixes - })]; - function makeFixes(context) { - var fixes = []; - var singleEntity = this.entityIds.length === 1 && context.hasEntity(this.entityIds[0]); - if (singleEntity) { - if (singleEntity.type === "way" && !singleEntity.isClosed()) { - var textDirection = _mainLocalizer.textDirection(); - var startFix = makeContinueDrawingFixIfAllowed(textDirection, singleEntity.first(), "start"); - if (startFix) - fixes.push(startFix); - var endFix = makeContinueDrawingFixIfAllowed(textDirection, singleEntity.last(), "end"); - if (endFix) - fixes.push(endFix); - } - if (!fixes.length) { - fixes.push(new validationIssueFix({ - title: _t.append("issues.fix.connect_feature.title") - })); + function wayTypeFor(way) { + if (way.tags.boundary && way.tags.boundary !== "no") return "boundary"; + if (way.tags.indoor && way.tags.indoor !== "no") return "indoor"; + if (way.tags.building && way.tags.building !== "no" || way.tags["building:part"] && way.tags["building:part"] !== "no") return "building"; + if (osmPathHighwayTagValues[way.tags.highway]) return "path"; + var parentRelations = graph.parentRelations(way); + for (var i3 in parentRelations) { + var relation = parentRelations[i3]; + if (relation.tags.type === "boundary") return "boundary"; + if (relation.isMultipolygon()) { + if (relation.tags.indoor && relation.tags.indoor !== "no") return "indoor"; + if (relation.tags.building && relation.tags.building !== "no" || relation.tags["building:part"] && relation.tags["building:part"] !== "no") return "building"; } - fixes.push(new validationIssueFix({ - icon: "iD-operation-delete", - title: _t.append("issues.fix.delete_feature.title"), - entityIds: [singleEntity.id], - onClick: function(context2) { - var id2 = this.issue.entityIds[0]; - var operation = operationDelete(context2, [id2]); - if (!operation.disabled()) { - operation(); - } - } - })); - } else { - fixes.push(new validationIssueFix({ - title: _t.append("issues.fix.connect_features.title") - })); } - return fixes; + return "other"; } - function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.disconnected_way.routable.reference")); + function shouldCheckWay(way) { + if (way.nodes.length <= 2 || way.isClosed() && way.nodes.length <= 4) return false; + var bbox2 = way.extent(graph).bbox(); + var hypotenuseMeters = geoSphericalDistance([bbox2.minX, bbox2.minY], [bbox2.maxX, bbox2.maxY]); + if (hypotenuseMeters < 1.5) return false; + return true; } - function routingIslandForEntity(entity2) { - var routingIsland = /* @__PURE__ */ new Set(); - var waysToCheck = []; - function queueParentWays(node) { - graph.parentWays(node).forEach(function(parentWay) { - if (!routingIsland.has(parentWay) && isRoutableWay(parentWay, false)) { - routingIsland.add(parentWay); - waysToCheck.push(parentWay); - } - }); + function getIssuesForWay(way) { + if (!shouldCheckWay(way)) return []; + var issues = [], nodes = graph.childNodes(way); + for (var i3 = 0; i3 < nodes.length - 1; i3++) { + var node1 = nodes[i3]; + var node2 = nodes[i3 + 1]; + var issue = getWayIssueIfAny(node1, node2, way); + if (issue) issues.push(issue); } - if (entity2.type === "way" && isRoutableWay(entity2, true)) { - routingIsland.add(entity2); - waysToCheck.push(entity2); - } else if (entity2.type === "node" && isRoutableNode(entity2)) { - routingIsland.add(entity2); - queueParentWays(entity2); - } else { - return null; + return issues; + } + function getIssuesForVertex(node, parentWays) { + var issues = []; + function checkForCloseness(node1, node2, way) { + var issue = getWayIssueIfAny(node1, node2, way); + if (issue) issues.push(issue); } - while (waysToCheck.length) { - var wayToCheck = waysToCheck.pop(); - var childNodes = graph.childNodes(wayToCheck); - for (var i2 in childNodes) { - var vertex = childNodes[i2]; - if (isConnectedVertex(vertex)) { - return null; + for (var i3 = 0; i3 < parentWays.length; i3++) { + var parentWay = parentWays[i3]; + if (!shouldCheckWay(parentWay)) continue; + var lastIndex = parentWay.nodes.length - 1; + for (var j2 = 0; j2 < parentWay.nodes.length; j2++) { + if (j2 !== 0) { + if (parentWay.nodes[j2 - 1] === node.id) { + checkForCloseness(node, graph.entity(parentWay.nodes[j2]), parentWay); + } } - if (isRoutableNode(vertex)) { - routingIsland.add(vertex); + if (j2 !== lastIndex) { + if (parentWay.nodes[j2 + 1] === node.id) { + checkForCloseness(graph.entity(parentWay.nodes[j2]), node, parentWay); + } } - queueParentWays(vertex); } } - return routingIsland; - } - function isConnectedVertex(vertex) { - var osm = services.osm; - if (osm && !osm.isDataLoaded(vertex.loc)) - return true; - if (vertex.tags.entrance && vertex.tags.entrance !== "no") - return true; - if (vertex.tags.amenity === "parking_entrance") - return true; - return false; - } - function isRoutableNode(node) { - if (node.tags.highway === "elevator") - return true; - return false; - } - function isRoutableWay(way, ignoreInnerWays) { - if (isTaggedAsHighway(way) || way.tags.route === "ferry") - return true; - return graph.parentRelations(way).some(function(parentRelation) { - if (parentRelation.tags.type === "route" && parentRelation.tags.route === "ferry") - return true; - if (parentRelation.isMultipolygon() && isTaggedAsHighway(parentRelation) && (!ignoreInnerWays || parentRelation.memberById(way.id).role !== "inner")) - return true; - return false; - }); + return issues; } - function makeContinueDrawingFixIfAllowed(textDirection, vertexID, whichEnd) { - var vertex = graph.hasEntity(vertexID); - if (!vertex || vertex.tags.noexit === "yes") - return null; - var useLeftContinue = whichEnd === "start" && textDirection === "ltr" || whichEnd === "end" && textDirection === "rtl"; - return new validationIssueFix({ - icon: "iD-operation-continue" + (useLeftContinue ? "-left" : ""), - title: _t.append("issues.fix.continue_from_" + whichEnd + ".title"), - entityIds: [vertexID], - onClick: function(context) { - var wayId = this.issue.entityIds[0]; - var way = context.hasEntity(wayId); - var vertexId = this.entityIds[0]; - var vertex2 = context.hasEntity(vertexId); - if (!way || !vertex2) - return; - var map2 = context.map(); - if (!context.editable() || !map2.trimmedExtent().contains(vertex2.loc)) { - map2.zoomToEase(vertex2); - } - context.enter( - modeDrawLine(context, wayId, context.graph(), "line", way.affix(vertexId), true) - ); - } - }); + function thresholdMetersForWay(way) { + if (!shouldCheckWay(way)) return 0; + var wayType = wayTypeFor(way); + if (wayType === "boundary") return 0; + if (wayType === "indoor") return 0.01; + if (wayType === "building") return 0.05; + if (wayType === "path") return 0.1; + return 0.2; } - }; - validation.type = type3; - return validation; - } - - // modules/validations/invalid_format.js - function validationFormatting() { - var type3 = "invalid_format"; - var validation = function(entity) { - var issues = []; - function isValidEmail(email) { - var valid_email = /^[^\(\)\\,":;<>@\[\]]+@[^\(\)\\,":;<>@\[\]\.]+(?:\.[a-z0-9-]+)*$/i; - return !email || valid_email.test(email); - } - function showReferenceEmail(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.invalid_format.email.reference")); - } - if (entity.tags.email) { - var emails = entity.tags.email.split(";").map(function(s) { - return s.trim(); - }).filter(function(x) { - return !isValidEmail(x); - }); - if (emails.length) { - issues.push(new validationIssue({ - type: type3, - subtype: "email", - severity: "warning", - message: function(context) { - var entity2 = context.hasEntity(this.entityIds[0]); - return entity2 ? _t.append( - "issues.invalid_format.email.message" + this.data, - { feature: utilDisplayLabel(entity2, context.graph()), email: emails.join(", ") } - ) : ""; - }, - reference: showReferenceEmail, - entityIds: [entity.id], - hash: emails.join(), - data: emails.length > 1 ? "_multi" : "" - })); - } - } - return issues; - }; - validation.type = type3; - return validation; - } - - // modules/validations/help_request.js - function validationHelpRequest(context) { - var type3 = "help_request"; - var validation = function checkFixmeTag(entity) { - if (!entity.tags.fixme) - return []; - if (entity.version === void 0) - return []; - if (entity.v !== void 0) { - var baseEntity = context.history().base().hasEntity(entity.id); - if (!baseEntity || !baseEntity.tags.fixme) - return []; - } - return [new validationIssue({ - type: type3, - subtype: "fixme_tag", - severity: "warning", - message: function(context2) { - var entity2 = context2.hasEntity(this.entityIds[0]); - return entity2 ? _t.append("issues.fixme_tag.message", { - feature: utilDisplayLabel(entity2, context2.graph(), true) - }) : ""; - }, - dynamicFixes: function() { - return [ - new validationIssueFix({ - title: _t.append("issues.fix.address_the_concern.title") - }) - ]; - }, - reference: showReference, - entityIds: [entity.id] - })]; - function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.fixme_tag.reference")); - } - }; - validation.type = type3; - return validation; - } - - // modules/validations/impossible_oneway.js - function validationImpossibleOneway() { - var type3 = "impossible_oneway"; - var validation = function checkImpossibleOneway(entity, graph) { - if (entity.type !== "way" || entity.geometry(graph) !== "line") - return []; - if (entity.isClosed()) - return []; - if (!typeForWay(entity)) - return []; - if (!isOneway(entity)) - return []; - var firstIssues = issuesForNode(entity, entity.first()); - var lastIssues = issuesForNode(entity, entity.last()); - return firstIssues.concat(lastIssues); - function typeForWay(way) { - if (way.geometry(graph) !== "line") - return null; - if (osmRoutableHighwayTagValues[way.tags.highway]) - return "highway"; - if (osmFlowingWaterwayTagValues[way.tags.waterway]) - return "waterway"; - return null; - } - function isOneway(way) { - if (way.tags.oneway === "yes") - return true; - if (way.tags.oneway) - return false; - for (var key in way.tags) { - if (osmOneWayTags[key] && osmOneWayTags[key][way.tags[key]]) { - return true; + function getIssuesForDetachedPoint(node) { + var issues = []; + var lon = node.loc[0]; + var lat = node.loc[1]; + var lon_range = geoMetersToLon(pointThresholdMeters, lat) / 2; + var lat_range = geoMetersToLat(pointThresholdMeters) / 2; + var queryExtent = geoExtent([ + [lon - lon_range, lat - lat_range], + [lon + lon_range, lat + lat_range] + ]); + var intersected = context.history().tree().intersects(queryExtent, graph); + for (var j2 = 0; j2 < intersected.length; j2++) { + var nearby = intersected[j2]; + if (nearby.id === node.id) continue; + if (nearby.type !== "node" || nearby.geometry(graph) !== "point") continue; + if (nearby.loc === node.loc || geoSphericalDistance(node.loc, nearby.loc) < pointThresholdMeters) { + if ("memorial:type" in node.tags && "memorial:type" in nearby.tags && node.tags["memorial:type"] === "stolperstein" && nearby.tags["memorial:type"] === "stolperstein") continue; + if ("memorial" in node.tags && "memorial" in nearby.tags && node.tags.memorial === "stolperstein" && nearby.tags.memorial === "stolperstein") continue; + var zAxisKeys = { layer: true, level: true, "addr:housenumber": true, "addr:unit": true }; + var zAxisDifferentiates = false; + for (var key in zAxisKeys) { + var nodeValue = node.tags[key] || "0"; + var nearbyValue = nearby.tags[key] || "0"; + if (nodeValue !== nearbyValue) { + zAxisDifferentiates = true; + break; + } + } + if (zAxisDifferentiates) continue; + issues.push(new validationIssue({ + type: type2, + subtype: "detached", + severity: "warning", + message: function(context2) { + var entity2 = context2.hasEntity(this.entityIds[0]), entity22 = context2.hasEntity(this.entityIds[1]); + return entity2 && entity22 ? _t.append("issues.close_nodes.detached.message", { + feature: utilDisplayLabel(entity2, context2.graph()), + feature2: utilDisplayLabel(entity22, context2.graph()) + }) : ""; + }, + reference: showReference, + entityIds: [node.id, nearby.id], + dynamicFixes: function() { + return [ + new validationIssueFix({ + icon: "iD-operation-disconnect", + title: _t.append("issues.fix.move_points_apart.title") + }), + new validationIssueFix({ + icon: "iD-icon-layers", + title: _t.append("issues.fix.use_different_layers_or_levels.title") + }) + ]; + } + })); } } - return false; - } - function nodeOccursMoreThanOnce(way, nodeID) { - var occurrences = 0; - for (var index in way.nodes) { - if (way.nodes[index] === nodeID) { - occurrences += 1; - if (occurrences > 1) - return true; - } + return issues; + function showReference(selection2) { + var referenceText = _t("issues.close_nodes.detached.reference"); + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").html(referenceText); } - return false; } - function isConnectedViaOtherTypes(way, node) { - var wayType = typeForWay(way); - if (wayType === "highway") { - if (node.tags.entrance && node.tags.entrance !== "no") - return true; - if (node.tags.amenity === "parking_entrance") - return true; - } else if (wayType === "waterway") { - if (node.id === way.first()) { - if (node.tags.natural === "spring") - return true; - } else { - if (node.tags.manhole === "drain") - return true; - } + function getWayIssueIfAny(node1, node2, way) { + if (node1.id === node2.id || node1.hasInterestingTags() && node2.hasInterestingTags()) { + return null; } - return graph.parentWays(node).some(function(parentWay) { - if (parentWay.id === way.id) - return false; - if (wayType === "highway") { - if (parentWay.geometry(graph) === "area" && osmRoutableHighwayTagValues[parentWay.tags.highway]) - return true; - if (parentWay.tags.route === "ferry") - return true; - return graph.parentRelations(parentWay).some(function(parentRelation) { - if (parentRelation.tags.type === "route" && parentRelation.tags.route === "ferry") - return true; - return parentRelation.isMultipolygon() && osmRoutableHighwayTagValues[parentRelation.tags.highway]; - }); - } else if (wayType === "waterway") { - if (parentWay.tags.natural === "water" || parentWay.tags.natural === "coastline") - return true; - } - return false; - }); - } - function issuesForNode(way, nodeID) { - var isFirst = nodeID === way.first(); - var wayType = typeForWay(way); - if (nodeOccursMoreThanOnce(way, nodeID)) - return []; - var osm = services.osm; - if (!osm) - return []; - var node = graph.hasEntity(nodeID); - if (!node || !osm.isDataLoaded(node.loc)) - return []; - if (isConnectedViaOtherTypes(way, node)) - return []; - var attachedWaysOfSameType = graph.parentWays(node).filter(function(parentWay) { - if (parentWay.id === way.id) - return false; - return typeForWay(parentWay) === wayType; - }); - if (wayType === "waterway" && attachedWaysOfSameType.length === 0) - return []; - var attachedOneways = attachedWaysOfSameType.filter(function(attachedWay) { - return isOneway(attachedWay); - }); - if (attachedOneways.length < attachedWaysOfSameType.length) - return []; - if (attachedOneways.length) { - var connectedEndpointsOkay = attachedOneways.some(function(attachedOneway) { - if ((isFirst ? attachedOneway.first() : attachedOneway.last()) !== nodeID) - return true; - if (nodeOccursMoreThanOnce(attachedOneway, nodeID)) - return true; - return false; + if (node1.loc !== node2.loc) { + var parentWays1 = graph.parentWays(node1); + var parentWays2 = new Set(graph.parentWays(node2)); + var sharedWays = parentWays1.filter(function(parentWay) { + return parentWays2.has(parentWay); }); - if (connectedEndpointsOkay) - return []; - } - var placement = isFirst ? "start" : "end", messageID = wayType + ".", referenceID = wayType + "."; - if (wayType === "waterway") { - messageID += "connected." + placement; - referenceID += "connected"; - } else { - messageID += placement; - referenceID += placement; - } - return [new validationIssue({ - type: type3, - subtype: wayType, - severity: "warning", - message: function(context) { - var entity2 = context.hasEntity(this.entityIds[0]); - return entity2 ? _t.append("issues.impossible_oneway." + messageID + ".message", { - feature: utilDisplayLabel(entity2, context.graph()) - }) : ""; - }, - reference: getReference(referenceID), - entityIds: [way.id, node.id], - dynamicFixes: function() { - var fixes = []; - if (attachedOneways.length) { - fixes.push(new validationIssueFix({ - icon: "iD-operation-reverse", - title: _t.append("issues.fix.reverse_feature.title"), - entityIds: [way.id], - onClick: function(context) { - var id2 = this.issue.entityIds[0]; - context.perform(actionReverse(id2), _t("operations.reverse.annotation.line", { n: 1 })); - } - })); - } - if (node.tags.noexit !== "yes") { - var textDirection = _mainLocalizer.textDirection(); - var useLeftContinue = isFirst && textDirection === "ltr" || !isFirst && textDirection === "rtl"; - fixes.push(new validationIssueFix({ - icon: "iD-operation-continue" + (useLeftContinue ? "-left" : ""), - title: _t.append("issues.fix.continue_from_" + (isFirst ? "start" : "end") + ".title"), - onClick: function(context) { - var entityID = this.issue.entityIds[0]; - var vertexID = this.issue.entityIds[1]; - var way2 = context.entity(entityID); - var vertex = context.entity(vertexID); - continueDrawing(way2, vertex, context); - } - })); - } - return fixes; - }, - loc: node.loc - })]; - function getReference(referenceID2) { - return function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.impossible_oneway." + referenceID2 + ".reference")); - }; + var thresholds = sharedWays.map(function(parentWay) { + return thresholdMetersForWay(parentWay); + }); + var threshold = Math.min(...thresholds); + var distance = geoSphericalDistance(node1.loc, node2.loc); + if (distance > threshold) return null; } - } - }; - function continueDrawing(way, vertex, context) { - var map2 = context.map(); - if (!context.editable() || !map2.trimmedExtent().contains(vertex.loc)) { - map2.zoomToEase(vertex); - } - context.enter( - modeDrawLine(context, way.id, context.graph(), "line", way.affix(vertex.id), true) - ); - } - validation.type = type3; - return validation; - } - - // modules/validations/incompatible_source.js - function validationIncompatibleSource() { - const type3 = "incompatible_source"; - const incompatibleRules = [ - { - id: "amap", - regex: /(^amap$|^amap\.com|autonavi|mapabc|é«å¾·)/i - }, - { - id: "baidu", - regex: /(baidu|mapbar|ç¾åº¦)/i - }, - { - id: "google", - regex: /google/i, - exceptRegex: /((books|drive)\.google|google\s?(books|drive|plus))|(esri\/Google_Africa_Buildings)/i - } - ]; - const validation = function checkIncompatibleSource(entity) { - const entitySources = entity.tags && entity.tags.source && entity.tags.source.split(";"); - if (!entitySources) - return []; - const entityID = entity.id; - return entitySources.map((source) => { - const matchRule = incompatibleRules.find((rule) => { - if (!rule.regex.test(source)) - return false; - if (rule.exceptRegex && rule.exceptRegex.test(source)) - return false; - return true; - }); - if (!matchRule) - return null; return new validationIssue({ - type: type3, + type: type2, + subtype: "vertices", severity: "warning", - message: (context) => { - const entity2 = context.hasEntity(entityID); - return entity2 ? _t.append("issues.incompatible_source.feature.message", { - feature: utilDisplayLabel(entity2, context.graph(), true), - value: source - }) : ""; + message: function(context2) { + var entity2 = context2.hasEntity(this.entityIds[0]); + return entity2 ? _t.append("issues.close_nodes.message", { way: utilDisplayLabel(entity2, context2.graph()) }) : ""; }, - reference: getReference(matchRule.id), - entityIds: [entityID], - hash: source, - dynamicFixes: () => { + reference: showReference, + entityIds: [way.id, node1.id, node2.id], + loc: node1.loc, + dynamicFixes: function() { return [ - new validationIssueFix({ title: _t.append("issues.fix.remove_proprietary_data.title") }) + new validationIssueFix({ + icon: "iD-icon-plus", + title: _t.append("issues.fix.merge_points.title"), + onClick: function(context2) { + var entityIds = this.issue.entityIds; + var action = actionMergeNodes([entityIds[1], entityIds[2]]); + context2.perform(action, _t("issues.fix.merge_close_vertices.annotation")); + } + }), + new validationIssueFix({ + icon: "iD-operation-disconnect", + title: _t.append("issues.fix.move_points_apart.title") + }) ]; } }); - }).filter(Boolean); - function getReference(id2) { - return function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append(`issues.incompatible_source.reference.${id2}`)); - }; + function showReference(selection2) { + var referenceText = _t("issues.close_nodes.reference"); + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").html(referenceText); + } } }; - validation.type = type3; + validation.type = type2; return validation; } - // modules/validations/maprules.js - function validationMaprules() { - var type3 = "maprules"; - var validation = function checkMaprules(entity, graph) { - if (!services.maprules) - return []; - var rules = services.maprules.validationRules(); - var issues = []; - for (var i2 = 0; i2 < rules.length; i2++) { - var rule = rules[i2]; - rule.findIssues(entity, graph, issues); + // modules/validations/crossing_ways.js + var import_lodash3 = __toESM(require_lodash()); + function validationCrossingWays(context) { + var type2 = "crossing_ways"; + function getFeatureWithFeatureTypeTagsForWay(way, graph) { + if (getFeatureType(way, graph) === null) { + var parentRels = graph.parentRelations(way); + for (var i3 = 0; i3 < parentRels.length; i3++) { + var rel = parentRels[i3]; + if (getFeatureType(rel, graph) !== null) { + return rel; + } + } } - return issues; + return way; + } + function hasTag(tags, key) { + return tags[key] !== void 0 && tags[key] !== "no"; + } + function taggedAsIndoor(tags) { + return hasTag(tags, "indoor") || hasTag(tags, "level") || tags.highway === "corridor"; + } + function allowsBridge(featureType) { + return featureType === "highway" || featureType === "railway" || featureType === "waterway"; + } + function allowsTunnel(featureType) { + return featureType === "highway" || featureType === "railway" || featureType === "waterway"; + } + var ignoredBuildings = { + demolished: true, + dismantled: true, + proposed: true, + razed: true }; - validation.type = type3; - return validation; - } - - // modules/validations/mismatched_geometry.js - var import_fast_deep_equal4 = __toESM(require_fast_deep_equal()); - function validationMismatchedGeometry() { - var type3 = "mismatched_geometry"; - function tagSuggestingLineIsArea(entity) { - if (entity.type !== "way" || entity.isClosed()) - return null; - var tagSuggestingArea = entity.tagSuggestingArea(); - if (!tagSuggestingArea) { - return null; - } - var asLine = _mainPresetIndex.matchTags(tagSuggestingArea, "line"); - var asArea = _mainPresetIndex.matchTags(tagSuggestingArea, "area"); - if (asLine && asArea && asLine === asArea) { - return null; - } - return tagSuggestingArea; + function getFeatureType(entity, graph) { + var geometry = entity.geometry(graph); + if (geometry !== "line" && geometry !== "area") return null; + var tags = entity.tags; + if (hasTag(tags, "building") && !ignoredBuildings[tags.building]) return "building"; + if (hasTag(tags, "highway") && osmRoutableHighwayTagValues[tags.highway]) return "highway"; + if (geometry !== "line") return null; + if (hasTag(tags, "railway") && osmRailwayTrackTagValues[tags.railway]) return "railway"; + if (hasTag(tags, "waterway") && osmFlowingWaterwayTagValues[tags.waterway]) return "waterway"; + return null; } - function makeConnectEndpointsFixOnClick(way, graph) { - if (way.nodes.length < 3) - return null; - var nodes = graph.childNodes(way), testNodes; - var firstToLastDistanceMeters = geoSphericalDistance(nodes[0].loc, nodes[nodes.length - 1].loc); - if (firstToLastDistanceMeters < 0.75) { - testNodes = nodes.slice(); - testNodes.pop(); - testNodes.push(testNodes[0]); - if (!geoHasSelfIntersections(testNodes, testNodes[0].id)) { - return function(context) { - var way2 = context.entity(this.issue.entityIds[0]); - context.perform( - actionMergeNodes([way2.nodes[0], way2.nodes[way2.nodes.length - 1]], nodes[0].loc), - _t("issues.fix.connect_endpoints.annotation") - ); - }; - } + function isLegitCrossing(tags1, featureType1, tags2, featureType2) { + var level1 = tags1.level || "0"; + var level2 = tags2.level || "0"; + if (taggedAsIndoor(tags1) && taggedAsIndoor(tags2) && level1 !== level2) { + return true; } - testNodes = nodes.slice(); - testNodes.push(testNodes[0]); - if (!geoHasSelfIntersections(testNodes, testNodes[0].id)) { - return function(context) { - var wayId = this.issue.entityIds[0]; - var way2 = context.entity(wayId); - var nodeId = way2.nodes[0]; - var index = way2.nodes.length; - context.perform( - actionAddVertex(wayId, nodeId, index), - _t("issues.fix.connect_endpoints.annotation") - ); - }; + var layer1 = tags1.layer || "0"; + var layer2 = tags2.layer || "0"; + if (allowsBridge(featureType1) && allowsBridge(featureType2)) { + if (hasTag(tags1, "bridge") && !hasTag(tags2, "bridge")) return true; + if (!hasTag(tags1, "bridge") && hasTag(tags2, "bridge")) return true; + if (hasTag(tags1, "bridge") && hasTag(tags2, "bridge") && layer1 !== layer2) return true; + } else if (allowsBridge(featureType1) && hasTag(tags1, "bridge")) return true; + else if (allowsBridge(featureType2) && hasTag(tags2, "bridge")) return true; + if (allowsTunnel(featureType1) && allowsTunnel(featureType2)) { + if (hasTag(tags1, "tunnel") && !hasTag(tags2, "tunnel")) return true; + if (!hasTag(tags1, "tunnel") && hasTag(tags2, "tunnel")) return true; + if (hasTag(tags1, "tunnel") && hasTag(tags2, "tunnel") && layer1 !== layer2) return true; + } else if (allowsTunnel(featureType1) && hasTag(tags1, "tunnel")) return true; + else if (allowsTunnel(featureType2) && hasTag(tags2, "tunnel")) return true; + if (featureType1 === "waterway" && featureType2 === "highway" && tags2.man_made === "pier") return true; + if (featureType2 === "waterway" && featureType1 === "highway" && tags1.man_made === "pier") return true; + if (featureType1 === "building" || featureType2 === "building" || taggedAsIndoor(tags1) || taggedAsIndoor(tags2)) { + if (layer1 !== layer2) return true; } + return false; } - function lineTaggedAsAreaIssue(entity) { - var tagSuggestingArea = tagSuggestingLineIsArea(entity); - if (!tagSuggestingArea) - return null; - var validAsLine = false; - var presetAsLine = _mainPresetIndex.matchTags(entity.tags, "line"); - if (presetAsLine) { - validAsLine = true; - var key = Object.keys(tagSuggestingArea)[0]; - if (presetAsLine.tags[key] && presetAsLine.tags[key] === "*") { - validAsLine = false; + var highwaysDisallowingFords = { + motorway: true, + motorway_link: true, + trunk: true, + trunk_link: true, + primary: true, + primary_link: true, + secondary: true, + secondary_link: true + }; + function tagsForConnectionNodeIfAllowed(entity1, entity2, graph, lessLikelyTags) { + var featureType1 = getFeatureType(entity1, graph); + var featureType2 = getFeatureType(entity2, graph); + var geometry1 = entity1.geometry(graph); + var geometry2 = entity2.geometry(graph); + var bothLines = geometry1 === "line" && geometry2 === "line"; + if (featureType1 === featureType2) { + if (featureType1 === "highway") { + var entity1IsPath = osmPathHighwayTagValues[entity1.tags.highway]; + var entity2IsPath = osmPathHighwayTagValues[entity2.tags.highway]; + if ((entity1IsPath || entity2IsPath) && entity1IsPath !== entity2IsPath) { + var roadFeature = entity1IsPath ? entity2 : entity1; + var pathFeature = entity1IsPath ? entity1 : entity2; + if (roadFeature.tags.highway === "track") { + return {}; + } + if (!lessLikelyTags && roadFeature.tags.highway === "service" && pathFeature.tags.highway === "footway" && pathFeature.tags.footway === "sidewalk") { + return {}; + } + if (["marked", "unmarked", "traffic_signals", "uncontrolled"].indexOf(pathFeature.tags.crossing) !== -1) { + return bothLines ? { highway: "crossing", crossing: pathFeature.tags.crossing } : {}; + } + return bothLines ? { highway: "crossing" } : {}; + } + return {}; } - if (Object.keys(presetAsLine.tags).length === 0) { - validAsLine = false; + if (featureType1 === "waterway") return {}; + if (featureType1 === "railway") return {}; + } else { + var featureTypes = [featureType1, featureType2]; + if (featureTypes.indexOf("highway") !== -1) { + if (featureTypes.indexOf("railway") !== -1) { + if (!bothLines) return {}; + var isTram = entity1.tags.railway === "tram" || entity2.tags.railway === "tram"; + if (osmPathHighwayTagValues[entity1.tags.highway] || osmPathHighwayTagValues[entity2.tags.highway]) { + if (isTram) return { railway: "tram_crossing" }; + return { railway: "crossing" }; + } else { + if (isTram) return { railway: "tram_level_crossing" }; + return { railway: "level_crossing" }; + } + } + if (featureTypes.indexOf("waterway") !== -1) { + if (hasTag(entity1.tags, "tunnel") && hasTag(entity2.tags, "tunnel")) return null; + if (hasTag(entity1.tags, "bridge") && hasTag(entity2.tags, "bridge")) return null; + if (highwaysDisallowingFords[entity1.tags.highway] || highwaysDisallowingFords[entity2.tags.highway]) { + return null; + } + return bothLines ? { ford: "yes" } : {}; + } } } - return new validationIssue({ - type: type3, - subtype: "area_as_line", - severity: "warning", - message: function(context) { - var entity2 = context.hasEntity(this.entityIds[0]); - return entity2 ? _t.append("issues.tag_suggests_area.message", { - feature: utilDisplayLabel(entity2, "area", true), - tag: utilTagText({ tags: tagSuggestingArea }) - }) : ""; - }, - reference: showReference, - entityIds: [entity.id], - hash: JSON.stringify(tagSuggestingArea), - dynamicFixes: function(context) { - var fixes = []; - var entity2 = context.entity(this.entityIds[0]); - var connectEndsOnClick = makeConnectEndpointsFixOnClick(entity2, context.graph()); - if (!validAsLine) { - fixes.push(new validationIssueFix({ - title: _t.append("issues.fix.connect_endpoints.title"), - onClick: connectEndsOnClick - })); + return null; + } + function findCrossingsByWay(way1, graph, tree) { + var edgeCrossInfos = []; + if (way1.type !== "way") return edgeCrossInfos; + var taggedFeature1 = getFeatureWithFeatureTypeTagsForWay(way1, graph); + var way1FeatureType = getFeatureType(taggedFeature1, graph); + if (way1FeatureType === null) return edgeCrossInfos; + var checkedSingleCrossingWays = {}; + var i3, j2; + var extent; + var n1, n22, nA, nB, nAId, nBId; + var segment1, segment2; + var oneOnly; + var segmentInfos, segment2Info, way2, taggedFeature2, way2FeatureType; + var way1Nodes = graph.childNodes(way1); + var comparedWays = {}; + for (i3 = 0; i3 < way1Nodes.length - 1; i3++) { + n1 = way1Nodes[i3]; + n22 = way1Nodes[i3 + 1]; + extent = geoExtent([ + [ + Math.min(n1.loc[0], n22.loc[0]), + Math.min(n1.loc[1], n22.loc[1]) + ], + [ + Math.max(n1.loc[0], n22.loc[0]), + Math.max(n1.loc[1], n22.loc[1]) + ] + ]); + segmentInfos = tree.waySegments(extent, graph); + for (j2 = 0; j2 < segmentInfos.length; j2++) { + segment2Info = segmentInfos[j2]; + if (segment2Info.wayId === way1.id) continue; + if (checkedSingleCrossingWays[segment2Info.wayId]) continue; + comparedWays[segment2Info.wayId] = true; + way2 = graph.hasEntity(segment2Info.wayId); + if (!way2) continue; + taggedFeature2 = getFeatureWithFeatureTypeTagsForWay(way2, graph); + way2FeatureType = getFeatureType(taggedFeature2, graph); + if (way2FeatureType === null || isLegitCrossing(taggedFeature1.tags, way1FeatureType, taggedFeature2.tags, way2FeatureType)) { + continue; } - fixes.push(new validationIssueFix({ - icon: "iD-operation-delete", - title: _t.append("issues.fix.remove_tag.title"), - onClick: function(context2) { - var entityId = this.issue.entityIds[0]; - var entity3 = context2.entity(entityId); - var tags = Object.assign({}, entity3.tags); - for (var key2 in tagSuggestingArea) { - delete tags[key2]; - } - context2.perform( - actionChangeTags(entityId, tags), - _t("issues.fix.remove_tag.annotation") - ); + oneOnly = way1FeatureType === "building" || way2FeatureType === "building"; + nAId = segment2Info.nodes[0]; + nBId = segment2Info.nodes[1]; + if (nAId === n1.id || nAId === n22.id || nBId === n1.id || nBId === n22.id) { + continue; + } + nA = graph.hasEntity(nAId); + if (!nA) continue; + nB = graph.hasEntity(nBId); + if (!nB) continue; + segment1 = [n1.loc, n22.loc]; + segment2 = [nA.loc, nB.loc]; + var point = geoLineIntersection(segment1, segment2); + if (point) { + edgeCrossInfos.push({ + wayInfos: [ + { + way: way1, + featureType: way1FeatureType, + edge: [n1.id, n22.id] + }, + { + way: way2, + featureType: way2FeatureType, + edge: [nA.id, nB.id] + } + ], + crossPoint: point + }); + if (oneOnly) { + checkedSingleCrossingWays[way2.id] = true; + break; } - })); - return fixes; + } } - }); - function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.tag_suggests_area.reference")); - } - } - function vertexPointIssue(entity, graph) { - if (entity.type !== "node") - return null; - if (Object.keys(entity.tags).length === 0) - return null; - if (entity.isOnAddressLine(graph)) - return null; - var geometry = entity.geometry(graph); - var allowedGeometries = osmNodeGeometriesForTags(entity.tags); - if (geometry === "point" && !allowedGeometries.point && allowedGeometries.vertex) { - return new validationIssue({ - type: type3, - subtype: "vertex_as_point", - severity: "warning", - message: function(context) { - var entity2 = context.hasEntity(this.entityIds[0]); - return entity2 ? _t.append("issues.vertex_as_point.message", { - feature: utilDisplayLabel(entity2, "vertex", true) - }) : ""; - }, - reference: function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.vertex_as_point.reference")); - }, - entityIds: [entity.id] - }); - } else if (geometry === "vertex" && !allowedGeometries.vertex && allowedGeometries.point) { - return new validationIssue({ - type: type3, - subtype: "point_as_vertex", - severity: "warning", - message: function(context) { - var entity2 = context.hasEntity(this.entityIds[0]); - return entity2 ? _t.append("issues.point_as_vertex.message", { - feature: utilDisplayLabel(entity2, "point", true) - }) : ""; - }, - reference: function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.point_as_vertex.reference")); - }, - entityIds: [entity.id], - dynamicFixes: extractPointDynamicFixes - }); - } - return null; - } - function otherMismatchIssue(entity, graph) { - if (!entity.hasInterestingTags()) - return null; - if (entity.type !== "node" && entity.type !== "way") - return null; - if (entity.type === "node" && entity.isOnAddressLine(graph)) - return null; - var sourceGeom = entity.geometry(graph); - var targetGeoms = entity.type === "way" ? ["point", "vertex"] : ["line", "area"]; - if (sourceGeom === "area") - targetGeoms.unshift("line"); - var asSource = _mainPresetIndex.match(entity, graph); - var targetGeom = targetGeoms.find((nodeGeom) => { - var asTarget = _mainPresetIndex.matchTags(entity.tags, nodeGeom); - if (!asSource || !asTarget || asSource === asTarget || (0, import_fast_deep_equal4.default)(asSource.tags, asTarget.tags)) - return false; - if (asTarget.isFallback()) - return false; - var primaryKey = Object.keys(asTarget.tags)[0]; - if (primaryKey === "building") - return false; - if (asTarget.tags[primaryKey] === "*") - return false; - return asSource.isFallback() || asSource.tags[primaryKey] === "*"; - }); - if (!targetGeom) - return null; - var subtype = targetGeom + "_as_" + sourceGeom; - if (targetGeom === "vertex") - targetGeom = "point"; - if (sourceGeom === "vertex") - sourceGeom = "point"; - var referenceId = targetGeom + "_as_" + sourceGeom; - var dynamicFixes; - if (targetGeom === "point") { - dynamicFixes = extractPointDynamicFixes; - } else if (sourceGeom === "area" && targetGeom === "line") { - dynamicFixes = lineToAreaDynamicFixes; } - return new validationIssue({ - type: type3, - subtype, - severity: "warning", - message: function(context) { - var entity2 = context.hasEntity(this.entityIds[0]); - return entity2 ? _t.append("issues." + referenceId + ".message", { - feature: utilDisplayLabel(entity2, targetGeom, true) - }) : ""; - }, - reference: function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.mismatched_geometry.reference")); - }, - entityIds: [entity.id], - dynamicFixes - }); + return edgeCrossInfos; } - function lineToAreaDynamicFixes(context) { - var convertOnClick; - var entityId = this.entityIds[0]; - var entity = context.entity(entityId); - var tags = Object.assign({}, entity.tags); - delete tags.area; - if (!osmTagSuggestingArea(tags)) { - convertOnClick = function(context2) { - var entityId2 = this.issue.entityIds[0]; - var entity2 = context2.entity(entityId2); - var tags2 = Object.assign({}, entity2.tags); - if (tags2.area) { - delete tags2.area; + function waysToCheck(entity, graph) { + var featureType = getFeatureType(entity, graph); + if (!featureType) return []; + if (entity.type === "way") { + return [entity]; + } else if (entity.type === "relation") { + return entity.members.reduce(function(array2, member) { + if (member.type === "way" && // only look at geometry ways + (!member.role || member.role === "outer" || member.role === "inner")) { + var entity2 = graph.hasEntity(member.id); + if (entity2 && array2.indexOf(entity2) === -1) { + array2.push(entity2); + } } - context2.perform( - actionChangeTags(entityId2, tags2), - _t("issues.fix.convert_to_line.annotation") - ); - }; - } - return [ - new validationIssueFix({ - icon: "iD-icon-line", - title: _t.append("issues.fix.convert_to_line.title"), - onClick: convertOnClick - }) - ]; - } - function extractPointDynamicFixes(context) { - var entityId = this.entityIds[0]; - var extractOnClick = null; - if (!context.hasHiddenConnections(entityId)) { - extractOnClick = function(context2) { - var entityId2 = this.issue.entityIds[0]; - var action = actionExtract(entityId2, context2.projection); - context2.perform( - action, - _t("operations.extract.annotation", { n: 1 }) - ); - context2.enter(modeSelect(context2, [action.getExtractedNodeID()])); - }; - } - return [ - new validationIssueFix({ - icon: "iD-operation-extract", - title: _t.append("issues.fix.extract_point.title"), - onClick: extractOnClick - }) - ]; - } - function unclosedMultipolygonPartIssues(entity, graph) { - if (entity.type !== "relation" || !entity.isMultipolygon() || entity.isDegenerate() || !entity.isComplete(graph)) - return []; - var sequences = osmJoinWays(entity.members, graph); - var issues = []; - for (var i2 in sequences) { - var sequence = sequences[i2]; - if (!sequence.nodes) - continue; - var firstNode = sequence.nodes[0]; - var lastNode = sequence.nodes[sequence.nodes.length - 1]; - if (firstNode === lastNode) - continue; - var issue = new validationIssue({ - type: type3, - subtype: "unclosed_multipolygon_part", - severity: "warning", - message: function(context) { - var entity2 = context.hasEntity(this.entityIds[0]); - return entity2 ? _t.append("issues.unclosed_multipolygon_part.message", { - feature: utilDisplayLabel(entity2, context.graph(), true) - }) : ""; - }, - reference: showReference, - loc: sequence.nodes[0].loc, - entityIds: [entity.id], - hash: sequence.map(function(way) { - return way.id; - }).join() - }); - issues.push(issue); - } - return issues; - function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.unclosed_multipolygon_part.reference")); + return array2; + }, []); } + return []; } - var validation = function checkMismatchedGeometry(entity, graph) { - var vertexPoint = vertexPointIssue(entity, graph); - if (vertexPoint) - return [vertexPoint]; - var lineAsArea = lineTaggedAsAreaIssue(entity); - if (lineAsArea) - return [lineAsArea]; - var mismatch = otherMismatchIssue(entity, graph); - if (mismatch) - return [mismatch]; - return unclosedMultipolygonPartIssues(entity, graph); - }; - validation.type = type3; - return validation; - } - - // modules/validations/missing_role.js - function validationMissingRole() { - var type3 = "missing_role"; - var validation = function checkMissingRole(entity, graph) { + var validation = function checkCrossingWays(entity, graph) { + var tree = context.history().tree(); + var ways = waysToCheck(entity, graph); var issues = []; - if (entity.type === "way") { - graph.parentRelations(entity).forEach(function(relation) { - if (!relation.isMultipolygon()) - return; - var member = relation.memberById(entity.id); - if (member && isMissingRole(member)) { - issues.push(makeIssue(entity, relation, member)); - } - }); - } else if (entity.type === "relation" && entity.isMultipolygon()) { - entity.indexedMembers().forEach(function(member) { - var way = graph.hasEntity(member.id); - if (way && isMissingRole(member)) { - issues.push(makeIssue(way, entity, member)); - } - }); + var wayIndex, crossingIndex, crossings; + for (wayIndex in ways) { + crossings = findCrossingsByWay(ways[wayIndex], graph, tree); + for (crossingIndex in crossings) { + issues.push(createIssue(crossings[crossingIndex], graph)); + } } return issues; }; - function isMissingRole(member) { - return !member.role || !member.role.trim().length; - } - function makeIssue(way, relation, member) { - return new validationIssue({ - type: type3, - severity: "warning", - message: function(context) { - var member2 = context.hasEntity(this.entityIds[1]), relation2 = context.hasEntity(this.entityIds[0]); - return member2 && relation2 ? _t.append("issues.missing_role.message", { - member: utilDisplayLabel(member2, context.graph()), - relation: utilDisplayLabel(relation2, context.graph()) - }) : ""; - }, - reference: showReference, - entityIds: [relation.id, way.id], - data: { - member - }, - hash: member.index.toString(), - dynamicFixes: function() { - return [ - makeAddRoleFix("inner"), - makeAddRoleFix("outer"), - new validationIssueFix({ - icon: "iD-operation-delete", - title: _t.append("issues.fix.remove_from_relation.title"), - onClick: function(context) { - context.perform( - actionDeleteMember(this.issue.entityIds[0], this.issue.data.member.index), - _t("operations.delete_member.annotation", { - n: 1 - }) - ); - } - }) - ]; - } - }); - function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.missing_role.multipolygon.reference")); - } - } - function makeAddRoleFix(role) { - return new validationIssueFix({ - title: _t.append("issues.fix.set_as_" + role + ".title"), - onClick: function(context) { - var oldMember = this.issue.data.member; - var member = { id: this.issue.entityIds[1], type: oldMember.type, role }; - context.perform( - actionChangeMember(this.issue.entityIds[0], member, oldMember.index), - _t("operations.change_role.annotation", { - n: 1 - }) - ); + function createIssue(crossing, graph) { + crossing.wayInfos.sort(function(way1Info, way2Info) { + var type1 = way1Info.featureType; + var type22 = way2Info.featureType; + if (type1 === type22) { + return utilDisplayLabel(way1Info.way, graph) > utilDisplayLabel(way2Info.way, graph); + } else if (type1 === "waterway") { + return true; + } else if (type22 === "waterway") { + return false; } + return type1 < type22; }); - } - validation.type = type3; - return validation; - } - - // modules/validations/missing_tag.js - function validationMissingTag(context) { - var type3 = "missing_tag"; - function hasDescriptiveTags(entity, graph) { - var onlyAttributeKeys = ["description", "name", "note", "start_date"]; - var entityDescriptiveKeys = Object.keys(entity.tags).filter(function(k) { - if (k === "area" || !osmIsInterestingTag(k)) - return false; - return !onlyAttributeKeys.some(function(attributeKey) { - return k === attributeKey || k.indexOf(attributeKey + ":") === 0; - }); + var entities = crossing.wayInfos.map(function(wayInfo) { + return getFeatureWithFeatureTypeTagsForWay(wayInfo.way, graph); }); - if (entity.type === "relation" && entityDescriptiveKeys.length === 1 && entity.tags.type === "multipolygon") { - return osmOldMultipolygonOuterMemberOfRelation(entity, graph); - } - return entityDescriptiveKeys.length > 0; - } - function isUnknownRoad(entity) { - return entity.type === "way" && entity.tags.highway === "road"; - } - function isUntypedRelation(entity) { - return entity.type === "relation" && !entity.tags.type; - } - var validation = function checkMissingTag(entity, graph) { - var subtype; - var osm = context.connection(); - var isUnloadedNode = entity.type === "node" && osm && !osm.isDataLoaded(entity.loc); - if (!isUnloadedNode && entity.geometry(graph) !== "vertex" && !entity.hasParentRelations(graph)) { - if (Object.keys(entity.tags).length === 0) { - subtype = "any"; - } else if (!hasDescriptiveTags(entity, graph)) { - subtype = "descriptive"; - } else if (isUntypedRelation(entity)) { - subtype = "relation_type"; - } + var edges = [crossing.wayInfos[0].edge, crossing.wayInfos[1].edge]; + var featureTypes = [crossing.wayInfos[0].featureType, crossing.wayInfos[1].featureType]; + var connectionTags = tagsForConnectionNodeIfAllowed(entities[0], entities[1], graph); + var featureType1 = crossing.wayInfos[0].featureType; + var featureType2 = crossing.wayInfos[1].featureType; + var isCrossingIndoors = taggedAsIndoor(entities[0].tags) && taggedAsIndoor(entities[1].tags); + var isCrossingTunnels = allowsTunnel(featureType1) && hasTag(entities[0].tags, "tunnel") && allowsTunnel(featureType2) && hasTag(entities[1].tags, "tunnel"); + var isCrossingBridges = allowsBridge(featureType1) && hasTag(entities[0].tags, "bridge") && allowsBridge(featureType2) && hasTag(entities[1].tags, "bridge"); + var subtype = [featureType1, featureType2].sort().join("-"); + var crossingTypeID = subtype; + if (isCrossingIndoors) { + crossingTypeID = "indoor-indoor"; + } else if (isCrossingTunnels) { + crossingTypeID = "tunnel-tunnel"; + } else if (isCrossingBridges) { + crossingTypeID = "bridge-bridge"; } - if (!subtype && isUnknownRoad(entity)) { - subtype = "highway_classification"; + if (connectionTags && (isCrossingIndoors || isCrossingTunnels || isCrossingBridges)) { + crossingTypeID += "_connectable"; } - if (!subtype) - return []; - var messageID = subtype === "highway_classification" ? "unknown_road" : "missing_tag." + subtype; - var referenceID = subtype === "highway_classification" ? "unknown_road" : "missing_tag"; - var canDelete = entity.version === void 0 || entity.v !== void 0; - var severity = canDelete && subtype !== "highway_classification" ? "error" : "warning"; - return [new validationIssue({ - type: type3, + var uniqueID = crossing.crossPoint[0].toFixed(4) + "," + crossing.crossPoint[1].toFixed(4); + return new validationIssue({ + type: type2, subtype, - severity, + severity: "warning", message: function(context2) { - var entity2 = context2.hasEntity(this.entityIds[0]); - return entity2 ? _t.append("issues." + messageID + ".message", { - feature: utilDisplayLabel(entity2, context2.graph()) + var graph2 = context2.graph(); + var entity1 = graph2.hasEntity(this.entityIds[0]), entity2 = graph2.hasEntity(this.entityIds[1]); + return entity1 && entity2 ? _t.append("issues.crossing_ways.message", { + feature: utilDisplayLabel(entity1, graph2), + feature2: utilDisplayLabel(entity2, graph2) }) : ""; }, reference: showReference, - entityIds: [entity.id], + entityIds: entities.map(function(entity) { + return entity.id; + }), + data: { + edges, + featureTypes, + connectionTags + }, + hash: uniqueID, + loc: crossing.crossPoint, dynamicFixes: function(context2) { + var mode = context2.mode(); + if (!mode || mode.id !== "select" || mode.selectedIDs().length !== 1) return []; + var selectedIndex = this.entityIds[0] === mode.selectedIDs()[0] ? 0 : 1; + var selectedFeatureType = this.data.featureTypes[selectedIndex]; + var otherFeatureType = this.data.featureTypes[selectedIndex === 0 ? 1 : 0]; var fixes = []; - var selectFixType = subtype === "highway_classification" ? "select_road_type" : "select_preset"; - fixes.push(new validationIssueFix({ - icon: "iD-icon-search", - title: _t.append("issues.fix." + selectFixType + ".title"), - onClick: function(context3) { - context3.ui().sidebar.showPresetList(); + if (connectionTags) { + fixes.push(makeConnectWaysFix(this.data.connectionTags)); + let lessLikelyConnectionTags = tagsForConnectionNodeIfAllowed(entities[0], entities[1], graph, true); + if (lessLikelyConnectionTags && !(0, import_lodash3.isEqual)(connectionTags, lessLikelyConnectionTags)) { + fixes.push(makeConnectWaysFix(lessLikelyConnectionTags)); } - })); - var deleteOnClick; - var id2 = this.entityIds[0]; - var operation = operationDelete(context2, [id2]); - var disabledReasonID = operation.disabled(); - if (!disabledReasonID) { - deleteOnClick = function(context3) { - var id3 = this.issue.entityIds[0]; - var operation2 = operationDelete(context3, [id3]); - if (!operation2.disabled()) { - operation2(); - } - }; } - fixes.push( - new validationIssueFix({ - icon: "iD-operation-delete", - title: _t.append("issues.fix.delete_feature.title"), - disabledReason: disabledReasonID ? _t("operations.delete." + disabledReasonID + ".single") : void 0, - onClick: deleteOnClick - }) - ); + if (isCrossingIndoors) { + fixes.push(new validationIssueFix({ + icon: "iD-icon-layers", + title: _t.append("issues.fix.use_different_levels.title") + })); + } else if (isCrossingTunnels || isCrossingBridges || featureType1 === "building" || featureType2 === "building") { + fixes.push(makeChangeLayerFix("higher")); + fixes.push(makeChangeLayerFix("lower")); + } else if (context2.graph().geometry(this.entityIds[0]) === "line" && context2.graph().geometry(this.entityIds[1]) === "line") { + if (allowsBridge(selectedFeatureType) && selectedFeatureType !== "waterway") { + fixes.push(makeAddBridgeOrTunnelFix("add_a_bridge", "temaki-bridge", "bridge")); + } + var skipTunnelFix = otherFeatureType === "waterway" && selectedFeatureType !== "waterway"; + if (allowsTunnel(selectedFeatureType) && !skipTunnelFix) { + fixes.push(makeAddBridgeOrTunnelFix("add_a_tunnel", "temaki-tunnel", "tunnel")); + } + } + fixes.push(new validationIssueFix({ + icon: "iD-operation-move", + title: _t.append("issues.fix.reposition_features.title") + })); return fixes; } - })]; + }); function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues." + referenceID + ".reference")); - } - }; - validation.type = type3; - return validation; - } - - // modules/validations/outdated_tags.js - function validationOutdatedTags() { - const type3 = "outdated_tags"; - let _waitingForDeprecated = true; - let _dataDeprecated; - _mainFileFetcher.get("deprecated").then((d) => _dataDeprecated = d).catch(() => { - }).finally(() => _waitingForDeprecated = false); - function oldTagIssues(entity, graph) { - const oldTags = Object.assign({}, entity.tags); - let preset = _mainPresetIndex.match(entity, graph); - let subtype = "deprecated_tags"; - if (!preset) - return []; - if (!entity.hasInterestingTags()) - return []; - if (preset.replacement) { - const newPreset = _mainPresetIndex.item(preset.replacement); - graph = actionChangePreset(entity.id, preset, newPreset, true)(graph); - entity = graph.entity(entity.id); - preset = newPreset; + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.crossing_ways." + crossingTypeID + ".reference")); } - if (_dataDeprecated) { - const deprecatedTags = entity.deprecatedTags(_dataDeprecated); - if (deprecatedTags.length) { - deprecatedTags.forEach((tag) => { - graph = actionUpgradeTags(entity.id, tag.old, tag.replace)(graph); - }); - entity = graph.entity(entity.id); - } - } - let newTags = Object.assign({}, entity.tags); - if (preset.tags !== preset.addTags) { - Object.keys(preset.addTags).forEach((k) => { - if (!newTags[k]) { - if (preset.addTags[k] === "*") { - newTags[k] = "yes"; + } + function makeAddBridgeOrTunnelFix(fixTitleID, iconName, bridgeOrTunnel) { + return new validationIssueFix({ + icon: iconName, + title: _t.append("issues.fix." + fixTitleID + ".title"), + onClick: function(context2) { + var mode = context2.mode(); + if (!mode || mode.id !== "select") return; + var selectedIDs = mode.selectedIDs(); + if (selectedIDs.length !== 1) return; + var selectedWayID = selectedIDs[0]; + if (!context2.hasEntity(selectedWayID)) return; + var resultWayIDs = [selectedWayID]; + var edge, crossedEdge, crossedWayID; + if (this.issue.entityIds[0] === selectedWayID) { + edge = this.issue.data.edges[0]; + crossedEdge = this.issue.data.edges[1]; + crossedWayID = this.issue.entityIds[1]; + } else { + edge = this.issue.data.edges[1]; + crossedEdge = this.issue.data.edges[0]; + crossedWayID = this.issue.entityIds[0]; + } + var crossingLoc = this.issue.loc; + var projection2 = context2.projection; + var action = function actionAddStructure(graph) { + var edgeNodes = [graph.entity(edge[0]), graph.entity(edge[1])]; + var crossedWay = graph.hasEntity(crossedWayID); + var structLengthMeters = crossedWay && isFinite(crossedWay.tags.width) && Number(crossedWay.tags.width); + if (!structLengthMeters) { + structLengthMeters = crossedWay && crossedWay.impliedLineWidthMeters(); + } + if (structLengthMeters) { + if (getFeatureType(crossedWay, graph) === "railway") { + structLengthMeters *= 2; + } } else { - newTags[k] = preset.addTags[k]; + structLengthMeters = 8; } - } - }); - } - const nsi = services.nsi; - let waitingForNsi = false; - let nsiResult; - if (nsi) { - waitingForNsi = nsi.status() === "loading"; - if (!waitingForNsi) { - const loc = entity.extent(graph).center(); - nsiResult = nsi.upgradeTags(newTags, loc); - if (nsiResult) { - newTags = nsiResult.newTags; - subtype = "noncanonical_brand"; - } + var a1 = geoAngle(edgeNodes[0], edgeNodes[1], projection2) + Math.PI; + var a2 = geoAngle(graph.entity(crossedEdge[0]), graph.entity(crossedEdge[1]), projection2) + Math.PI; + var crossingAngle = Math.max(a1, a2) - Math.min(a1, a2); + if (crossingAngle > Math.PI) crossingAngle -= Math.PI; + structLengthMeters = structLengthMeters / 2 / Math.sin(crossingAngle) * 2; + structLengthMeters += 4; + structLengthMeters = Math.min(Math.max(structLengthMeters, 4), 50); + function geomToProj(geoPoint) { + return [ + geoLonToMeters(geoPoint[0], geoPoint[1]), + geoLatToMeters(geoPoint[1]) + ]; + } + function projToGeom(projPoint) { + var lat = geoMetersToLat(projPoint[1]); + return [ + geoMetersToLon(projPoint[0], lat), + lat + ]; + } + var projEdgeNode1 = geomToProj(edgeNodes[0].loc); + var projEdgeNode2 = geomToProj(edgeNodes[1].loc); + var projectedAngle = geoVecAngle(projEdgeNode1, projEdgeNode2); + var projectedCrossingLoc = geomToProj(crossingLoc); + var linearToSphericalMetersRatio = geoVecLength(projEdgeNode1, projEdgeNode2) / geoSphericalDistance(edgeNodes[0].loc, edgeNodes[1].loc); + function locSphericalDistanceFromCrossingLoc(angle2, distanceMeters) { + var lengthSphericalMeters = distanceMeters * linearToSphericalMetersRatio; + return projToGeom([ + projectedCrossingLoc[0] + Math.cos(angle2) * lengthSphericalMeters, + projectedCrossingLoc[1] + Math.sin(angle2) * lengthSphericalMeters + ]); + } + var endpointLocGetter1 = function(lengthMeters) { + return locSphericalDistanceFromCrossingLoc(projectedAngle, lengthMeters); + }; + var endpointLocGetter2 = function(lengthMeters) { + return locSphericalDistanceFromCrossingLoc(projectedAngle + Math.PI, lengthMeters); + }; + var minEdgeLengthMeters = 0.55; + function determineEndpoint(edge2, endNode, locGetter) { + var newNode; + var idealLengthMeters = structLengthMeters / 2; + var crossingToEdgeEndDistance = geoSphericalDistance(crossingLoc, endNode.loc); + if (crossingToEdgeEndDistance - idealLengthMeters > minEdgeLengthMeters) { + var idealNodeLoc = locGetter(idealLengthMeters); + newNode = osmNode(); + graph = actionAddMidpoint({ loc: idealNodeLoc, edge: edge2 }, newNode)(graph); + } else { + var edgeCount = 0; + endNode.parentIntersectionWays(graph).forEach(function(way) { + way.nodes.forEach(function(nodeID) { + if (nodeID === endNode.id) { + if (endNode.id === way.first() && endNode.id !== way.last() || endNode.id === way.last() && endNode.id !== way.first()) { + edgeCount += 1; + } else { + edgeCount += 2; + } + } + }); + }); + if (edgeCount >= 3) { + var insetLength = crossingToEdgeEndDistance - minEdgeLengthMeters; + if (insetLength > minEdgeLengthMeters) { + var insetNodeLoc = locGetter(insetLength); + newNode = osmNode(); + graph = actionAddMidpoint({ loc: insetNodeLoc, edge: edge2 }, newNode)(graph); + } + } + } + if (!newNode) newNode = endNode; + var splitAction = actionSplit([newNode.id]).limitWays(resultWayIDs); + graph = splitAction(graph); + if (splitAction.getCreatedWayIDs().length) { + resultWayIDs.push(splitAction.getCreatedWayIDs()[0]); + } + return newNode; + } + var structEndNode1 = determineEndpoint(edge, edgeNodes[1], endpointLocGetter1); + var structEndNode2 = determineEndpoint([edgeNodes[0].id, structEndNode1.id], edgeNodes[0], endpointLocGetter2); + var structureWay = resultWayIDs.map(function(id2) { + return graph.entity(id2); + }).find(function(way) { + return way.nodes.indexOf(structEndNode1.id) !== -1 && way.nodes.indexOf(structEndNode2.id) !== -1; + }); + var tags = Object.assign({}, structureWay.tags); + if (bridgeOrTunnel === "bridge") { + tags.bridge = "yes"; + tags.layer = "1"; + } else { + var tunnelValue = "yes"; + if (getFeatureType(structureWay, graph) === "waterway") { + tunnelValue = "culvert"; + } + tags.tunnel = tunnelValue; + tags.layer = "-1"; + } + graph = actionChangeTags(structureWay.id, tags)(graph); + return graph; + }; + context2.perform(action, _t("issues.fix." + fixTitleID + ".annotation")); + context2.enter(modeSelect(context2, resultWayIDs)); } + }); + } + function makeConnectWaysFix(connectionTags) { + var fixTitleID = "connect_features"; + var fixIcon = "iD-icon-crossing"; + if (connectionTags.highway === "crossing") { + fixTitleID = "connect_using_crossing"; + fixIcon = "temaki-pedestrian"; } - let issues = []; - issues.provisional = _waitingForDeprecated || waitingForNsi; - const tagDiff = utilTagDiff(oldTags, newTags); - if (!tagDiff.length) - return issues; - const isOnlyAddingTags = tagDiff.every((d) => d.type === "+"); - let prefix = ""; - if (nsiResult) { - prefix = "noncanonical_brand."; - } else if (subtype === "deprecated_tags" && isOnlyAddingTags) { - subtype = "incomplete_tags"; - prefix = "incomplete."; + if (connectionTags.ford) { + fixTitleID = "connect_using_ford"; + fixIcon = "roentgen-ford"; } - let autoArgs = subtype !== "noncanonical_brand" ? [doUpgrade, _t("issues.fix.upgrade_tags.annotation")] : null; - issues.push(new validationIssue({ - type: type3, - subtype, - severity: "warning", - message: showMessage, - reference: showReference, - entityIds: [entity.id], - hash: utilHashcode(JSON.stringify(tagDiff)), - dynamicFixes: () => { - let fixes = [ - new validationIssueFix({ - autoArgs, - title: _t.append("issues.fix.upgrade_tags.title"), - onClick: (context) => { - context.perform(doUpgrade, _t("issues.fix.upgrade_tags.annotation")); - } - }) - ]; - const item = nsiResult && nsiResult.matched; - if (item) { - fixes.push( - new validationIssueFix({ - title: _t.append("issues.fix.tag_as_not.title", { name: item.displayName }), - onClick: (context) => { - context.perform(addNotTag, _t("issues.fix.tag_as_not.annotation")); + const fix = new validationIssueFix({ + icon: fixIcon, + title: _t.append("issues.fix." + fixTitleID + ".title"), + onClick: function(context2) { + var loc = this.issue.loc; + var edges = this.issue.data.edges; + context2.perform( + function actionConnectCrossingWays(graph) { + var node = osmNode({ loc, tags: connectionTags }); + graph = graph.replace(node); + var nodesToMerge = [node.id]; + var mergeThresholdInMeters = 0.75; + edges.forEach(function(edge) { + var edgeNodes = [graph.entity(edge[0]), graph.entity(edge[1])]; + var nearby = geoSphericalClosestNode(edgeNodes, loc); + if ((!nearby.node.hasInterestingTags() || nearby.node.isCrossing()) && nearby.distance < mergeThresholdInMeters) { + nodesToMerge.push(nearby.node.id); + } else { + graph = actionAddMidpoint({ loc, edge }, node)(graph); } - }) - ); - } - return fixes; + }); + if (nodesToMerge.length > 1) { + graph = actionMergeNodes(nodesToMerge, loc)(graph); + } + return graph; + }, + _t("issues.fix.connect_crossing_features.annotation") + ); } - })); - return issues; - function doUpgrade(graph2) { - const currEntity = graph2.hasEntity(entity.id); - if (!currEntity) - return graph2; - let newTags2 = Object.assign({}, currEntity.tags); - tagDiff.forEach((diff) => { - if (diff.type === "-") { - delete newTags2[diff.key]; - } else if (diff.type === "+") { - newTags2[diff.key] = diff.newVal; + }); + fix._connectionTags = connectionTags; + return fix; + } + function makeChangeLayerFix(higherOrLower) { + return new validationIssueFix({ + icon: "iD-icon-" + (higherOrLower === "higher" ? "up" : "down"), + title: _t.append("issues.fix.tag_this_as_" + higherOrLower + ".title"), + onClick: function(context2) { + var mode = context2.mode(); + if (!mode || mode.id !== "select") return; + var selectedIDs = mode.selectedIDs(); + if (selectedIDs.length !== 1) return; + var selectedID = selectedIDs[0]; + if (!this.issue.entityIds.some(function(entityId) { + return entityId === selectedID; + })) return; + var entity = context2.hasEntity(selectedID); + if (!entity) return; + var tags = Object.assign({}, entity.tags); + var layer = tags.layer && Number(tags.layer); + if (layer && !isNaN(layer)) { + if (higherOrLower === "higher") { + layer += 1; + } else { + layer -= 1; + } + } else { + if (higherOrLower === "higher") { + layer = 1; + } else { + layer = -1; + } } - }); - return actionChangeTags(currEntity.id, newTags2)(graph2); - } - function addNotTag(graph2) { - const currEntity = graph2.hasEntity(entity.id); - if (!currEntity) - return graph2; - const item = nsiResult && nsiResult.matched; - if (!item) - return graph2; - let newTags2 = Object.assign({}, currEntity.tags); - const wd = item.mainTag; - const notwd = `not:${wd}`; - const qid = item.tags[wd]; - newTags2[notwd] = qid; - if (newTags2[wd] === qid) { - const wp = item.mainTag.replace("wikidata", "wikipedia"); - delete newTags2[wd]; - delete newTags2[wp]; + tags.layer = layer.toString(); + context2.perform( + actionChangeTags(entity.id, tags), + _t("operations.change_tags.annotation") + ); } - return actionChangeTags(currEntity.id, newTags2)(graph2); + }); + } + validation.type = type2; + return validation; + } + + // modules/behavior/draw_way.js + function behaviorDrawWay(context, wayID, mode, startGraph) { + const keybinding = utilKeybinding("drawWay"); + var dispatch14 = dispatch_default("rejectedSelfIntersection"); + var behavior = behaviorDraw(context); + var _nodeIndex; + var _origWay; + var _wayGeometry; + var _headNodeID; + var _annotation; + var _pointerHasMoved = false; + var _drawNode; + var _didResolveTempEdit = false; + function createDrawNode(loc) { + _drawNode = osmNode({ loc }); + context.pauseChangeDispatch(); + context.replace(function actionAddDrawNode(graph) { + var way = graph.entity(wayID); + return graph.replace(_drawNode).replace(way.addNode(_drawNode.id, _nodeIndex)); + }, _annotation); + context.resumeChangeDispatch(); + setActiveElements(); + } + function removeDrawNode() { + context.pauseChangeDispatch(); + context.replace( + function actionDeleteDrawNode(graph) { + var way = graph.entity(wayID); + return graph.replace(way.removeNode(_drawNode.id)).remove(_drawNode); + }, + _annotation + ); + _drawNode = void 0; + context.resumeChangeDispatch(); + } + function keydown(d3_event) { + if (d3_event.keyCode === utilKeybinding.modifierCodes.alt) { + if (context.surface().classed("nope")) { + context.surface().classed("nope-suppressed", true); + } + context.surface().classed("nope", false).classed("nope-disabled", true); } - function showMessage(context) { - const currEntity = context.hasEntity(entity.id); - if (!currEntity) - return ""; - let messageID = `issues.outdated_tags.${prefix}message`; - if (subtype === "noncanonical_brand" && isOnlyAddingTags) { - messageID += "_incomplete"; + } + function keyup(d3_event) { + if (d3_event.keyCode === utilKeybinding.modifierCodes.alt) { + if (context.surface().classed("nope-suppressed")) { + context.surface().classed("nope", true); } - return _t.append(messageID, { - feature: utilDisplayLabel(currEntity, context.graph(), true) - }); + context.surface().classed("nope-suppressed", false).classed("nope-disabled", false); } - function showReference(selection2) { - let enter = selection2.selectAll(".issue-reference").data([0]).enter(); - enter.append("div").attr("class", "issue-reference").call(_t.append(`issues.outdated_tags.${prefix}reference`)); - enter.append("strong").call(_t.append("issues.suggested")); - enter.append("table").attr("class", "tagDiff-table").selectAll(".tagDiff-row").data(tagDiff).enter().append("tr").attr("class", "tagDiff-row").append("td").attr("class", (d) => { - let klass = d.type === "+" ? "add" : "remove"; - return `tagDiff-cell tagDiff-cell-${klass}`; - }).html((d) => d.display); + } + function allowsVertex(d2) { + return d2.geometry(context.graph()) === "vertex" || _mainPresetIndex.allowsVertex(d2, context.graph()); + } + function move(d3_event, datum2) { + var loc = context.map().mouseCoordinates(); + if (!_drawNode) createDrawNode(loc); + context.surface().classed("nope-disabled", d3_event.altKey); + var targetLoc = datum2 && datum2.properties && datum2.properties.entity && allowsVertex(datum2.properties.entity) && datum2.properties.entity.loc; + var targetNodes = datum2 && datum2.properties && datum2.properties.nodes; + if (targetLoc) { + loc = targetLoc; + } else if (targetNodes) { + var choice = geoChooseEdge(targetNodes, context.map().mouse(), context.projection, _drawNode.id); + if (choice) { + loc = choice.loc; + } } + context.replace(actionMoveNode(_drawNode.id, loc), _annotation); + _drawNode = context.entity(_drawNode.id); + checkGeometry( + true + /* includeDrawNode */ + ); } - function oldMultipolygonIssues(entity, graph) { - let multipolygon, outerWay; - if (entity.type === "relation") { - outerWay = osmOldMultipolygonOuterMemberOfRelation(entity, graph); - multipolygon = entity; - } else if (entity.type === "way") { - multipolygon = osmIsOldMultipolygonOuterMember(entity, graph); - outerWay = entity; + function checkGeometry(includeDrawNode) { + var nopeDisabled = context.surface().classed("nope-disabled"); + var isInvalid = isInvalidGeometry(includeDrawNode); + if (nopeDisabled) { + context.surface().classed("nope", false).classed("nope-suppressed", isInvalid); } else { - return []; + context.surface().classed("nope", isInvalid).classed("nope-suppressed", false); } - if (!multipolygon || !outerWay) - return []; - return [new validationIssue({ - type: type3, - subtype: "old_multipolygon", - severity: "warning", - message: showMessage, - reference: showReference, - entityIds: [outerWay.id, multipolygon.id], - dynamicFixes: () => { - return [ - new validationIssueFix({ - autoArgs: [doUpgrade, _t("issues.fix.move_tags.annotation")], - title: _t.append("issues.fix.move_tags.title"), - onClick: (context) => { - context.perform(doUpgrade, _t("issues.fix.move_tags.annotation")); - } - }) - ]; + } + function isInvalidGeometry(includeDrawNode) { + var testNode = _drawNode; + var parentWay = context.graph().entity(wayID); + var nodes = context.graph().childNodes(parentWay).slice(); + if (includeDrawNode) { + if (parentWay.isClosed()) { + nodes.pop(); + } + } else { + if (parentWay.isClosed()) { + if (nodes.length < 3) return false; + if (_drawNode) nodes.splice(-2, 1); + testNode = nodes[nodes.length - 2]; + } else { + return false; } - })]; - function doUpgrade(graph2) { - let currMultipolygon = graph2.hasEntity(multipolygon.id); - let currOuterWay = graph2.hasEntity(outerWay.id); - if (!currMultipolygon || !currOuterWay) - return graph2; - currMultipolygon = currMultipolygon.mergeTags(currOuterWay.tags); - graph2 = graph2.replace(currMultipolygon); - return actionChangeTags(currOuterWay.id, {})(graph2); } - function showMessage(context) { - let currMultipolygon = context.hasEntity(multipolygon.id); - if (!currMultipolygon) - return ""; - return _t.append( - "issues.old_multipolygon.message", - { multipolygon: utilDisplayLabel(currMultipolygon, context.graph(), true) } - ); + return testNode && geoHasSelfIntersections(nodes, testNode.id); + } + function undone() { + _didResolveTempEdit = true; + context.pauseChangeDispatch(); + var nextMode; + if (context.graph() === startGraph) { + nextMode = modeSelect(context, [wayID]); + } else { + context.pop(1); + nextMode = mode; } - function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.old_multipolygon.reference")); + context.perform(actionNoop()); + context.pop(1); + context.resumeChangeDispatch(); + context.enter(nextMode); + } + function setActiveElements() { + if (!_drawNode) return; + context.surface().selectAll("." + _drawNode.id).classed("active", true); + } + function resetToStartGraph() { + while (context.graph() !== startGraph) { + context.pop(); } } - let validation = function checkOutdatedTags(entity, graph) { - let issues = oldMultipolygonIssues(entity, graph); - if (!issues.length) - issues = oldTagIssues(entity, graph); - return issues; - }; - validation.type = type3; - return validation; - } - - // modules/validations/private_data.js - function validationPrivateData() { - var type3 = "private_data"; - var privateBuildingValues = { - detached: true, - farm: true, - house: true, - houseboat: true, - residential: true, - semidetached_house: true, - static_caravan: true - }; - var publicKeys = { - amenity: true, - craft: true, - historic: true, - leisure: true, - office: true, - shop: true, - tourism: true + var drawWay = function(surface) { + _drawNode = void 0; + _didResolveTempEdit = false; + _origWay = context.entity(wayID); + if (typeof _nodeIndex === "number") { + _headNodeID = _origWay.nodes[_nodeIndex]; + } else if (_origWay.isClosed()) { + _headNodeID = _origWay.nodes[_origWay.nodes.length - 2]; + } else { + _headNodeID = _origWay.nodes[_origWay.nodes.length - 1]; + } + _wayGeometry = _origWay.geometry(context.graph()); + _annotation = _t( + (_origWay.nodes.length === (_origWay.isClosed() ? 2 : 1) ? "operations.start.annotation." : "operations.continue.annotation.") + _wayGeometry + ); + _pointerHasMoved = false; + context.pauseChangeDispatch(); + context.perform(actionNoop(), _annotation); + context.resumeChangeDispatch(); + behavior.hover().initialNodeID(_headNodeID); + behavior.on("move", function() { + _pointerHasMoved = true; + move.apply(this, arguments); + }).on("down", function() { + move.apply(this, arguments); + }).on("downcancel", function() { + if (_drawNode) removeDrawNode(); + }).on("click", drawWay.add).on("clickWay", drawWay.addWay).on("clickNode", drawWay.addNode).on("undo", context.undo).on("cancel", drawWay.cancel).on("finish", drawWay.finish); + select_default2(window).on("keydown.drawWay", keydown).on("keyup.drawWay", keyup); + context.map().dblclickZoomEnable(false).on("drawn.draw", setActiveElements); + setActiveElements(); + surface.call(behavior); + context.history().on("undone.draw", undone); }; - var personalTags = { - "contact:email": true, - "contact:fax": true, - "contact:phone": true, - email: true, - fax: true, - phone: true + drawWay.off = function(surface) { + if (!_didResolveTempEdit) { + context.pauseChangeDispatch(); + resetToStartGraph(); + context.resumeChangeDispatch(); + } + _drawNode = void 0; + _nodeIndex = void 0; + context.map().on("drawn.draw", null); + surface.call(behavior.off).selectAll(".active").classed("active", false); + surface.classed("nope", false).classed("nope-suppressed", false).classed("nope-disabled", false); + select_default2(window).on("keydown.drawWay", null).on("keyup.drawWay", null); + context.history().on("undone.draw", null); }; - var validation = function checkPrivateData(entity) { - var tags = entity.tags; - if (!tags.building || !privateBuildingValues[tags.building]) - return []; - var keepTags = {}; - for (var k in tags) { - if (publicKeys[k]) - return []; - if (!personalTags[k]) { - keepTags[k] = tags[k]; - } + function attemptAdd(d2, loc, doAdd) { + if (_drawNode) { + context.replace(actionMoveNode(_drawNode.id, loc), _annotation); + _drawNode = context.entity(_drawNode.id); + } else { + createDrawNode(loc); } - var tagDiff = utilTagDiff(tags, keepTags); - if (!tagDiff.length) - return []; - var fixID = tagDiff.length === 1 ? "remove_tag" : "remove_tags"; - return [new validationIssue({ - type: type3, - severity: "warning", - message: showMessage, - reference: showReference, - entityIds: [entity.id], - dynamicFixes: function() { - return [ - new validationIssueFix({ - icon: "iD-operation-delete", - title: _t.append("issues.fix." + fixID + ".title"), - onClick: function(context) { - context.perform(doUpgrade, _t("issues.fix.remove_tag.annotation")); - } - }) - ]; + checkGeometry( + true + /* includeDrawNode */ + ); + if (d2 && d2.properties && d2.properties.nope || context.surface().classed("nope")) { + if (!_pointerHasMoved) { + removeDrawNode(); } - })]; - function doUpgrade(graph) { - var currEntity = graph.hasEntity(entity.id); - if (!currEntity) - return graph; - var newTags = Object.assign({}, currEntity.tags); - tagDiff.forEach(function(diff) { - if (diff.type === "-") { - delete newTags[diff.key]; - } else if (diff.type === "+") { - newTags[diff.key] = diff.newVal; - } - }); - return actionChangeTags(currEntity.id, newTags)(graph); + dispatch14.call("rejectedSelfIntersection", this); + return; } - function showMessage(context) { - var currEntity = context.hasEntity(this.entityIds[0]); - if (!currEntity) - return ""; - return _t.append( - "issues.private_data.contact.message", - { feature: utilDisplayLabel(currEntity, context.graph()) } + context.pauseChangeDispatch(); + doAdd(); + _didResolveTempEdit = true; + context.resumeChangeDispatch(); + context.enter(mode); + } + drawWay.add = function(loc, d2) { + attemptAdd(d2, loc, function() { + }); + }; + drawWay.addWay = function(loc, edge, d2) { + attemptAdd(d2, loc, function() { + context.replace( + actionAddMidpoint({ loc, edge }, _drawNode), + _annotation ); - } - function showReference(selection2) { - var enter = selection2.selectAll(".issue-reference").data([0]).enter(); - enter.append("div").attr("class", "issue-reference").call(_t.append("issues.private_data.reference")); - enter.append("strong").call(_t.append("issues.suggested")); - enter.append("table").attr("class", "tagDiff-table").selectAll(".tagDiff-row").data(tagDiff).enter().append("tr").attr("class", "tagDiff-row").append("td").attr("class", function(d) { - var klass = d.type === "+" ? "add" : "remove"; - return "tagDiff-cell tagDiff-cell-" + klass; - }).html(function(d) { - return d.display; - }); - } + }); }; - validation.type = type3; - return validation; - } - - // modules/validations/suspicious_name.js - function validationSuspiciousName() { - const type3 = "suspicious_name"; - const keysToTestForGenericValues = [ - "aerialway", - "aeroway", - "amenity", - "building", - "craft", - "highway", - "leisure", - "railway", - "man_made", - "office", - "shop", - "tourism", - "waterway" - ]; - let _waitingForNsi = false; - function isGenericMatchInNsi(tags) { - const nsi = services.nsi; - if (nsi) { - _waitingForNsi = nsi.status() === "loading"; - if (!_waitingForNsi) { - return nsi.isGenericName(tags); - } + drawWay.addNode = function(node, d2) { + if (node.id === _headNodeID || // or the first node when drawing an area + _origWay.isClosed() && node.id === _origWay.first()) { + drawWay.finish(); + return; } - return false; + attemptAdd(d2, node.loc, function() { + context.replace( + function actionReplaceDrawNode(graph) { + graph = graph.replace(graph.entity(wayID).removeNode(_drawNode.id)).remove(_drawNode); + return graph.replace(graph.entity(wayID).addNode(node.id, _nodeIndex)); + }, + _annotation + ); + }); + }; + function getFeatureType(ways) { + if (ways.every((way) => way.isClosed())) return "area"; + if (ways.every((way) => !way.isClosed())) return "line"; + return "generic"; } - function nameMatchesRawTag(lowercaseName, tags) { - for (let i2 = 0; i2 < keysToTestForGenericValues.length; i2++) { - let key = keysToTestForGenericValues[i2]; - let val = tags[key]; - if (val) { - val = val.toLowerCase(); - if (key === lowercaseName || val === lowercaseName || key.replace(/\_/g, " ") === lowercaseName || val.replace(/\_/g, " ") === lowercaseName) { - return true; - } + function followMode() { + if (_didResolveTempEdit) return; + try { + const isDrawingArea = _origWay.nodes[0] === _origWay.nodes.slice(-1)[0]; + const [secondLastNodeId, lastNodeId] = _origWay.nodes.slice(isDrawingArea ? -3 : -2); + const historyGraph = context.history().graph(); + if (!lastNodeId || !secondLastNodeId || !historyGraph.hasEntity(lastNodeId) || !historyGraph.hasEntity(secondLastNodeId)) { + context.ui().flash.duration(4e3).iconName("#iD-icon-no").label(_t.append("operations.follow.error.needs_more_initial_nodes"))(); + return; + } + const lastNodesParents = historyGraph.parentWays(historyGraph.entity(lastNodeId)).filter((w2) => w2.id !== wayID); + const secondLastNodesParents = historyGraph.parentWays(historyGraph.entity(secondLastNodeId)).filter((w2) => w2.id !== wayID); + const featureType = getFeatureType(lastNodesParents); + if (lastNodesParents.length !== 1 || secondLastNodesParents.length === 0) { + context.ui().flash.duration(4e3).iconName("#iD-icon-no").label(_t.append("operations.follow.error.intersection_of_multiple_ways.".concat(featureType)))(); + return; } + if (!secondLastNodesParents.some((n3) => n3.id === lastNodesParents[0].id)) { + context.ui().flash.duration(4e3).iconName("#iD-icon-no").label(_t.append("operations.follow.error.intersection_of_different_ways.".concat(featureType)))(); + return; + } + const way = lastNodesParents[0]; + const indexOfLast = way.nodes.indexOf(lastNodeId); + const indexOfSecondLast = way.nodes.indexOf(secondLastNodeId); + const isDescendingPastZero = indexOfLast === way.nodes.length - 2 && indexOfSecondLast === 0; + let nextNodeIndex = indexOfLast + (indexOfLast > indexOfSecondLast && !isDescendingPastZero ? 1 : -1); + if (nextNodeIndex === -1) nextNodeIndex = indexOfSecondLast === 1 ? way.nodes.length - 2 : 1; + const nextNode = historyGraph.entity(way.nodes[nextNodeIndex]); + drawWay.addNode(nextNode, { + geometry: { type: "Point", coordinates: nextNode.loc }, + id: nextNode.id, + properties: { target: true, entity: nextNode } + }); + } catch { + context.ui().flash.duration(4e3).iconName("#iD-icon-no").label(_t.append("operations.follow.error.unknown"))(); } - return false; - } - function isGenericName(name, tags) { - name = name.toLowerCase(); - return nameMatchesRawTag(name, tags) || isGenericMatchInNsi(tags); } - function makeGenericNameIssue(entityId, nameKey, genericName, langCode) { - return new validationIssue({ - type: type3, - subtype: "generic_name", - severity: "warning", - message: function(context) { - let entity = context.hasEntity(this.entityIds[0]); - if (!entity) - return ""; - let preset = _mainPresetIndex.match(entity, context.graph()); - let langName = langCode && _mainLocalizer.languageName(langCode); - return _t.append( - "issues.generic_name.message" + (langName ? "_language" : ""), - { feature: preset.name(), name: genericName, language: langName } - ); - }, - reference: showReference, - entityIds: [entityId], - hash: `${nameKey}=${genericName}`, - dynamicFixes: function() { - return [ - new validationIssueFix({ - icon: "iD-operation-delete", - title: _t.append("issues.fix.remove_the_name.title"), - onClick: function(context) { - let entityId2 = this.issue.entityIds[0]; - let entity = context.entity(entityId2); - let tags = Object.assign({}, entity.tags); - delete tags[nameKey]; - context.perform( - actionChangeTags(entityId2, tags), - _t("issues.fix.remove_generic_name.annotation") - ); - } - }) - ]; - } - }); - function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.generic_name.reference")); + keybinding.on(_t("operations.follow.key"), followMode); + select_default2(document).call(keybinding); + drawWay.finish = function() { + checkGeometry( + false + /* includeDrawNode */ + ); + if (context.surface().classed("nope")) { + dispatch14.call("rejectedSelfIntersection", this); + return; + } + context.pauseChangeDispatch(); + context.pop(1); + _didResolveTempEdit = true; + context.resumeChangeDispatch(); + var way = context.hasEntity(wayID); + if (!way || way.isDegenerate()) { + drawWay.cancel(); + return; } + window.setTimeout(function() { + context.map().dblclickZoomEnable(true); + }, 1e3); + var isNewFeature = !mode.isContinuing; + context.enter(modeSelect(context, [wayID]).newFeature(isNewFeature)); + }; + drawWay.cancel = function() { + context.pauseChangeDispatch(); + resetToStartGraph(); + context.resumeChangeDispatch(); + window.setTimeout(function() { + context.map().dblclickZoomEnable(true); + }, 1e3); + context.surface().classed("nope", false).classed("nope-disabled", false).classed("nope-suppressed", false); + context.enter(modeBrowse(context)); + }; + drawWay.nodeIndex = function(val) { + if (!arguments.length) return _nodeIndex; + _nodeIndex = val; + return drawWay; + }; + drawWay.activeID = function() { + if (!arguments.length) return _drawNode && _drawNode.id; + return drawWay; + }; + return utilRebind(drawWay, dispatch14, "on"); + } + + // modules/modes/draw_line.js + function modeDrawLine(context, wayID, startGraph, button, affix, continuing) { + var mode = { + button, + id: "draw-line" + }; + var behavior = behaviorDrawWay(context, wayID, mode, startGraph).on("rejectedSelfIntersection.modeDrawLine", function() { + context.ui().flash.iconName("#iD-icon-no").label(_t.append("self_intersection.error.lines"))(); + }); + mode.wayID = wayID; + mode.isContinuing = continuing; + mode.enter = function() { + behavior.nodeIndex(affix === "prefix" ? 0 : void 0); + context.install(behavior); + }; + mode.exit = function() { + context.uninstall(behavior); + }; + mode.selectedIDs = function() { + return [wayID]; + }; + mode.activeID = function() { + return behavior && behavior.activeID() || []; + }; + return mode; + } + + // modules/validations/disconnected_way.js + function validationDisconnectedWay() { + var type2 = "disconnected_way"; + function isTaggedAsHighway(entity) { + return osmRoutableHighwayTagValues[entity.tags.highway]; } - function makeIncorrectNameIssue(entityId, nameKey, incorrectName, langCode) { - return new validationIssue({ - type: type3, - subtype: "not_name", + var validation = function checkDisconnectedWay(entity, graph) { + var routingIslandWays = routingIslandForEntity(entity); + if (!routingIslandWays) return []; + return [new validationIssue({ + type: type2, + subtype: "highway", severity: "warning", message: function(context) { - const entity = context.hasEntity(this.entityIds[0]); - if (!entity) - return ""; - const preset = _mainPresetIndex.match(entity, context.graph()); - const langName = langCode && _mainLocalizer.languageName(langCode); - return _t.append( - "issues.incorrect_name.message" + (langName ? "_language" : ""), - { feature: preset.name(), name: incorrectName, language: langName } - ); + var entity2 = this.entityIds.length && context.hasEntity(this.entityIds[0]); + var label = entity2 && utilDisplayLabel(entity2, context.graph()); + return _t.append("issues.disconnected_way.routable.message", { count: this.entityIds.length, highway: label }); }, reference: showReference, - entityIds: [entityId], - hash: `${nameKey}=${incorrectName}`, - dynamicFixes: function() { - return [ - new validationIssueFix({ - icon: "iD-operation-delete", - title: _t.append("issues.fix.remove_the_name.title"), - onClick: function(context) { - const entityId2 = this.issue.entityIds[0]; - const entity = context.entity(entityId2); - let tags = Object.assign({}, entity.tags); - delete tags[nameKey]; - context.perform( - actionChangeTags(entityId2, tags), - _t("issues.fix.remove_mistaken_name.annotation") - ); + entityIds: Array.from(routingIslandWays).map(function(way) { + return way.id; + }), + dynamicFixes: makeFixes + })]; + function makeFixes(context) { + var fixes = []; + var singleEntity = this.entityIds.length === 1 && context.hasEntity(this.entityIds[0]); + if (singleEntity) { + if (singleEntity.type === "way" && !singleEntity.isClosed()) { + var textDirection = _mainLocalizer.textDirection(); + var startFix = makeContinueDrawingFixIfAllowed(textDirection, singleEntity.first(), "start"); + if (startFix) fixes.push(startFix); + var endFix = makeContinueDrawingFixIfAllowed(textDirection, singleEntity.last(), "end"); + if (endFix) fixes.push(endFix); + } + if (!fixes.length) { + fixes.push(new validationIssueFix({ + title: _t.append("issues.fix.connect_feature.title") + })); + } + fixes.push(new validationIssueFix({ + icon: "iD-operation-delete", + title: _t.append("issues.fix.delete_feature.title"), + entityIds: [singleEntity.id], + onClick: function(context2) { + var id2 = this.issue.entityIds[0]; + var operation2 = operationDelete(context2, [id2]); + if (!operation2.disabled()) { + operation2(); } - }) - ]; + } + })); + } else { + fixes.push(new validationIssueFix({ + title: _t.append("issues.fix.connect_features.title") + })); } - }); + return fixes; + } function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.generic_name.reference")); + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.disconnected_way.routable.reference")); } - } - let validation = function checkGenericName(entity) { - const tags = entity.tags; - const hasWikidata = !!tags.wikidata || !!tags["brand:wikidata"] || !!tags["operator:wikidata"]; - if (hasWikidata) - return []; - let issues = []; - const notNames2 = (tags["not:name"] || "").split(";"); - for (let key in tags) { - const m = key.match(/^name(?:(?::)([a-zA-Z_-]+))?$/); - if (!m) - continue; - const langCode = m.length >= 2 ? m[1] : null; - const value = tags[key]; - if (notNames2.length) { - for (let i2 in notNames2) { - const notName = notNames2[i2]; - if (notName && value === notName) { - issues.push(makeIncorrectNameIssue(entity.id, key, value, langCode)); - continue; + function routingIslandForEntity(entity2) { + var routingIsland = /* @__PURE__ */ new Set(); + var waysToCheck = []; + function queueParentWays(node) { + graph.parentWays(node).forEach(function(parentWay) { + if (!routingIsland.has(parentWay) && // only check each feature once + isRoutableWay(parentWay, false)) { + routingIsland.add(parentWay); + waysToCheck.push(parentWay); + } + }); + } + if (entity2.type === "way" && isRoutableWay(entity2, true)) { + routingIsland.add(entity2); + waysToCheck.push(entity2); + } else if (entity2.type === "node" && isRoutableNode(entity2)) { + routingIsland.add(entity2); + queueParentWays(entity2); + } else { + return null; + } + while (waysToCheck.length) { + var wayToCheck = waysToCheck.pop(); + var childNodes = graph.childNodes(wayToCheck); + for (var i3 in childNodes) { + var vertex = childNodes[i3]; + if (isConnectedVertex(vertex)) { + return null; } + if (isRoutableNode(vertex)) { + routingIsland.add(vertex); + } + queueParentWays(vertex); } } - if (isGenericName(value, tags)) { - issues.provisional = _waitingForNsi; - issues.push(makeGenericNameIssue(entity.id, key, value, langCode)); + return routingIsland; + } + function isConnectedVertex(vertex) { + var osm = services.osm; + if (osm && !osm.isDataLoaded(vertex.loc)) return true; + if (vertex.tags.entrance && vertex.tags.entrance !== "no") return true; + if (vertex.tags.amenity === "parking_entrance") return true; + return false; + } + function isRoutableNode(node) { + if (node.tags.highway === "elevator") return true; + return false; + } + function isRoutableWay(way, ignoreInnerWays) { + if (isTaggedAsHighway(way) || way.tags.route === "ferry") return true; + return graph.parentRelations(way).some(function(parentRelation) { + if (parentRelation.tags.type === "route" && parentRelation.tags.route === "ferry") return true; + if (parentRelation.isMultipolygon() && isTaggedAsHighway(parentRelation) && (!ignoreInnerWays || parentRelation.memberById(way.id).role !== "inner")) return true; + return false; + }); + } + function makeContinueDrawingFixIfAllowed(textDirection, vertexID, whichEnd) { + var vertex = graph.hasEntity(vertexID); + if (!vertex || vertex.tags.noexit === "yes") return null; + var useLeftContinue = whichEnd === "start" && textDirection === "ltr" || whichEnd === "end" && textDirection === "rtl"; + return new validationIssueFix({ + icon: "iD-operation-continue" + (useLeftContinue ? "-left" : ""), + title: _t.append("issues.fix.continue_from_" + whichEnd + ".title"), + entityIds: [vertexID], + onClick: function(context) { + var wayId = this.issue.entityIds[0]; + var way = context.hasEntity(wayId); + var vertexId = this.entityIds[0]; + var vertex2 = context.hasEntity(vertexId); + if (!way || !vertex2) return; + var map2 = context.map(); + if (!context.editable() || !map2.trimmedExtent().contains(vertex2.loc)) { + map2.zoomToEase(vertex2); + } + context.enter( + modeDrawLine(context, wayId, context.graph(), "line", way.affix(vertexId), true) + ); + } + }); + } + }; + validation.type = type2; + return validation; + } + + // modules/validations/invalid_format.js + function validationFormatting() { + var type2 = "invalid_format"; + var validation = function(entity) { + var issues = []; + function isValidEmail(email) { + var valid_email = /^[^\(\)\\,":;<>@\[\]]+@[^\(\)\\,":;<>@\[\]\.]+(?:\.[a-z0-9-]+)*$/i; + return !email || valid_email.test(email); + } + function showReferenceEmail(selection2) { + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.invalid_format.email.reference")); + } + if (entity.tags.email) { + var emails = entity.tags.email.split(";").map(function(s2) { + return s2.trim(); + }).filter(function(x2) { + return !isValidEmail(x2); + }); + if (emails.length) { + issues.push(new validationIssue({ + type: type2, + subtype: "email", + severity: "warning", + message: function(context) { + var entity2 = context.hasEntity(this.entityIds[0]); + return entity2 ? _t.append( + "issues.invalid_format.email.message" + this.data, + { feature: utilDisplayLabel(entity2, context.graph()), email: emails.join(", ") } + ) : ""; + }, + reference: showReferenceEmail, + entityIds: [entity.id], + hash: emails.join(), + data: emails.length > 1 ? "_multi" : "" + })); } } return issues; }; - validation.type = type3; + validation.type = type2; return validation; } - // modules/validations/unsquare_way.js - function validationUnsquareWay(context) { - var type3 = "unsquare_way"; - var DEFAULT_DEG_THRESHOLD = 5; - var epsilon3 = 0.05; - var nodeThreshold = 10; - function isBuilding(entity, graph) { - if (entity.type !== "way" || entity.geometry(graph) !== "area") - return false; - return entity.tags.building && entity.tags.building !== "no"; - } - var validation = function checkUnsquareWay(entity, graph) { - if (!isBuilding(entity, graph)) - return []; - if (entity.tags.nonsquare === "yes") - return []; - var isClosed = entity.isClosed(); - if (!isClosed) - return []; - var nodes = graph.childNodes(entity).slice(); - if (nodes.length > nodeThreshold + 1) - return []; - var osm = services.osm; - if (!osm || nodes.some(function(node) { - return !osm.isDataLoaded(node.loc); - })) - return []; - var hasConnectedSquarableWays = nodes.some(function(node) { - return graph.parentWays(node).some(function(way) { - if (way.id === entity.id) - return false; - if (isBuilding(way, graph)) - return true; - return graph.parentRelations(way).some(function(parentRelation) { - return parentRelation.isMultipolygon() && parentRelation.tags.building && parentRelation.tags.building !== "no"; - }); - }); - }); - if (hasConnectedSquarableWays) - return []; - var storedDegreeThreshold = corePreferences("validate-square-degrees"); - var degreeThreshold = isNaN(storedDegreeThreshold) ? DEFAULT_DEG_THRESHOLD : parseFloat(storedDegreeThreshold); - var points = nodes.map(function(node) { - return context.projection(node.loc); - }); - if (!geoOrthoCanOrthogonalize(points, isClosed, epsilon3, degreeThreshold, true)) - return []; - var autoArgs; - if (!entity.tags.wikidata) { - var autoAction = actionOrthogonalize(entity.id, context.projection, void 0, degreeThreshold); - autoAction.transitionable = false; - autoArgs = [autoAction, _t("operations.orthogonalize.annotation.feature", { n: 1 })]; + // modules/validations/help_request.js + function validationHelpRequest(context) { + var type2 = "help_request"; + var validation = function checkFixmeTag(entity) { + if (!entity.tags.fixme) return []; + if (entity.version === void 0) return []; + if (entity.v !== void 0) { + var baseEntity = context.history().base().hasEntity(entity.id); + if (!baseEntity || !baseEntity.tags.fixme) return []; } return [new validationIssue({ - type: type3, - subtype: "building", + type: type2, + subtype: "fixme_tag", severity: "warning", message: function(context2) { var entity2 = context2.hasEntity(this.entityIds[0]); - return entity2 ? _t.append("issues.unsquare_way.message", { - feature: utilDisplayLabel(entity2, context2.graph()) + return entity2 ? _t.append("issues.fixme_tag.message", { + feature: utilDisplayLabel( + entity2, + context2.graph(), + true + /* verbose */ + ) }) : ""; }, - reference: showReference, - entityIds: [entity.id], - hash: degreeThreshold, dynamicFixes: function() { return [ new validationIssueFix({ - icon: "iD-operation-orthogonalize", - title: _t.append("issues.fix.square_feature.title"), - autoArgs, - onClick: function(context2, completionHandler) { - var entityId = this.issue.entityIds[0]; - context2.perform( - actionOrthogonalize(entityId, context2.projection, void 0, degreeThreshold), - _t("operations.orthogonalize.annotation.feature", { n: 1 }) - ); - window.setTimeout(function() { - completionHandler(); - }, 175); - } + title: _t.append("issues.fix.address_the_concern.title") }) ]; - } + }, + reference: showReference, + entityIds: [entity.id] })]; function showReference(selection2) { - selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.unsquare_way.buildings.reference")); + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.fixme_tag.reference")); } }; - validation.type = type3; + validation.type = type2; return validation; } - // modules/core/validator.js - function coreValidator(context) { - let dispatch10 = dispatch_default("validated", "focusedIssue"); - let validator = utilRebind({}, dispatch10, "on"); - let _rules = {}; - let _disabledRules = {}; - let _ignoredIssueIDs = /* @__PURE__ */ new Set(); - let _resolvedIssueIDs = /* @__PURE__ */ new Set(); - let _baseCache = validationCache("base"); - let _headCache = validationCache("head"); - let _completeDiff = {}; - let _headIsCurrent = false; - let _deferredRIC = {}; - let _deferredST = /* @__PURE__ */ new Set(); - let _headPromise; - const RETRY = 5e3; - const _errorOverrides = parseHashParam(context.initialHashParams.validationError); - const _warningOverrides = parseHashParam(context.initialHashParams.validationWarning); - const _disableOverrides = parseHashParam(context.initialHashParams.validationDisable); - function parseHashParam(param) { - let result = []; - let rules = (param || "").split(","); - rules.forEach((rule) => { - rule = rule.trim(); - const parts = rule.split("/", 2); - const type3 = parts[0]; - const subtype = parts[1] || "*"; - if (!type3 || !subtype) - return; - result.push({ type: makeRegExp(type3), subtype: makeRegExp(subtype) }); - }); - return result; - function makeRegExp(str2) { - const escaped = str2.replace(/[-\/\\^$+?.()|[\]{}]/g, "\\$&").replace(/\*/g, ".*"); - return new RegExp("^" + escaped + "$"); + // modules/validations/impossible_oneway.js + function validationImpossibleOneway() { + var type2 = "impossible_oneway"; + var validation = function checkImpossibleOneway(entity, graph) { + if (entity.type !== "way" || entity.geometry(graph) !== "line") return []; + if (entity.isClosed()) return []; + if (!typeForWay(entity)) return []; + if (!isOneway(entity)) return []; + var firstIssues = issuesForNode(entity, entity.first()); + var lastIssues = issuesForNode(entity, entity.last()); + return firstIssues.concat(lastIssues); + function typeForWay(way) { + if (way.geometry(graph) !== "line") return null; + if (osmRoutableHighwayTagValues[way.tags.highway]) return "highway"; + if (osmFlowingWaterwayTagValues[way.tags.waterway]) return "waterway"; + return null; } - } - validator.init = () => { - Object.values(validations_exports).forEach((validation) => { - if (typeof validation !== "function") - return; - const fn = validation(context); - const key = fn.type; - _rules[key] = fn; - }); - let disabledRules = corePreferences("validate-disabledRules"); - if (disabledRules) { - disabledRules.split(",").forEach((k) => _disabledRules[k] = true); + function isOneway(way) { + if (way.tags.oneway === "yes") return true; + if (way.tags.oneway) return false; + for (var key in way.tags) { + if (osmOneWayTags[key] && osmOneWayTags[key][way.tags[key]]) { + return true; + } + } + return false; } - }; - function reset(resetIgnored) { - _baseCache.queue = []; - _headCache.queue = []; - Object.keys(_deferredRIC).forEach((key) => { - window.cancelIdleCallback(key); - _deferredRIC[key](); - }); - _deferredRIC = {}; - _deferredST.forEach(window.clearTimeout); - _deferredST.clear(); - if (resetIgnored) - _ignoredIssueIDs.clear(); - _resolvedIssueIDs.clear(); - _baseCache = validationCache("base"); - _headCache = validationCache("head"); - _completeDiff = {}; - _headIsCurrent = false; - } - validator.reset = () => { - reset(true); - }; - validator.resetIgnoredIssues = () => { - _ignoredIssueIDs.clear(); - dispatch10.call("validated"); - }; - validator.revalidateUnsquare = () => { - revalidateUnsquare(_headCache); - revalidateUnsquare(_baseCache); - dispatch10.call("validated"); - }; - function revalidateUnsquare(cache) { - const checkUnsquareWay = _rules.unsquare_way; - if (!cache.graph || typeof checkUnsquareWay !== "function") - return; - cache.uncacheIssuesOfType("unsquare_way"); - const buildings = context.history().tree().intersects(geoExtent([-180, -90], [180, 90]), cache.graph).filter((entity) => entity.type === "way" && entity.tags.building && entity.tags.building !== "no"); - buildings.forEach((entity) => { - const detected = checkUnsquareWay(entity, cache.graph); - if (!detected.length) - return; - cache.cacheIssues(detected); - }); - } - validator.getIssues = (options2) => { - const opts = Object.assign({ what: "all", where: "all", includeIgnored: false, includeDisabledRules: false }, options2); - const view = context.map().extent(); - let seen = /* @__PURE__ */ new Set(); - let results = []; - if (_headCache.graph && _headCache.graph !== _baseCache.graph) { - Object.values(_headCache.issuesByIssueID).forEach((issue) => { - const userModified = (issue.entityIds || []).some((id2) => _completeDiff.hasOwnProperty(id2)); - if (opts.what === "edited" && !userModified) - return; - if (!filter2(issue)) - return; - seen.add(issue.id); - results.push(issue); - }); + function nodeOccursMoreThanOnce(way, nodeID) { + var occurrences = 0; + for (var index in way.nodes) { + if (way.nodes[index] === nodeID) { + occurrences += 1; + if (occurrences > 1) return true; + } + } + return false; } - if (opts.what === "all") { - Object.values(_baseCache.issuesByIssueID).forEach((issue) => { - if (!filter2(issue)) - return; - seen.add(issue.id); - results.push(issue); + function isConnectedViaOtherTypes(way, node) { + var wayType = typeForWay(way); + if (wayType === "highway") { + if (node.tags.entrance && node.tags.entrance !== "no") return true; + if (node.tags.amenity === "parking_entrance") return true; + } else if (wayType === "waterway") { + if (node.id === way.first()) { + if (node.tags.natural === "spring") return true; + } else { + if (node.tags.manhole === "drain") return true; + } + } + return graph.parentWays(node).some(function(parentWay) { + if (parentWay.id === way.id) return false; + if (wayType === "highway") { + if (parentWay.geometry(graph) === "area" && osmRoutableHighwayTagValues[parentWay.tags.highway]) return true; + if (parentWay.tags.route === "ferry") return true; + return graph.parentRelations(parentWay).some(function(parentRelation) { + if (parentRelation.tags.type === "route" && parentRelation.tags.route === "ferry") return true; + return parentRelation.isMultipolygon() && osmRoutableHighwayTagValues[parentRelation.tags.highway]; + }); + } else if (wayType === "waterway") { + if (parentWay.tags.natural === "water" || parentWay.tags.natural === "coastline") return true; + } + return false; }); } - return results; - function filter2(issue) { - if (!issue) - return false; - if (seen.has(issue.id)) - return false; - if (_resolvedIssueIDs.has(issue.id)) - return false; - if (opts.includeDisabledRules === "only" && !_disabledRules[issue.type]) - return false; - if (!opts.includeDisabledRules && _disabledRules[issue.type]) - return false; - if (opts.includeIgnored === "only" && !_ignoredIssueIDs.has(issue.id)) - return false; - if (!opts.includeIgnored && _ignoredIssueIDs.has(issue.id)) - return false; - if ((issue.entityIds || []).some((id2) => !context.hasEntity(id2))) - return false; - if (opts.where === "visible") { - const extent = issue.extent(context.graph()); - if (!view.intersects(extent)) + function issuesForNode(way, nodeID) { + var isFirst = nodeID === way.first(); + var wayType = typeForWay(way); + if (nodeOccursMoreThanOnce(way, nodeID)) return []; + var osm = services.osm; + if (!osm) return []; + var node = graph.hasEntity(nodeID); + if (!node || !osm.isDataLoaded(node.loc)) return []; + if (isConnectedViaOtherTypes(way, node)) return []; + var attachedWaysOfSameType = graph.parentWays(node).filter(function(parentWay) { + if (parentWay.id === way.id) return false; + return typeForWay(parentWay) === wayType; + }); + if (wayType === "waterway" && attachedWaysOfSameType.length === 0) return []; + var attachedOneways = attachedWaysOfSameType.filter(function(attachedWay) { + return isOneway(attachedWay); + }); + if (attachedOneways.length < attachedWaysOfSameType.length) return []; + if (attachedOneways.length) { + var connectedEndpointsOkay = attachedOneways.some(function(attachedOneway) { + if ((isFirst ? attachedOneway.first() : attachedOneway.last()) !== nodeID) return true; + if (nodeOccursMoreThanOnce(attachedOneway, nodeID)) return true; return false; + }); + if (connectedEndpointsOkay) return []; } - return true; - } - }; - validator.getResolvedIssues = () => { - return Array.from(_resolvedIssueIDs).map((issueID) => _baseCache.issuesByIssueID[issueID]).filter(Boolean); - }; - validator.focusIssue = (issue) => { - const graph = context.graph(); - let selectID; - let focusCenter; - const issueExtent = issue.extent(graph); - if (issueExtent) { - focusCenter = issueExtent.center(); - } - if (issue.entityIds && issue.entityIds.length) { - selectID = issue.entityIds[0]; - if (selectID && selectID.charAt(0) === "r") { - const ids = utilEntityAndDeepMemberIDs([selectID], graph); - let nodeID = ids.find((id2) => id2.charAt(0) === "n" && graph.hasEntity(id2)); - if (!nodeID) { - const wayID = ids.find((id2) => id2.charAt(0) === "w" && graph.hasEntity(id2)); - if (wayID) { - nodeID = graph.entity(wayID).first(); + var placement = isFirst ? "start" : "end", messageID = wayType + ".", referenceID = wayType + "."; + if (wayType === "waterway") { + messageID += "connected." + placement; + referenceID += "connected"; + } else { + messageID += placement; + referenceID += placement; + } + return [new validationIssue({ + type: type2, + subtype: wayType, + severity: "warning", + message: function(context) { + var entity2 = context.hasEntity(this.entityIds[0]); + return entity2 ? _t.append("issues.impossible_oneway." + messageID + ".message", { + feature: utilDisplayLabel(entity2, context.graph()) + }) : ""; + }, + reference: getReference(referenceID), + entityIds: [way.id, node.id], + dynamicFixes: function() { + var fixes = []; + if (attachedOneways.length) { + fixes.push(new validationIssueFix({ + icon: "iD-operation-reverse", + title: _t.append("issues.fix.reverse_feature.title"), + entityIds: [way.id], + onClick: function(context) { + var id2 = this.issue.entityIds[0]; + context.perform(actionReverse(id2), _t("operations.reverse.annotation.line", { n: 1 })); + } + })); } - } - if (nodeID) { - focusCenter = graph.entity(nodeID).loc; - } + if (node.tags.noexit !== "yes") { + var textDirection = _mainLocalizer.textDirection(); + var useLeftContinue = isFirst && textDirection === "ltr" || !isFirst && textDirection === "rtl"; + fixes.push(new validationIssueFix({ + icon: "iD-operation-continue" + (useLeftContinue ? "-left" : ""), + title: _t.append("issues.fix.continue_from_" + (isFirst ? "start" : "end") + ".title"), + onClick: function(context) { + var entityID = this.issue.entityIds[0]; + var vertexID = this.issue.entityIds[1]; + var way2 = context.entity(entityID); + var vertex = context.entity(vertexID); + continueDrawing(way2, vertex, context); + } + })); + } + return fixes; + }, + loc: node.loc + })]; + function getReference(referenceID2) { + return function showReference(selection2) { + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.impossible_oneway." + referenceID2 + ".reference")); + }; } } - if (focusCenter) { - const setZoom = Math.max(context.map().zoom(), 19); - context.map().unobscuredCenterZoomEase(focusCenter, setZoom); + }; + function continueDrawing(way, vertex, context) { + var map2 = context.map(); + if (!context.editable() || !map2.trimmedExtent().contains(vertex.loc)) { + map2.zoomToEase(vertex); } - if (selectID) { - window.setTimeout(() => { - context.enter(modeSelect(context, [selectID])); - dispatch10.call("focusedIssue", this, issue); - }, 250); + context.enter( + modeDrawLine(context, way.id, context.graph(), "line", way.affix(vertex.id), true) + ); + } + validation.type = type2; + return validation; + } + + // modules/validations/incompatible_source.js + function validationIncompatibleSource() { + const type2 = "incompatible_source"; + const incompatibleRules = [ + { + id: "amap", + regex: /(^amap$|^amap\.com|autonavi|mapabc|é«å¾·)/i + }, + { + id: "baidu", + regex: /(baidu|mapbar|ç¾åº¦)/i + }, + { + id: "google", + regex: /google/i, + exceptRegex: /((books|drive)\.google|google\s?(books|drive|plus))|(esri\/Google_Africa_Buildings)/i } - }; - validator.getIssuesBySeverity = (options2) => { - let groups = utilArrayGroupBy(validator.getIssues(options2), "severity"); - groups.error = groups.error || []; - groups.warning = groups.warning || []; - return groups; - }; - validator.getSharedEntityIssues = (entityIDs, options2) => { - const orderedIssueTypes = [ - "missing_tag", - "missing_role", - "outdated_tags", - "mismatched_geometry", - "crossing_ways", - "almost_junction", - "disconnected_way", - "impossible_oneway" - ]; - const allIssues = validator.getIssues(options2); - const forEntityIDs = new Set(entityIDs); - return allIssues.filter((issue) => (issue.entityIds || []).some((entityID) => forEntityIDs.has(entityID))).sort((issue1, issue2) => { - if (issue1.type === issue2.type) { - return issue1.id < issue2.id ? -1 : 1; - } - const index1 = orderedIssueTypes.indexOf(issue1.type); - const index2 = orderedIssueTypes.indexOf(issue2.type); - if (index1 !== -1 && index2 !== -1) { - return index1 - index2; - } else if (index1 === -1 && index2 === -1) { - return issue1.type < issue2.type ? -1 : 1; - } else { - return index1 !== -1 ? -1 : 1; - } - }); - }; - validator.getEntityIssues = (entityID, options2) => { - return validator.getSharedEntityIssues([entityID], options2); - }; - validator.getRuleKeys = () => { - return Object.keys(_rules); - }; - validator.isRuleEnabled = (key) => { - return !_disabledRules[key]; - }; - validator.toggleRule = (key) => { - if (_disabledRules[key]) { - delete _disabledRules[key]; - } else { - _disabledRules[key] = true; + ]; + const validation = function checkIncompatibleSource(entity) { + const entitySources = entity.tags && entity.tags.source && entity.tags.source.split(";"); + if (!entitySources) return []; + const entityID = entity.id; + return entitySources.map((source) => { + const matchRule = incompatibleRules.find((rule) => { + if (!rule.regex.test(source)) return false; + if (rule.exceptRegex && rule.exceptRegex.test(source)) return false; + return true; + }); + if (!matchRule) return null; + return new validationIssue({ + type: type2, + severity: "warning", + message: (context) => { + const entity2 = context.hasEntity(entityID); + return entity2 ? _t.append("issues.incompatible_source.feature.message", { + feature: utilDisplayLabel( + entity2, + context.graph(), + true + /* verbose */ + ), + value: source + }) : ""; + }, + reference: getReference(matchRule.id), + entityIds: [entityID], + hash: source, + dynamicFixes: () => { + return [ + new validationIssueFix({ title: _t.append("issues.fix.remove_proprietary_data.title") }) + ]; + } + }); + }).filter(Boolean); + function getReference(id2) { + return function showReference(selection2) { + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.incompatible_source.reference.".concat(id2))); + }; } - corePreferences("validate-disabledRules", Object.keys(_disabledRules).join(",")); - validator.validate(); }; - validator.disableRules = (keys) => { - _disabledRules = {}; - keys.forEach((k) => _disabledRules[k] = true); - corePreferences("validate-disabledRules", Object.keys(_disabledRules).join(",")); - validator.validate(); - }; - validator.ignoreIssue = (issueID) => { - _ignoredIssueIDs.add(issueID); - }; - validator.validate = () => { - const baseGraph = context.history().base(); - if (!_headCache.graph) - _headCache.graph = baseGraph; - if (!_baseCache.graph) - _baseCache.graph = baseGraph; - const prevGraph = _headCache.graph; - const currGraph = context.graph(); - if (currGraph === prevGraph) { - _headIsCurrent = true; - dispatch10.call("validated"); - return Promise.resolve(); + validation.type = type2; + return validation; + } + + // modules/validations/maprules.js + function validationMaprules() { + var type2 = "maprules"; + var validation = function checkMaprules(entity, graph) { + if (!services.maprules) return []; + var rules = services.maprules.validationRules(); + var issues = []; + for (var i3 = 0; i3 < rules.length; i3++) { + var rule = rules[i3]; + rule.findIssues(entity, graph, issues); } - if (_headPromise) { - _headIsCurrent = false; - return _headPromise; + return issues; + }; + validation.type = type2; + return validation; + } + + // modules/validations/mismatched_geometry.js + var import_fast_deep_equal4 = __toESM(require_fast_deep_equal()); + function validationMismatchedGeometry() { + var type2 = "mismatched_geometry"; + function tagSuggestingLineIsArea(entity) { + if (entity.type !== "way" || entity.isClosed()) return null; + var tagSuggestingArea = entity.tagSuggestingArea(); + if (!tagSuggestingArea) { + return null; } - _headCache.graph = currGraph; - _completeDiff = context.history().difference().complete(); - const incrementalDiff = coreDifference(prevGraph, currGraph); - let entityIDs = Object.keys(incrementalDiff.complete()); - entityIDs = _headCache.withAllRelatedEntities(entityIDs); - if (!entityIDs.size) { - dispatch10.call("validated"); - return Promise.resolve(); + var asLine = _mainPresetIndex.matchTags(tagSuggestingArea, "line"); + var asArea = _mainPresetIndex.matchTags(tagSuggestingArea, "area"); + if (asLine && asArea && (0, import_fast_deep_equal4.default)(asLine.tags, asArea.tags)) { + return null; } - _headPromise = validateEntitiesAsync(entityIDs, _headCache).then(() => updateResolvedIssues(entityIDs)).then(() => dispatch10.call("validated")).catch(() => { - }).then(() => { - _headPromise = null; - if (!_headIsCurrent) { - validator.validate(); + return tagSuggestingArea; + } + function makeConnectEndpointsFixOnClick(way, graph) { + if (way.nodes.length < 3) return null; + var nodes = graph.childNodes(way), testNodes; + var firstToLastDistanceMeters = geoSphericalDistance(nodes[0].loc, nodes[nodes.length - 1].loc); + if (firstToLastDistanceMeters < 0.75) { + testNodes = nodes.slice(); + testNodes.pop(); + testNodes.push(testNodes[0]); + if (!geoHasSelfIntersections(testNodes, testNodes[0].id)) { + return function(context) { + var way2 = context.entity(this.issue.entityIds[0]); + context.perform( + actionMergeNodes([way2.nodes[0], way2.nodes[way2.nodes.length - 1]], nodes[0].loc), + _t("issues.fix.connect_endpoints.annotation") + ); + }; } - }); - return _headPromise; - }; - context.history().on("restore.validator", validator.validate).on("undone.validator", validator.validate).on("redone.validator", validator.validate).on("reset.validator", () => { - reset(false); - validator.validate(); - }); - context.on("exit.validator", validator.validate); - context.history().on("merge.validator", (entities) => { - if (!entities) - return; - const baseGraph = context.history().base(); - if (!_headCache.graph) - _headCache.graph = baseGraph; - if (!_baseCache.graph) - _baseCache.graph = baseGraph; - let entityIDs = entities.map((entity) => entity.id); - entityIDs = _baseCache.withAllRelatedEntities(entityIDs); - validateEntitiesAsync(entityIDs, _baseCache); - }); - function validateEntity(entity, graph) { - let result = { issues: [], provisional: false }; - Object.keys(_rules).forEach(runValidation); - return result; - function runValidation(key) { - const fn = _rules[key]; - if (typeof fn !== "function") { - console.error("no such validation rule = " + key); - return; + } + testNodes = nodes.slice(); + testNodes.push(testNodes[0]); + if (!geoHasSelfIntersections(testNodes, testNodes[0].id)) { + return function(context) { + var wayId = this.issue.entityIds[0]; + var way2 = context.entity(wayId); + var nodeId = way2.nodes[0]; + var index = way2.nodes.length; + context.perform( + actionAddVertex(wayId, nodeId, index), + _t("issues.fix.connect_endpoints.annotation") + ); + }; + } + } + function lineTaggedAsAreaIssue(entity) { + var tagSuggestingArea = tagSuggestingLineIsArea(entity); + if (!tagSuggestingArea) return null; + var validAsLine = false; + var presetAsLine = _mainPresetIndex.matchTags(entity.tags, "line"); + if (presetAsLine) { + validAsLine = true; + var key = Object.keys(tagSuggestingArea)[0]; + if (presetAsLine.tags[key] && presetAsLine.tags[key] === "*") { + validAsLine = false; } - let detected = fn(entity, graph); - if (detected.provisional) { - result.provisional = true; + if (Object.keys(presetAsLine.tags).length === 0) { + validAsLine = false; } - detected = detected.filter(applySeverityOverrides); - result.issues = result.issues.concat(detected); - function applySeverityOverrides(issue) { - const type3 = issue.type; - const subtype = issue.subtype || ""; - let i2; - for (i2 = 0; i2 < _errorOverrides.length; i2++) { - if (_errorOverrides[i2].type.test(type3) && _errorOverrides[i2].subtype.test(subtype)) { - issue.severity = "error"; - return true; - } - } - for (i2 = 0; i2 < _warningOverrides.length; i2++) { - if (_warningOverrides[i2].type.test(type3) && _warningOverrides[i2].subtype.test(subtype)) { - issue.severity = "warning"; - return true; - } + } + return new validationIssue({ + type: type2, + subtype: "area_as_line", + severity: "warning", + message: function(context) { + var entity2 = context.hasEntity(this.entityIds[0]); + return entity2 ? _t.append("issues.tag_suggests_area.message", { + feature: utilDisplayLabel( + entity2, + "area", + true + /* verbose */ + ), + tag: utilTagText({ tags: tagSuggestingArea }) + }) : ""; + }, + reference: showReference, + entityIds: [entity.id], + hash: JSON.stringify(tagSuggestingArea), + dynamicFixes: function(context) { + var fixes = []; + var entity2 = context.entity(this.entityIds[0]); + var connectEndsOnClick = makeConnectEndpointsFixOnClick(entity2, context.graph()); + if (!validAsLine) { + fixes.push(new validationIssueFix({ + title: _t.append("issues.fix.connect_endpoints.title"), + onClick: connectEndsOnClick + })); } - for (i2 = 0; i2 < _disableOverrides.length; i2++) { - if (_disableOverrides[i2].type.test(type3) && _disableOverrides[i2].subtype.test(subtype)) { - return false; + fixes.push(new validationIssueFix({ + icon: "iD-operation-delete", + title: _t.append("issues.fix.remove_tag.title"), + onClick: function(context2) { + var entityId = this.issue.entityIds[0]; + var entity3 = context2.entity(entityId); + var tags = Object.assign({}, entity3.tags); + for (var key2 in tagSuggestingArea) { + delete tags[key2]; + } + context2.perform( + actionChangeTags(entityId, tags), + _t("issues.fix.remove_tag.annotation") + ); } - } - return true; + })); + return fixes; } + }); + function showReference(selection2) { + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.tag_suggests_area.reference")); } } - function updateResolvedIssues(entityIDs) { - entityIDs.forEach((entityID) => { - const baseIssues = _baseCache.issuesByEntityID[entityID]; - if (!baseIssues) - return; - baseIssues.forEach((issueID) => { - const issue = _baseCache.issuesByIssueID[issueID]; - const userModified = (issue.entityIds || []).some((id2) => _completeDiff.hasOwnProperty(id2)); - if (userModified && !_headCache.issuesByIssueID[issueID]) { - _resolvedIssueIDs.add(issueID); - } else { - _resolvedIssueIDs.delete(issueID); - } + function vertexPointIssue(entity, graph) { + if (entity.type !== "node") return null; + if (Object.keys(entity.tags).length === 0) return null; + if (entity.isOnAddressLine(graph)) return null; + var geometry = entity.geometry(graph); + var allowedGeometries = osmNodeGeometriesForTags(entity.tags); + if (geometry === "point" && !allowedGeometries.point && allowedGeometries.vertex) { + return new validationIssue({ + type: type2, + subtype: "vertex_as_point", + severity: "warning", + message: function(context) { + var entity2 = context.hasEntity(this.entityIds[0]); + return entity2 ? _t.append("issues.vertex_as_point.message", { + feature: utilDisplayLabel( + entity2, + "vertex", + true + /* verbose */ + ) + }) : ""; + }, + reference: function showReference(selection2) { + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.vertex_as_point.reference")); + }, + entityIds: [entity.id] }); + } else if (geometry === "vertex" && !allowedGeometries.vertex && allowedGeometries.point) { + return new validationIssue({ + type: type2, + subtype: "point_as_vertex", + severity: "warning", + message: function(context) { + var entity2 = context.hasEntity(this.entityIds[0]); + return entity2 ? _t.append("issues.point_as_vertex.message", { + feature: utilDisplayLabel( + entity2, + "point", + true + /* verbose */ + ) + }) : ""; + }, + reference: function showReference(selection2) { + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.point_as_vertex.reference")); + }, + entityIds: [entity.id], + dynamicFixes: extractPointDynamicFixes + }); + } + return null; + } + function otherMismatchIssue(entity, graph) { + if (!entity.hasInterestingTags()) return null; + if (entity.type !== "node" && entity.type !== "way") return null; + if (entity.type === "node" && entity.isOnAddressLine(graph)) return null; + var sourceGeom = entity.geometry(graph); + var targetGeoms = entity.type === "way" ? ["point", "vertex"] : ["line", "area"]; + if (sourceGeom === "area") targetGeoms.unshift("line"); + var asSource = _mainPresetIndex.match(entity, graph); + var targetGeom = targetGeoms.find((nodeGeom) => { + var asTarget = _mainPresetIndex.matchTags(entity.tags, nodeGeom); + if (!asSource || !asTarget || asSource === asTarget || // sometimes there are two presets with the same tags for different geometries + (0, import_fast_deep_equal4.default)(asSource.tags, asTarget.tags)) return false; + if (asTarget.isFallback()) return false; + var primaryKey = Object.keys(asTarget.tags)[0]; + if (primaryKey === "building") return false; + if (asTarget.tags[primaryKey] === "*") return false; + return asSource.isFallback() || asSource.tags[primaryKey] === "*"; + }); + if (!targetGeom) return null; + var subtype = targetGeom + "_as_" + sourceGeom; + if (targetGeom === "vertex") targetGeom = "point"; + if (sourceGeom === "vertex") sourceGeom = "point"; + var referenceId = targetGeom + "_as_" + sourceGeom; + var dynamicFixes; + if (targetGeom === "point") { + dynamicFixes = extractPointDynamicFixes; + } else if (sourceGeom === "area" && targetGeom === "line") { + dynamicFixes = lineToAreaDynamicFixes; + } + return new validationIssue({ + type: type2, + subtype, + severity: "warning", + message: function(context) { + var entity2 = context.hasEntity(this.entityIds[0]); + return entity2 ? _t.append("issues." + referenceId + ".message", { + feature: utilDisplayLabel( + entity2, + targetGeom, + true + /* verbose */ + ) + }) : ""; + }, + reference: function showReference(selection2) { + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.mismatched_geometry.reference")); + }, + entityIds: [entity.id], + dynamicFixes }); } - function validateEntitiesAsync(entityIDs, cache) { - const jobs = Array.from(entityIDs).map((entityID) => { - if (cache.queuedEntityIDs.has(entityID)) - return null; - cache.queuedEntityIDs.add(entityID); - cache.uncacheEntityID(entityID); - return () => { - cache.queuedEntityIDs.delete(entityID); - const graph = cache.graph; - if (!graph) - return; - const entity = graph.hasEntity(entityID); - if (!entity) - return; - const result = validateEntity(entity, graph); - if (result.provisional) { - cache.provisionalEntityIDs.add(entityID); + function lineToAreaDynamicFixes(context) { + var convertOnClick; + var entityId = this.entityIds[0]; + var entity = context.entity(entityId); + var tags = Object.assign({}, entity.tags); + delete tags.area; + if (!osmTagSuggestingArea(tags)) { + convertOnClick = function(context2) { + var entityId2 = this.issue.entityIds[0]; + var entity2 = context2.entity(entityId2); + var tags2 = Object.assign({}, entity2.tags); + if (tags2.area) { + delete tags2.area; } - cache.cacheIssues(result.issues); + context2.perform( + actionChangeTags(entityId2, tags2), + _t("issues.fix.convert_to_line.annotation") + ); }; - }).filter(Boolean); - cache.queue = cache.queue.concat(utilArrayChunk(jobs, 100)); - if (cache.queuePromise) - return cache.queuePromise; - cache.queuePromise = processQueue(cache).then(() => revalidateProvisionalEntities(cache)).catch(() => { - }).finally(() => cache.queuePromise = null); - return cache.queuePromise; + } + return [ + new validationIssueFix({ + icon: "iD-icon-line", + title: _t.append("issues.fix.convert_to_line.title"), + onClick: convertOnClick + }) + ]; } - function revalidateProvisionalEntities(cache) { - if (!cache.provisionalEntityIDs.size) - return; - const handle = window.setTimeout(() => { - _deferredST.delete(handle); - if (!cache.provisionalEntityIDs.size) - return; - validateEntitiesAsync(Array.from(cache.provisionalEntityIDs), cache); - }, RETRY); - _deferredST.add(handle); + function extractPointDynamicFixes(context) { + var entityId = this.entityIds[0]; + var extractOnClick = null; + if (!context.hasHiddenConnections(entityId)) { + extractOnClick = function(context2) { + var entityId2 = this.issue.entityIds[0]; + var action = actionExtract(entityId2, context2.projection); + context2.perform( + action, + _t("operations.extract.annotation", { n: 1 }) + ); + context2.enter(modeSelect(context2, [action.getExtractedNodeID()])); + }; + } + return [ + new validationIssueFix({ + icon: "iD-operation-extract", + title: _t.append("issues.fix.extract_point.title"), + onClick: extractOnClick + }) + ]; } - function processQueue(cache) { - if (!cache.queue.length) - return Promise.resolve(); - const chunk = cache.queue.pop(); - return new Promise((resolvePromise, rejectPromise) => { - const handle = window.requestIdleCallback(() => { - delete _deferredRIC[handle]; - chunk.forEach((job) => job()); - resolvePromise(); + function unclosedMultipolygonPartIssues(entity, graph) { + if (entity.type !== "relation" || !entity.isMultipolygon() || entity.isDegenerate() || // cannot determine issues for incompletely-downloaded relations + !entity.isComplete(graph)) return []; + var sequences = osmJoinWays(entity.members, graph); + var issues = []; + for (var i3 in sequences) { + var sequence = sequences[i3]; + if (!sequence.nodes) continue; + var firstNode = sequence.nodes[0]; + var lastNode = sequence.nodes[sequence.nodes.length - 1]; + if (firstNode === lastNode) continue; + var issue = new validationIssue({ + type: type2, + subtype: "unclosed_multipolygon_part", + severity: "warning", + message: function(context) { + var entity2 = context.hasEntity(this.entityIds[0]); + return entity2 ? _t.append("issues.unclosed_multipolygon_part.message", { + feature: utilDisplayLabel( + entity2, + context.graph(), + true + /* verbose */ + ) + }) : ""; + }, + reference: showReference, + loc: sequence.nodes[0].loc, + entityIds: [entity.id], + hash: sequence.map(function(way) { + return way.id; + }).join() }); - _deferredRIC[handle] = rejectPromise; - }).then(() => { - if (cache.queue.length % 25 === 0) - dispatch10.call("validated"); - }).then(() => processQueue(cache)); + issues.push(issue); + } + return issues; + function showReference(selection2) { + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.unclosed_multipolygon_part.reference")); + } } - return validator; + var validation = function checkMismatchedGeometry(entity, graph) { + var vertexPoint = vertexPointIssue(entity, graph); + if (vertexPoint) return [vertexPoint]; + var lineAsArea = lineTaggedAsAreaIssue(entity); + if (lineAsArea) return [lineAsArea]; + var mismatch = otherMismatchIssue(entity, graph); + if (mismatch) return [mismatch]; + return unclosedMultipolygonPartIssues(entity, graph); + }; + validation.type = type2; + return validation; } - function validationCache(which) { - let cache = { - which, - graph: null, - queue: [], - queuePromise: null, - queuedEntityIDs: /* @__PURE__ */ new Set(), - provisionalEntityIDs: /* @__PURE__ */ new Set(), - issuesByIssueID: {}, - issuesByEntityID: {} + + // modules/validations/missing_role.js + function validationMissingRole() { + var type2 = "missing_role"; + var validation = function checkMissingRole(entity, graph) { + var issues = []; + if (entity.type === "way") { + graph.parentRelations(entity).forEach(function(relation) { + if (!relation.isMultipolygon()) return; + var member = relation.memberById(entity.id); + if (member && isMissingRole(member)) { + issues.push(makeIssue(entity, relation, member)); + } + }); + } else if (entity.type === "relation" && entity.isMultipolygon()) { + entity.indexedMembers().forEach(function(member) { + var way = graph.hasEntity(member.id); + if (way && isMissingRole(member)) { + issues.push(makeIssue(way, entity, member)); + } + }); + } + return issues; }; - cache.cacheIssue = (issue) => { - (issue.entityIds || []).forEach((entityID) => { - if (!cache.issuesByEntityID[entityID]) { - cache.issuesByEntityID[entityID] = /* @__PURE__ */ new Set(); + function isMissingRole(member) { + return !member.role || !member.role.trim().length; + } + function makeIssue(way, relation, member) { + return new validationIssue({ + type: type2, + severity: "warning", + message: function(context) { + var member2 = context.hasEntity(this.entityIds[1]), relation2 = context.hasEntity(this.entityIds[0]); + return member2 && relation2 ? _t.append("issues.missing_role.message", { + member: utilDisplayLabel(member2, context.graph()), + relation: utilDisplayLabel(relation2, context.graph()) + }) : ""; + }, + reference: showReference, + entityIds: [relation.id, way.id], + data: { + member + }, + hash: member.index.toString(), + dynamicFixes: function() { + return [ + makeAddRoleFix("inner"), + makeAddRoleFix("outer"), + new validationIssueFix({ + icon: "iD-operation-delete", + title: _t.append("issues.fix.remove_from_relation.title"), + onClick: function(context) { + context.perform( + actionDeleteMember(this.issue.entityIds[0], this.issue.data.member.index), + _t("operations.delete_member.annotation", { + n: 1 + }) + ); + } + }) + ]; } - cache.issuesByEntityID[entityID].add(issue.id); }); - cache.issuesByIssueID[issue.id] = issue; - }; - cache.uncacheIssue = (issue) => { - (issue.entityIds || []).forEach((entityID) => { - if (cache.issuesByEntityID[entityID]) { - cache.issuesByEntityID[entityID].delete(issue.id); + function showReference(selection2) { + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.missing_role.multipolygon.reference")); + } + } + function makeAddRoleFix(role) { + return new validationIssueFix({ + title: _t.append("issues.fix.set_as_" + role + ".title"), + onClick: function(context) { + var oldMember = this.issue.data.member; + var member = { id: this.issue.entityIds[1], type: oldMember.type, role }; + context.perform( + actionChangeMember(this.issue.entityIds[0], member, oldMember.index), + _t("operations.change_role.annotation", { + n: 1 + }) + ); } }); - delete cache.issuesByIssueID[issue.id]; - }; - cache.cacheIssues = (issues) => { - issues.forEach(cache.cacheIssue); - }; - cache.uncacheIssues = (issues) => { - issues.forEach(cache.uncacheIssue); - }; - cache.uncacheIssuesOfType = (type3) => { - const issuesOfType = Object.values(cache.issuesByIssueID).filter((issue) => issue.type === type3); - cache.uncacheIssues(issuesOfType); - }; - cache.uncacheEntityID = (entityID) => { - const entityIssueIDs = cache.issuesByEntityID[entityID]; - if (entityIssueIDs) { - entityIssueIDs.forEach((issueID) => { - const issue = cache.issuesByIssueID[issueID]; - if (issue) { - cache.uncacheIssue(issue); - } else { - delete cache.issuesByIssueID[issueID]; - } + } + validation.type = type2; + return validation; + } + + // modules/validations/missing_tag.js + function validationMissingTag(context) { + var type2 = "missing_tag"; + function hasDescriptiveTags(entity) { + var onlyAttributeKeys = ["description", "name", "note", "start_date"]; + var entityDescriptiveKeys = Object.keys(entity.tags).filter(function(k2) { + if (k2 === "area" || !osmIsInterestingTag(k2)) return false; + return !onlyAttributeKeys.some(function(attributeKey) { + return k2 === attributeKey || k2.indexOf(attributeKey + ":") === 0; }); + }); + if (entity.type === "relation" && entityDescriptiveKeys.length === 1 && entity.tags.type === "multipolygon") { + return false; } - delete cache.issuesByEntityID[entityID]; - cache.provisionalEntityIDs.delete(entityID); - }; - cache.withAllRelatedEntities = (entityIDs) => { - let result = /* @__PURE__ */ new Set(); - (entityIDs || []).forEach((entityID) => { - result.add(entityID); - const entityIssueIDs = cache.issuesByEntityID[entityID]; - if (entityIssueIDs) { - entityIssueIDs.forEach((issueID) => { - const issue = cache.issuesByIssueID[issueID]; - if (issue) { - (issue.entityIds || []).forEach((relatedID) => result.add(relatedID)); - } else { - delete cache.issuesByIssueID[issueID]; + return entityDescriptiveKeys.length > 0; + } + function isUnknownRoad(entity) { + return entity.type === "way" && entity.tags.highway === "road"; + } + function isUntypedRelation(entity) { + return entity.type === "relation" && !entity.tags.type; + } + var validation = function checkMissingTag(entity, graph) { + var subtype; + var osm = context.connection(); + var isUnloadedNode = entity.type === "node" && osm && !osm.isDataLoaded(entity.loc); + if (!isUnloadedNode && // allow untagged nodes that are part of ways + entity.geometry(graph) !== "vertex" && // allow untagged entities that are part of relations + !entity.hasParentRelations(graph)) { + if (Object.keys(entity.tags).length === 0) { + subtype = "any"; + } else if (!hasDescriptiveTags(entity)) { + subtype = "descriptive"; + } else if (isUntypedRelation(entity)) { + subtype = "relation_type"; + } + } + if (!subtype && isUnknownRoad(entity)) { + subtype = "highway_classification"; + } + if (!subtype) return []; + var messageID = subtype === "highway_classification" ? "unknown_road" : "missing_tag." + subtype; + var referenceID = subtype === "highway_classification" ? "unknown_road" : "missing_tag"; + var canDelete = entity.version === void 0 || entity.v !== void 0; + var severity = canDelete && subtype !== "highway_classification" ? "error" : "warning"; + return [new validationIssue({ + type: type2, + subtype, + severity, + message: function(context2) { + var entity2 = context2.hasEntity(this.entityIds[0]); + return entity2 ? _t.append("issues." + messageID + ".message", { + feature: utilDisplayLabel(entity2, context2.graph()) + }) : ""; + }, + reference: showReference, + entityIds: [entity.id], + dynamicFixes: function(context2) { + var fixes = []; + var selectFixType = subtype === "highway_classification" ? "select_road_type" : "select_preset"; + fixes.push(new validationIssueFix({ + icon: "iD-icon-search", + title: _t.append("issues.fix." + selectFixType + ".title"), + onClick: function(context3) { + context3.ui().sidebar.showPresetList(); } - }); + })); + var deleteOnClick; + var id2 = this.entityIds[0]; + var operation2 = operationDelete(context2, [id2]); + var disabledReasonID = operation2.disabled(); + if (!disabledReasonID) { + deleteOnClick = function(context3) { + var id3 = this.issue.entityIds[0]; + var operation3 = operationDelete(context3, [id3]); + if (!operation3.disabled()) { + operation3(); + } + }; + } + fixes.push( + new validationIssueFix({ + icon: "iD-operation-delete", + title: _t.append("issues.fix.delete_feature.title"), + disabledReason: disabledReasonID ? _t("operations.delete." + disabledReasonID + ".single") : void 0, + onClick: deleteOnClick + }) + ); + return fixes; } - }); - return result; + })]; + function showReference(selection2) { + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues." + referenceID + ".reference")); + } }; - return cache; + validation.type = type2; + return validation; } - // modules/core/uploader.js - function coreUploader(context) { - var dispatch10 = dispatch_default( - "saveStarted", - "saveEnded", - "willAttemptUpload", - "progressChanged", - "resultNoChanges", - "resultErrors", - "resultConflicts", - "resultSuccess" - ); - var _isSaving = false; - var _conflicts = []; - var _errors = []; - var _origChanges; - var _discardTags = {}; - _mainFileFetcher.get("discarded").then(function(d) { - _discardTags = d; - }).catch(function() { - }); - var uploader = utilRebind({}, dispatch10, "on"); - uploader.isSaving = function() { - return _isSaving; - }; - uploader.save = function(changeset, tryAgain, checkConflicts) { - if (_isSaving && !tryAgain) { - return; - } - var osm = context.connection(); - if (!osm) - return; - if (!osm.authenticated()) { - osm.authenticate(function(err) { - if (!err) { - uploader.save(changeset, tryAgain, checkConflicts); + // modules/validations/mutually_exclusive_tags.js + function validationMutuallyExclusiveTags() { + const type2 = "mutually_exclusive_tags"; + const tagKeyPairs = osmMutuallyExclusiveTagPairs; + const validation = function checkMutuallyExclusiveTags(entity) { + let pairsFounds = tagKeyPairs.filter((pair3) => { + return pair3[0] in entity.tags && pair3[1] in entity.tags; + }).filter((pair3) => { + return !(pair3[0].match(/^(addr:)?no[a-z]/) && entity.tags[pair3[0]] === "no" || pair3[1].match(/^(addr:)?no[a-z]/) && entity.tags[pair3[1]] === "no"); + }); + Object.keys(entity.tags).forEach((key) => { + let negative_key = "not:" + key; + if (negative_key in entity.tags && entity.tags[negative_key].split(";").includes(entity.tags[key])) { + pairsFounds.push([negative_key, key, "same_value"]); + } + if (key.match(/^name:[a-z]+/)) { + negative_key = "not:name"; + if (negative_key in entity.tags && entity.tags[negative_key].split(";").includes(entity.tags[key])) { + pairsFounds.push([negative_key, key, "same_value"]); + } + } + }); + let issues = pairsFounds.map((pair3) => { + const subtype = pair3[2] || "default"; + return new validationIssue({ + type: type2, + subtype, + severity: "warning", + message: function(context) { + let entity2 = context.hasEntity(this.entityIds[0]); + return entity2 ? _t.append("issues.".concat(type2, ".").concat(subtype, ".message"), { + feature: utilDisplayLabel(entity2, context.graph()), + tag1: pair3[0], + tag2: pair3[1] + }) : ""; + }, + reference: (selection2) => showReference(selection2, pair3, subtype), + entityIds: [entity.id], + dynamicFixes: () => pair3.slice(0, 2).map((tagToRemove) => createIssueFix(tagToRemove)) + }); + }); + function createIssueFix(tagToRemove) { + return new validationIssueFix({ + icon: "iD-operation-delete", + title: _t.append("issues.fix.remove_named_tag.title", { tag: tagToRemove }), + onClick: function(context) { + const entityId = this.issue.entityIds[0]; + const entity2 = context.entity(entityId); + let tags = Object.assign({}, entity2.tags); + delete tags[tagToRemove]; + context.perform( + actionChangeTags(entityId, tags), + _t("issues.fix.remove_named_tag.annotation", { tag: tagToRemove }) + ); } }); - return; - } - if (!_isSaving) { - _isSaving = true; - dispatch10.call("saveStarted", this); - } - var history = context.history(); - _conflicts = []; - _errors = []; - _origChanges = history.changes(actionDiscardTags(history.difference(), _discardTags)); - if (!tryAgain) { - history.perform(actionNoop()); } - if (!checkConflicts) { - upload(changeset); - } else { - performFullConflictCheck(changeset); + function showReference(selection2, pair3, subtype) { + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.".concat(type2, ".").concat(subtype, ".reference"), { tag1: pair3[0], tag2: pair3[1] })); } + return issues; }; - function performFullConflictCheck(changeset) { - var osm = context.connection(); - if (!osm) - return; - var history = context.history(); - var localGraph = context.graph(); - var remoteGraph = coreGraph(history.base(), true); - var summary = history.difference().summary(); - var _toCheck = []; - for (var i2 = 0; i2 < summary.length; i2++) { - var item = summary[i2]; - if (item.changeType === "modified") { - _toCheck.push(item.entity.id); + validation.type = type2; + return validation; + } + + // modules/validations/outdated_tags.js + function validationOutdatedTags() { + const type2 = "outdated_tags"; + let _waitingForDeprecated = true; + let _dataDeprecated; + _mainFileFetcher.get("deprecated").then((d2) => _dataDeprecated = d2).catch(() => { + }).finally(() => _waitingForDeprecated = false); + function oldTagIssues(entity, graph) { + if (!entity.hasInterestingTags()) return []; + let preset = _mainPresetIndex.match(entity, graph); + if (!preset) return []; + const oldTags = Object.assign({}, entity.tags); + let subtype = "deprecated_tags"; + if (preset.replacement) { + const newPreset = _mainPresetIndex.item(preset.replacement); + graph = actionChangePreset( + entity.id, + preset, + newPreset, + true + /* skip field defaults */ + )(graph); + entity = graph.entity(entity.id); + preset = newPreset; + } + const upgradeReasons = []; + if (_dataDeprecated) { + const deprecatedTags = entity.deprecatedTags(_dataDeprecated); + if (entity.type === "way" && entity.isClosed() && entity.tags.traffic_calming === "island" && !entity.tags.highway) { + deprecatedTags.push({ + old: { traffic_calming: "island" }, + replace: { "area:highway": "traffic_island" } + }); + } + if (deprecatedTags.length) { + deprecatedTags.forEach((tag2) => { + graph = actionUpgradeTags(entity.id, tag2.old, tag2.replace)(graph); + upgradeReasons.push({ + source: "id-tagging-schema--deprecated", + data: tag2 + }); + }); + entity = graph.entity(entity.id); } } - var _toLoad = withChildNodes(_toCheck, localGraph); - var _loaded = {}; - var _toLoadCount = 0; - var _toLoadTotal = _toLoad.length; - if (_toCheck.length) { - dispatch10.call("progressChanged", this, _toLoadCount, _toLoadTotal); - _toLoad.forEach(function(id2) { - _loaded[id2] = false; - }); - osm.loadMultiple(_toLoad, loaded); - } else { - upload(changeset); - } - return; - function withChildNodes(ids, graph) { - var s = new Set(ids); - ids.forEach(function(id2) { - var entity = graph.entity(id2); - if (entity.type !== "way") - return; - graph.childNodes(entity).forEach(function(child) { - if (child.version !== void 0) { - s.add(child.id); - } - }); + let newTags = Object.assign({}, entity.tags); + if (preset.tags !== preset.addTags) { + Object.keys(preset.addTags).forEach((k2) => { + if (!newTags[k2]) { + if (preset.addTags[k2] === "*") { + newTags[k2] = "yes"; + } else if (preset.addTags[k2]) { + newTags[k2] = preset.addTags[k2]; + } + upgradeReasons.push({ + source: "id-tagging-schema--preset-addTags", + data: preset + }); + } }); - return Array.from(s); } - function loaded(err, result) { - if (_errors.length) - return; - if (err) { - _errors.push({ - msg: err.message || err.responseText, - details: [_t("save.status_code", { code: err.status })] - }); - didResultInErrors(); - } else { - var loadMore = []; - result.data.forEach(function(entity) { - remoteGraph.replace(entity); - _loaded[entity.id] = true; - _toLoad = _toLoad.filter(function(val) { - return val !== entity.id; + const nsi = services.nsi; + let waitingForNsi = false; + let nsiResult; + if (nsi) { + waitingForNsi = nsi.status() === "loading"; + if (!waitingForNsi) { + const loc = entity.extent(graph).center(); + nsiResult = nsi.upgradeTags(newTags, loc); + if (nsiResult) { + newTags = nsiResult.newTags; + subtype = "noncanonical_brand"; + upgradeReasons.push({ + source: "name-suggestion-index", + data: nsiResult }); - if (!entity.visible) - return; - var i3, id2; - if (entity.type === "way") { - for (i3 = 0; i3 < entity.nodes.length; i3++) { - id2 = entity.nodes[i3]; - if (_loaded[id2] === void 0) { - _loaded[id2] = false; - loadMore.push(id2); - } + } + } + } + let issues = []; + issues.provisional = _waitingForDeprecated || waitingForNsi; + const tagDiff = utilTagDiff(oldTags, newTags); + if (!tagDiff.length) return issues; + const isOnlyAddingTags = tagDiff.every((d2) => d2.type === "+"); + let prefix = ""; + if (nsiResult) { + prefix = "noncanonical_brand."; + } else if (subtype === "deprecated_tags" && isOnlyAddingTags) { + subtype = "incomplete_tags"; + prefix = "incomplete."; + } + let autoArgs = subtype !== "noncanonical_brand" ? [doUpgrade, _t("issues.fix.upgrade_tags.annotation")] : null; + issues.push(new validationIssue({ + type: type2, + subtype, + severity: "warning", + message: showMessage, + reference: showReference, + entityIds: [entity.id], + hash: utilHashcode(JSON.stringify(tagDiff)), + dynamicFixes: () => { + let fixes = [ + new validationIssueFix({ + autoArgs, + title: _t.append("issues.fix.upgrade_tags.title"), + onClick: (context) => { + context.perform(doUpgrade, _t("issues.fix.upgrade_tags.annotation")); } - } else if (entity.type === "relation" && entity.isMultipolygon()) { - for (i3 = 0; i3 < entity.members.length; i3++) { - id2 = entity.members[i3].id; - if (_loaded[id2] === void 0) { - _loaded[id2] = false; - loadMore.push(id2); + }) + ]; + const item = nsiResult && nsiResult.matched; + if (item) { + fixes.push( + new validationIssueFix({ + title: _t.append("issues.fix.tag_as_not.title", { name: item.displayName }), + onClick: (context) => { + context.perform(addNotTag, _t("issues.fix.tag_as_not.annotation")); } - } - } - }); - _toLoadCount += result.data.length; - _toLoadTotal += loadMore.length; - dispatch10.call("progressChanged", this, _toLoadCount, _toLoadTotal); - if (loadMore.length) { - _toLoad.push.apply(_toLoad, loadMore); - osm.loadMultiple(loadMore, loaded); + }) + ); } - if (!_toLoad.length) { - detectConflicts(); - upload(changeset); + return fixes; + } + })); + return issues; + function doUpgrade(graph2) { + const currEntity = graph2.hasEntity(entity.id); + if (!currEntity) return graph2; + let newTags2 = Object.assign({}, currEntity.tags); + tagDiff.forEach((diff) => { + if (diff.type === "-") { + delete newTags2[diff.key]; + } else if (diff.type === "+") { + newTags2[diff.key] = diff.newVal; } + }); + return actionChangeTags(currEntity.id, newTags2)(graph2); + } + function addNotTag(graph2) { + const currEntity = graph2.hasEntity(entity.id); + if (!currEntity) return graph2; + const item = nsiResult && nsiResult.matched; + if (!item) return graph2; + let newTags2 = Object.assign({}, currEntity.tags); + const wd = item.mainTag; + const notwd = "not:".concat(wd); + const qid = item.tags[wd]; + newTags2[notwd] = qid; + if (newTags2[wd] === qid) { + const wp = item.mainTag.replace("wikidata", "wikipedia"); + delete newTags2[wd]; + delete newTags2[wp]; } + return actionChangeTags(currEntity.id, newTags2)(graph2); } - function detectConflicts() { - function choice(id2, text2, action) { - return { - id: id2, - text: text2, - action: function() { - history.replace(action); - } - }; + function showMessage(context) { + const currEntity = context.hasEntity(entity.id); + if (!currEntity) return ""; + let messageID = "issues.outdated_tags.".concat(prefix, "message"); + if (subtype === "noncanonical_brand" && isOnlyAddingTags) { + messageID += "_incomplete"; } - function formatUser(d) { - return '' + escape_default(d) + ""; + return _t.append(messageID, { + feature: utilDisplayLabel( + currEntity, + context.graph(), + true + /* verbose */ + ) + }); + } + function showReference(selection2) { + let enter = selection2.selectAll(".issue-reference").data([0]).enter(); + enter.append("div").attr("class", "issue-reference").call(_t.append("issues.outdated_tags.".concat(prefix, "reference"))); + enter.append("strong").call(_t.append("issues.suggested")); + enter.append("table").attr("class", "tagDiff-table").selectAll(".tagDiff-row").data(tagDiff).enter().append("tr").attr("class", "tagDiff-row").append("td").attr("class", (d2) => { + let klass = d2.type === "+" ? "add" : "remove"; + return "tagDiff-cell tagDiff-cell-".concat(klass); + }).html((d2) => d2.display); + } + } + let validation = oldTagIssues; + validation.type = type2; + return validation; + } + + // modules/validations/private_data.js + function validationPrivateData() { + var type2 = "private_data"; + var privateBuildingValues = { + detached: true, + farm: true, + house: true, + houseboat: true, + residential: true, + semidetached_house: true, + static_caravan: true + }; + var publicKeys = { + amenity: true, + craft: true, + historic: true, + leisure: true, + office: true, + shop: true, + tourism: true + }; + var personalTags = { + "contact:email": true, + "contact:fax": true, + "contact:phone": true, + email: true, + fax: true, + phone: true + }; + var validation = function checkPrivateData(entity) { + var tags = entity.tags; + if (!tags.building || !privateBuildingValues[tags.building]) return []; + var keepTags = {}; + for (var k2 in tags) { + if (publicKeys[k2]) return []; + if (!personalTags[k2]) { + keepTags[k2] = tags[k2]; } - function entityName(entity) { - return utilDisplayName(entity) || utilDisplayType(entity.id) + " " + entity.id; + } + var tagDiff = utilTagDiff(tags, keepTags); + if (!tagDiff.length) return []; + var fixID = tagDiff.length === 1 ? "remove_tag" : "remove_tags"; + return [new validationIssue({ + type: type2, + severity: "warning", + message: showMessage, + reference: showReference, + entityIds: [entity.id], + dynamicFixes: function() { + return [ + new validationIssueFix({ + icon: "iD-operation-delete", + title: _t.append("issues.fix." + fixID + ".title"), + onClick: function(context) { + context.perform(doUpgrade, _t("issues.fix.remove_tag.annotation")); + } + }) + ]; } - function sameVersions(local, remote) { - if (local.version !== remote.version) - return false; - if (local.type === "way") { - var children2 = utilArrayUnion(local.nodes, remote.nodes); - for (var i3 = 0; i3 < children2.length; i3++) { - var a = localGraph.hasEntity(children2[i3]); - var b = remoteGraph.hasEntity(children2[i3]); - if (a && b && a.version !== b.version) - return false; - } + })]; + function doUpgrade(graph) { + var currEntity = graph.hasEntity(entity.id); + if (!currEntity) return graph; + var newTags = Object.assign({}, currEntity.tags); + tagDiff.forEach(function(diff) { + if (diff.type === "-") { + delete newTags[diff.key]; + } else if (diff.type === "+") { + newTags[diff.key] = diff.newVal; } - return true; - } - _toCheck.forEach(function(id2) { - var local = localGraph.entity(id2); - var remote = remoteGraph.entity(id2); - if (sameVersions(local, remote)) - return; - var merge3 = actionMergeRemoteChanges(id2, localGraph, remoteGraph, _discardTags, formatUser); - history.replace(merge3); - var mergeConflicts = merge3.conflicts(); - if (!mergeConflicts.length) - return; - var forceLocal = actionMergeRemoteChanges(id2, localGraph, remoteGraph, _discardTags).withOption("force_local"); - var forceRemote = actionMergeRemoteChanges(id2, localGraph, remoteGraph, _discardTags).withOption("force_remote"); - var keepMine = _t("save.conflict." + (remote.visible ? "keep_local" : "restore")); - var keepTheirs = _t("save.conflict." + (remote.visible ? "keep_remote" : "delete")); - _conflicts.push({ - id: id2, - name: entityName(local), - details: mergeConflicts, - chosen: 1, - choices: [ - choice(id2, keepMine, forceLocal), - choice(id2, keepTheirs, forceRemote) - ] - }); }); + return actionChangeTags(currEntity.id, newTags)(graph); } - } - function upload(changeset) { - var osm = context.connection(); - if (!osm) { - _errors.push({ msg: "No OSM Service" }); + function showMessage(context) { + var currEntity = context.hasEntity(this.entityIds[0]); + if (!currEntity) return ""; + return _t.append( + "issues.private_data.contact.message", + { feature: utilDisplayLabel(currEntity, context.graph()) } + ); } - if (_conflicts.length) { - didResultInConflicts(changeset); - } else if (_errors.length) { - didResultInErrors(); - } else { - var history = context.history(); - var changes = history.changes(actionDiscardTags(history.difference(), _discardTags)); - if (changes.modified.length || changes.created.length || changes.deleted.length) { - dispatch10.call("willAttemptUpload", this); - osm.putChangeset(changeset, changes, uploadCallback); - } else { - didResultInNoChanges(); + function showReference(selection2) { + var enter = selection2.selectAll(".issue-reference").data([0]).enter(); + enter.append("div").attr("class", "issue-reference").call(_t.append("issues.private_data.reference")); + enter.append("strong").call(_t.append("issues.suggested")); + enter.append("table").attr("class", "tagDiff-table").selectAll(".tagDiff-row").data(tagDiff).enter().append("tr").attr("class", "tagDiff-row").append("td").attr("class", function(d2) { + var klass = d2.type === "+" ? "add" : "remove"; + return "tagDiff-cell tagDiff-cell-" + klass; + }).html(function(d2) { + return d2.display; + }); + } + }; + validation.type = type2; + return validation; + } + + // modules/validations/suspicious_name.js + function validationSuspiciousName() { + const type2 = "suspicious_name"; + const keysToTestForGenericValues = [ + "aerialway", + "aeroway", + "amenity", + "building", + "craft", + "highway", + "leisure", + "railway", + "man_made", + "office", + "shop", + "tourism", + "waterway" + ]; + let _waitingForNsi = false; + function isGenericMatchInNsi(tags) { + const nsi = services.nsi; + if (nsi) { + _waitingForNsi = nsi.status() === "loading"; + if (!_waitingForNsi) { + return nsi.isGenericName(tags); } } + return false; } - function uploadCallback(err, changeset) { - if (err) { - if (err.status === 409) { - uploader.save(changeset, true, true); - } else { - _errors.push({ - msg: err.message || err.responseText, - details: [_t("save.status_code", { code: err.status })] - }); - didResultInErrors(); + function nameMatchesRawTag(lowercaseName, tags) { + for (let i3 = 0; i3 < keysToTestForGenericValues.length; i3++) { + let key = keysToTestForGenericValues[i3]; + let val = tags[key]; + if (val) { + val = val.toLowerCase(); + if (key === lowercaseName || val === lowercaseName || key.replace(/\_/g, " ") === lowercaseName || val.replace(/\_/g, " ") === lowercaseName) { + return true; + } } - } else { - didResultInSuccess(changeset); } + return false; } - function didResultInNoChanges() { - dispatch10.call("resultNoChanges", this); - endSave(); - context.flush(); - } - function didResultInErrors() { - context.history().pop(); - dispatch10.call("resultErrors", this, _errors); - endSave(); + function isGenericName(name, tags) { + name = name.toLowerCase(); + return nameMatchesRawTag(name, tags) || isGenericMatchInNsi(tags); } - function didResultInConflicts(changeset) { - _conflicts.sort(function(a, b) { - return b.id.localeCompare(a.id); + function makeGenericNameIssue(entityId, nameKey, genericName, langCode) { + return new validationIssue({ + type: type2, + subtype: "generic_name", + severity: "warning", + message: function(context) { + let entity = context.hasEntity(this.entityIds[0]); + if (!entity) return ""; + let preset = _mainPresetIndex.match(entity, context.graph()); + let langName = langCode && _mainLocalizer.languageName(langCode); + return _t.append( + "issues.generic_name.message" + (langName ? "_language" : ""), + { feature: preset.name(), name: genericName, language: langName } + ); + }, + reference: showReference, + entityIds: [entityId], + hash: "".concat(nameKey, "=").concat(genericName), + dynamicFixes: function() { + return [ + new validationIssueFix({ + icon: "iD-operation-delete", + title: _t.append("issues.fix.remove_the_name.title"), + onClick: function(context) { + let entityId2 = this.issue.entityIds[0]; + let entity = context.entity(entityId2); + let tags = Object.assign({}, entity.tags); + delete tags[nameKey]; + context.perform( + actionChangeTags(entityId2, tags), + _t("issues.fix.remove_generic_name.annotation") + ); + } + }) + ]; + } }); - dispatch10.call("resultConflicts", this, changeset, _conflicts, _origChanges); - endSave(); - } - function didResultInSuccess(changeset) { - context.history().clearSaved(); - dispatch10.call("resultSuccess", this, changeset); - window.setTimeout(function() { - endSave(); - context.flush(); - }, 2500); - } - function endSave() { - _isSaving = false; - dispatch10.call("saveEnded", this); + function showReference(selection2) { + selection2.selectAll(".issue-reference").data([0]).enter().append("div").attr("class", "issue-reference").call(_t.append("issues.generic_name.reference")); + } } - uploader.cancelConflictResolution = function() { - context.history().pop(); - }; - uploader.processResolvedConflicts = function(changeset) { - var history = context.history(); - for (var i2 = 0; i2 < _conflicts.length; i2++) { - if (_conflicts[i2].chosen === 1) { - var entity = context.hasEntity(_conflicts[i2].id); - if (entity && entity.type === "way") { - var children2 = utilArrayUniq(entity.nodes); - for (var j2 = 0; j2 < children2.length; j2++) { - history.replace(actionRevert(children2[j2])); - } - } - history.replace(actionRevert(_conflicts[i2].id)); + let validation = function checkGenericName(entity) { + const tags = entity.tags; + const hasWikidata = !!tags.wikidata || !!tags["brand:wikidata"] || !!tags["operator:wikidata"]; + if (hasWikidata) return []; + let issues = []; + for (let key in tags) { + const m2 = key.match(/^name(?:(?::)([a-zA-Z_-]+))?$/); + if (!m2) continue; + const langCode = m2.length >= 2 ? m2[1] : null; + const value = tags[key]; + if (isGenericName(value, tags)) { + issues.provisional = _waitingForNsi; + issues.push(makeGenericNameIssue(entity.id, key, value, langCode)); } } - uploader.save(changeset, true, false); - }; - uploader.reset = function() { + return issues; }; - return uploader; + validation.type = type2; + return validation; } - // modules/renderer/background_source.js - var import_lodash2 = __toESM(require_lodash()); - - // modules/util/IntervalTasksQueue.js - var IntervalTasksQueue = class { - constructor(intervalInMs) { - this.intervalInMs = intervalInMs; - this.pendingHandles = []; - this.time = 0; - } - enqueue(task) { - let taskTimeout = this.time; - this.time += this.intervalInMs; - this.pendingHandles.push(setTimeout(() => { - this.time -= this.intervalInMs; - task(); - }, taskTimeout)); + // modules/validations/unsquare_way.js + function validationUnsquareWay(context) { + var type2 = "unsquare_way"; + var DEFAULT_DEG_THRESHOLD = 5; + var epsilon3 = 0.05; + var nodeThreshold = 10; + function isBuilding(entity, graph) { + if (entity.type !== "way" || entity.geometry(graph) !== "area") return false; + return entity.tags.building && entity.tags.building !== "no"; } - clear() { - this.pendingHandles.forEach((timeoutHandle) => { - clearTimeout(timeoutHandle); + var validation = function checkUnsquareWay(entity, graph) { + if (!isBuilding(entity, graph)) return []; + if (entity.tags.nonsquare === "yes") return []; + var isClosed = entity.isClosed(); + if (!isClosed) return []; + var nodes = graph.childNodes(entity).slice(); + if (nodes.length > nodeThreshold + 1) return []; + var osm = services.osm; + if (!osm || nodes.some(function(node) { + return !osm.isDataLoaded(node.loc); + })) return []; + var hasConnectedSquarableWays = nodes.some(function(node) { + return graph.parentWays(node).some(function(way) { + if (way.id === entity.id) return false; + if (isBuilding(way, graph)) return true; + return graph.parentRelations(way).some(function(parentRelation) { + return parentRelation.isMultipolygon() && parentRelation.tags.building && parentRelation.tags.building !== "no"; + }); + }); }); - this.pendingHandles = []; - this.time = 0; - } - }; - - // modules/renderer/background_source.js - var isRetina = window.devicePixelRatio && window.devicePixelRatio >= 2; - window.matchMedia(` - (-webkit-min-device-pixel-ratio: 2), /* Safari */ - (min-resolution: 2dppx), /* standard */ - (min-resolution: 192dpi) /* fallback */ - `).addListener(function() { - isRetina = window.devicePixelRatio && window.devicePixelRatio >= 2; - }); - function localeDateString(s) { - if (!s) - return null; - var options2 = { day: "numeric", month: "short", year: "numeric" }; - var d = new Date(s); - if (isNaN(d.getTime())) - return null; - return d.toLocaleDateString(_mainLocalizer.localeCode(), options2); - } - function vintageRange(vintage) { - var s; - if (vintage.start || vintage.end) { - s = vintage.start || "?"; - if (vintage.start !== vintage.end) { - s += " - " + (vintage.end || "?"); + if (hasConnectedSquarableWays) return []; + var storedDegreeThreshold = corePreferences("validate-square-degrees"); + var degreeThreshold = isFinite(storedDegreeThreshold) ? Number(storedDegreeThreshold) : DEFAULT_DEG_THRESHOLD; + var points = nodes.map(function(node) { + return context.projection(node.loc); + }); + if (!geoOrthoCanOrthogonalize(points, isClosed, epsilon3, degreeThreshold, true)) return []; + var autoArgs; + if (!entity.tags.wikidata) { + var autoAction = actionOrthogonalize(entity.id, context.projection, void 0, degreeThreshold); + autoAction.transitionable = false; + autoArgs = [autoAction, _t("operations.orthogonalize.annotation.feature", { n: 1 })]; } - } - return s; - } - function rendererBackgroundSource(data) { - var source = Object.assign({}, data); - var _offset = [0, 0]; - var _name = source.name; - var _description = source.description; - var _best = !!source.best; - var _template = source.encrypted ? utilAesDecrypt(source.template) : source.template; - source.tileSize = data.tileSize || 256; - source.zoomExtent = data.zoomExtent || [0, 22]; - source.overzoom = data.overzoom !== false; - source.offset = function(val) { - if (!arguments.length) - return _offset; - _offset = val; - return source; - }; - source.nudge = function(val, zoomlevel) { - _offset[0] += val[0] / Math.pow(2, zoomlevel); - _offset[1] += val[1] / Math.pow(2, zoomlevel); - return source; - }; - source.name = function() { - var id_safe = source.id.replace(/\./g, "
"); - if (options2.buttonText && options2.buttonCallback) { - html2 += '"; - } - var classes = "curtain-tooltip popover tooltip arrowed in " + (options2.tooltipClass || ""); - tooltip.classed(classes, true).selectAll(".popover-inner").html(html2); - if (options2.buttonText && options2.buttonCallback) { - var button = tooltip.selectAll(".button-section .button.action"); - button.on("click", function(d3_event) { - d3_event.preventDefault(); - options2.buttonCallback(); - }); - } - var tip = copyBox(tooltip.node().getBoundingClientRect()), w = containerNode.clientWidth, h = containerNode.clientHeight, tooltipWidth = 200, tooltipArrow = 5, side, pos; - if (options2.tooltipClass === "intro-mouse") { - tip.height += 80; - } - if (tooltipBox.top + tooltipBox.height > h) { - tooltipBox.height -= tooltipBox.top + tooltipBox.height - h; - } - if (tooltipBox.left + tooltipBox.width > w) { - tooltipBox.width -= tooltipBox.left + tooltipBox.width - w; + function click(d3_event, operation2) { + d3_event.stopPropagation(); + if (operation2.relatedEntityIds) { + utilHighlightEntities(operation2.relatedEntityIds(), false, context); } - if (tooltipBox.top + tooltipBox.height < 100) { - side = "bottom"; - pos = [ - tooltipBox.left + tooltipBox.width / 2 - tip.width / 2, - tooltipBox.top + tooltipBox.height - ]; - } else if (tooltipBox.top > h - 140) { - side = "top"; - pos = [ - tooltipBox.left + tooltipBox.width / 2 - tip.width / 2, - tooltipBox.top - tip.height - ]; - } else { - var tipY = tooltipBox.top + tooltipBox.height / 2 - tip.height / 2; - if (_mainLocalizer.textDirection() === "rtl") { - if (tooltipBox.left - tooltipWidth - tooltipArrow < 70) { - side = "right"; - pos = [tooltipBox.left + tooltipBox.width + tooltipArrow, tipY]; - } else { - side = "left"; - pos = [tooltipBox.left - tooltipWidth - tooltipArrow, tipY]; - } - } else { - if (tooltipBox.left + tooltipBox.width + tooltipArrow + tooltipWidth > w - 70) { - side = "left"; - pos = [tooltipBox.left - tooltipWidth - tooltipArrow, tipY]; - } else { - side = "right"; - pos = [tooltipBox.left + tooltipBox.width + tooltipArrow, tipY]; - } + if (operation2.disabled()) { + if (lastPointerUpType === "touch" || lastPointerUpType === "pen") { + context.ui().flash.duration(4e3).iconName("#iD-operation-" + operation2.id).iconClass("operation disabled").label(operation2.tooltip())(); } - } - if (options2.duration !== 0 || !tooltip.classed(side)) { - tooltip.call(uiToggle(true)); - } - tooltip.style("top", pos[1] + "px").style("left", pos[0] + "px").attr("class", classes + " " + side); - var shiftY = 0; - if (side === "left" || side === "right") { - if (pos[1] < 60) { - shiftY = 60 - pos[1]; - } else if (pos[1] + tip.height > h - 100) { - shiftY = h - pos[1] - tip.height - 100; + } else { + if (lastPointerUpType === "touch" || lastPointerUpType === "pen") { + context.ui().flash.duration(2e3).iconName("#iD-operation-" + operation2.id).iconClass("operation").label(operation2.annotation() || operation2.title)(); } + operation2(); + editMenu.close(); } - tooltip.selectAll(".popover-inner").style("top", shiftY + "px"); - } else { - tooltip.classed("in", false).call(uiToggle(false)); + lastPointerUpType = null; } - curtain.cut(box, options2.duration); - return tooltip; + dispatch14.call("toggled", this, true); }; - curtain.cut = function(datum2, duration) { - darkness.datum(datum2).interrupt(); - var selection2; - if (duration === 0) { - selection2 = darkness; - } else { - selection2 = darkness.transition().duration(duration || 600).ease(linear2); + function updatePosition() { + if (!_menu || _menu.empty()) return; + var anchorLoc = context.projection(_anchorLocLonLat); + var viewport = context.surfaceRect(); + if (anchorLoc[0] < 0 || anchorLoc[0] > viewport.width || anchorLoc[1] < 0 || anchorLoc[1] > viewport.height) { + editMenu.close(); + return; } - selection2.attr("d", function(d) { - var containerWidth = containerNode.clientWidth; - var containerHeight = containerNode.clientHeight; - var string = "M 0,0 L 0," + containerHeight + " L " + containerWidth + "," + containerHeight + "L" + containerWidth + ",0 Z"; - if (!d) - return string; - return string + "M" + d.left + "," + d.top + "L" + d.left + "," + (d.top + d.height) + "L" + (d.left + d.width) + "," + (d.top + d.height) + "L" + (d.left + d.width) + "," + d.top + "Z"; - }); - }; - curtain.remove = function() { - surface.remove(); - tooltip.remove(); - select_default2(window).on("resize.curtain", null); + var menuLeft = displayOnLeft(viewport); + var offset = [0, 0]; + offset[0] = menuLeft ? -1 * (_menuSideMargin + _menuWidth) : _menuSideMargin; + if (_menuTop) { + if (anchorLoc[1] - _menuHeight < _vpTopMargin) { + offset[1] = -anchorLoc[1] + _vpTopMargin; + } else { + offset[1] = -_menuHeight; + } + } else { + if (anchorLoc[1] + _menuHeight > viewport.height - _vpBottomMargin) { + offset[1] = -anchorLoc[1] - _menuHeight + viewport.height - _vpBottomMargin; + } else { + offset[1] = 0; + } + } + var origin = geoVecAdd(anchorLoc, offset); + _menu.style("left", origin[0] + "px").style("top", origin[1] + "px"); + var tooltipSide = tooltipPosition(viewport, menuLeft); + _tooltips.forEach(function(tooltip) { + tooltip.placement(tooltipSide); + }); + function displayOnLeft(viewport2) { + if (_mainLocalizer.textDirection() === "ltr") { + if (anchorLoc[0] + _menuSideMargin + _menuWidth > viewport2.width - _vpSideMargin) { + return true; + } + return false; + } else { + if (anchorLoc[0] - _menuSideMargin - _menuWidth < _vpSideMargin) { + return false; + } + return true; + } + } + function tooltipPosition(viewport2, menuLeft2) { + if (_mainLocalizer.textDirection() === "ltr") { + if (menuLeft2) { + return "left"; + } + if (anchorLoc[0] + _menuSideMargin + _menuWidth + _tooltipWidth > viewport2.width - _vpSideMargin) { + return "left"; + } + return "right"; + } else { + if (!menuLeft2) { + return "right"; + } + if (anchorLoc[0] - _menuSideMargin - _menuWidth - _tooltipWidth < _vpSideMargin) { + return "right"; + } + return "left"; + } + } + } + editMenu.close = function() { + context.map().on("move.edit-menu", null).on("drawn.edit-menu", null); + _menu.remove(); + _tooltips = []; + dispatch14.call("toggled", this, false); }; - function copyBox(src) { - return { - top: src.top, - right: src.right, - bottom: src.bottom, - left: src.left, - width: src.width, - height: src.height - }; + editMenu.anchorLoc = function(val) { + if (!arguments.length) return _anchorLoc; + _anchorLoc = val; + _anchorLocLonLat = context.projection.invert(_anchorLoc); + return editMenu; + }; + editMenu.triggerType = function(val) { + if (!arguments.length) return _triggerType; + _triggerType = val; + return editMenu; + }; + editMenu.operations = function(val) { + if (!arguments.length) return _operations; + _operations = val; + return editMenu; + }; + return utilRebind(editMenu, dispatch14, "on"); + } + + // modules/ui/feature_info.js + function uiFeatureInfo(context) { + function update(selection2) { + var features = context.features(); + var stats = features.stats(); + var count = 0; + var hiddenList = features.hidden().map(function(k2) { + if (stats[k2]) { + count += stats[k2]; + return _t.append("inspector.title_count", { + title: _t("feature." + k2 + ".description"), + count: stats[k2] + }); + } + return null; + }).filter(Boolean); + selection2.text(""); + if (hiddenList.length) { + var tooltipBehavior = uiTooltip().placement("top").title(function() { + return (selection3) => { + hiddenList.forEach((hiddenFeature) => { + selection3.append("div").call(hiddenFeature); + }); + }; + }); + selection2.append("a").attr("class", "chip").attr("href", "#").call(_t.append("feature_info.hidden_warning", { count })).call(tooltipBehavior).on("click", function(d3_event) { + tooltipBehavior.hide(); + d3_event.preventDefault(); + context.ui().togglePanes(context.container().select(".map-panes .map-data-pane")); + }); + } + selection2.classed("hide", !hiddenList.length); } - return curtain; + return function(selection2) { + update(selection2); + context.features().on("change.feature_info", function() { + update(selection2); + }); + }; } - // modules/ui/intro/welcome.js - function uiIntroWelcome(context, reveal) { - var dispatch10 = dispatch_default("done"); - var chapter = { - title: "intro.welcome.title" + // modules/ui/flash.js + function uiFlash(context) { + var _flashTimer; + var _duration = 2e3; + var _iconName = "#iD-icon-no"; + var _iconClass = "disabled"; + var _label = (s2) => s2.text(""); + function flash() { + if (_flashTimer) { + _flashTimer.stop(); + } + context.container().select(".main-footer-wrap").classed("footer-hide", true).classed("footer-show", false); + context.container().select(".flash-wrap").classed("footer-hide", false).classed("footer-show", true); + var content = context.container().select(".flash-wrap").selectAll(".flash-content").data([0]); + var contentEnter = content.enter().append("div").attr("class", "flash-content"); + var iconEnter = contentEnter.append("svg").attr("class", "flash-icon icon").append("g").attr("transform", "translate(10,10)"); + iconEnter.append("circle").attr("r", 9); + iconEnter.append("use").attr("transform", "translate(-7,-7)").attr("width", "14").attr("height", "14"); + contentEnter.append("div").attr("class", "flash-text"); + content = content.merge(contentEnter); + content.selectAll(".flash-icon").attr("class", "icon flash-icon " + (_iconClass || "")); + content.selectAll(".flash-icon use").attr("xlink:href", _iconName); + content.selectAll(".flash-text").attr("class", "flash-text").call(_label); + _flashTimer = timeout_default(function() { + _flashTimer = null; + context.container().select(".main-footer-wrap").classed("footer-hide", false).classed("footer-show", true); + context.container().select(".flash-wrap").classed("footer-hide", true).classed("footer-show", false); + }, _duration); + return content; + } + flash.duration = function(_2) { + if (!arguments.length) return _duration; + _duration = _2; + return flash; }; - function welcome() { - context.map().centerZoom([-85.63591, 41.94285], 19); - reveal( - ".intro-nav-wrap .chapter-welcome", - helpHtml("intro.welcome.welcome"), - { buttonText: _t.html("intro.ok"), buttonCallback: practice } - ); + flash.label = function(_2) { + if (!arguments.length) return _label; + if (typeof _2 !== "function") { + _label = (selection2) => selection2.text(_2); + } else { + _label = (selection2) => selection2.text("").call(_2); + } + return flash; + }; + flash.iconName = function(_2) { + if (!arguments.length) return _iconName; + _iconName = _2; + return flash; + }; + flash.iconClass = function(_2) { + if (!arguments.length) return _iconClass; + _iconClass = _2; + return flash; + }; + return flash; + } + + // modules/ui/full_screen.js + function uiFullScreen(context) { + var element = context.container().node(); + function getFullScreenFn() { + if (element.requestFullscreen) { + return element.requestFullscreen; + } else if (element.msRequestFullscreen) { + return element.msRequestFullscreen; + } else if (element.mozRequestFullScreen) { + return element.mozRequestFullScreen; + } else if (element.webkitRequestFullscreen) { + return element.webkitRequestFullscreen; + } } - function practice() { - reveal( - ".intro-nav-wrap .chapter-welcome", - helpHtml("intro.welcome.practice"), - { buttonText: _t.html("intro.ok"), buttonCallback: words } - ); + function getExitFullScreenFn() { + if (document.exitFullscreen) { + return document.exitFullscreen; + } else if (document.msExitFullscreen) { + return document.msExitFullscreen; + } else if (document.mozCancelFullScreen) { + return document.mozCancelFullScreen; + } else if (document.webkitExitFullscreen) { + return document.webkitExitFullscreen; + } } - function words() { - reveal( - ".intro-nav-wrap .chapter-welcome", - helpHtml("intro.welcome.words"), - { buttonText: _t.html("intro.ok"), buttonCallback: chapters } - ); + function isFullScreen() { + return document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement; } - function chapters() { - dispatch10.call("done"); - reveal( - ".intro-nav-wrap .chapter-navigation", - helpHtml("intro.welcome.chapters", { next: _t("intro.navigation.title") }) - ); + function isSupported() { + return !!getFullScreenFn(); } - chapter.enter = function() { - welcome(); - }; - chapter.exit = function() { - context.container().select(".curtain-tooltip.intro-mouse").selectAll(".counter").remove(); - }; - chapter.restart = function() { - chapter.exit(); - chapter.enter(); + function fullScreen(d3_event) { + d3_event.preventDefault(); + if (!isFullScreen()) { + getFullScreenFn().apply(element); + } else { + getExitFullScreenFn().apply(document); + } + } + return function() { + if (!isSupported()) return; + var detected = utilDetect(); + var keys2 = detected.os === "mac" ? [uiCmd("\u2303\u2318F"), "f11"] : ["f11"]; + context.keybinding().on(keys2, fullScreen); }; - return utilRebind(chapter, dispatch10, "on"); } - // modules/ui/intro/navigation.js - function uiIntroNavigation(context, reveal) { - var dispatch10 = dispatch_default("done"); - var timeouts = []; - var hallId = "n2061"; - var townHall = [-85.63591, 41.94285]; - var springStreetId = "w397"; - var springStreetEndId = "n1834"; - var springStreet = [-85.63582, 41.94255]; - var onewayField = _mainPresetIndex.field("oneway"); - var maxspeedField = _mainPresetIndex.field("maxspeed"); - var chapter = { - title: "intro.navigation.title" + // modules/ui/geolocate.js + function uiGeolocate(context) { + var _geolocationOptions = { + // prioritize speed and power usage over precision + enableHighAccuracy: false, + // don't hang indefinitely getting the location + timeout: 6e3 + // 6sec }; - function timeout2(f2, t) { - timeouts.push(window.setTimeout(f2, t)); + var _locating = uiLoading(context).message(_t.html("geolocate.locating")).blocking(true); + var _layer = context.layers().layer("geolocate"); + var _position; + var _extent; + var _timeoutID; + var _button = select_default2(null); + function click() { + if (context.inIntro()) return; + if (!_layer.enabled() && !_locating.isShown()) { + _timeoutID = setTimeout( + error, + 1e4 + /* 10sec */ + ); + context.container().call(_locating); + navigator.geolocation.getCurrentPosition(success, error, _geolocationOptions); + } else { + _locating.close(); + _layer.enabled(null, false); + updateButtonState(); + } } - function eventCancel(d3_event) { - d3_event.stopPropagation(); - d3_event.preventDefault(); + function zoomTo() { + context.enter(modeBrowse(context)); + var map2 = context.map(); + _layer.enabled(_position, true); + updateButtonState(); + map2.centerZoomEase(_extent.center(), Math.min(20, map2.extentZoom(_extent))); } - function isTownHallSelected() { - var ids = context.selectedIDs(); - return ids.length === 1 && ids[0] === hallId; + function success(geolocation) { + _position = geolocation; + var coords = _position.coords; + _extent = geoExtent([coords.longitude, coords.latitude]).padByMeters(coords.accuracy); + zoomTo(); + finish(); } - function dragMap() { - context.enter(modeBrowse(context)); - context.history().reset("initial"); - var msec = transitionTime(townHall, context.map().center()); - if (msec) { - reveal(null, null, { duration: 0 }); - } - context.map().centerZoomEase(townHall, 19, msec); - timeout2(function() { - var centerStart = context.map().center(); - var textId = context.lastPointerType() === "mouse" ? "drag" : "drag_touch"; - var dragString = helpHtml("intro.navigation.map_info") + "{br}" + helpHtml("intro.navigation." + textId); - reveal(".surface", dragString); - context.map().on("drawn.intro", function() { - reveal(".surface", dragString, { duration: 0 }); - }); - context.map().on("move.intro", function() { - var centerNow = context.map().center(); - if (centerStart[0] !== centerNow[0] || centerStart[1] !== centerNow[1]) { - context.map().on("move.intro", null); - timeout2(function() { - continueTo(zoomMap); - }, 3e3); - } - }); - }, msec + 100); - function continueTo(nextStep) { - context.map().on("move.intro drawn.intro", null); - nextStep(); + function error() { + if (_position) { + zoomTo(); + } else { + context.ui().flash.label(_t.append("geolocate.location_unavailable")).iconName("#iD-icon-geolocate")(); } + finish(); } - function zoomMap() { - var zoomStart = context.map().zoom(); - var textId = context.lastPointerType() === "mouse" ? "zoom" : "zoom_touch"; - var zoomString = helpHtml("intro.navigation." + textId); - reveal(".surface", zoomString); - context.map().on("drawn.intro", function() { - reveal(".surface", zoomString, { duration: 0 }); - }); - context.map().on("move.intro", function() { - if (context.map().zoom() !== zoomStart) { - context.map().on("move.intro", null); - timeout2(function() { - continueTo(features2); - }, 3e3); - } - }); - function continueTo(nextStep) { - context.map().on("move.intro drawn.intro", null); - nextStep(); + function finish() { + _locating.close(); + if (_timeoutID) { + clearTimeout(_timeoutID); } + _timeoutID = void 0; } - function features2() { - var onClick = function() { - continueTo(pointsLinesAreas); - }; - reveal( - ".surface", - helpHtml("intro.navigation.features"), - { buttonText: _t.html("intro.ok"), buttonCallback: onClick } + function updateButtonState() { + _button.classed("active", _layer.enabled()); + _button.attr("aria-pressed", _layer.enabled()); + } + return function(selection2) { + if (!navigator.geolocation || !navigator.geolocation.getCurrentPosition) return; + _button = selection2.append("button").on("click", click).attr("aria-pressed", false).call(svgIcon("#iD-icon-geolocate", "light")).call( + uiTooltip().placement(_mainLocalizer.textDirection() === "rtl" ? "right" : "left").title(() => _t.append("geolocate.title")).keys([_t("geolocate.key")]) ); - context.map().on("drawn.intro", function() { - reveal( - ".surface", - helpHtml("intro.navigation.features"), - { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: onClick } - ); + context.keybinding().on(_t("geolocate.key"), click); + }; + } + + // modules/ui/panels/background.js + function uiPanelBackground(context) { + var background = context.background(); + var _currSourceName = null; + var _metadata = {}; + var _metadataKeys = [ + "zoom", + "vintage", + "source", + "description", + "resolution", + "accuracy" + ]; + var debouncedRedraw = debounce_default(redraw, 250); + function redraw(selection2) { + var source = background.baseLayerSource(); + if (!source) return; + var isDG = source.id.match(/^DigitalGlobe/i) !== null; + var sourceLabel = source.label(); + if (_currSourceName !== sourceLabel) { + _currSourceName = sourceLabel; + _metadata = {}; + } + selection2.text(""); + var list2 = selection2.append("ul").attr("class", "background-info"); + list2.append("li").call(_currSourceName); + _metadataKeys.forEach(function(k2) { + if (isDG && k2 === "vintage") return; + list2.append("li").attr("class", "background-info-list-" + k2).classed("hide", !_metadata[k2]).call(_t.append("info_panels.background." + k2, { suffix: ":" })).append("span").attr("class", "background-info-span-" + k2).text(_metadata[k2]); }); - function continueTo(nextStep) { - context.map().on("drawn.intro", null); - nextStep(); + debouncedGetMetadata(selection2); + var toggleTiles = context.getDebug("tile") ? "hide_tiles" : "show_tiles"; + selection2.append("a").call(_t.append("info_panels.background." + toggleTiles)).attr("href", "#").attr("class", "button button-toggle-tiles").on("click", function(d3_event) { + d3_event.preventDefault(); + context.setDebug("tile", !context.getDebug("tile")); + selection2.call(redraw); + }); + if (isDG) { + var key = source.id + "-vintage"; + var sourceVintage = context.background().findSource(key); + var showsVintage = context.background().showsLayer(sourceVintage); + var toggleVintage = showsVintage ? "hide_vintage" : "show_vintage"; + selection2.append("a").call(_t.append("info_panels.background." + toggleVintage)).attr("href", "#").attr("class", "button button-toggle-vintage").on("click", function(d3_event) { + d3_event.preventDefault(); + context.background().toggleOverlayLayer(sourceVintage); + selection2.call(redraw); + }); } + ["DigitalGlobe-Premium", "DigitalGlobe-Standard"].forEach(function(layerId) { + if (source.id !== layerId) { + var key2 = layerId + "-vintage"; + var sourceVintage2 = context.background().findSource(key2); + if (context.background().showsLayer(sourceVintage2)) { + context.background().toggleOverlayLayer(sourceVintage2); + } + } + }); } - function pointsLinesAreas() { - var onClick = function() { - continueTo(nodesWays); - }; - reveal( - ".surface", - helpHtml("intro.navigation.points_lines_areas"), - { buttonText: _t.html("intro.ok"), buttonCallback: onClick } - ); - context.map().on("drawn.intro", function() { - reveal( - ".surface", - helpHtml("intro.navigation.points_lines_areas"), - { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: onClick } - ); + var debouncedGetMetadata = debounce_default(getMetadata, 250); + function getMetadata(selection2) { + var tile = context.container().select(".layer-background img.tile-center"); + if (tile.empty()) return; + var sourceName = _currSourceName; + var d2 = tile.datum(); + var zoom = d2 && d2.length >= 3 && d2[2] || Math.floor(context.map().zoom()); + var center = context.map().center(); + _metadata.zoom = String(zoom); + selection2.selectAll(".background-info-list-zoom").classed("hide", false).selectAll(".background-info-span-zoom").text(_metadata.zoom); + if (!d2 || !d2.length >= 3) return; + background.baseLayerSource().getMetadata(center, d2, function(err, result) { + if (err || _currSourceName !== sourceName) return; + var vintage = result.vintage; + _metadata.vintage = vintage && vintage.range || _t("info_panels.background.unknown"); + selection2.selectAll(".background-info-list-vintage").classed("hide", false).selectAll(".background-info-span-vintage").text(_metadata.vintage); + _metadataKeys.forEach(function(k2) { + if (k2 === "zoom" || k2 === "vintage") return; + var val = result[k2]; + _metadata[k2] = val; + selection2.selectAll(".background-info-list-" + k2).classed("hide", !val).selectAll(".background-info-span-" + k2).text(val); + }); }); - function continueTo(nextStep) { - context.map().on("drawn.intro", null); - nextStep(); - } } - function nodesWays() { - var onClick = function() { - continueTo(clickTownHall); - }; - reveal( - ".surface", - helpHtml("intro.navigation.nodes_ways"), - { buttonText: _t.html("intro.ok"), buttonCallback: onClick } - ); - context.map().on("drawn.intro", function() { - reveal( - ".surface", - helpHtml("intro.navigation.nodes_ways"), - { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: onClick } - ); + var panel = function(selection2) { + selection2.call(redraw); + context.map().on("drawn.info-background", function() { + selection2.call(debouncedRedraw); + }).on("move.info-background", function() { + selection2.call(debouncedGetMetadata); }); - function continueTo(nextStep) { - context.map().on("drawn.intro", null); - nextStep(); + }; + panel.off = function() { + context.map().on("drawn.info-background", null).on("move.info-background", null); + }; + panel.id = "background"; + panel.label = _t.append("info_panels.background.title"); + panel.key = _t("info_panels.background.key"); + return panel; + } + + // modules/ui/panels/history.js + function uiPanelHistory(context) { + var osm; + function displayTimestamp(timestamp) { + if (!timestamp) return _t("info_panels.history.unknown"); + var options2 = { + day: "numeric", + month: "short", + year: "numeric", + hour: "numeric", + minute: "numeric", + second: "numeric" + }; + var d2 = new Date(timestamp); + if (isNaN(d2.getTime())) return _t("info_panels.history.unknown"); + return d2.toLocaleString(_mainLocalizer.localeCode(), options2); + } + function displayUser(selection2, userName) { + if (!userName) { + selection2.append("span").call(_t.append("info_panels.history.unknown")); + return; } + selection2.append("span").attr("class", "user-name").text(userName); + var links = selection2.append("div").attr("class", "links"); + if (osm) { + links.append("a").attr("class", "user-osm-link").attr("href", osm.userURL(userName)).attr("target", "_blank").call(_t.append("info_panels.history.profile_link")); + } + links.append("a").attr("class", "user-hdyc-link").attr("href", "https://hdyc.neis-one.org/?" + userName).attr("target", "_blank").attr("tabindex", -1).text("HDYC"); } - function clickTownHall() { - context.enter(modeBrowse(context)); - context.history().reset("initial"); - var entity = context.hasEntity(hallId); - if (!entity) + function displayChangeset(selection2, changeset) { + if (!changeset) { + selection2.append("span").call(_t.append("info_panels.history.unknown")); return; - reveal(null, null, { duration: 0 }); - context.map().centerZoomEase(entity.loc, 19, 500); - timeout2(function() { - var entity2 = context.hasEntity(hallId); - if (!entity2) - return; - var box = pointBox(entity2.loc, context); - var textId = context.lastPointerType() === "mouse" ? "click_townhall" : "tap_townhall"; - reveal(box, helpHtml("intro.navigation." + textId)); - context.map().on("move.intro drawn.intro", function() { - var entity3 = context.hasEntity(hallId); - if (!entity3) - return; - var box2 = pointBox(entity3.loc, context); - reveal(box2, helpHtml("intro.navigation." + textId), { duration: 0 }); - }); - context.on("enter.intro", function() { - if (isTownHallSelected()) - continueTo(selectedTownHall); - }); - }, 550); - context.history().on("change.intro", function() { - if (!context.hasEntity(hallId)) { - continueTo(clickTownHall); - } - }); - function continueTo(nextStep) { - context.on("enter.intro", null); - context.map().on("move.intro drawn.intro", null); - context.history().on("change.intro", null); - nextStep(); - } - } - function selectedTownHall() { - if (!isTownHallSelected()) - return clickTownHall(); - var entity = context.hasEntity(hallId); - if (!entity) - return clickTownHall(); - var box = pointBox(entity.loc, context); - var onClick = function() { - continueTo(editorTownHall); - }; - reveal( - box, - helpHtml("intro.navigation.selected_townhall"), - { buttonText: _t.html("intro.ok"), buttonCallback: onClick } - ); - context.map().on("move.intro drawn.intro", function() { - var entity2 = context.hasEntity(hallId); - if (!entity2) - return; - var box2 = pointBox(entity2.loc, context); - reveal( - box2, - helpHtml("intro.navigation.selected_townhall"), - { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: onClick } - ); - }); - context.history().on("change.intro", function() { - if (!context.hasEntity(hallId)) { - continueTo(clickTownHall); - } - }); - function continueTo(nextStep) { - context.map().on("move.intro drawn.intro", null); - context.history().on("change.intro", null); - nextStep(); } - } - function editorTownHall() { - if (!isTownHallSelected()) - return clickTownHall(); - context.container().select(".inspector-wrap").on("wheel.intro", eventCancel); - var onClick = function() { - continueTo(presetTownHall); - }; - reveal( - ".entity-editor-pane", - helpHtml("intro.navigation.editor_townhall"), - { buttonText: _t.html("intro.ok"), buttonCallback: onClick } - ); - context.on("exit.intro", function() { - continueTo(clickTownHall); - }); - context.history().on("change.intro", function() { - if (!context.hasEntity(hallId)) { - continueTo(clickTownHall); - } - }); - function continueTo(nextStep) { - context.on("exit.intro", null); - context.history().on("change.intro", null); - context.container().select(".inspector-wrap").on("wheel.intro", null); - nextStep(); + selection2.append("span").attr("class", "changeset-id").text(changeset); + var links = selection2.append("div").attr("class", "links"); + if (osm) { + links.append("a").attr("class", "changeset-osm-link").attr("href", osm.changesetURL(changeset)).attr("target", "_blank").call(_t.append("info_panels.history.changeset_link")); } + links.append("a").attr("class", "changeset-osmcha-link").attr("href", "https://osmcha.org/changesets/" + changeset).attr("target", "_blank").text("OSMCha"); + links.append("a").attr("class", "changeset-achavi-link").attr("href", "https://overpass-api.de/achavi/?changeset=" + changeset).attr("target", "_blank").text("Achavi"); } - function presetTownHall() { - if (!isTownHallSelected()) - return clickTownHall(); - context.container().select(".inspector-wrap .panewrap").style("right", "0%"); - context.container().select(".inspector-wrap").on("wheel.intro", eventCancel); - var entity = context.entity(context.selectedIDs()[0]); - var preset = _mainPresetIndex.match(entity, context.graph()); - var onClick = function() { - continueTo(fieldsTownHall); - }; - reveal( - ".entity-editor-pane .section-feature-type", - helpHtml("intro.navigation.preset_townhall", { preset: preset.name() }), - { buttonText: _t.html("intro.ok"), buttonCallback: onClick } - ); - context.on("exit.intro", function() { - continueTo(clickTownHall); - }); - context.history().on("change.intro", function() { - if (!context.hasEntity(hallId)) { - continueTo(clickTownHall); + function redraw(selection2) { + var selectedNoteID = context.selectedNoteID(); + osm = context.connection(); + var selected, note, entity; + if (selectedNoteID && osm) { + selected = [_t.html("note.note") + " " + selectedNoteID]; + note = osm.getNote(selectedNoteID); + } else { + selected = context.selectedIDs().filter(function(e3) { + return context.hasEntity(e3); + }); + if (selected.length) { + entity = context.entity(selected[0]); } - }); - function continueTo(nextStep) { - context.on("exit.intro", null); - context.history().on("change.intro", null); - context.container().select(".inspector-wrap").on("wheel.intro", null); - nextStep(); } - } - function fieldsTownHall() { - if (!isTownHallSelected()) - return clickTownHall(); - context.container().select(".inspector-wrap .panewrap").style("right", "0%"); - context.container().select(".inspector-wrap").on("wheel.intro", eventCancel); - var onClick = function() { - continueTo(closeTownHall); - }; - reveal( - ".entity-editor-pane .section-preset-fields", - helpHtml("intro.navigation.fields_townhall"), - { buttonText: _t.html("intro.ok"), buttonCallback: onClick } - ); - context.on("exit.intro", function() { - continueTo(clickTownHall); - }); - context.history().on("change.intro", function() { - if (!context.hasEntity(hallId)) { - continueTo(clickTownHall); - } - }); - function continueTo(nextStep) { - context.on("exit.intro", null); - context.history().on("change.intro", null); - context.container().select(".inspector-wrap").on("wheel.intro", null); - nextStep(); + var singular = selected.length === 1 ? selected[0] : null; + selection2.html(""); + if (singular) { + selection2.append("h4").attr("class", "history-heading").html(singular); + } else { + selection2.append("h4").attr("class", "history-heading").call(_t.append("info_panels.selected", { n: selected.length })); } - } - function closeTownHall() { - if (!isTownHallSelected()) - return clickTownHall(); - var selector = ".entity-editor-pane button.close svg use"; - var href = select_default2(selector).attr("href") || "#iD-icon-close"; - reveal( - ".entity-editor-pane", - helpHtml("intro.navigation.close_townhall", { button: { html: icon(href, "inline") } }) - ); - context.on("exit.intro", function() { - continueTo(searchStreet); - }); - context.history().on("change.intro", function() { - var selector2 = ".entity-editor-pane button.close svg use"; - var href2 = select_default2(selector2).attr("href") || "#iD-icon-close"; - reveal( - ".entity-editor-pane", - helpHtml("intro.navigation.close_townhall", { button: { html: icon(href2, "inline") } }), - { duration: 0 } - ); - }); - function continueTo(nextStep) { - context.on("exit.intro", null); - context.history().on("change.intro", null); - nextStep(); + if (!singular) return; + if (entity) { + selection2.call(redrawEntity, entity); + } else if (note) { + selection2.call(redrawNote, note); } } - function searchStreet() { - context.enter(modeBrowse(context)); - context.history().reset("initial"); - var msec = transitionTime(springStreet, context.map().center()); - if (msec) { - reveal(null, null, { duration: 0 }); + function redrawNote(selection2, note) { + if (!note || note.isNew()) { + selection2.append("div").call(_t.append("info_panels.history.note_no_history")); + return; } - context.map().centerZoomEase(springStreet, 19, msec); - timeout2(function() { - reveal( - ".search-header input", - helpHtml("intro.navigation.search_street", { name: _t("intro.graph.name.spring-street") }) - ); - context.container().select(".search-header input").on("keyup.intro", checkSearchResult); - }, msec + 100); - } - function checkSearchResult() { - var first = context.container().select(".feature-list-item:nth-child(0n+2)"); - var firstName = first.select(".entity-name"); - var name = _t("intro.graph.name.spring-street"); - if (!firstName.empty() && firstName.html() === name) { - reveal( - first.node(), - helpHtml("intro.navigation.choose_street", { name }), - { duration: 300 } - ); - context.on("exit.intro", function() { - continueTo(selectedStreet); - }); - context.container().select(".search-header input").on("keydown.intro", eventCancel, true).on("keyup.intro", null); + var list2 = selection2.append("ul"); + list2.append("li").call(_t.append("info_panels.history.note_comments", { suffix: ":" })).append("span").text(note.comments.length); + if (note.comments.length) { + list2.append("li").call(_t.append("info_panels.history.note_created_date", { suffix: ":" })).append("span").text(displayTimestamp(note.comments[0].date)); + list2.append("li").call(_t.append("info_panels.history.note_created_user", { suffix: ":" })).call(displayUser, note.comments[0].user); } - function continueTo(nextStep) { - context.on("exit.intro", null); - context.container().select(".search-header input").on("keydown.intro", null).on("keyup.intro", null); - nextStep(); + if (osm) { + selection2.append("a").attr("class", "view-history-on-osm").attr("target", "_blank").attr("href", osm.noteURL(note)).call(svgIcon("#iD-icon-out-link", "inline")).append("span").call(_t.append("info_panels.history.note_link_text")); } } - function selectedStreet() { - if (!context.hasEntity(springStreetEndId) || !context.hasEntity(springStreetId)) { - return searchStreet(); + function redrawEntity(selection2, entity) { + if (!entity || entity.isNew()) { + selection2.append("div").call(_t.append("info_panels.history.no_history")); + return; } - var onClick = function() { - continueTo(editorStreet); - }; - var entity = context.entity(springStreetEndId); - var box = pointBox(entity.loc, context); - box.height = 500; - reveal( - box, - helpHtml("intro.navigation.selected_street", { name: _t("intro.graph.name.spring-street") }), - { duration: 600, buttonText: _t.html("intro.ok"), buttonCallback: onClick } - ); - timeout2(function() { - context.map().on("move.intro drawn.intro", function() { - var entity2 = context.hasEntity(springStreetEndId); - if (!entity2) - return; - var box2 = pointBox(entity2.loc, context); - box2.height = 500; - reveal( - box2, - helpHtml("intro.navigation.selected_street", { name: _t("intro.graph.name.spring-street") }), - { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: onClick } - ); - }); - }, 600); - context.on("enter.intro", function(mode) { - if (!context.hasEntity(springStreetId)) { - return continueTo(searchStreet); - } - var ids = context.selectedIDs(); - if (mode.id !== "select" || !ids.length || ids[0] !== springStreetId) { - context.enter(modeSelect(context, [springStreetId])); - } - }); - context.history().on("change.intro", function() { - if (!context.hasEntity(springStreetEndId) || !context.hasEntity(springStreetId)) { - timeout2(function() { - continueTo(searchStreet); - }, 300); - } - }); - function continueTo(nextStep) { - context.map().on("move.intro drawn.intro", null); - context.on("enter.intro", null); - context.history().on("change.intro", null); - nextStep(); + var links = selection2.append("div").attr("class", "links"); + if (osm) { + links.append("a").attr("class", "view-history-on-osm").attr("href", osm.historyURL(entity)).attr("target", "_blank").call(_t.append("info_panels.history.history_link")); } + links.append("a").attr("class", "pewu-history-viewer-link").attr("href", "https://pewu.github.io/osm-history/#/" + entity.type + "/" + entity.osmId()).attr("target", "_blank").attr("tabindex", -1).text("PeWu"); + var list2 = selection2.append("ul"); + list2.append("li").call(_t.append("info_panels.history.version", { suffix: ":" })).append("span").text(entity.version); + list2.append("li").call(_t.append("info_panels.history.last_edit", { suffix: ":" })).append("span").text(displayTimestamp(entity.timestamp)); + list2.append("li").call(_t.append("info_panels.history.edited_by", { suffix: ":" })).call(displayUser, entity.user); + list2.append("li").call(_t.append("info_panels.history.changeset", { suffix: ":" })).call(displayChangeset, entity.changeset); } - function editorStreet() { - var selector = ".entity-editor-pane button.close svg use"; - var href = select_default2(selector).attr("href") || "#iD-icon-close"; - reveal(".entity-editor-pane", helpHtml("intro.navigation.street_different_fields") + "{br}" + helpHtml("intro.navigation.editor_street", { - button: { html: icon(href, "inline") }, - field1: onewayField.title(), - field2: maxspeedField.title() - })); - context.on("exit.intro", function() { - continueTo(play); + var panel = function(selection2) { + selection2.call(redraw); + context.map().on("drawn.info-history", function() { + selection2.call(redraw); }); - context.history().on("change.intro", function() { - var selector2 = ".entity-editor-pane button.close svg use"; - var href2 = select_default2(selector2).attr("href") || "#iD-icon-close"; - reveal( - ".entity-editor-pane", - helpHtml("intro.navigation.street_different_fields") + "{br}" + helpHtml("intro.navigation.editor_street", { - button: { html: icon(href2, "inline") }, - field1: onewayField.title(), - field2: maxspeedField.title() - }), - { duration: 0 } - ); + context.on("enter.info-history", function() { + selection2.call(redraw); }); - function continueTo(nextStep) { - context.on("exit.intro", null); - context.history().on("change.intro", null); - nextStep(); + }; + panel.off = function() { + context.map().on("drawn.info-history", null); + context.on("enter.info-history", null); + }; + panel.id = "history"; + panel.label = _t.append("info_panels.history.title"); + panel.key = _t("info_panels.history.key"); + return panel; + } + + // modules/ui/panels/location.js + function uiPanelLocation(context) { + var currLocation = ""; + function redraw(selection2) { + selection2.html(""); + var list2 = selection2.append("ul"); + var coord2 = context.map().mouseCoordinates(); + if (coord2.some(isNaN)) { + coord2 = context.map().center(); } + list2.append("li").text(dmsCoordinatePair(coord2)).append("li").text(decimalCoordinatePair(coord2)); + selection2.append("div").attr("class", "location-info").text(currLocation || " "); + debouncedGetLocation(selection2, coord2); } - function play() { - dispatch10.call("done"); - reveal( - ".ideditor", - helpHtml("intro.navigation.play", { next: _t("intro.points.title") }), - { - tooltipBox: ".intro-nav-wrap .chapter-point", - buttonText: _t.html("intro.ok"), - buttonCallback: function() { - reveal(".ideditor"); - } - } - ); + var debouncedGetLocation = debounce_default(getLocation, 250); + function getLocation(selection2, coord2) { + if (!services.geocoder) { + currLocation = _t("info_panels.location.unknown_location"); + selection2.selectAll(".location-info").text(currLocation); + } else { + services.geocoder.reverse(coord2, function(err, result) { + currLocation = result ? result.display_name : _t("info_panels.location.unknown_location"); + selection2.selectAll(".location-info").text(currLocation); + }); + } } - chapter.enter = function() { - dragMap(); - }; - chapter.exit = function() { - timeouts.forEach(window.clearTimeout); - context.on("enter.intro exit.intro", null); - context.map().on("move.intro drawn.intro", null); - context.history().on("change.intro", null); - context.container().select(".inspector-wrap").on("wheel.intro", null); - context.container().select(".search-header input").on("keydown.intro keyup.intro", null); + var panel = function(selection2) { + selection2.call(redraw); + context.surface().on(("PointerEvent" in window ? "pointer" : "mouse") + "move.info-location", function() { + selection2.call(redraw); + }); }; - chapter.restart = function() { - chapter.exit(); - chapter.enter(); + panel.off = function() { + context.surface().on(".info-location", null); }; - return utilRebind(chapter, dispatch10, "on"); + panel.id = "location"; + panel.label = _t.append("info_panels.location.title"); + panel.key = _t("info_panels.location.key"); + return panel; } - // modules/ui/intro/point.js - function uiIntroPoint(context, reveal) { - var dispatch10 = dispatch_default("done"); - var timeouts = []; - var intersection = [-85.63279, 41.94394]; - var building = [-85.632422, 41.944045]; - var cafePreset = _mainPresetIndex.item("amenity/cafe"); - var _pointID = null; - var chapter = { - title: "intro.points.title" - }; - function timeout2(f2, t) { - timeouts.push(window.setTimeout(f2, t)); + // modules/ui/panels/measurement.js + function uiPanelMeasurement(context) { + function radiansToMeters(r2) { + return r2 * 63710071809e-4; } - function eventCancel(d3_event) { - d3_event.stopPropagation(); - d3_event.preventDefault(); + function steradiansToSqmeters(r2) { + return r2 / (4 * Math.PI) * 510065621724e3; } - function addPoint() { - context.enter(modeBrowse(context)); - context.history().reset("initial"); - var msec = transitionTime(intersection, context.map().center()); - if (msec) { - reveal(null, null, { duration: 0 }); + function toLineString(feature3) { + if (feature3.type === "LineString") return feature3; + var result = { type: "LineString", coordinates: [] }; + if (feature3.type === "Polygon") { + result.coordinates = feature3.coordinates[0]; + } else if (feature3.type === "MultiPolygon") { + result.coordinates = feature3.coordinates[0][0]; } - context.map().centerZoomEase(intersection, 19, msec); - timeout2(function() { - var tooltip = reveal( - "button.add-point", - helpHtml("intro.points.points_info") + "{br}" + helpHtml("intro.points.add_point") - ); - _pointID = null; - tooltip.selectAll(".popover-inner").insert("svg", "span").attr("class", "tooltip-illustration").append("use").attr("xlink:href", "#iD-graphic-points"); - context.on("enter.intro", function(mode) { - if (mode.id !== "add-point") - return; - continueTo(placePoint); + return result; + } + var _isImperial = !_mainLocalizer.usesMetric(); + function redraw(selection2) { + var graph = context.graph(); + var selectedNoteID = context.selectedNoteID(); + var osm = services.osm; + var localeCode = _mainLocalizer.localeCode(); + var heading2; + var center, location, centroid; + var closed, geometry; + var totalNodeCount, length2 = 0, area = 0, distance; + if (selectedNoteID && osm) { + var note = osm.getNote(selectedNoteID); + heading2 = _t.html("note.note") + " " + selectedNoteID; + location = note.loc; + geometry = "note"; + } else { + var selectedIDs = context.selectedIDs().filter(function(id2) { + return context.hasEntity(id2); }); - }, msec + 100); - function continueTo(nextStep) { - context.on("enter.intro", null); - nextStep(); + var selected = selectedIDs.map(function(id2) { + return context.entity(id2); + }); + heading2 = selected.length === 1 ? selected[0].id : _t.html("info_panels.selected", { n: selected.length }); + if (selected.length) { + var extent = geoExtent(); + for (var i3 in selected) { + var entity = selected[i3]; + extent._extend(entity.extent(graph)); + geometry = entity.geometry(graph); + if (geometry === "line" || geometry === "area") { + closed = entity.type === "relation" || entity.isClosed() && !entity.isDegenerate(); + var feature3 = entity.asGeoJSON(graph); + length2 += radiansToMeters(length_default(toLineString(feature3))); + centroid = path_default(context.projection).centroid(entity.asGeoJSON(graph)); + centroid = centroid && context.projection.invert(centroid); + if (!centroid || !isFinite(centroid[0]) || !isFinite(centroid[1])) { + centroid = entity.extent(graph).center(); + } + if (closed) { + area += steradiansToSqmeters(entity.area(graph)); + } + } + } + if (selected.length > 1) { + geometry = null; + closed = null; + centroid = null; + } + if (selected.length === 2 && selected[0].type === "node" && selected[1].type === "node") { + distance = geoSphericalDistance(selected[0].loc, selected[1].loc); + } + if (selected.length === 1 && selected[0].type === "node") { + location = selected[0].loc; + } else { + totalNodeCount = utilGetAllNodes(selectedIDs, context.graph()).length; + } + if (!location && !centroid) { + center = extent.center(); + } + } } - } - function placePoint() { - if (context.mode().id !== "add-point") { - return chapter.restart(); + selection2.html(""); + if (heading2) { + selection2.append("h4").attr("class", "measurement-heading").html(heading2); } - var pointBox2 = pad(building, 150, context); - var textId = context.lastPointerType() === "mouse" ? "place_point" : "place_point_touch"; - reveal(pointBox2, helpHtml("intro.points." + textId)); - context.map().on("move.intro drawn.intro", function() { - pointBox2 = pad(building, 150, context); - reveal(pointBox2, helpHtml("intro.points." + textId), { duration: 0 }); - }); - context.on("enter.intro", function(mode) { - if (mode.id !== "select") - return chapter.restart(); - _pointID = context.mode().selectedIDs()[0]; - continueTo(searchPreset); - }); - function continueTo(nextStep) { - context.map().on("move.intro drawn.intro", null); - context.on("enter.intro", null); - nextStep(); + var list2 = selection2.append("ul"); + var coordItem; + if (geometry) { + list2.append("li").call(_t.append("info_panels.measurement.geometry", { suffix: ":" })).append("span").html( + closed ? _t.html("info_panels.measurement.closed_" + geometry) : _t.html("geometry." + geometry) + ); } - } - function searchPreset() { - if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) { - return addPoint(); + if (totalNodeCount) { + list2.append("li").call(_t.append("info_panels.measurement.node_count", { suffix: ":" })).append("span").text(totalNodeCount.toLocaleString(localeCode)); } - context.container().select(".inspector-wrap").on("wheel.intro", eventCancel); - context.container().select(".preset-search-input").on("keydown.intro", null).on("keyup.intro", checkPresetSearch); - reveal( - ".preset-search-input", - helpHtml("intro.points.search_cafe", { preset: cafePreset.name() }) - ); - context.on("enter.intro", function(mode) { - if (!_pointID || !context.hasEntity(_pointID)) { - return continueTo(addPoint); - } - var ids = context.selectedIDs(); - if (mode.id !== "select" || !ids.length || ids[0] !== _pointID) { - context.enter(modeSelect(context, [_pointID])); - context.container().select(".inspector-wrap").on("wheel.intro", eventCancel); - context.container().select(".preset-search-input").on("keydown.intro", null).on("keyup.intro", checkPresetSearch); - reveal( - ".preset-search-input", - helpHtml("intro.points.search_cafe", { preset: cafePreset.name() }) - ); - context.history().on("change.intro", null); - } - }); - function checkPresetSearch() { - var first = context.container().select(".preset-list-item:first-child"); - if (first.classed("preset-amenity-cafe")) { - context.container().select(".preset-search-input").on("keydown.intro", eventCancel, true).on("keyup.intro", null); - reveal( - first.select(".preset-list-button").node(), - helpHtml("intro.points.choose_cafe", { preset: cafePreset.name() }), - { duration: 300 } - ); - context.history().on("change.intro", function() { - continueTo(aboutFeatureEditor); - }); - } + if (area) { + list2.append("li").call(_t.append("info_panels.measurement.area", { suffix: ":" })).append("span").text(displayArea(area, _isImperial)); } - function continueTo(nextStep) { - context.on("enter.intro", null); - context.history().on("change.intro", null); - context.container().select(".inspector-wrap").on("wheel.intro", null); - context.container().select(".preset-search-input").on("keydown.intro keyup.intro", null); - nextStep(); + if (length2) { + list2.append("li").call(_t.append("info_panels.measurement." + (closed ? "perimeter" : "length"), { suffix: ":" })).append("span").text(displayLength(length2, _isImperial)); + } + if (typeof distance === "number") { + list2.append("li").call(_t.append("info_panels.measurement.distance", { suffix: ":" })).append("span").text(displayLength(distance, _isImperial)); + } + if (location) { + coordItem = list2.append("li").call(_t.append("info_panels.measurement.location", { suffix: ":" })); + coordItem.append("span").text(dmsCoordinatePair(location)); + coordItem.append("span").text(decimalCoordinatePair(location)); + } + if (centroid) { + coordItem = list2.append("li").call(_t.append("info_panels.measurement.centroid", { suffix: ":" })); + coordItem.append("span").text(dmsCoordinatePair(centroid)); + coordItem.append("span").text(decimalCoordinatePair(centroid)); + } + if (center) { + coordItem = list2.append("li").call(_t.append("info_panels.measurement.center", { suffix: ":" })); + coordItem.append("span").text(dmsCoordinatePair(center)); + coordItem.append("span").text(decimalCoordinatePair(center)); + } + if (length2 || area || typeof distance === "number") { + var toggle = _isImperial ? "imperial" : "metric"; + selection2.append("a").call(_t.append("info_panels.measurement." + toggle)).attr("href", "#").attr("class", "button button-toggle-units").on("click", function(d3_event) { + d3_event.preventDefault(); + _isImperial = !_isImperial; + selection2.call(redraw); + }); } } - function aboutFeatureEditor() { - if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) { - return addPoint(); + var panel = function(selection2) { + selection2.call(redraw); + context.map().on("drawn.info-measurement", function() { + selection2.call(redraw); + }); + context.on("enter.info-measurement", function() { + selection2.call(redraw); + }); + }; + panel.off = function() { + context.map().on("drawn.info-measurement", null); + context.on("enter.info-measurement", null); + }; + panel.id = "measurement"; + panel.label = _t.append("info_panels.measurement.title"); + panel.key = _t("info_panels.measurement.key"); + return panel; + } + + // modules/ui/panels/index.js + var uiInfoPanels = { + background: uiPanelBackground, + history: uiPanelHistory, + location: uiPanelLocation, + measurement: uiPanelMeasurement + }; + + // modules/ui/info.js + function uiInfo(context) { + var ids = Object.keys(uiInfoPanels); + var wasActive = ["measurement"]; + var panels = {}; + var active = {}; + ids.forEach(function(k2) { + if (!panels[k2]) { + panels[k2] = uiInfoPanels[k2](context); + active[k2] = false; } - timeout2(function() { - reveal(".entity-editor-pane", helpHtml("intro.points.feature_editor"), { - tooltipClass: "intro-points-describe", - buttonText: _t.html("intro.ok"), - buttonCallback: function() { - continueTo(addName); + }); + function info(selection2) { + function redraw() { + var activeids = ids.filter(function(k2) { + return active[k2]; + }).sort(); + var containers = infoPanels.selectAll(".panel-container").data(activeids, function(k2) { + return k2; + }); + containers.exit().style("opacity", 1).transition().duration(200).style("opacity", 0).on("end", function(d2) { + select_default2(this).call(panels[d2].off).remove(); + }); + var enter = containers.enter().append("div").attr("class", function(d2) { + return "fillD2 panel-container panel-container-" + d2; + }); + enter.style("opacity", 0).transition().duration(200).style("opacity", 1); + var title = enter.append("div").attr("class", "panel-title fillD2"); + title.append("h3").each(function(d2) { + return panels[d2].label(select_default2(this)); + }); + title.append("button").attr("class", "close").attr("title", _t("icons.close")).on("click", function(d3_event, d2) { + d3_event.stopImmediatePropagation(); + d3_event.preventDefault(); + info.toggle(d2); + }).call(svgIcon("#iD-icon-close")); + enter.append("div").attr("class", function(d2) { + return "panel-content panel-content-" + d2; + }); + infoPanels.selectAll(".panel-content").each(function(d2) { + select_default2(this).call(panels[d2]); + }); + } + info.toggle = function(which) { + var activeids = ids.filter(function(k2) { + return active[k2]; + }); + if (which) { + active[which] = !active[which]; + if (activeids.length === 1 && activeids[0] === which) { + wasActive = [which]; + } + context.container().select("." + which + "-panel-toggle-item").classed("active", active[which]).select("input").property("checked", active[which]); + } else { + if (activeids.length) { + wasActive = activeids; + activeids.forEach(function(k2) { + active[k2] = false; + }); + } else { + wasActive.forEach(function(k2) { + active[k2] = true; + }); } + } + redraw(); + }; + var infoPanels = selection2.selectAll(".info-panels").data([0]); + infoPanels = infoPanels.enter().append("div").attr("class", "info-panels").merge(infoPanels); + redraw(); + context.keybinding().on(uiCmd("\u2318" + _t("info_panels.key")), function(d3_event) { + d3_event.stopImmediatePropagation(); + d3_event.preventDefault(); + info.toggle(); + }); + ids.forEach(function(k2) { + var key = _t("info_panels." + k2 + ".key", { default: null }); + if (!key) return; + context.keybinding().on(uiCmd("\u2318\u21E7" + key), function(d3_event) { + d3_event.stopImmediatePropagation(); + d3_event.preventDefault(); + info.toggle(k2); }); - }, 400); - context.on("exit.intro", function() { - continueTo(reselectPoint); }); - function continueTo(nextStep) { - context.on("exit.intro", null); - nextStep(); + } + return info; + } + + // modules/ui/toggle.js + function uiToggle(show, callback) { + return function(selection2) { + selection2.style("opacity", show ? 0 : 1).classed("hide", false).transition().style("opacity", show ? 1 : 0).on("end", function() { + select_default2(this).classed("hide", !show).style("opacity", null); + if (callback) callback.apply(this); + }); + }; + } + + // modules/ui/curtain.js + function uiCurtain(containerNode) { + var surface = select_default2(null), tooltip = select_default2(null), darkness = select_default2(null); + function curtain(selection2) { + surface = selection2.append("svg").attr("class", "curtain").style("top", 0).style("left", 0); + darkness = surface.append("path").attr("x", 0).attr("y", 0).attr("class", "curtain-darkness"); + select_default2(window).on("resize.curtain", resize); + tooltip = selection2.append("div").attr("class", "tooltip"); + tooltip.append("div").attr("class", "popover-arrow"); + tooltip.append("div").attr("class", "popover-inner"); + resize(); + function resize() { + surface.attr("width", containerNode.clientWidth).attr("height", containerNode.clientHeight); + curtain.cut(darkness.datum()); } } - function addName() { - if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) { - return addPoint(); + curtain.reveal = function(box, html3, options2) { + options2 = options2 || {}; + if (typeof box === "string") { + box = select_default2(box).node(); } - context.container().select(".inspector-wrap .panewrap").style("right", "0%"); - var addNameString = helpHtml("intro.points.fields_info") + "{br}" + helpHtml("intro.points.add_name"); - timeout2(function() { - var entity = context.entity(_pointID); - if (entity.tags.name) { - var tooltip = reveal(".entity-editor-pane", addNameString, { - tooltipClass: "intro-points-describe", - buttonText: _t.html("intro.ok"), - buttonCallback: function() { - continueTo(addCloseEditor); - } + if (box && box.getBoundingClientRect) { + box = copyBox(box.getBoundingClientRect()); + var containerRect = containerNode.getBoundingClientRect(); + box.top -= containerRect.top; + box.left -= containerRect.left; + } + if (box && options2.padding) { + box.top -= options2.padding; + box.left -= options2.padding; + box.bottom += options2.padding; + box.right += options2.padding; + box.height += options2.padding * 2; + box.width += options2.padding * 2; + } + var tooltipBox; + if (options2.tooltipBox) { + tooltipBox = options2.tooltipBox; + if (typeof tooltipBox === "string") { + tooltipBox = select_default2(tooltipBox).node(); + } + if (tooltipBox && tooltipBox.getBoundingClientRect) { + tooltipBox = copyBox(tooltipBox.getBoundingClientRect()); + } + } else { + tooltipBox = box; + } + if (tooltipBox && html3) { + if (html3.indexOf("**") !== -1) { + if (html3.indexOf("
"); + if (options2.buttonText && options2.buttonCallback) { + html3 += '"; + } + var classes = "curtain-tooltip popover tooltip arrowed in " + (options2.tooltipClass || ""); + tooltip.classed(classes, true).selectAll(".popover-inner").html(html3); + if (options2.buttonText && options2.buttonCallback) { + var button = tooltip.selectAll(".button-section .button.action"); + button.on("click", function(d3_event) { + d3_event.preventDefault(); + options2.buttonCallback(); }); - tooltip.select(".instruction").style("display", "none"); + } + var tip = copyBox(tooltip.node().getBoundingClientRect()), w2 = containerNode.clientWidth, h2 = containerNode.clientHeight, tooltipWidth = 200, tooltipArrow = 5, side, pos; + if (options2.tooltipClass === "intro-mouse") { + tip.height += 80; + } + if (tooltipBox.top + tooltipBox.height > h2) { + tooltipBox.height -= tooltipBox.top + tooltipBox.height - h2; + } + if (tooltipBox.left + tooltipBox.width > w2) { + tooltipBox.width -= tooltipBox.left + tooltipBox.width - w2; + } + if (tooltipBox.top + tooltipBox.height < 100) { + side = "bottom"; + pos = [ + tooltipBox.left + tooltipBox.width / 2 - tip.width / 2, + tooltipBox.top + tooltipBox.height + ]; + } else if (tooltipBox.top > h2 - 140) { + side = "top"; + pos = [ + tooltipBox.left + tooltipBox.width / 2 - tip.width / 2, + tooltipBox.top - tip.height + ]; } else { - reveal( - ".entity-editor-pane", - addNameString, - { tooltipClass: "intro-points-describe" } - ); + var tipY = tooltipBox.top + tooltipBox.height / 2 - tip.height / 2; + if (_mainLocalizer.textDirection() === "rtl") { + if (tooltipBox.left - tooltipWidth - tooltipArrow < 70) { + side = "right"; + pos = [tooltipBox.left + tooltipBox.width + tooltipArrow, tipY]; + } else { + side = "left"; + pos = [tooltipBox.left - tooltipWidth - tooltipArrow, tipY]; + } + } else { + if (tooltipBox.left + tooltipBox.width + tooltipArrow + tooltipWidth > w2 - 70) { + side = "left"; + pos = [tooltipBox.left - tooltipWidth - tooltipArrow, tipY]; + } else { + side = "right"; + pos = [tooltipBox.left + tooltipBox.width + tooltipArrow, tipY]; + } + } } - }, 400); - context.history().on("change.intro", function() { - continueTo(addCloseEditor); - }); - context.on("exit.intro", function() { - continueTo(reselectPoint); - }); - function continueTo(nextStep) { - context.on("exit.intro", null); - context.history().on("change.intro", null); - nextStep(); + if (options2.duration !== 0 || !tooltip.classed(side)) { + tooltip.call(uiToggle(true)); + } + tooltip.style("top", pos[1] + "px").style("left", pos[0] + "px").attr("class", classes + " " + side); + var shiftY = 0; + if (side === "left" || side === "right") { + if (pos[1] < 60) { + shiftY = 60 - pos[1]; + } else if (pos[1] + tip.height > h2 - 100) { + shiftY = h2 - pos[1] - tip.height - 100; + } + } + tooltip.selectAll(".popover-inner").style("top", shiftY + "px"); + } else { + tooltip.classed("in", false).call(uiToggle(false)); } - } - function addCloseEditor() { - context.container().select(".inspector-wrap .panewrap").style("right", "0%"); - var selector = ".entity-editor-pane button.close svg use"; - var href = select_default2(selector).attr("href") || "#iD-icon-close"; - context.on("exit.intro", function() { - continueTo(reselectPoint); + curtain.cut(box, options2.duration); + return tooltip; + }; + curtain.cut = function(datum2, duration) { + darkness.datum(datum2).interrupt(); + var selection2; + if (duration === 0) { + selection2 = darkness; + } else { + selection2 = darkness.transition().duration(duration || 600).ease(linear2); + } + selection2.attr("d", function(d2) { + var containerWidth = containerNode.clientWidth; + var containerHeight = containerNode.clientHeight; + var string = "M 0,0 L 0," + containerHeight + " L " + containerWidth + "," + containerHeight + "L" + containerWidth + ",0 Z"; + if (!d2) return string; + return string + "M" + d2.left + "," + d2.top + "L" + d2.left + "," + (d2.top + d2.height) + "L" + (d2.left + d2.width) + "," + (d2.top + d2.height) + "L" + (d2.left + d2.width) + "," + d2.top + "Z"; }); + }; + curtain.remove = function() { + surface.remove(); + tooltip.remove(); + select_default2(window).on("resize.curtain", null); + }; + function copyBox(src) { + return { + top: src.top, + right: src.right, + bottom: src.bottom, + left: src.left, + width: src.width, + height: src.height + }; + } + return curtain; + } + + // modules/ui/intro/welcome.js + function uiIntroWelcome(context, reveal) { + var dispatch14 = dispatch_default("done"); + var chapter = { + title: "intro.welcome.title" + }; + function welcome() { + context.map().centerZoom([-85.63591, 41.94285], 19); reveal( - ".entity-editor-pane", - helpHtml("intro.points.add_close", { button: { html: icon(href, "inline") } }) + ".intro-nav-wrap .chapter-welcome", + helpHtml("intro.welcome.welcome"), + { buttonText: _t.html("intro.ok"), buttonCallback: practice } ); - function continueTo(nextStep) { - context.on("exit.intro", null); - nextStep(); - } } - function reselectPoint() { - if (!_pointID) - return chapter.restart(); - var entity = context.hasEntity(_pointID); - if (!entity) - return chapter.restart(); - var oldPreset = _mainPresetIndex.match(entity, context.graph()); - context.replace(actionChangePreset(_pointID, oldPreset, cafePreset)); + function practice() { + reveal( + ".intro-nav-wrap .chapter-welcome", + helpHtml("intro.welcome.practice"), + { buttonText: _t.html("intro.ok"), buttonCallback: words } + ); + } + function words() { + reveal( + ".intro-nav-wrap .chapter-welcome", + helpHtml("intro.welcome.words"), + { buttonText: _t.html("intro.ok"), buttonCallback: chapters } + ); + } + function chapters() { + dispatch14.call("done"); + reveal( + ".intro-nav-wrap .chapter-navigation", + helpHtml("intro.welcome.chapters", { next: _t("intro.navigation.title") }) + ); + } + chapter.enter = function() { + welcome(); + }; + chapter.exit = function() { + context.container().select(".curtain-tooltip.intro-mouse").selectAll(".counter").remove(); + }; + chapter.restart = function() { + chapter.exit(); + chapter.enter(); + }; + return utilRebind(chapter, dispatch14, "on"); + } + + // modules/ui/intro/navigation.js + function uiIntroNavigation(context, reveal) { + var dispatch14 = dispatch_default("done"); + var timeouts = []; + var hallId = "n2061"; + var townHall = [-85.63591, 41.94285]; + var springStreetId = "w397"; + var springStreetEndId = "n1834"; + var springStreet = [-85.63582, 41.94255]; + var onewayField = _mainPresetIndex.field("oneway"); + var maxspeedField = _mainPresetIndex.field("maxspeed"); + var chapter = { + title: "intro.navigation.title" + }; + function timeout2(f2, t2) { + timeouts.push(window.setTimeout(f2, t2)); + } + function eventCancel(d3_event) { + d3_event.stopPropagation(); + d3_event.preventDefault(); + } + function isTownHallSelected() { + var ids = context.selectedIDs(); + return ids.length === 1 && ids[0] === hallId; + } + function dragMap() { context.enter(modeBrowse(context)); - var msec = transitionTime(entity.loc, context.map().center()); + context.history().reset("initial"); + var msec = transitionTime(townHall, context.map().center()); if (msec) { reveal(null, null, { duration: 0 }); } - context.map().centerEase(entity.loc, msec); + context.map().centerZoomEase(townHall, 19, msec); timeout2(function() { - var box = pointBox(entity.loc, context); - reveal(box, helpHtml("intro.points.reselect"), { duration: 600 }); - timeout2(function() { - context.map().on("move.intro drawn.intro", function() { - var entity2 = context.hasEntity(_pointID); - if (!entity2) - return chapter.restart(); - var box2 = pointBox(entity2.loc, context); - reveal(box2, helpHtml("intro.points.reselect"), { duration: 0 }); - }); - }, 600); - context.on("enter.intro", function(mode) { - if (mode.id !== "select") - return; - continueTo(updatePoint); + var centerStart = context.map().center(); + var textId = context.lastPointerType() === "mouse" ? "drag" : "drag_touch"; + var dragString = helpHtml("intro.navigation.map_info") + "{br}" + helpHtml("intro.navigation." + textId); + reveal(".surface", dragString); + context.map().on("drawn.intro", function() { + reveal(".surface", dragString, { duration: 0 }); + }); + context.map().on("move.intro", function() { + var centerNow = context.map().center(); + if (centerStart[0] !== centerNow[0] || centerStart[1] !== centerNow[1]) { + context.map().on("move.intro", null); + timeout2(function() { + continueTo(zoomMap); + }, 3e3); + } }); }, msec + 100); function continueTo(nextStep) { context.map().on("move.intro drawn.intro", null); - context.on("enter.intro", null); nextStep(); } } - function updatePoint() { - if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) { - return continueTo(reselectPoint); - } - context.container().select(".inspector-wrap .panewrap").style("right", "0%"); - context.on("exit.intro", function() { - continueTo(reselectPoint); + function zoomMap() { + var zoomStart = context.map().zoom(); + var textId = context.lastPointerType() === "mouse" ? "zoom" : "zoom_touch"; + var zoomString = helpHtml("intro.navigation." + textId); + reveal(".surface", zoomString); + context.map().on("drawn.intro", function() { + reveal(".surface", zoomString, { duration: 0 }); }); - context.history().on("change.intro", function() { - continueTo(updateCloseEditor); + context.map().on("move.intro", function() { + if (context.map().zoom() !== zoomStart) { + context.map().on("move.intro", null); + timeout2(function() { + continueTo(features); + }, 3e3); + } }); - timeout2(function() { - reveal( - ".entity-editor-pane", - helpHtml("intro.points.update"), - { tooltipClass: "intro-points-describe" } - ); - }, 400); function continueTo(nextStep) { - context.on("exit.intro", null); - context.history().on("change.intro", null); + context.map().on("move.intro drawn.intro", null); nextStep(); } } - function updateCloseEditor() { - if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) { - return continueTo(reselectPoint); - } - context.container().select(".inspector-wrap .panewrap").style("right", "0%"); - context.on("exit.intro", function() { - continueTo(rightClickPoint); - }); - timeout2(function() { + function features() { + var onClick = function() { + continueTo(pointsLinesAreas); + }; + reveal( + ".surface", + helpHtml("intro.navigation.features"), + { buttonText: _t.html("intro.ok"), buttonCallback: onClick } + ); + context.map().on("drawn.intro", function() { reveal( - ".entity-editor-pane", - helpHtml("intro.points.update_close", { button: { html: icon("#iD-icon-close", "inline") } }) + ".surface", + helpHtml("intro.navigation.features"), + { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: onClick } ); - }, 500); + }); function continueTo(nextStep) { - context.on("exit.intro", null); + context.map().on("drawn.intro", null); nextStep(); } } - function rightClickPoint() { - if (!_pointID) - return chapter.restart(); - var entity = context.hasEntity(_pointID); - if (!entity) - return chapter.restart(); - context.enter(modeBrowse(context)); - var box = pointBox(entity.loc, context); - var textId = context.lastPointerType() === "mouse" ? "rightclick" : "edit_menu_touch"; - reveal(box, helpHtml("intro.points." + textId), { duration: 600 }); - timeout2(function() { - context.map().on("move.intro", function() { - var entity2 = context.hasEntity(_pointID); - if (!entity2) - return chapter.restart(); - var box2 = pointBox(entity2.loc, context); - reveal(box2, helpHtml("intro.points." + textId), { duration: 0 }); - }); - }, 600); - context.on("enter.intro", function(mode) { - if (mode.id !== "select") - return; - var ids = context.selectedIDs(); - if (ids.length !== 1 || ids[0] !== _pointID) - return; - timeout2(function() { - var node = selectMenuItem(context, "delete").node(); - if (!node) - return; - continueTo(enterDelete); - }, 50); + function pointsLinesAreas() { + var onClick = function() { + continueTo(nodesWays); + }; + reveal( + ".surface", + helpHtml("intro.navigation.points_lines_areas"), + { buttonText: _t.html("intro.ok"), buttonCallback: onClick } + ); + context.map().on("drawn.intro", function() { + reveal( + ".surface", + helpHtml("intro.navigation.points_lines_areas"), + { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: onClick } + ); }); function continueTo(nextStep) { - context.on("enter.intro", null); - context.map().on("move.intro", null); + context.map().on("drawn.intro", null); nextStep(); } } - function enterDelete() { - if (!_pointID) - return chapter.restart(); - var entity = context.hasEntity(_pointID); - if (!entity) - return chapter.restart(); - var node = selectMenuItem(context, "delete").node(); - if (!node) { - return continueTo(rightClickPoint); - } + function nodesWays() { + var onClick = function() { + continueTo(clickTownHall); + }; reveal( - ".edit-menu", - helpHtml("intro.points.delete"), - { padding: 50 } + ".surface", + helpHtml("intro.navigation.nodes_ways"), + { buttonText: _t.html("intro.ok"), buttonCallback: onClick } ); + context.map().on("drawn.intro", function() { + reveal( + ".surface", + helpHtml("intro.navigation.nodes_ways"), + { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: onClick } + ); + }); + function continueTo(nextStep) { + context.map().on("drawn.intro", null); + nextStep(); + } + } + function clickTownHall() { + context.enter(modeBrowse(context)); + context.history().reset("initial"); + var entity = context.hasEntity(hallId); + if (!entity) return; + reveal(null, null, { duration: 0 }); + context.map().centerZoomEase(entity.loc, 19, 500); timeout2(function() { - context.map().on("move.intro", function() { - reveal( - ".edit-menu", - helpHtml("intro.points.delete"), - { duration: 0, padding: 50 } - ); + var entity2 = context.hasEntity(hallId); + if (!entity2) return; + var box = pointBox(entity2.loc, context); + var textId = context.lastPointerType() === "mouse" ? "click_townhall" : "tap_townhall"; + reveal(box, helpHtml("intro.navigation." + textId)); + context.map().on("move.intro drawn.intro", function() { + var entity3 = context.hasEntity(hallId); + if (!entity3) return; + var box2 = pointBox(entity3.loc, context); + reveal(box2, helpHtml("intro.navigation." + textId), { duration: 0 }); }); - }, 300); + context.on("enter.intro", function() { + if (isTownHallSelected()) continueTo(selectedTownHall); + }); + }, 550); + context.history().on("change.intro", function() { + if (!context.hasEntity(hallId)) { + continueTo(clickTownHall); + } + }); + function continueTo(nextStep) { + context.on("enter.intro", null); + context.map().on("move.intro drawn.intro", null); + context.history().on("change.intro", null); + nextStep(); + } + } + function selectedTownHall() { + if (!isTownHallSelected()) return clickTownHall(); + var entity = context.hasEntity(hallId); + if (!entity) return clickTownHall(); + var box = pointBox(entity.loc, context); + var onClick = function() { + continueTo(editorTownHall); + }; + reveal( + box, + helpHtml("intro.navigation.selected_townhall"), + { buttonText: _t.html("intro.ok"), buttonCallback: onClick } + ); + context.map().on("move.intro drawn.intro", function() { + var entity2 = context.hasEntity(hallId); + if (!entity2) return; + var box2 = pointBox(entity2.loc, context); + reveal( + box2, + helpHtml("intro.navigation.selected_townhall"), + { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: onClick } + ); + }); + context.history().on("change.intro", function() { + if (!context.hasEntity(hallId)) { + continueTo(clickTownHall); + } + }); + function continueTo(nextStep) { + context.map().on("move.intro drawn.intro", null); + context.history().on("change.intro", null); + nextStep(); + } + } + function editorTownHall() { + if (!isTownHallSelected()) return clickTownHall(); + context.container().select(".inspector-wrap").on("wheel.intro", eventCancel); + var onClick = function() { + continueTo(presetTownHall); + }; + reveal( + ".entity-editor-pane", + helpHtml("intro.navigation.editor_townhall"), + { buttonText: _t.html("intro.ok"), buttonCallback: onClick } + ); context.on("exit.intro", function() { - if (!_pointID) - return chapter.restart(); - var entity2 = context.hasEntity(_pointID); - if (entity2) - return continueTo(rightClickPoint); + continueTo(clickTownHall); }); - context.history().on("change.intro", function(changed) { - if (changed.deleted().length) { - continueTo(undo); + context.history().on("change.intro", function() { + if (!context.hasEntity(hallId)) { + continueTo(clickTownHall); } }); function continueTo(nextStep) { - context.map().on("move.intro", null); + context.on("exit.intro", null); context.history().on("change.intro", null); + context.container().select(".inspector-wrap").on("wheel.intro", null); + nextStep(); + } + } + function presetTownHall() { + if (!isTownHallSelected()) return clickTownHall(); + context.container().select(".inspector-wrap .panewrap").style("right", "0%"); + context.container().select(".inspector-wrap").on("wheel.intro", eventCancel); + var entity = context.entity(context.selectedIDs()[0]); + var preset = _mainPresetIndex.match(entity, context.graph()); + var onClick = function() { + continueTo(fieldsTownHall); + }; + reveal( + ".entity-editor-pane .section-feature-type", + helpHtml("intro.navigation.preset_townhall", { preset: preset.name() }), + { buttonText: _t.html("intro.ok"), buttonCallback: onClick } + ); + context.on("exit.intro", function() { + continueTo(clickTownHall); + }); + context.history().on("change.intro", function() { + if (!context.hasEntity(hallId)) { + continueTo(clickTownHall); + } + }); + function continueTo(nextStep) { context.on("exit.intro", null); + context.history().on("change.intro", null); + context.container().select(".inspector-wrap").on("wheel.intro", null); nextStep(); } } - function undo() { + function fieldsTownHall() { + if (!isTownHallSelected()) return clickTownHall(); + context.container().select(".inspector-wrap .panewrap").style("right", "0%"); + context.container().select(".inspector-wrap").on("wheel.intro", eventCancel); + var onClick = function() { + continueTo(closeTownHall); + }; + reveal( + ".entity-editor-pane .section-preset-fields", + helpHtml("intro.navigation.fields_townhall"), + { buttonText: _t.html("intro.ok"), buttonCallback: onClick } + ); + context.on("exit.intro", function() { + continueTo(clickTownHall); + }); context.history().on("change.intro", function() { - continueTo(play); + if (!context.hasEntity(hallId)) { + continueTo(clickTownHall); + } }); + function continueTo(nextStep) { + context.on("exit.intro", null); + context.history().on("change.intro", null); + context.container().select(".inspector-wrap").on("wheel.intro", null); + nextStep(); + } + } + function closeTownHall() { + if (!isTownHallSelected()) return clickTownHall(); + var selector = ".entity-editor-pane button.close svg use"; + var href = select_default2(selector).attr("href") || "#iD-icon-close"; reveal( - ".top-toolbar button.undo-button", - helpHtml("intro.points.undo") + ".entity-editor-pane", + helpHtml("intro.navigation.close_townhall", { button: { html: icon(href, "inline") } }) + ); + context.on("exit.intro", function() { + continueTo(searchStreet); + }); + context.history().on("change.intro", function() { + var selector2 = ".entity-editor-pane button.close svg use"; + var href2 = select_default2(selector2).attr("href") || "#iD-icon-close"; + reveal( + ".entity-editor-pane", + helpHtml("intro.navigation.close_townhall", { button: { html: icon(href2, "inline") } }), + { duration: 0 } + ); + }); + function continueTo(nextStep) { + context.on("exit.intro", null); + context.history().on("change.intro", null); + nextStep(); + } + } + function searchStreet() { + context.enter(modeBrowse(context)); + context.history().reset("initial"); + var msec = transitionTime(springStreet, context.map().center()); + if (msec) { + reveal(null, null, { duration: 0 }); + } + context.map().centerZoomEase(springStreet, 19, msec); + timeout2(function() { + reveal( + ".search-header input", + helpHtml("intro.navigation.search_street", { name: _t("intro.graph.name.spring-street") }) + ); + context.container().select(".search-header input").on("keyup.intro", checkSearchResult); + }, msec + 100); + } + function checkSearchResult() { + var first = context.container().select(".feature-list-item:nth-child(0n+2)"); + var firstName = first.select(".entity-name"); + var name = _t("intro.graph.name.spring-street"); + if (!firstName.empty() && firstName.html() === name) { + reveal( + first.node(), + helpHtml("intro.navigation.choose_street", { name }), + { duration: 300 } + ); + context.on("exit.intro", function() { + continueTo(selectedStreet); + }); + context.container().select(".search-header input").on("keydown.intro", eventCancel, true).on("keyup.intro", null); + } + function continueTo(nextStep) { + context.on("exit.intro", null); + context.container().select(".search-header input").on("keydown.intro", null).on("keyup.intro", null); + nextStep(); + } + } + function selectedStreet() { + if (!context.hasEntity(springStreetEndId) || !context.hasEntity(springStreetId)) { + return searchStreet(); + } + var onClick = function() { + continueTo(editorStreet); + }; + var entity = context.entity(springStreetEndId); + var box = pointBox(entity.loc, context); + box.height = 500; + reveal( + box, + helpHtml("intro.navigation.selected_street", { name: _t("intro.graph.name.spring-street") }), + { duration: 600, buttonText: _t.html("intro.ok"), buttonCallback: onClick } ); + timeout2(function() { + context.map().on("move.intro drawn.intro", function() { + var entity2 = context.hasEntity(springStreetEndId); + if (!entity2) return; + var box2 = pointBox(entity2.loc, context); + box2.height = 500; + reveal( + box2, + helpHtml("intro.navigation.selected_street", { name: _t("intro.graph.name.spring-street") }), + { duration: 0, buttonText: _t.html("intro.ok"), buttonCallback: onClick } + ); + }); + }, 600); + context.on("enter.intro", function(mode) { + if (!context.hasEntity(springStreetId)) { + return continueTo(searchStreet); + } + var ids = context.selectedIDs(); + if (mode.id !== "select" || !ids.length || ids[0] !== springStreetId) { + context.enter(modeSelect(context, [springStreetId])); + } + }); + context.history().on("change.intro", function() { + if (!context.hasEntity(springStreetEndId) || !context.hasEntity(springStreetId)) { + timeout2(function() { + continueTo(searchStreet); + }, 300); + } + }); + function continueTo(nextStep) { + context.map().on("move.intro drawn.intro", null); + context.on("enter.intro", null); + context.history().on("change.intro", null); + nextStep(); + } + } + function editorStreet() { + var selector = ".entity-editor-pane button.close svg use"; + var href = select_default2(selector).attr("href") || "#iD-icon-close"; + reveal(".entity-editor-pane", helpHtml("intro.navigation.street_different_fields") + "{br}" + helpHtml("intro.navigation.editor_street", { + button: { html: icon(href, "inline") }, + field1: onewayField.title(), + field2: maxspeedField.title() + })); + context.on("exit.intro", function() { + continueTo(play); + }); + context.history().on("change.intro", function() { + var selector2 = ".entity-editor-pane button.close svg use"; + var href2 = select_default2(selector2).attr("href") || "#iD-icon-close"; + reveal( + ".entity-editor-pane", + helpHtml("intro.navigation.street_different_fields") + "{br}" + helpHtml("intro.navigation.editor_street", { + button: { html: icon(href2, "inline") }, + field1: onewayField.title(), + field2: maxspeedField.title() + }), + { duration: 0 } + ); + }); function continueTo(nextStep) { + context.on("exit.intro", null); context.history().on("change.intro", null); nextStep(); } } function play() { - dispatch10.call("done"); + dispatch14.call("done"); reveal( ".ideditor", - helpHtml("intro.points.play", { next: _t("intro.areas.title") }), + helpHtml("intro.navigation.play", { next: _t("intro.points.title") }), { - tooltipBox: ".intro-nav-wrap .chapter-area", + tooltipBox: ".intro-nav-wrap .chapter-point", buttonText: _t.html("intro.ok"), buttonCallback: function() { reveal(".ideditor"); @@ -54413,66 +57905,59 @@ ${content} ); } chapter.enter = function() { - addPoint(); + dragMap(); }; chapter.exit = function() { timeouts.forEach(window.clearTimeout); context.on("enter.intro exit.intro", null); context.map().on("move.intro drawn.intro", null); context.history().on("change.intro", null); - context.container().select(".inspector-wrap").on("wheel.intro", eventCancel); - context.container().select(".preset-search-input").on("keydown.intro keyup.intro", null); + context.container().select(".inspector-wrap").on("wheel.intro", null); + context.container().select(".search-header input").on("keydown.intro keyup.intro", null); }; chapter.restart = function() { chapter.exit(); chapter.enter(); }; - return utilRebind(chapter, dispatch10, "on"); + return utilRebind(chapter, dispatch14, "on"); } - // modules/ui/intro/area.js - function uiIntroArea(context, reveal) { - var dispatch10 = dispatch_default("done"); - var playground = [-85.63552, 41.94159]; - var playgroundPreset = _mainPresetIndex.item("leisure/playground"); - var nameField = _mainPresetIndex.field("name"); - var descriptionField = _mainPresetIndex.field("description"); + // modules/ui/intro/point.js + function uiIntroPoint(context, reveal) { + var dispatch14 = dispatch_default("done"); var timeouts = []; - var _areaID; + var intersection2 = [-85.63279, 41.94394]; + var building = [-85.632422, 41.944045]; + var cafePreset = _mainPresetIndex.item("amenity/cafe"); + var _pointID = null; var chapter = { - title: "intro.areas.title" + title: "intro.points.title" }; - function timeout2(f2, t) { - timeouts.push(window.setTimeout(f2, t)); + function timeout2(f2, t2) { + timeouts.push(window.setTimeout(f2, t2)); } function eventCancel(d3_event) { d3_event.stopPropagation(); d3_event.preventDefault(); } - function revealPlayground(center, text2, options2) { - var padding = 180 * Math.pow(2, context.map().zoom() - 19.5); - var box = pad(center, padding, context); - reveal(box, text2, options2); - } - function addArea() { + function addPoint() { context.enter(modeBrowse(context)); context.history().reset("initial"); - _areaID = null; - var msec = transitionTime(playground, context.map().center()); + var msec = transitionTime(intersection2, context.map().center()); if (msec) { reveal(null, null, { duration: 0 }); } - context.map().centerZoomEase(playground, 19, msec); + context.map().centerZoomEase(intersection2, 19, msec); timeout2(function() { var tooltip = reveal( - "button.add-area", - helpHtml("intro.areas.add_playground") + "button.add-point", + helpHtml("intro.points.points_info") + "{br}" + helpHtml("intro.points.add_point") ); - tooltip.selectAll(".popover-inner").insert("svg", "span").attr("class", "tooltip-illustration").append("use").attr("xlink:href", "#iD-graphic-areas"); + _pointID = null; + tooltip.selectAll(".popover-inner").insert("svg", "span").attr("class", "tooltip-illustration").append("use").attr("xlink:href", "#iD-graphic-points"); context.on("enter.intro", function(mode) { - if (mode.id !== "add-area") - return; - continueTo(startPlayground); + if (mode.id !== "add-point") return; + continueTo(placePoint); }); }, msec + 100); function continueTo(nextStep) { @@ -54480,99 +57965,495 @@ ${content} nextStep(); } } - function startPlayground() { - if (context.mode().id !== "add-area") { + function placePoint() { + if (context.mode().id !== "add-point") { return chapter.restart(); } - _areaID = null; - context.map().zoomEase(19.5, 500); - timeout2(function() { - var textId = context.lastPointerType() === "mouse" ? "starting_node_click" : "starting_node_tap"; - var startDrawString = helpHtml("intro.areas.start_playground") + helpHtml("intro.areas." + textId); - revealPlayground( - playground, - startDrawString, - { duration: 250 } - ); - timeout2(function() { - context.map().on("move.intro drawn.intro", function() { - revealPlayground( - playground, - startDrawString, - { duration: 0 } - ); - }); - context.on("enter.intro", function(mode) { - if (mode.id !== "draw-area") + var pointBox2 = pad(building, 150, context); + var textId = context.lastPointerType() === "mouse" ? "place_point" : "place_point_touch"; + reveal(pointBox2, helpHtml("intro.points." + textId)); + context.map().on("move.intro drawn.intro", function() { + pointBox2 = pad(building, 150, context); + reveal(pointBox2, helpHtml("intro.points." + textId), { duration: 0 }); + }); + context.on("enter.intro", function(mode) { + if (mode.id !== "select") return chapter.restart(); + _pointID = context.mode().selectedIDs()[0]; + if (context.graph().geometry(_pointID) === "vertex") { + context.map().on("move.intro drawn.intro", null); + context.on("enter.intro", null); + reveal(pointBox2, helpHtml("intro.points.place_point_error"), { + buttonText: _t.html("intro.ok"), + buttonCallback: function() { return chapter.restart(); - continueTo(continuePlayground); + } }); - }, 250); - }, 550); + } else { + continueTo(searchPreset); + } + }); function continueTo(nextStep) { context.map().on("move.intro drawn.intro", null); context.on("enter.intro", null); nextStep(); } } - function continuePlayground() { - if (context.mode().id !== "draw-area") { - return chapter.restart(); + function searchPreset() { + if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) { + return addPoint(); } - _areaID = null; - revealPlayground( - playground, - helpHtml("intro.areas.continue_playground"), - { duration: 250 } + context.container().select(".inspector-wrap").on("wheel.intro", eventCancel); + context.container().select(".preset-search-input").on("keydown.intro", null).on("keyup.intro", checkPresetSearch); + reveal( + ".preset-search-input", + helpHtml("intro.points.search_cafe", { preset: cafePreset.name() }) ); - timeout2(function() { - context.map().on("move.intro drawn.intro", function() { - revealPlayground( - playground, - helpHtml("intro.areas.continue_playground"), - { duration: 0 } - ); - }); - }, 250); context.on("enter.intro", function(mode) { - if (mode.id === "draw-area") { - var entity = context.hasEntity(context.selectedIDs()[0]); - if (entity && entity.nodes.length >= 6) { - return continueTo(finishPlayground); - } else { - return; - } - } else if (mode.id === "select") { - _areaID = context.selectedIDs()[0]; - return continueTo(searchPresets); - } else { - return chapter.restart(); + if (!_pointID || !context.hasEntity(_pointID)) { + return continueTo(addPoint); + } + var ids = context.selectedIDs(); + if (mode.id !== "select" || !ids.length || ids[0] !== _pointID) { + context.enter(modeSelect(context, [_pointID])); + context.container().select(".inspector-wrap").on("wheel.intro", eventCancel); + context.container().select(".preset-search-input").on("keydown.intro", null).on("keyup.intro", checkPresetSearch); + reveal( + ".preset-search-input", + helpHtml("intro.points.search_cafe", { preset: cafePreset.name() }) + ); + context.history().on("change.intro", null); } }); + function checkPresetSearch() { + var first = context.container().select(".preset-list-item:first-child"); + if (first.classed("preset-amenity-cafe")) { + context.container().select(".preset-search-input").on("keydown.intro", eventCancel, true).on("keyup.intro", null); + reveal( + first.select(".preset-list-button").node(), + helpHtml("intro.points.choose_cafe", { preset: cafePreset.name() }), + { duration: 300 } + ); + context.history().on("change.intro", function() { + continueTo(aboutFeatureEditor); + }); + } + } function continueTo(nextStep) { - context.map().on("move.intro drawn.intro", null); context.on("enter.intro", null); + context.history().on("change.intro", null); + context.container().select(".inspector-wrap").on("wheel.intro", null); + context.container().select(".preset-search-input").on("keydown.intro keyup.intro", null); nextStep(); } } - function finishPlayground() { - if (context.mode().id !== "draw-area") { - return chapter.restart(); + function aboutFeatureEditor() { + if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) { + return addPoint(); } - _areaID = null; - var finishString = helpHtml("intro.areas.finish_area_" + (context.lastPointerType() === "mouse" ? "click" : "tap")) + helpHtml("intro.areas.finish_playground"); - revealPlayground( - playground, - finishString, - { duration: 250 } - ); timeout2(function() { - context.map().on("move.intro drawn.intro", function() { - revealPlayground( - playground, - finishString, - { duration: 0 } - ); + reveal(".entity-editor-pane", helpHtml("intro.points.feature_editor"), { + tooltipClass: "intro-points-describe", + buttonText: _t.html("intro.ok"), + buttonCallback: function() { + continueTo(addName); + } + }); + }, 400); + context.on("exit.intro", function() { + continueTo(reselectPoint); + }); + function continueTo(nextStep) { + context.on("exit.intro", null); + nextStep(); + } + } + function addName() { + if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) { + return addPoint(); + } + context.container().select(".inspector-wrap .panewrap").style("right", "0%"); + var addNameString = helpHtml("intro.points.fields_info") + "{br}" + helpHtml("intro.points.add_name"); + timeout2(function() { + var entity = context.entity(_pointID); + if (entity.tags.name) { + var tooltip = reveal(".entity-editor-pane", addNameString, { + tooltipClass: "intro-points-describe", + buttonText: _t.html("intro.ok"), + buttonCallback: function() { + continueTo(addCloseEditor); + } + }); + tooltip.select(".instruction").style("display", "none"); + } else { + reveal( + ".entity-editor-pane", + addNameString, + { tooltipClass: "intro-points-describe" } + ); + } + }, 400); + context.history().on("change.intro", function() { + continueTo(addCloseEditor); + }); + context.on("exit.intro", function() { + continueTo(reselectPoint); + }); + function continueTo(nextStep) { + context.on("exit.intro", null); + context.history().on("change.intro", null); + nextStep(); + } + } + function addCloseEditor() { + context.container().select(".inspector-wrap .panewrap").style("right", "0%"); + var selector = ".entity-editor-pane button.close svg use"; + var href = select_default2(selector).attr("href") || "#iD-icon-close"; + context.on("exit.intro", function() { + continueTo(reselectPoint); + }); + reveal( + ".entity-editor-pane", + helpHtml("intro.points.add_close", { button: { html: icon(href, "inline") } }) + ); + function continueTo(nextStep) { + context.on("exit.intro", null); + nextStep(); + } + } + function reselectPoint() { + if (!_pointID) return chapter.restart(); + var entity = context.hasEntity(_pointID); + if (!entity) return chapter.restart(); + var oldPreset = _mainPresetIndex.match(entity, context.graph()); + context.replace(actionChangePreset(_pointID, oldPreset, cafePreset)); + context.enter(modeBrowse(context)); + var msec = transitionTime(entity.loc, context.map().center()); + if (msec) { + reveal(null, null, { duration: 0 }); + } + context.map().centerEase(entity.loc, msec); + timeout2(function() { + var box = pointBox(entity.loc, context); + reveal(box, helpHtml("intro.points.reselect"), { duration: 600 }); + timeout2(function() { + context.map().on("move.intro drawn.intro", function() { + var entity2 = context.hasEntity(_pointID); + if (!entity2) return chapter.restart(); + var box2 = pointBox(entity2.loc, context); + reveal(box2, helpHtml("intro.points.reselect"), { duration: 0 }); + }); + }, 600); + context.on("enter.intro", function(mode) { + if (mode.id !== "select") return; + continueTo(updatePoint); + }); + }, msec + 100); + function continueTo(nextStep) { + context.map().on("move.intro drawn.intro", null); + context.on("enter.intro", null); + nextStep(); + } + } + function updatePoint() { + if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) { + return continueTo(reselectPoint); + } + context.container().select(".inspector-wrap .panewrap").style("right", "0%"); + context.on("exit.intro", function() { + continueTo(reselectPoint); + }); + context.history().on("change.intro", function() { + continueTo(updateCloseEditor); + }); + timeout2(function() { + reveal( + ".entity-editor-pane", + helpHtml("intro.points.update"), + { tooltipClass: "intro-points-describe" } + ); + }, 400); + function continueTo(nextStep) { + context.on("exit.intro", null); + context.history().on("change.intro", null); + nextStep(); + } + } + function updateCloseEditor() { + if (context.mode().id !== "select" || !_pointID || !context.hasEntity(_pointID)) { + return continueTo(reselectPoint); + } + context.container().select(".inspector-wrap .panewrap").style("right", "0%"); + context.on("exit.intro", function() { + continueTo(rightClickPoint); + }); + timeout2(function() { + reveal( + ".entity-editor-pane", + helpHtml("intro.points.update_close", { button: { html: icon("#iD-icon-close", "inline") } }) + ); + }, 500); + function continueTo(nextStep) { + context.on("exit.intro", null); + nextStep(); + } + } + function rightClickPoint() { + if (!_pointID) return chapter.restart(); + var entity = context.hasEntity(_pointID); + if (!entity) return chapter.restart(); + context.enter(modeBrowse(context)); + var box = pointBox(entity.loc, context); + var textId = context.lastPointerType() === "mouse" ? "rightclick" : "edit_menu_touch"; + reveal(box, helpHtml("intro.points." + textId), { duration: 600 }); + timeout2(function() { + context.map().on("move.intro", function() { + var entity2 = context.hasEntity(_pointID); + if (!entity2) return chapter.restart(); + var box2 = pointBox(entity2.loc, context); + reveal(box2, helpHtml("intro.points." + textId), { duration: 0 }); + }); + }, 600); + context.on("enter.intro", function(mode) { + if (mode.id !== "select") return; + var ids = context.selectedIDs(); + if (ids.length !== 1 || ids[0] !== _pointID) return; + timeout2(function() { + var node = selectMenuItem(context, "delete").node(); + if (!node) return; + continueTo(enterDelete); + }, 50); + }); + function continueTo(nextStep) { + context.on("enter.intro", null); + context.map().on("move.intro", null); + nextStep(); + } + } + function enterDelete() { + if (!_pointID) return chapter.restart(); + var entity = context.hasEntity(_pointID); + if (!entity) return chapter.restart(); + var node = selectMenuItem(context, "delete").node(); + if (!node) { + return continueTo(rightClickPoint); + } + reveal( + ".edit-menu", + helpHtml("intro.points.delete"), + { padding: 50 } + ); + timeout2(function() { + context.map().on("move.intro", function() { + reveal( + ".edit-menu", + helpHtml("intro.points.delete"), + { duration: 0, padding: 50 } + ); + }); + }, 300); + context.on("exit.intro", function() { + if (!_pointID) return chapter.restart(); + var entity2 = context.hasEntity(_pointID); + if (entity2) return continueTo(rightClickPoint); + }); + context.history().on("change.intro", function(changed) { + if (changed.deleted().length) { + continueTo(undo); + } + }); + function continueTo(nextStep) { + context.map().on("move.intro", null); + context.history().on("change.intro", null); + context.on("exit.intro", null); + nextStep(); + } + } + function undo() { + context.history().on("change.intro", function() { + continueTo(play); + }); + reveal( + ".top-toolbar button.undo-button", + helpHtml("intro.points.undo") + ); + function continueTo(nextStep) { + context.history().on("change.intro", null); + nextStep(); + } + } + function play() { + dispatch14.call("done"); + reveal( + ".ideditor", + helpHtml("intro.points.play", { next: _t("intro.areas.title") }), + { + tooltipBox: ".intro-nav-wrap .chapter-area", + buttonText: _t.html("intro.ok"), + buttonCallback: function() { + reveal(".ideditor"); + } + } + ); + } + chapter.enter = function() { + addPoint(); + }; + chapter.exit = function() { + timeouts.forEach(window.clearTimeout); + context.on("enter.intro exit.intro", null); + context.map().on("move.intro drawn.intro", null); + context.history().on("change.intro", null); + context.container().select(".inspector-wrap").on("wheel.intro", eventCancel); + context.container().select(".preset-search-input").on("keydown.intro keyup.intro", null); + }; + chapter.restart = function() { + chapter.exit(); + chapter.enter(); + }; + return utilRebind(chapter, dispatch14, "on"); + } + + // modules/ui/intro/area.js + function uiIntroArea(context, reveal) { + var dispatch14 = dispatch_default("done"); + var playground = [-85.63552, 41.94159]; + var playgroundPreset = _mainPresetIndex.item("leisure/playground"); + var nameField = _mainPresetIndex.field("name"); + var descriptionField = _mainPresetIndex.field("description"); + var timeouts = []; + var _areaID; + var chapter = { + title: "intro.areas.title" + }; + function timeout2(f2, t2) { + timeouts.push(window.setTimeout(f2, t2)); + } + function eventCancel(d3_event) { + d3_event.stopPropagation(); + d3_event.preventDefault(); + } + function revealPlayground(center, text, options2) { + var padding = 180 * Math.pow(2, context.map().zoom() - 19.5); + var box = pad(center, padding, context); + reveal(box, text, options2); + } + function addArea() { + context.enter(modeBrowse(context)); + context.history().reset("initial"); + _areaID = null; + var msec = transitionTime(playground, context.map().center()); + if (msec) { + reveal(null, null, { duration: 0 }); + } + context.map().centerZoomEase(playground, 19, msec); + timeout2(function() { + var tooltip = reveal( + "button.add-area", + helpHtml("intro.areas.add_playground") + ); + tooltip.selectAll(".popover-inner").insert("svg", "span").attr("class", "tooltip-illustration").append("use").attr("xlink:href", "#iD-graphic-areas"); + context.on("enter.intro", function(mode) { + if (mode.id !== "add-area") return; + continueTo(startPlayground); + }); + }, msec + 100); + function continueTo(nextStep) { + context.on("enter.intro", null); + nextStep(); + } + } + function startPlayground() { + if (context.mode().id !== "add-area") { + return chapter.restart(); + } + _areaID = null; + context.map().zoomEase(19.5, 500); + timeout2(function() { + var textId = context.lastPointerType() === "mouse" ? "starting_node_click" : "starting_node_tap"; + var startDrawString = helpHtml("intro.areas.start_playground") + helpHtml("intro.areas." + textId); + revealPlayground( + playground, + startDrawString, + { duration: 250 } + ); + timeout2(function() { + context.map().on("move.intro drawn.intro", function() { + revealPlayground( + playground, + startDrawString, + { duration: 0 } + ); + }); + context.on("enter.intro", function(mode) { + if (mode.id !== "draw-area") return chapter.restart(); + continueTo(continuePlayground); + }); + }, 250); + }, 550); + function continueTo(nextStep) { + context.map().on("move.intro drawn.intro", null); + context.on("enter.intro", null); + nextStep(); + } + } + function continuePlayground() { + if (context.mode().id !== "draw-area") { + return chapter.restart(); + } + _areaID = null; + revealPlayground( + playground, + helpHtml("intro.areas.continue_playground"), + { duration: 250 } + ); + timeout2(function() { + context.map().on("move.intro drawn.intro", function() { + revealPlayground( + playground, + helpHtml("intro.areas.continue_playground"), + { duration: 0 } + ); + }); + }, 250); + context.on("enter.intro", function(mode) { + if (mode.id === "draw-area") { + var entity = context.hasEntity(context.selectedIDs()[0]); + if (entity && entity.nodes.length >= 6) { + return continueTo(finishPlayground); + } else { + return; + } + } else if (mode.id === "select") { + _areaID = context.selectedIDs()[0]; + return continueTo(searchPresets); + } else { + return chapter.restart(); + } + }); + function continueTo(nextStep) { + context.map().on("move.intro drawn.intro", null); + context.on("enter.intro", null); + nextStep(); + } + } + function finishPlayground() { + if (context.mode().id !== "draw-area") { + return chapter.restart(); + } + _areaID = null; + var finishString = helpHtml("intro.areas.finish_area_" + (context.lastPointerType() === "mouse" ? "click" : "tap")) + helpHtml("intro.areas.finish_playground"); + revealPlayground( + playground, + finishString, + { duration: 250 } + ); + timeout2(function() { + context.map().on("move.intro drawn.intro", function() { + revealPlayground( + playground, + finishString, + { duration: 0 } + ); }); }, 250); context.on("enter.intro", function(mode) { @@ -54672,9 +58553,9 @@ ${content} var end = start2 + (box.top - 300); pane.transition().duration(250).tween("scroll.inspector", function() { var node = this; - var i2 = number_default(start2, end); - return function(t) { - node.scrollTop = i2(t); + var i3 = number_default(start2, end); + return function(t2) { + node.scrollTop = i3(t2); }; }); } @@ -54744,8 +58625,7 @@ ${content} return continueTo(searchPresets); }); function continueTo(nextStep) { - if (watcher) - window.clearInterval(watcher); + if (watcher) window.clearInterval(watcher); context.on("exit.intro", null); nextStep(); } @@ -54803,7 +58683,7 @@ ${content} } } function play() { - dispatch10.call("done"); + dispatch14.call("done"); reveal( ".ideditor", helpHtml("intro.areas.play", { next: _t("intro.lines.title") }), @@ -54832,12 +58712,12 @@ ${content} chapter.exit(); chapter.enter(); }; - return utilRebind(chapter, dispatch10, "on"); + return utilRebind(chapter, dispatch14, "on"); } // modules/ui/intro/line.js function uiIntroLine(context, reveal) { - var dispatch10 = dispatch_default("done"); + var dispatch14 = dispatch_default("done"); var timeouts = []; var _tulipRoadID = null; var flowerRoadID = "w646"; @@ -54863,8 +58743,8 @@ ${content} var chapter = { title: "intro.lines.title" }; - function timeout2(f2, t) { - timeouts.push(window.setTimeout(f2, t)); + function timeout2(f2, t2) { + timeouts.push(window.setTimeout(f2, t2)); } function eventCancel(d3_event) { d3_event.stopPropagation(); @@ -54885,8 +58765,7 @@ ${content} ); tooltip.selectAll(".popover-inner").insert("svg", "span").attr("class", "tooltip-illustration").append("use").attr("xlink:href", "#iD-graphic-lines"); context.on("enter.intro", function(mode) { - if (mode.id !== "add-line") - return; + if (mode.id !== "add-line") return; continueTo(startLine); }); }, msec + 100); @@ -54896,8 +58775,7 @@ ${content} } } function startLine() { - if (context.mode().id !== "add-line") - return chapter.restart(); + if (context.mode().id !== "add-line") return chapter.restart(); _tulipRoadID = null; var padding = 70 * Math.pow(2, context.map().zoom() - 18); var box = pad(tulipRoadStart, padding, context); @@ -54912,8 +58790,7 @@ ${content} reveal(box, startLineString, { duration: 0 }); }); context.on("enter.intro", function(mode) { - if (mode.id !== "draw-line") - return chapter.restart(); + if (mode.id !== "draw-line") return chapter.restart(); continueTo(drawLine); }); function continueTo(nextStep) { @@ -54923,8 +58800,7 @@ ${content} } } function drawLine() { - if (context.mode().id !== "draw-line") - return chapter.restart(); + if (context.mode().id !== "draw-line") return chapter.restart(); _tulipRoadID = context.mode().selectedIDs()[0]; context.map().centerEase(tulipRoadMidpoint, 500); timeout2(function() { @@ -54970,8 +58846,7 @@ ${content} } function isLineConnected() { var entity = _tulipRoadID && context.hasEntity(_tulipRoadID); - if (!entity) - return false; + if (!entity) return false; var drawNodes = context.graph().childNodes(entity); return drawNodes.some(function(node) { return context.graph().parentWays(node).some(function(parent) { @@ -54989,11 +58864,9 @@ ${content} timeout2(chapter.restart, 3e3); } function continueLine() { - if (context.mode().id !== "draw-line") - return chapter.restart(); + if (context.mode().id !== "draw-line") return chapter.restart(); var entity = _tulipRoadID && context.hasEntity(_tulipRoadID); - if (!entity) - return chapter.restart(); + if (!entity) return chapter.restart(); context.map().centerEase(tulipRoadIntersection, 500); var continueLineText = helpHtml("intro.lines.continue_line") + "{br}" + helpHtml("intro.lines.finish_line_" + (context.lastPointerType() === "mouse" ? "click" : "tap")) + helpHtml("intro.lines.finish_road"); reveal(".surface", continueLineText); @@ -55012,14 +58885,12 @@ ${content} } } function chooseCategoryRoad() { - if (context.mode().id !== "select") - return chapter.restart(); + if (context.mode().id !== "select") return chapter.restart(); context.on("exit.intro", function() { return chapter.restart(); }); var button = context.container().select(".preset-category-road_minor .preset-list-button"); - if (button.empty()) - return chapter.restart(); + if (button.empty()) return chapter.restart(); context.container().select(".inspector-wrap").on("wheel.intro", eventCancel); timeout2(function() { context.container().select(".inspector-wrap .panewrap").style("right", "-100%"); @@ -55039,14 +58910,12 @@ ${content} } } function choosePresetResidential() { - if (context.mode().id !== "select") - return chapter.restart(); + if (context.mode().id !== "select") return chapter.restart(); context.on("exit.intro", function() { return chapter.restart(); }); var subgrid = context.container().select(".preset-category-road_minor .subgrid"); - if (subgrid.empty()) - return chapter.restart(); + if (subgrid.empty()) return chapter.restart(); subgrid.selectAll(":not(.preset-highway-residential) .preset-list-button").on("click.intro", function() { continueTo(retryPresetResidential); }); @@ -55067,8 +58936,7 @@ ${content} } } function retryPresetResidential() { - if (context.mode().id !== "select") - return chapter.restart(); + if (context.mode().id !== "select") return chapter.restart(); context.on("exit.intro", function() { return chapter.restart(); }); @@ -55384,15 +59252,12 @@ ${content} ); }); context.on("enter.intro", function(mode) { - if (mode.id !== "select") - return; + if (mode.id !== "select") return; var ids = context.selectedIDs(); - if (ids.length !== 1 || ids[0] !== eleventhAvenueEndID) - return; + if (ids.length !== 1 || ids[0] !== eleventhAvenueEndID) return; timeout2(function() { var node = selectMenuItem(context, "split").node(); - if (!node) - return; + if (!node) return; continueTo(splitIntersection); }, 50); }); @@ -55517,7 +59382,7 @@ ${content} context.on("enter.intro", function() { var ids2 = context.selectedIDs(); if (ids2.length === 1 && ids2[0] === _washingtonSegmentID) { - continueTo(multiSelect); + continueTo(multiSelect2); } }); context.history().on("change.intro", function() { @@ -55532,7 +59397,7 @@ ${content} nextStep(); } } - function multiSelect() { + function multiSelect2() { if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) { return continueTo(rightClickIntersection); } @@ -55597,7 +59462,7 @@ ${content} ); }); context.on("enter.intro", function() { - continueTo(multiSelect); + continueTo(multiSelect2); }); context.history().on("change.intro", function() { if (!_washingtonSegmentID || !context.hasEntity(_washingtonSegmentID) || !context.hasEntity(washingtonStreetID) || !context.hasEntity(twelfthAvenueID) || !context.hasEntity(eleventhAvenueEndID)) { @@ -55626,17 +59491,15 @@ ${content} reveal(box2, rightClickString, { duration: 0 }); }); context.ui().editMenu().on("toggled.intro", function(open) { - if (!open) - return; + if (!open) return; timeout2(function() { var ids = context.selectedIDs(); if (ids.length === 2 && ids.indexOf(twelfthAvenueID) !== -1 && ids.indexOf(_washingtonSegmentID) !== -1) { var node = selectMenuItem(context, "delete").node(); - if (!node) - return; + if (!node) return; continueTo(multiDelete); } else if (ids.length === 1 && ids.indexOf(_washingtonSegmentID) !== -1) { - return continueTo(multiSelect); + return continueTo(multiSelect2); } else { return continueTo(didSplit); } @@ -55659,8 +59522,7 @@ ${content} return continueTo(rightClickIntersection); } var node = selectMenuItem(context, "delete").node(); - if (!node) - return continueTo(multiRightClick); + if (!node) return continueTo(multiRightClick); reveal( ".edit-menu", helpHtml("intro.lines.multi_delete"), @@ -55675,7 +59537,7 @@ ${content} }); context.on("exit.intro", function() { if (context.hasEntity(_washingtonSegmentID) || context.hasEntity(twelfthAvenueID)) { - return continueTo(multiSelect); + return continueTo(multiSelect2); } }); context.history().on("change.intro", function() { @@ -55699,7 +59561,7 @@ ${content} reveal(box, helpHtml("intro.lines.retry_delete"), { buttonText: _t.html("intro.ok"), buttonCallback: function() { - continueTo(multiSelect); + continueTo(multiSelect2); } }); function continueTo(nextStep) { @@ -55707,7 +59569,7 @@ ${content} } } function play() { - dispatch10.call("done"); + dispatch14.call("done"); reveal( ".ideditor", helpHtml("intro.lines.play", { next: _t("intro.buildings.title") }), @@ -55736,12 +59598,12 @@ ${content} chapter.exit(); chapter.enter(); }; - return utilRebind(chapter, dispatch10, "on"); + return utilRebind(chapter, dispatch14, "on"); } // modules/ui/intro/building.js function uiIntroBuilding(context, reveal) { - var dispatch10 = dispatch_default("done"); + var dispatch14 = dispatch_default("done"); var house = [-85.62815, 41.95638]; var tank = [-85.62732, 41.95347]; var buildingCatetory = _mainPresetIndex.item("category-building"); @@ -55753,22 +59615,22 @@ ${content} var chapter = { title: "intro.buildings.title" }; - function timeout2(f2, t) { - timeouts.push(window.setTimeout(f2, t)); + function timeout2(f2, t2) { + timeouts.push(window.setTimeout(f2, t2)); } function eventCancel(d3_event) { d3_event.stopPropagation(); d3_event.preventDefault(); } - function revealHouse(center, text2, options2) { + function revealHouse(center, text, options2) { var padding = 160 * Math.pow(2, context.map().zoom() - 20); var box = pad(center, padding, context); - reveal(box, text2, options2); + reveal(box, text, options2); } - function revealTank(center, text2, options2) { + function revealTank(center, text, options2) { var padding = 190 * Math.pow(2, context.map().zoom() - 19.5); var box = pad(center, padding, context); - reveal(box, text2, options2); + reveal(box, text, options2); } function addHouse() { context.enter(modeBrowse(context)); @@ -55786,8 +59648,7 @@ ${content} ); tooltip.selectAll(".popover-inner").insert("svg", "span").attr("class", "tooltip-illustration").append("use").attr("xlink:href", "#iD-graphic-buildings"); context.on("enter.intro", function(mode) { - if (mode.id !== "add-area") - return; + if (mode.id !== "add-area") return; continueTo(startHouse); }); }, msec + 100); @@ -55809,8 +59670,7 @@ ${content} revealHouse(house, startString, { duration: 0 }); }); context.on("enter.intro", function(mode) { - if (mode.id !== "draw-area") - return chapter.restart(); + if (mode.id !== "draw-area") return chapter.restart(); continueTo(continueHouse); }); }, 550); @@ -55837,8 +59697,8 @@ ${content} var graph = context.graph(); var way = context.entity(context.selectedIDs()[0]); var nodes = graph.childNodes(way); - var points = utilArrayUniq(nodes).map(function(n2) { - return context.projection(n2.loc); + var points = utilArrayUniq(nodes).map(function(n3) { + return context.projection(n3.loc); }); if (isMostlySquare(points)) { _houseID = way.id; @@ -55976,8 +59836,7 @@ ${content} } } function rightClickHouse() { - if (!_houseID) - return chapter.restart(); + if (!_houseID) return chapter.restart(); context.enter(modeBrowse(context)); context.history().reset("hasHouse"); var zoom = context.map().zoom(); @@ -55986,15 +59845,12 @@ ${content} } context.map().centerZoomEase(house, zoom, 500); context.on("enter.intro", function(mode) { - if (mode.id !== "select") - return; + if (mode.id !== "select") return; var ids = context.selectedIDs(); - if (ids.length !== 1 || ids[0] !== _houseID) - return; + if (ids.length !== 1 || ids[0] !== _houseID) return; timeout2(function() { var node = selectMenuItem(context, "orthogonalize").node(); - if (!node) - return; + if (!node) return; continueTo(clickSquare); }, 50); }); @@ -56013,11 +59869,9 @@ ${content} } } function clickSquare() { - if (!_houseID) - return chapter.restart(); + if (!_houseID) return chapter.restart(); var entity = context.hasEntity(_houseID); - if (!entity) - return continueTo(rightClickHouse); + if (!entity) return continueTo(rightClickHouse); var node = selectMenuItem(context, "orthogonalize").node(); if (!node) { return continueTo(rightClickHouse); @@ -56103,8 +59957,7 @@ ${content} helpHtml("intro.buildings.add_tank") ); context.on("enter.intro", function(mode) { - if (mode.id !== "add-area") - return; + if (mode.id !== "add-area") return; continueTo(startTank); }); }, msec + 100); @@ -56125,8 +59978,7 @@ ${content} revealTank(tank, startString, { duration: 0 }); }); context.on("enter.intro", function(mode) { - if (mode.id !== "draw-area") - return chapter.restart(); + if (mode.id !== "draw-area") return chapter.restart(); continueTo(continueTank); }); }, 550); @@ -56242,22 +60094,18 @@ ${content} } } function rightClickTank() { - if (!_tankID) - return continueTo(addTank); + if (!_tankID) return continueTo(addTank); context.enter(modeBrowse(context)); context.history().reset("hasTank"); context.map().centerEase(tank, 500); timeout2(function() { context.on("enter.intro", function(mode) { - if (mode.id !== "select") - return; + if (mode.id !== "select") return; var ids = context.selectedIDs(); - if (ids.length !== 1 || ids[0] !== _tankID) - return; + if (ids.length !== 1 || ids[0] !== _tankID) return; timeout2(function() { var node = selectMenuItem(context, "circularize").node(); - if (!node) - return; + if (!node) return; continueTo(clickCircle); }, 50); }); @@ -56278,11 +60126,9 @@ ${content} } } function clickCircle() { - if (!_tankID) - return chapter.restart(); + if (!_tankID) return chapter.restart(); var entity = context.hasEntity(_tankID); - if (!entity) - return continueTo(rightClickTank); + if (!entity) return continueTo(rightClickTank); var node = selectMenuItem(context, "circularize").node(); if (!node) { return continueTo(rightClickTank); @@ -56342,7 +60188,7 @@ ${content} } } function play() { - dispatch10.call("done"); + dispatch14.call("done"); reveal( ".ideditor", helpHtml("intro.buildings.play", { next: _t("intro.startediting.title") }), @@ -56371,12 +60217,12 @@ ${content} chapter.exit(); chapter.enter(); }; - return utilRebind(chapter, dispatch10, "on"); + return utilRebind(chapter, dispatch14, "on"); } // modules/ui/intro/start_editing.js function uiIntroStartEditing(context, reveal) { - var dispatch10 = dispatch_default("done", "startEditing"); + var dispatch14 = dispatch_default("done", "startEditing"); var modalSelection = select_default2(null); var chapter = { title: "intro.startediting.title" @@ -56428,7 +60274,7 @@ ${content} }); startbutton.append("svg").attr("class", "illustration").append("use").attr("xlink:href", "#iD-logo-walkthrough"); startbutton.append("h2").call(_t.append("intro.startediting.start")); - dispatch10.call("startEditing"); + dispatch14.call("startEditing"); } chapter.enter = function() { showHelp(); @@ -56437,7 +60283,7 @@ ${content} modalSelection.remove(); context.container().selectAll(".shaded").remove(); }; - return utilRebind(chapter, dispatch10, "on"); + return utilRebind(chapter, dispatch14, "on"); } // modules/ui/intro/intro.js @@ -56501,7 +60347,7 @@ ${content} } else { context.background().bing(); } - overlays.forEach((d) => context.background().toggleOverlayLayer(d)); + overlays.forEach((d2) => context.background().toggleOverlayLayer(d2)); let layers = context.layers(); layers.all().forEach((item) => { if (typeof item.layer.enabled === "function") { @@ -56514,17 +60360,17 @@ ${content} corePreferences("walkthrough_started", "yes"); let storedProgress = corePreferences("walkthrough_progress") || ""; let progress = storedProgress.split(";").filter(Boolean); - let chapters = chapterFlow.map((chapter, i2) => { - let s = chapterUi[chapter](context, curtain.reveal).on("done", () => { - buttons.filter((d) => d.title === s.title).classed("finished", true); - if (i2 < chapterFlow.length - 1) { - const next = chapterFlow[i2 + 1]; - context.container().select(`button.chapter-${next}`).classed("next", true); + let chapters = chapterFlow.map((chapter, i3) => { + let s2 = chapterUi[chapter](context, curtain.reveal).on("done", () => { + buttons.filter((d2) => d2.title === s2.title).classed("finished", true); + if (i3 < chapterFlow.length - 1) { + const next = chapterFlow[i3 + 1]; + context.container().select("button.chapter-".concat(next)).classed("next", true); } progress.push(chapter); corePreferences("walkthrough_progress", utilArrayUniq(progress).join(";")); }); - return s; + return s2; }); chapters[chapters.length - 1].on("startEditing", () => { progress.push("startEditing"); @@ -56542,7 +60388,7 @@ ${content} } context.history().reset().merge(Object.values(baseEntities)); context.background().baseLayerSource(background); - overlays.forEach((d) => context.background().toggleOverlayLayer(d)); + overlays.forEach((d2) => context.background().toggleOverlayLayer(d2)); if (history) { context.history().fromJSON(history, false); } @@ -56553,8 +60399,8 @@ ${content} let navwrap = selection2.append("div").attr("class", "intro-nav-wrap fillD"); navwrap.append("svg").attr("class", "intro-nav-wrap-logo").append("use").attr("xlink:href", "#iD-logo-walkthrough"); let buttonwrap = navwrap.append("div").attr("class", "joined").selectAll("button.chapter"); - let buttons = buttonwrap.data(chapters).enter().append("button").attr("class", (d, i2) => `chapter chapter-${chapterFlow[i2]}`).on("click", enterChapter); - buttons.append("span").html((d) => _t.html(d.title)); + let buttons = buttonwrap.data(chapters).enter().append("button").attr("class", (d2, i3) => "chapter chapter-".concat(chapterFlow[i3])).on("click", enterChapter); + buttons.append("span").html((d2) => _t.html(d2.title)); buttons.append("span").attr("class", "status").call(svgIcon(_mainLocalizer.textDirection() === "rtl" ? "#iD-icon-backward" : "#iD-icon-forward", "inline")); enterChapter(null, chapters[0]); function enterChapter(d3_event, newChapter) { @@ -56564,7 +60410,7 @@ ${content} context.enter(modeBrowse(context)); _currChapter = newChapter; _currChapter.enter(); - buttons.classed("next", false).classed("active", (d) => d.title === _currChapter.title); + buttons.classed("next", false).classed("active", (d2) => d2.title === _currChapter.title); } } return intro; @@ -56601,25 +60447,25 @@ ${content} shownItems.push(resolvedItem); } } - var chips = selection2.selectAll(".chip").data(shownItems, function(d) { - return d.id; + var chips = selection2.selectAll(".chip").data(shownItems, function(d2) { + return d2.id; }); chips.exit().remove(); - var enter = chips.enter().append("a").attr("class", function(d) { - return "chip " + d.id + "-count"; - }).attr("href", "#").each(function(d) { + var enter = chips.enter().append("a").attr("class", function(d2) { + return "chip " + d2.id + "-count"; + }).attr("href", "#").each(function(d2) { var chipSelection = select_default2(this); - var tooltipBehavior = uiTooltip().placement("top").title(() => _t.append(d.descriptionID)); + var tooltipBehavior = uiTooltip().placement("top").title(() => _t.append(d2.descriptionID)); chipSelection.call(tooltipBehavior).on("click", function(d3_event) { d3_event.preventDefault(); tooltipBehavior.hide(select_default2(this)); context.ui().togglePanes(context.container().select(".map-panes .issues-pane")); }); - chipSelection.call(svgIcon("#" + d.iconID)); + chipSelection.call(svgIcon("#" + d2.iconID)); }); enter.append("span").attr("class", "count"); - enter.merge(chips).selectAll("span.count").text(function(d) { - return d.count.toString(); + enter.merge(chips).selectAll("span.count").text(function(d2) { + return d2.count.toString(); }); } return function(selection2) { @@ -56630,7467 +60476,6591 @@ ${content} }; } - // modules/ui/map_in_map.js - function uiMapInMap(context) { - function mapInMap(selection2) { - var backgroundLayer = rendererTileLayer(context); - var overlayLayers = {}; - var projection2 = geoRawMercator(); - var dataLayer = svgData(projection2, context).showLabels(false); - var debugLayer = svgDebug(projection2, context); - var zoom = zoom_default2().scaleExtent([geoZoomToScale(0.5), geoZoomToScale(24)]).on("start", zoomStarted).on("zoom", zoomed).on("end", zoomEnded); - var wrap2 = select_default2(null); - var tiles = select_default2(null); - var viewport = select_default2(null); - var _isTransformed = false; - var _isHidden = true; - var _skipEvents = false; - var _gesture = null; - var _zDiff = 6; - var _dMini; - var _cMini; - var _tStart; - var _tCurr; - var _timeoutID; - function zoomStarted() { - if (_skipEvents) - return; - _tStart = _tCurr = projection2.transform(); - _gesture = null; - } - function zoomed(d3_event) { - if (_skipEvents) - return; - var x = d3_event.transform.x; - var y = d3_event.transform.y; - var k = d3_event.transform.k; - var isZooming = k !== _tStart.k; - var isPanning = x !== _tStart.x || y !== _tStart.y; - if (!isZooming && !isPanning) { - return; - } - if (!_gesture) { - _gesture = isZooming ? "zoom" : "pan"; - } - var tMini = projection2.transform(); - var tX, tY, scale; - if (_gesture === "zoom") { - scale = k / tMini.k; - tX = (_cMini[0] / scale - _cMini[0]) * scale; - tY = (_cMini[1] / scale - _cMini[1]) * scale; - } else { - k = tMini.k; - scale = 1; - tX = x - tMini.x; - tY = y - tMini.y; - } - utilSetTransform(tiles, tX, tY, scale); - utilSetTransform(viewport, 0, 0, scale); - _isTransformed = true; - _tCurr = identity2.translate(x, y).scale(k); - var zMain = geoScaleToZoom(context.projection.scale()); - var zMini = geoScaleToZoom(k); - _zDiff = zMain - zMini; - queueRedraw(); + // modules/renderer/background_source.js + var import_lodash4 = __toESM(require_lodash()); + + // modules/util/IntervalTasksQueue.js + var IntervalTasksQueue = class { + /** + * Interval in milliseconds inside which only 1 task can execute. + * e.g. if interval is 200ms, and 5 async tasks are unqueued, + * they will complete in ~1s if not cleared + * @param {number} intervalInMs + */ + constructor(intervalInMs) { + this.intervalInMs = intervalInMs; + this.pendingHandles = []; + this.time = 0; + } + enqueue(task) { + let taskTimeout = this.time; + this.time += this.intervalInMs; + this.pendingHandles.push(setTimeout(() => { + this.time -= this.intervalInMs; + task(); + }, taskTimeout)); + } + clear() { + this.pendingHandles.forEach((timeoutHandle) => { + clearTimeout(timeoutHandle); + }); + this.pendingHandles = []; + this.time = 0; + } + }; + + // modules/renderer/background_source.js + var isRetina = window.devicePixelRatio && window.devicePixelRatio >= 2; + window.matchMedia("\n (-webkit-min-device-pixel-ratio: 2), /* Safari */\n (min-resolution: 2dppx), /* standard */\n (min-resolution: 192dpi) /* fallback */\n ").addListener(function() { + isRetina = window.devicePixelRatio && window.devicePixelRatio >= 2; + }); + function localeDateString(s2) { + if (!s2) return null; + var options2 = { day: "numeric", month: "short", year: "numeric" }; + var d2 = new Date(s2); + if (isNaN(d2.getTime())) return null; + return d2.toLocaleDateString(_mainLocalizer.localeCode(), options2); + } + function vintageRange(vintage) { + var s2; + if (vintage.start || vintage.end) { + s2 = vintage.start || "?"; + if (vintage.start !== vintage.end) { + s2 += " - " + (vintage.end || "?"); } - function zoomEnded() { - if (_skipEvents) - return; - if (_gesture !== "pan") - return; - updateProjection(); - _gesture = null; - context.map().center(projection2.invert(_cMini)); + } + return s2; + } + function rendererBackgroundSource(data) { + var source = Object.assign({}, data); + var _offset = [0, 0]; + var _name = source.name; + var _description = source.description; + var _best = !!source.best; + var _template = source.encrypted ? utilAesDecrypt(source.template) : source.template; + source.tileSize = data.tileSize || 256; + source.zoomExtent = data.zoomExtent || [0, 22]; + source.overzoom = data.overzoom !== false; + source.offset = function(val) { + if (!arguments.length) return _offset; + _offset = val; + return source; + }; + source.nudge = function(val, zoomlevel) { + _offset[0] += val[0] / Math.pow(2, zoomlevel); + _offset[1] += val[1] / Math.pow(2, zoomlevel); + return source; + }; + source.name = function() { + var id_safe = source.id.replace(/\./g, "
/g, "").replace(/<\/code>/g, "")
+ };
+ });
+ var helpPane = uiPane("help", context).key(_t("help.key")).label(_t.append("help.title")).description(_t.append("help.title")).iconName("iD-icon-help");
+ helpPane.renderContent = function(content) {
+ function clickHelp(d2, i3) {
+ var rtl = _mainLocalizer.textDirection() === "rtl";
+ content.property("scrollTop", 0);
+ helpPane.selection().select(".pane-heading h2").html(d2.title);
+ body.html(d2.content);
+ body.selectAll("a").attr("target", "_blank");
+ menuItems.classed("selected", function(m2) {
+ return m2.title === d2.title;
+ });
+ nav.html("");
+ if (rtl) {
+ nav.call(drawNext).call(drawPrevious);
+ } else {
+ nav.call(drawPrevious).call(drawNext);
}
- });
- buttonSection.select(".ignore-button").call(_t.append("QA.keepRight.ignore")).on("click.ignore", function(d3_event, d) {
- this.blur();
- const qaService = services.osmose;
- if (qaService) {
- d.newStatus = "false";
- qaService.postUpdate(d, (err, item) => dispatch10.call("change", item));
+ function drawNext(selection2) {
+ if (i3 < docs.length - 1) {
+ var nextLink = selection2.append("a").attr("href", "#").attr("class", "next").on("click", function(d3_event) {
+ d3_event.preventDefault();
+ clickHelp(docs[i3 + 1], i3 + 1);
+ });
+ nextLink.append("span").html(docs[i3 + 1].title).call(svgIcon(rtl ? "#iD-icon-backward" : "#iD-icon-forward", "inline"));
+ }
+ }
+ function drawPrevious(selection2) {
+ if (i3 > 0) {
+ var prevLink = selection2.append("a").attr("href", "#").attr("class", "previous").on("click", function(d3_event) {
+ d3_event.preventDefault();
+ clickHelp(docs[i3 - 1], i3 - 1);
+ });
+ prevLink.call(svgIcon(rtl ? "#iD-icon-forward" : "#iD-icon-backward", "inline")).append("span").html(docs[i3 - 1].title);
+ }
}
+ }
+ function clickWalkthrough(d3_event) {
+ d3_event.preventDefault();
+ if (context.inIntro()) return;
+ context.container().call(uiIntro(context));
+ context.ui().togglePanes();
+ }
+ function clickShortcuts(d3_event) {
+ d3_event.preventDefault();
+ context.container().call(context.ui().shortcuts, true);
+ }
+ var toc = content.append("ul").attr("class", "toc");
+ var menuItems = toc.selectAll("li").data(docs).enter().append("li").append("a").attr("role", "button").attr("href", "#").html(function(d2) {
+ return d2.title;
+ }).on("click", function(d3_event, d2) {
+ d3_event.preventDefault();
+ clickHelp(d2, docs.indexOf(d2));
});
- }
- osmoseEditor.error = function(val) {
- if (!arguments.length)
- return _qaItem;
- _qaItem = val;
- return osmoseEditor;
+ var shortcuts = toc.append("li").attr("class", "shortcuts").call(
+ uiTooltip().title(() => _t.append("shortcuts.tooltip")).keys(["?"]).placement("top")
+ ).append("a").attr("href", "#").on("click", clickShortcuts);
+ shortcuts.append("div").call(_t.append("shortcuts.title"));
+ var walkthrough = toc.append("li").attr("class", "walkthrough").append("a").attr("href", "#").on("click", clickWalkthrough);
+ walkthrough.append("svg").attr("class", "logo logo-walkthrough").append("use").attr("xlink:href", "#iD-logo-walkthrough");
+ walkthrough.append("div").call(_t.append("splash.walkthrough"));
+ var helpContent = content.append("div").attr("class", "left-content");
+ var body = helpContent.append("div").attr("class", "body");
+ var nav = helpContent.append("div").attr("class", "nav");
+ clickHelp(docs[0], 0);
};
- return utilRebind(osmoseEditor, dispatch10, "on");
+ return helpPane;
}
- // modules/ui/sidebar.js
- function uiSidebar(context) {
- var inspector = uiInspector(context);
- var dataEditor = uiDataEditor(context);
- var noteEditor = uiNoteEditor(context);
- var improveOsmEditor = uiImproveOsmEditor(context);
- var keepRightEditor = uiKeepRightEditor(context);
- var osmoseEditor = uiOsmoseEditor(context);
- var _current;
- var _wasData = false;
- var _wasNote = false;
- var _wasQaItem = false;
- var _pointerPrefix = "PointerEvent" in window ? "pointer" : "mouse";
- function sidebar(selection2) {
- var container = context.container();
- var minWidth = 240;
- var sidebarWidth;
- var containerWidth;
- var dragOffset;
- selection2.style("min-width", minWidth + "px").style("max-width", "400px").style("width", "33.3333%");
- var resizer = selection2.append("div").attr("class", "sidebar-resizer").on(_pointerPrefix + "down.sidebar-resizer", pointerdown);
- var downPointerId, lastClientX, containerLocGetter;
- function pointerdown(d3_event) {
- if (downPointerId)
- return;
- if ("button" in d3_event && d3_event.button !== 0)
- return;
- downPointerId = d3_event.pointerId || "mouse";
- lastClientX = d3_event.clientX;
- containerLocGetter = utilFastMouse(container.node());
- dragOffset = utilFastMouse(resizer.node())(d3_event)[0] - 1;
- sidebarWidth = selection2.node().getBoundingClientRect().width;
- containerWidth = container.node().getBoundingClientRect().width;
- var widthPct = sidebarWidth / containerWidth * 100;
- selection2.style("width", widthPct + "%").style("max-width", "85%");
- resizer.classed("dragging", true);
- select_default2(window).on("touchmove.sidebar-resizer", function(d3_event2) {
- d3_event2.preventDefault();
- }, { passive: false }).on(_pointerPrefix + "move.sidebar-resizer", pointermove).on(_pointerPrefix + "up.sidebar-resizer pointercancel.sidebar-resizer", pointerup);
- }
- function pointermove(d3_event) {
- if (downPointerId !== (d3_event.pointerId || "mouse"))
- return;
- d3_event.preventDefault();
- var dx = d3_event.clientX - lastClientX;
- lastClientX = d3_event.clientX;
- var isRTL = _mainLocalizer.textDirection() === "rtl";
- var scaleX = isRTL ? 0 : 1;
- var xMarginProperty = isRTL ? "margin-right" : "margin-left";
- var x = containerLocGetter(d3_event)[0] - dragOffset;
- sidebarWidth = isRTL ? containerWidth - x : x;
- var isCollapsed = selection2.classed("collapsed");
- var shouldCollapse = sidebarWidth < minWidth;
- selection2.classed("collapsed", shouldCollapse);
- if (shouldCollapse) {
- if (!isCollapsed) {
- selection2.style(xMarginProperty, "-400px").style("width", "400px");
- context.ui().onResize([(sidebarWidth - dx) * scaleX, 0]);
- }
- } else {
- var widthPct = sidebarWidth / containerWidth * 100;
- selection2.style(xMarginProperty, null).style("width", widthPct + "%");
- if (isCollapsed) {
- context.ui().onResize([-sidebarWidth * scaleX, 0]);
- } else {
- context.ui().onResize([-dx * scaleX, 0]);
- }
- }
- }
- function pointerup(d3_event) {
- if (downPointerId !== (d3_event.pointerId || "mouse"))
- return;
- downPointerId = null;
- resizer.classed("dragging", false);
- select_default2(window).on("touchmove.sidebar-resizer", null).on(_pointerPrefix + "move.sidebar-resizer", null).on(_pointerPrefix + "up.sidebar-resizer pointercancel.sidebar-resizer", null);
- }
- var featureListWrap = selection2.append("div").attr("class", "feature-list-pane").call(uiFeatureList(context));
- var inspectorWrap = selection2.append("div").attr("class", "inspector-hidden inspector-wrap");
- var hoverModeSelect = function(targets) {
- context.container().selectAll(".feature-list-item button").classed("hover", false);
- if (context.selectedIDs().length > 1 && targets && targets.length) {
- var elements = context.container().selectAll(".feature-list-item button").filter(function(node) {
- return targets.indexOf(node) !== -1;
- });
- if (!elements.empty()) {
- elements.classed("hover", true);
- }
- }
- };
- sidebar.hoverModeSelect = throttle_default(hoverModeSelect, 200);
- function hover(targets) {
- var datum2 = targets && targets.length && targets[0];
- if (datum2 && datum2.__featurehash__) {
- _wasData = true;
- sidebar.show(dataEditor.datum(datum2));
- selection2.selectAll(".sidebar-component").classed("inspector-hover", true);
- } else if (datum2 instanceof osmNote) {
- if (context.mode().id === "drag-note")
- return;
- _wasNote = true;
- var osm = services.osm;
- if (osm) {
- datum2 = osm.getNote(datum2.id);
- }
- sidebar.show(noteEditor.note(datum2));
- selection2.selectAll(".sidebar-component").classed("inspector-hover", true);
- } else if (datum2 instanceof QAItem) {
- _wasQaItem = true;
- var errService = services[datum2.service];
- if (errService) {
- datum2 = errService.getError(datum2.id);
- }
- var errEditor;
- if (datum2.service === "keepRight") {
- errEditor = keepRightEditor;
- } else if (datum2.service === "osmose") {
- errEditor = osmoseEditor;
- } else {
- errEditor = improveOsmEditor;
- }
- context.container().selectAll(".qaItem." + datum2.service).classed("hover", function(d) {
- return d.id === datum2.id;
- });
- sidebar.show(errEditor.error(datum2));
- selection2.selectAll(".sidebar-component").classed("inspector-hover", true);
- } else if (!_current && datum2 instanceof osmEntity) {
- featureListWrap.classed("inspector-hidden", true);
- inspectorWrap.classed("inspector-hidden", false).classed("inspector-hover", true);
- if (!inspector.entityIDs() || !utilArrayIdentical(inspector.entityIDs(), [datum2.id]) || inspector.state() !== "hover") {
- inspector.state("hover").entityIDs([datum2.id]).newFeature(false);
- inspectorWrap.call(inspector);
- }
- } else if (!_current) {
- featureListWrap.classed("inspector-hidden", false);
- inspectorWrap.classed("inspector-hidden", true);
- inspector.state("hide");
- } else if (_wasData || _wasNote || _wasQaItem) {
- _wasNote = false;
- _wasData = false;
- _wasQaItem = false;
- context.container().selectAll(".note").classed("hover", false);
- context.container().selectAll(".qaItem").classed("hover", false);
- sidebar.hide();
- }
- }
- sidebar.hover = throttle_default(hover, 200);
- sidebar.intersects = function(extent) {
- var rect = selection2.node().getBoundingClientRect();
- return extent.intersects([
- context.projection.invert([0, rect.height]),
- context.projection.invert([rect.width, 0])
- ]);
- };
- sidebar.select = function(ids, newFeature) {
- sidebar.hide();
- if (ids && ids.length) {
- var entity = ids.length === 1 && context.entity(ids[0]);
- if (entity && newFeature && selection2.classed("collapsed")) {
- var extent = entity.extent(context.graph());
- sidebar.expand(sidebar.intersects(extent));
- }
- featureListWrap.classed("inspector-hidden", true);
- inspectorWrap.classed("inspector-hidden", false).classed("inspector-hover", false);
- inspector.state("select").entityIDs(ids).newFeature(newFeature);
- inspectorWrap.call(inspector);
- } else {
- inspector.state("hide");
- }
- };
- sidebar.showPresetList = function() {
- inspector.showList();
- };
- sidebar.show = function(component, element) {
- featureListWrap.classed("inspector-hidden", true);
- inspectorWrap.classed("inspector-hidden", true);
- if (_current)
- _current.remove();
- _current = selection2.append("div").attr("class", "sidebar-component").call(component, element);
- };
- sidebar.hide = function() {
- featureListWrap.classed("inspector-hidden", false);
- inspectorWrap.classed("inspector-hidden", true);
- if (_current)
- _current.remove();
- _current = null;
- };
- sidebar.expand = function(moveMap) {
- if (selection2.classed("collapsed")) {
- sidebar.toggle(moveMap);
- }
- };
- sidebar.collapse = function(moveMap) {
- if (!selection2.classed("collapsed")) {
- sidebar.toggle(moveMap);
- }
- };
- sidebar.toggle = function(moveMap) {
- if (context.inIntro())
- return;
- var isCollapsed = selection2.classed("collapsed");
- var isCollapsing = !isCollapsed;
- var isRTL = _mainLocalizer.textDirection() === "rtl";
- var scaleX = isRTL ? 0 : 1;
- var xMarginProperty = isRTL ? "margin-right" : "margin-left";
- sidebarWidth = selection2.node().getBoundingClientRect().width;
- selection2.style("width", sidebarWidth + "px");
- var startMargin, endMargin, lastMargin;
- if (isCollapsing) {
- startMargin = lastMargin = 0;
- endMargin = -sidebarWidth;
- } else {
- startMargin = lastMargin = -sidebarWidth;
- endMargin = 0;
- }
- if (!isCollapsing) {
- selection2.classed("collapsed", isCollapsing);
- }
- selection2.transition().style(xMarginProperty, endMargin + "px").tween("panner", function() {
- var i2 = number_default(startMargin, endMargin);
- return function(t) {
- var dx = lastMargin - Math.round(i2(t));
- lastMargin = lastMargin - dx;
- context.ui().onResize(moveMap ? void 0 : [dx * scaleX, 0]);
- };
- }).on("end", function() {
- if (isCollapsing) {
- selection2.classed("collapsed", isCollapsing);
- }
- if (!isCollapsing) {
- var containerWidth2 = container.node().getBoundingClientRect().width;
- var widthPct = sidebarWidth / containerWidth2 * 100;
- selection2.style(xMarginProperty, null).style("width", widthPct + "%");
- }
- });
+ // modules/ui/sections/validation_issues.js
+ function uiSectionValidationIssues(id2, severity, context) {
+ var _issues = [];
+ var section = uiSection(id2, context).label(function() {
+ if (!_issues) return "";
+ var issueCountText = _issues.length > 1e3 ? "1000+" : String(_issues.length);
+ return _t.append("inspector.title_count", { title: _t("issues." + severity + "s.list_title"), count: issueCountText });
+ }).disclosureContent(renderDisclosureContent).shouldDisplay(function() {
+ return _issues && _issues.length;
+ });
+ function getOptions() {
+ return {
+ what: corePreferences("validate-what") || "edited",
+ where: corePreferences("validate-where") || "all"
};
- resizer.on("dblclick", function(d3_event) {
- d3_event.preventDefault();
- if (d3_event.sourceEvent) {
- d3_event.sourceEvent.preventDefault();
- }
- sidebar.toggle();
+ }
+ function reloadIssues() {
+ _issues = context.validator().getIssuesBySeverity(getOptions())[severity];
+ }
+ function renderDisclosureContent(selection2) {
+ var center = context.map().center();
+ var graph = context.graph();
+ var issues = _issues.map(function withDistance(issue) {
+ var extent = issue.extent(graph);
+ var dist = extent ? geoSphericalDistance(center, extent.center()) : 0;
+ return Object.assign(issue, { dist });
+ }).sort(function byDistance(a2, b2) {
+ return a2.dist - b2.dist;
});
- context.map().on("crossEditableZoom.sidebar", function(within) {
- if (!within && !selection2.select(".inspector-hover").empty()) {
- hover([]);
- }
+ issues = issues.slice(0, 1e3);
+ selection2.call(drawIssuesList, issues);
+ }
+ function drawIssuesList(selection2, issues) {
+ var list2 = selection2.selectAll(".issues-list").data([0]);
+ list2 = list2.enter().append("ul").attr("class", "layer-list issues-list " + severity + "s-list").merge(list2);
+ var items = list2.selectAll("li").data(issues, function(d2) {
+ return d2.key;
+ });
+ items.exit().remove();
+ var itemsEnter = items.enter().append("li").attr("class", function(d2) {
+ return "issue severity-" + d2.severity;
+ });
+ var labelsEnter = itemsEnter.append("button").attr("class", "issue-label").on("click", function(d3_event, d2) {
+ context.validator().focusIssue(d2);
+ }).on("mouseover", function(d3_event, d2) {
+ utilHighlightEntities(d2.entityIds, true, context);
+ }).on("mouseout", function(d3_event, d2) {
+ utilHighlightEntities(d2.entityIds, false, context);
+ });
+ var textEnter = labelsEnter.append("span").attr("class", "issue-text");
+ textEnter.append("span").attr("class", "issue-icon").each(function(d2) {
+ var iconName = "#iD-icon-" + (d2.severity === "warning" ? "alert" : "error");
+ select_default2(this).call(svgIcon(iconName));
+ });
+ textEnter.append("span").attr("class", "issue-message");
+ items = items.merge(itemsEnter).order();
+ items.selectAll(".issue-message").text("").each(function(d2) {
+ return d2.message(context)(select_default2(this));
});
}
- sidebar.showPresetList = function() {
- };
- sidebar.hover = function() {
- };
- sidebar.hover.cancel = function() {
- };
- sidebar.intersects = function() {
- };
- sidebar.select = function() {
- };
- sidebar.show = function() {
- };
- sidebar.hide = function() {
- };
- sidebar.expand = function() {
- };
- sidebar.collapse = function() {
- };
- sidebar.toggle = function() {
- };
- return sidebar;
- }
-
- // modules/modes/draw_area.js
- function modeDrawArea(context, wayID, startGraph, button) {
- var mode = {
- button,
- id: "draw-area"
- };
- var behavior = behaviorDrawWay(context, wayID, mode, startGraph).on("rejectedSelfIntersection.modeDrawArea", function() {
- context.ui().flash.iconName("#iD-icon-no").label(_t.append("self_intersection.error.areas"))();
+ context.validator().on("validated.uiSectionValidationIssues" + id2, function() {
+ window.requestIdleCallback(function() {
+ reloadIssues();
+ section.reRender();
+ });
});
- mode.wayID = wayID;
- mode.enter = function() {
- context.install(behavior);
- };
- mode.exit = function() {
- context.uninstall(behavior);
- };
- mode.selectedIDs = function() {
- return [wayID];
- };
- mode.activeID = function() {
- return behavior && behavior.activeID() || [];
- };
- return mode;
+ context.map().on(
+ "move.uiSectionValidationIssues" + id2,
+ debounce_default(function() {
+ window.requestIdleCallback(function() {
+ if (getOptions().where === "visible") {
+ reloadIssues();
+ }
+ section.reRender();
+ });
+ }, 1e3)
+ );
+ return section;
}
- // modules/modes/add_area.js
- function modeAddArea(context, mode) {
- mode.id = "add-area";
- var behavior = behaviorAddWay(context).on("start", start2).on("startFromWay", startFromWay).on("startFromNode", startFromNode);
- var defaultTags = { area: "yes" };
- if (mode.preset)
- defaultTags = mode.preset.setTags(defaultTags, "area");
- function actionClose(wayId) {
- return function(graph) {
- return graph.replace(graph.entity(wayId).close());
- };
- }
- function start2(loc) {
- var startGraph = context.graph();
- var node = osmNode({ loc });
- var way = osmWay({ tags: defaultTags });
- context.perform(
- actionAddEntity(node),
- actionAddEntity(way),
- actionAddVertex(way.id, node.id),
- actionClose(way.id)
- );
- context.enter(modeDrawArea(context, way.id, startGraph, mode.button));
+ // modules/ui/sections/validation_options.js
+ function uiSectionValidationOptions(context) {
+ var section = uiSection("issues-options", context).content(renderContent);
+ function renderContent(selection2) {
+ var container = selection2.selectAll(".issues-options-container").data([0]);
+ container = container.enter().append("div").attr("class", "issues-options-container").merge(container);
+ var data = [
+ { key: "what", values: ["edited", "all"] },
+ { key: "where", values: ["visible", "all"] }
+ ];
+ var options2 = container.selectAll(".issues-option").data(data, function(d2) {
+ return d2.key;
+ });
+ var optionsEnter = options2.enter().append("div").attr("class", function(d2) {
+ return "issues-option issues-option-" + d2.key;
+ });
+ optionsEnter.append("div").attr("class", "issues-option-title").html(function(d2) {
+ return _t.html("issues.options." + d2.key + ".title");
+ });
+ var valuesEnter = optionsEnter.selectAll("label").data(function(d2) {
+ return d2.values.map(function(val) {
+ return { value: val, key: d2.key };
+ });
+ }).enter().append("label");
+ valuesEnter.append("input").attr("type", "radio").attr("name", function(d2) {
+ return "issues-option-" + d2.key;
+ }).attr("value", function(d2) {
+ return d2.value;
+ }).property("checked", function(d2) {
+ return getOptions()[d2.key] === d2.value;
+ }).on("change", function(d3_event, d2) {
+ updateOptionValue(d3_event, d2.key, d2.value);
+ });
+ valuesEnter.append("span").html(function(d2) {
+ return _t.html("issues.options." + d2.key + "." + d2.value);
+ });
}
- function startFromWay(loc, edge) {
- var startGraph = context.graph();
- var node = osmNode({ loc });
- var way = osmWay({ tags: defaultTags });
- context.perform(
- actionAddEntity(node),
- actionAddEntity(way),
- actionAddVertex(way.id, node.id),
- actionClose(way.id),
- actionAddMidpoint({ loc, edge }, node)
- );
- context.enter(modeDrawArea(context, way.id, startGraph, mode.button));
+ function getOptions() {
+ return {
+ what: corePreferences("validate-what") || "edited",
+ // 'all', 'edited'
+ where: corePreferences("validate-where") || "all"
+ // 'all', 'visible'
+ };
}
- function startFromNode(node) {
- var startGraph = context.graph();
- var way = osmWay({ tags: defaultTags });
- context.perform(
- actionAddEntity(way),
- actionAddVertex(way.id, node.id),
- actionClose(way.id)
- );
- context.enter(modeDrawArea(context, way.id, startGraph, mode.button));
+ function updateOptionValue(d3_event, d2, val) {
+ if (!val && d3_event && d3_event.target) {
+ val = d3_event.target.value;
+ }
+ corePreferences("validate-" + d2, val);
+ context.validator().validate();
}
- mode.enter = function() {
- context.install(behavior);
- };
- mode.exit = function() {
- context.uninstall(behavior);
- };
- return mode;
+ return section;
}
- // modules/modes/add_line.js
- function modeAddLine(context, mode) {
- mode.id = "add-line";
- var behavior = behaviorAddWay(context).on("start", start2).on("startFromWay", startFromWay).on("startFromNode", startFromNode);
- var defaultTags = {};
- if (mode.preset)
- defaultTags = mode.preset.setTags(defaultTags, "line");
- function start2(loc) {
- var startGraph = context.graph();
- var node = osmNode({ loc });
- var way = osmWay({ tags: defaultTags });
- context.perform(
- actionAddEntity(node),
- actionAddEntity(way),
- actionAddVertex(way.id, node.id)
- );
- context.enter(modeDrawLine(context, way.id, startGraph, mode.button));
+ // modules/ui/sections/validation_rules.js
+ function uiSectionValidationRules(context) {
+ var MINSQUARE = 0;
+ var MAXSQUARE = 20;
+ var DEFAULTSQUARE = 5;
+ var section = uiSection("issues-rules", context).disclosureContent(renderDisclosureContent).label(() => _t.append("issues.rules.title"));
+ var _ruleKeys = context.validator().getRuleKeys().filter(function(key) {
+ return key !== "maprules";
+ }).sort(function(key1, key2) {
+ return _t("issues." + key1 + ".title") < _t("issues." + key2 + ".title") ? -1 : 1;
+ });
+ function renderDisclosureContent(selection2) {
+ var container = selection2.selectAll(".issues-rulelist-container").data([0]);
+ var containerEnter = container.enter().append("div").attr("class", "issues-rulelist-container");
+ containerEnter.append("ul").attr("class", "layer-list issue-rules-list");
+ var ruleLinks = containerEnter.append("div").attr("class", "issue-rules-links section-footer");
+ ruleLinks.append("a").attr("class", "issue-rules-link").attr("role", "button").attr("href", "#").call(_t.append("issues.disable_all")).on("click", function(d3_event) {
+ d3_event.preventDefault();
+ context.validator().disableRules(_ruleKeys);
+ });
+ ruleLinks.append("a").attr("class", "issue-rules-link").attr("role", "button").attr("href", "#").call(_t.append("issues.enable_all")).on("click", function(d3_event) {
+ d3_event.preventDefault();
+ context.validator().disableRules([]);
+ });
+ container = container.merge(containerEnter);
+ container.selectAll(".issue-rules-list").call(drawListItems, _ruleKeys, "checkbox", "rule", toggleRule, isRuleEnabled);
}
- function startFromWay(loc, edge) {
- var startGraph = context.graph();
- var node = osmNode({ loc });
- var way = osmWay({ tags: defaultTags });
- context.perform(
- actionAddEntity(node),
- actionAddEntity(way),
- actionAddVertex(way.id, node.id),
- actionAddMidpoint({ loc, edge }, node)
- );
- context.enter(modeDrawLine(context, way.id, startGraph, mode.button));
+ function drawListItems(selection2, data, type2, name, change, active) {
+ var items = selection2.selectAll("li").data(data);
+ items.exit().remove();
+ var enter = items.enter().append("li");
+ if (name === "rule") {
+ enter.call(
+ uiTooltip().title(function(d2) {
+ return _t.append("issues." + d2 + ".tip");
+ }).placement("top")
+ );
+ }
+ var label = enter.append("label");
+ label.append("input").attr("type", type2).attr("name", name).on("change", change);
+ label.append("span").html(function(d2) {
+ var params = {};
+ if (d2 === "unsquare_way") {
+ params.val = { html: '' };
+ }
+ return _t.html("issues." + d2 + ".title", params);
+ });
+ items = items.merge(enter);
+ items.classed("active", active).selectAll("input").property("checked", active).property("indeterminate", false);
+ var degStr = corePreferences("validate-square-degrees");
+ if (degStr === null) {
+ degStr = DEFAULTSQUARE.toString();
+ }
+ var span = items.selectAll(".square-degrees");
+ var input = span.selectAll(".square-degrees-input").data([0]);
+ input.enter().append("input").attr("type", "number").attr("min", MINSQUARE.toString()).attr("max", MAXSQUARE.toString()).attr("step", "0.5").attr("class", "square-degrees-input").call(utilNoAuto).on("click", function(d3_event) {
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ this.select();
+ }).on("keyup", function(d3_event) {
+ if (d3_event.keyCode === 13) {
+ this.blur();
+ this.select();
+ }
+ }).on("blur", changeSquare).merge(input).property("value", degStr);
}
- function startFromNode(node) {
- var startGraph = context.graph();
- var way = osmWay({ tags: defaultTags });
- context.perform(
- actionAddEntity(way),
- actionAddVertex(way.id, node.id)
- );
- context.enter(modeDrawLine(context, way.id, startGraph, mode.button));
+ function changeSquare() {
+ var input = select_default2(this);
+ var degStr = utilGetSetValue(input).trim();
+ var degNum = Number(degStr);
+ if (!isFinite(degNum)) {
+ degNum = DEFAULTSQUARE;
+ } else if (degNum > MAXSQUARE) {
+ degNum = MAXSQUARE;
+ } else if (degNum < MINSQUARE) {
+ degNum = MINSQUARE;
+ }
+ degNum = Math.round(degNum * 10) / 10;
+ degStr = degNum.toString();
+ input.property("value", degStr);
+ corePreferences("validate-square-degrees", degStr);
+ context.validator().revalidateUnsquare();
}
- mode.enter = function() {
- context.install(behavior);
- };
- mode.exit = function() {
- context.uninstall(behavior);
- };
- return mode;
+ function isRuleEnabled(d2) {
+ return context.validator().isRuleEnabled(d2);
+ }
+ function toggleRule(d3_event, d2) {
+ context.validator().toggleRule(d2);
+ }
+ context.validator().on("validated.uiSectionValidationRules", function() {
+ window.requestIdleCallback(section.reRender);
+ });
+ return section;
}
- // modules/modes/add_point.js
- function modeAddPoint(context, mode) {
- mode.id = "add-point";
- var behavior = behaviorDraw(context).on("click", add).on("clickWay", addWay).on("clickNode", addNode).on("cancel", cancel).on("finish", cancel);
- var defaultTags = {};
- if (mode.preset)
- defaultTags = mode.preset.setTags(defaultTags, "point");
- function add(loc) {
- var node = osmNode({ loc, tags: defaultTags });
- context.perform(
- actionAddEntity(node),
- _t("operations.add.annotation.point")
- );
- enterSelectMode(node);
+ // modules/ui/sections/validation_status.js
+ function uiSectionValidationStatus(context) {
+ var section = uiSection("issues-status", context).content(renderContent).shouldDisplay(function() {
+ var issues = context.validator().getIssues(getOptions());
+ return issues.length === 0;
+ });
+ function getOptions() {
+ return {
+ what: corePreferences("validate-what") || "edited",
+ where: corePreferences("validate-where") || "all"
+ };
}
- function addWay(loc, edge) {
- var node = osmNode({ tags: defaultTags });
- context.perform(
- actionAddMidpoint({ loc, edge }, node),
- _t("operations.add.annotation.vertex")
- );
- enterSelectMode(node);
+ function renderContent(selection2) {
+ var box = selection2.selectAll(".box").data([0]);
+ var boxEnter = box.enter().append("div").attr("class", "box");
+ boxEnter.append("div").call(svgIcon("#iD-icon-apply", "pre-text"));
+ var noIssuesMessage = boxEnter.append("span");
+ noIssuesMessage.append("strong").attr("class", "message");
+ noIssuesMessage.append("br");
+ noIssuesMessage.append("span").attr("class", "details");
+ renderIgnoredIssuesReset(selection2);
+ setNoIssuesText(selection2);
}
- function enterSelectMode(node) {
- context.enter(
- modeSelect(context, [node.id]).newFeature(true)
- );
+ function renderIgnoredIssuesReset(selection2) {
+ var ignoredIssues = context.validator().getIssues({ what: "all", where: "all", includeDisabledRules: true, includeIgnored: "only" });
+ var resetIgnored = selection2.selectAll(".reset-ignored").data(ignoredIssues.length ? [0] : []);
+ resetIgnored.exit().remove();
+ var resetIgnoredEnter = resetIgnored.enter().append("div").attr("class", "reset-ignored section-footer");
+ resetIgnoredEnter.append("a").attr("href", "#");
+ resetIgnored = resetIgnored.merge(resetIgnoredEnter);
+ resetIgnored.select("a").html(_t.html("inspector.title_count", { title: { html: _t.html("issues.reset_ignored") }, count: ignoredIssues.length }));
+ resetIgnored.on("click", function(d3_event) {
+ d3_event.preventDefault();
+ context.validator().resetIgnoredIssues();
+ });
}
- function addNode(node) {
- if (Object.keys(defaultTags).length === 0) {
- enterSelectMode(node);
- return;
+ function setNoIssuesText(selection2) {
+ var opts = getOptions();
+ function checkForHiddenIssues(cases) {
+ for (var type2 in cases) {
+ var hiddenOpts = cases[type2];
+ var hiddenIssues = context.validator().getIssues(hiddenOpts);
+ if (hiddenIssues.length) {
+ selection2.select(".box .details").html("").call(_t.append(
+ "issues.no_issues.hidden_issues." + type2,
+ { count: hiddenIssues.length.toString() }
+ ));
+ return;
+ }
+ }
+ selection2.select(".box .details").html("").call(_t.append("issues.no_issues.hidden_issues.none"));
}
- var tags = Object.assign({}, node.tags);
- for (var key in defaultTags) {
- tags[key] = defaultTags[key];
+ var messageType;
+ if (opts.what === "edited" && opts.where === "visible") {
+ messageType = "edits_in_view";
+ checkForHiddenIssues({
+ elsewhere: { what: "edited", where: "all" },
+ everything_else: { what: "all", where: "visible" },
+ disabled_rules: { what: "edited", where: "visible", includeDisabledRules: "only" },
+ everything_else_elsewhere: { what: "all", where: "all" },
+ disabled_rules_elsewhere: { what: "edited", where: "all", includeDisabledRules: "only" },
+ ignored_issues: { what: "edited", where: "visible", includeIgnored: "only" },
+ ignored_issues_elsewhere: { what: "edited", where: "all", includeIgnored: "only" }
+ });
+ } else if (opts.what === "edited" && opts.where === "all") {
+ messageType = "edits";
+ checkForHiddenIssues({
+ everything_else: { what: "all", where: "all" },
+ disabled_rules: { what: "edited", where: "all", includeDisabledRules: "only" },
+ ignored_issues: { what: "edited", where: "all", includeIgnored: "only" }
+ });
+ } else if (opts.what === "all" && opts.where === "visible") {
+ messageType = "everything_in_view";
+ checkForHiddenIssues({
+ elsewhere: { what: "all", where: "all" },
+ disabled_rules: { what: "all", where: "visible", includeDisabledRules: "only" },
+ disabled_rules_elsewhere: { what: "all", where: "all", includeDisabledRules: "only" },
+ ignored_issues: { what: "all", where: "visible", includeIgnored: "only" },
+ ignored_issues_elsewhere: { what: "all", where: "all", includeIgnored: "only" }
+ });
+ } else if (opts.what === "all" && opts.where === "all") {
+ messageType = "everything";
+ checkForHiddenIssues({
+ disabled_rules: { what: "all", where: "all", includeDisabledRules: "only" },
+ ignored_issues: { what: "all", where: "all", includeIgnored: "only" }
+ });
}
- context.perform(
- actionChangeTags(node.id, tags),
- _t("operations.add.annotation.point")
- );
- enterSelectMode(node);
- }
- function cancel() {
- context.enter(modeBrowse(context));
+ if (opts.what === "edited" && context.history().difference().summary().length === 0) {
+ messageType = "no_edits";
+ }
+ selection2.select(".box .message").html("").call(_t.append("issues.no_issues.message." + messageType));
}
- mode.enter = function() {
- context.install(behavior);
- };
- mode.exit = function() {
- context.uninstall(behavior);
- };
- return mode;
+ context.validator().on("validated.uiSectionValidationStatus", function() {
+ window.requestIdleCallback(section.reRender);
+ });
+ context.map().on(
+ "move.uiSectionValidationStatus",
+ debounce_default(function() {
+ window.requestIdleCallback(section.reRender);
+ }, 1e3)
+ );
+ return section;
}
- // modules/modes/select_note.js
- function modeSelectNote(context, selectedNoteID) {
- var mode = {
- id: "select-note",
- button: "browse"
- };
- var _keybinding = utilKeybinding("select-note");
- var _noteEditor = uiNoteEditor(context).on("change", function() {
- context.map().pan([0, 0]);
- var note = checkSelectedID();
- if (!note)
- return;
- context.ui().sidebar.show(_noteEditor.note(note));
- });
- var _behaviors = [
- behaviorBreathe(context),
- behaviorHover(context),
- behaviorSelect(context),
- behaviorLasso(context),
- modeDragNode(context).behavior,
- modeDragNote(context).behavior
- ];
- var _newFeature = false;
- function checkSelectedID() {
- if (!services.osm)
- return;
- var note = services.osm.getNote(selectedNoteID);
- if (!note) {
- context.enter(modeBrowse(context));
+ // modules/ui/panes/issues.js
+ function uiPaneIssues(context) {
+ var issuesPane = uiPane("issues", context).key(_t("issues.key")).label(_t.append("issues.title")).description(_t.append("issues.title")).iconName("iD-icon-alert").sections([
+ uiSectionValidationOptions(context),
+ uiSectionValidationStatus(context),
+ uiSectionValidationIssues("issues-errors", "error", context),
+ uiSectionValidationIssues("issues-warnings", "warning", context),
+ uiSectionValidationRules(context)
+ ]);
+ return issuesPane;
+ }
+
+ // modules/ui/settings/custom_data.js
+ function uiSettingsCustomData(context) {
+ var dispatch14 = dispatch_default("change");
+ function render(selection2) {
+ var dataLayer = context.layers().layer("data");
+ var _origSettings = {
+ fileList: dataLayer && dataLayer.fileList() || null,
+ url: corePreferences("settings-custom-data-url")
+ };
+ var _currSettings = {
+ fileList: dataLayer && dataLayer.fileList() || null
+ // url: prefs('settings-custom-data-url')
+ };
+ var modal = uiConfirm(selection2).okButton();
+ modal.classed("settings-modal settings-custom-data", true);
+ modal.select(".modal-section.header").append("h3").call(_t.append("settings.custom_data.header"));
+ var textSection = modal.select(".modal-section.message-text");
+ textSection.append("pre").attr("class", "instructions-file").call(_t.append("settings.custom_data.file.instructions"));
+ textSection.append("input").attr("class", "field-file").attr("type", "file").attr("accept", ".gpx,.kml,.geojson,.json,application/gpx+xml,application/vnd.google-earth.kml+xml,application/geo+json,application/json").property("files", _currSettings.fileList).on("change", function(d3_event) {
+ var files = d3_event.target.files;
+ if (files && files.length) {
+ _currSettings.url = "";
+ textSection.select(".field-url").property("value", "");
+ _currSettings.fileList = files;
+ } else {
+ _currSettings.fileList = null;
+ }
+ });
+ textSection.append("h4").call(_t.append("settings.custom_data.or"));
+ textSection.append("pre").attr("class", "instructions-url").call(_t.append("settings.custom_data.url.instructions"));
+ textSection.append("textarea").attr("class", "field-url").attr("placeholder", _t("settings.custom_data.url.placeholder")).call(utilNoAuto).property("value", _currSettings.url);
+ var buttonSection = modal.select(".modal-section.buttons");
+ buttonSection.insert("button", ".ok-button").attr("class", "button cancel-button secondary-action").call(_t.append("confirm.cancel"));
+ buttonSection.select(".cancel-button").on("click.cancel", clickCancel);
+ buttonSection.select(".ok-button").attr("disabled", isSaveDisabled).on("click.save", clickSave);
+ function isSaveDisabled() {
+ return null;
}
- return note;
- }
- function selectNote(d3_event, drawn) {
- if (!checkSelectedID())
- return;
- var selection2 = context.surface().selectAll(".layer-notes .note-" + selectedNoteID);
- if (selection2.empty()) {
- var source = d3_event && d3_event.type === "zoom" && d3_event.sourceEvent;
- if (drawn && source && (source.type === "pointermove" || source.type === "mousemove" || source.type === "touchmove")) {
- context.enter(modeBrowse(context));
+ function clickCancel() {
+ textSection.select(".field-url").property("value", _origSettings.url);
+ corePreferences("settings-custom-data-url", _origSettings.url);
+ this.blur();
+ modal.close();
+ }
+ function clickSave() {
+ _currSettings.url = textSection.select(".field-url").property("value").trim();
+ if (_currSettings.url) {
+ _currSettings.fileList = null;
}
- } else {
- selection2.classed("selected", true);
- context.selectedNoteID(selectedNoteID);
+ if (_currSettings.fileList) {
+ _currSettings.url = "";
+ }
+ corePreferences("settings-custom-data-url", _currSettings.url);
+ this.blur();
+ modal.close();
+ dispatch14.call("change", this, _currSettings);
}
}
- function esc() {
- if (context.container().select(".combobox").size())
- return;
- context.enter(modeBrowse(context));
- }
- mode.zoomToSelected = function() {
- if (!services.osm)
- return;
- var note = services.osm.getNote(selectedNoteID);
- if (note) {
- context.map().centerZoomEase(note.loc, 20);
- }
- };
- mode.newFeature = function(val) {
- if (!arguments.length)
- return _newFeature;
- _newFeature = val;
- return mode;
- };
- mode.enter = function() {
- var note = checkSelectedID();
- if (!note)
- return;
- _behaviors.forEach(context.install);
- _keybinding.on(_t("inspector.zoom_to.key"), mode.zoomToSelected).on("\u238B", esc, true);
- select_default2(document).call(_keybinding);
- selectNote();
- var sidebar = context.ui().sidebar;
- sidebar.show(_noteEditor.note(note).newNote(_newFeature));
- sidebar.expand(sidebar.intersects(note.extent()));
- context.map().on("drawn.select", selectNote);
- };
- mode.exit = function() {
- _behaviors.forEach(context.uninstall);
- select_default2(document).call(_keybinding.unbind);
- context.surface().selectAll(".layer-notes .selected").classed("selected hover", false);
- context.map().on("drawn.select", null);
- context.ui().sidebar.hide();
- context.selectedNoteID(null);
- };
- return mode;
+ return utilRebind(render, dispatch14, "on");
}
- // modules/modes/add_note.js
- function modeAddNote(context) {
- var mode = {
- id: "add-note",
- button: "note",
- description: _t.append("modes.add_note.description"),
- key: _t("modes.add_note.key")
- };
- var behavior = behaviorDraw(context).on("click", add).on("cancel", cancel).on("finish", cancel);
- function add(loc) {
- var osm = services.osm;
- if (!osm)
- return;
- var note = osmNote({ loc, status: "open", comments: [] });
- osm.replaceNote(note);
- context.map().pan([0, 0]);
- context.selectedNoteID(note.id).enter(modeSelectNote(context, note.id).newFeature(true));
+ // modules/ui/sections/data_layers.js
+ function uiSectionDataLayers(context) {
+ var settingsCustomData = uiSettingsCustomData(context).on("change", customChanged);
+ var layers = context.layers();
+ var section = uiSection("data-layers", context).label(() => _t.append("map_data.data_layers")).disclosureContent(renderDisclosureContent);
+ function renderDisclosureContent(selection2) {
+ var container = selection2.selectAll(".data-layer-container").data([0]);
+ container.enter().append("div").attr("class", "data-layer-container").merge(container).call(drawOsmItems).call(drawQAItems).call(drawCustomDataItems).call(drawVectorItems).call(drawPanelItems);
}
- function cancel() {
- context.enter(modeBrowse(context));
+ function showsLayer(which) {
+ var layer = layers.layer(which);
+ if (layer) {
+ return layer.enabled();
+ }
+ return false;
}
- mode.enter = function() {
- context.install(behavior);
- };
- mode.exit = function() {
- context.uninstall(behavior);
- };
- return mode;
- }
-
- // modules/modes/save.js
- function modeSave(context) {
- var mode = { id: "save" };
- var keybinding = utilKeybinding("modeSave");
- var commit = uiCommit(context).on("cancel", cancel);
- var _conflictsUi;
- var _location;
- var _success;
- var uploader = context.uploader().on("saveStarted.modeSave", function() {
- keybindingOff();
- }).on("willAttemptUpload.modeSave", prepareForSuccess).on("progressChanged.modeSave", showProgress).on("resultNoChanges.modeSave", function() {
- cancel();
- }).on("resultErrors.modeSave", showErrors).on("resultConflicts.modeSave", showConflicts).on("resultSuccess.modeSave", showSuccess);
- function cancel() {
- context.enter(modeBrowse(context));
+ function setLayer(which, enabled) {
+ var mode = context.mode();
+ if (mode && /^draw/.test(mode.id)) return;
+ var layer = layers.layer(which);
+ if (layer) {
+ layer.enabled(enabled);
+ if (!enabled && (which === "osm" || which === "notes")) {
+ context.enter(modeBrowse(context));
+ }
+ }
}
- function showProgress(num, total) {
- var modal = context.container().select(".loading-modal .modal-section");
- var progress = modal.selectAll(".progress").data([0]);
- progress.enter().append("div").attr("class", "progress").merge(progress).text(_t("save.conflict_progress", { num, total }));
+ function toggleLayer(which) {
+ setLayer(which, !showsLayer(which));
}
- function showConflicts(changeset, conflicts, origChanges) {
- var selection2 = context.container().select(".sidebar").append("div").attr("class", "sidebar-component");
- context.container().selectAll(".main-content").classed("active", true).classed("inactive", false);
- _conflictsUi = uiConflicts(context).conflictList(conflicts).origChanges(origChanges).on("cancel", function() {
- context.container().selectAll(".main-content").classed("active", false).classed("inactive", true);
- selection2.remove();
- keybindingOn();
- uploader.cancelConflictResolution();
- }).on("save", function() {
- context.container().selectAll(".main-content").classed("active", false).classed("inactive", true);
- selection2.remove();
- uploader.processResolvedConflicts(changeset);
+ function drawOsmItems(selection2) {
+ var osmKeys = ["osm", "notes"];
+ var osmLayers = layers.all().filter(function(obj) {
+ return osmKeys.indexOf(obj.id) !== -1;
+ });
+ var ul = selection2.selectAll(".layer-list-osm").data([0]);
+ ul = ul.enter().append("ul").attr("class", "layer-list layer-list-osm").merge(ul);
+ var li = ul.selectAll(".list-item").data(osmLayers);
+ li.exit().remove();
+ var liEnter = li.enter().append("li").attr("class", function(d2) {
+ return "list-item list-item-" + d2.id;
+ });
+ var labelEnter = liEnter.append("label").each(function(d2) {
+ if (d2.id === "osm") {
+ select_default2(this).call(
+ uiTooltip().title(() => _t.append("map_data.layers." + d2.id + ".tooltip")).keys([uiCmd("\u2325" + _t("area_fill.wireframe.key"))]).placement("bottom")
+ );
+ } else {
+ select_default2(this).call(
+ uiTooltip().title(() => _t.append("map_data.layers." + d2.id + ".tooltip")).placement("bottom")
+ );
+ }
+ });
+ labelEnter.append("input").attr("type", "checkbox").on("change", function(d3_event, d2) {
+ toggleLayer(d2.id);
+ });
+ labelEnter.append("span").html(function(d2) {
+ return _t.html("map_data.layers." + d2.id + ".title");
+ });
+ li.merge(liEnter).classed("active", function(d2) {
+ return d2.layer.enabled();
+ }).selectAll("input").property("checked", function(d2) {
+ return d2.layer.enabled();
});
- selection2.call(_conflictsUi);
}
- function showErrors(errors) {
- keybindingOn();
- var selection2 = uiConfirm(context.container());
- selection2.select(".modal-section.header").append("h3").text(_t("save.error"));
- addErrors(selection2, errors);
- selection2.okButton();
+ function drawQAItems(selection2) {
+ var qaKeys = ["keepRight", "osmose"];
+ var qaLayers = layers.all().filter(function(obj) {
+ return qaKeys.indexOf(obj.id) !== -1;
+ });
+ var ul = selection2.selectAll(".layer-list-qa").data([0]);
+ ul = ul.enter().append("ul").attr("class", "layer-list layer-list-qa").merge(ul);
+ var li = ul.selectAll(".list-item").data(qaLayers);
+ li.exit().remove();
+ var liEnter = li.enter().append("li").attr("class", function(d2) {
+ return "list-item list-item-" + d2.id;
+ });
+ var labelEnter = liEnter.append("label").each(function(d2) {
+ select_default2(this).call(
+ uiTooltip().title(() => _t.append("map_data.layers." + d2.id + ".tooltip")).placement("bottom")
+ );
+ });
+ labelEnter.append("input").attr("type", "checkbox").on("change", function(d3_event, d2) {
+ toggleLayer(d2.id);
+ });
+ labelEnter.append("span").each(function(d2) {
+ _t.append("map_data.layers." + d2.id + ".title")(select_default2(this));
+ });
+ li.merge(liEnter).classed("active", function(d2) {
+ return d2.layer.enabled();
+ }).selectAll("input").property("checked", function(d2) {
+ return d2.layer.enabled();
+ });
}
- function addErrors(selection2, data) {
- var message = selection2.select(".modal-section.message-text");
- var items = message.selectAll(".error-container").data(data);
- var enter = items.enter().append("div").attr("class", "error-container");
- enter.append("a").attr("class", "error-description").attr("href", "#").classed("hide-toggle", true).text(function(d) {
- return d.msg || _t("save.unknown_error_details");
- }).on("click", function(d3_event) {
- d3_event.preventDefault();
- var error = select_default2(this);
- var detail = select_default2(this.nextElementSibling);
- var exp2 = error.classed("expanded");
- detail.style("display", exp2 ? "none" : "block");
- error.classed("expanded", !exp2);
+ function drawVectorItems(selection2) {
+ var dataLayer = layers.layer("data");
+ var vtData = [
+ {
+ name: "Detroit Neighborhoods/Parks",
+ src: "neighborhoods-parks",
+ tooltip: "Neighborhood boundaries and parks as compiled by City of Detroit in concert with community groups.",
+ template: "https://{switch:a,b,c,d}.tiles.mapbox.com/v4/jonahadkins.cjksmur6x34562qp9iv1u3ksf-54hev,jonahadkins.cjksmqxdx33jj2wp90xd9x2md-4e5y2/{z}/{x}/{y}.vector.pbf?access_token=pk.eyJ1Ijoiam9uYWhhZGtpbnMiLCJhIjoiRlVVVkx3VSJ9.9sdVEK_B_VkEXPjssU5MqA"
+ },
+ {
+ name: "Detroit Composite POIs",
+ src: "composite-poi",
+ tooltip: "Fire Inspections, Business Licenses, and other public location data collated from the City of Detroit.",
+ template: "https://{switch:a,b,c,d}.tiles.mapbox.com/v4/jonahadkins.cjksmm6a02sli31myxhsr7zf3-2sw8h/{z}/{x}/{y}.vector.pbf?access_token=pk.eyJ1Ijoiam9uYWhhZGtpbnMiLCJhIjoiRlVVVkx3VSJ9.9sdVEK_B_VkEXPjssU5MqA"
+ },
+ {
+ name: "Detroit All-The-Places POIs",
+ src: "alltheplaces-poi",
+ tooltip: "Public domain business location data created by web scrapers.",
+ template: "https://{switch:a,b,c,d}.tiles.mapbox.com/v4/jonahadkins.cjksmswgk340g2vo06p1w9w0j-8fjjc/{z}/{x}/{y}.vector.pbf?access_token=pk.eyJ1Ijoiam9uYWhhZGtpbnMiLCJhIjoiRlVVVkx3VSJ9.9sdVEK_B_VkEXPjssU5MqA"
+ }
+ ];
+ var detroit = geoExtent([-83.5, 42.1], [-82.8, 42.5]);
+ var showVectorItems = context.map().zoom() > 9 && detroit.contains(context.map().center());
+ var container = selection2.selectAll(".vectortile-container").data(showVectorItems ? [0] : []);
+ container.exit().remove();
+ var containerEnter = container.enter().append("div").attr("class", "vectortile-container");
+ containerEnter.append("h4").attr("class", "vectortile-header").text("Detroit Vector Tiles (Beta)");
+ containerEnter.append("ul").attr("class", "layer-list layer-list-vectortile");
+ containerEnter.append("div").attr("class", "vectortile-footer").append("a").attr("target", "_blank").call(svgIcon("#iD-icon-out-link", "inline")).attr("href", "https://github.com/osmus/detroit-mapping-challenge").append("span").text("About these layers");
+ container = container.merge(containerEnter);
+ var ul = container.selectAll(".layer-list-vectortile");
+ var li = ul.selectAll(".list-item").data(vtData);
+ li.exit().remove();
+ var liEnter = li.enter().append("li").attr("class", function(d2) {
+ return "list-item list-item-" + d2.src;
});
- var details = enter.append("div").attr("class", "error-detail-container").style("display", "none");
- details.append("ul").attr("class", "error-detail-list").selectAll("li").data(function(d) {
- return d.details || [];
- }).enter().append("li").attr("class", "error-detail-item").text(function(d) {
- return d;
+ var labelEnter = liEnter.append("label").each(function(d2) {
+ select_default2(this).call(
+ uiTooltip().title(d2.tooltip).placement("top")
+ );
});
- items.exit().remove();
+ labelEnter.append("input").attr("type", "radio").attr("name", "vectortile").on("change", selectVTLayer);
+ labelEnter.append("span").text(function(d2) {
+ return d2.name;
+ });
+ li.merge(liEnter).classed("active", isVTLayerSelected).selectAll("input").property("checked", isVTLayerSelected);
+ function isVTLayerSelected(d2) {
+ return dataLayer && dataLayer.template() === d2.template;
+ }
+ function selectVTLayer(d3_event, d2) {
+ corePreferences("settings-custom-data-url", d2.template);
+ if (dataLayer) {
+ dataLayer.template(d2.template, d2.src);
+ dataLayer.enabled(true);
+ }
+ }
}
- function showSuccess(changeset) {
- commit.reset();
- var ui = _success.changeset(changeset).location(_location).on("cancel", function() {
- context.ui().sidebar.hide();
+ function drawCustomDataItems(selection2) {
+ var dataLayer = layers.layer("data");
+ var hasData = dataLayer && dataLayer.hasData();
+ var showsData = hasData && dataLayer.enabled();
+ var ul = selection2.selectAll(".layer-list-data").data(dataLayer ? [0] : []);
+ ul.exit().remove();
+ var ulEnter = ul.enter().append("ul").attr("class", "layer-list layer-list-data");
+ var liEnter = ulEnter.append("li").attr("class", "list-item-data");
+ var labelEnter = liEnter.append("label").call(
+ uiTooltip().title(() => _t.append("map_data.layers.custom.tooltip")).placement("top")
+ );
+ labelEnter.append("input").attr("type", "checkbox").on("change", function() {
+ toggleLayer("data");
});
- context.enter(modeBrowse(context).sidebar(ui));
+ labelEnter.append("span").call(_t.append("map_data.layers.custom.title"));
+ liEnter.append("button").attr("class", "open-data-options").call(
+ uiTooltip().title(() => _t.append("settings.custom_data.tooltip")).placement(_mainLocalizer.textDirection() === "rtl" ? "right" : "left")
+ ).on("click", function(d3_event) {
+ d3_event.preventDefault();
+ editCustom();
+ }).call(svgIcon("#iD-icon-more"));
+ liEnter.append("button").attr("class", "zoom-to-data").call(
+ uiTooltip().title(() => _t.append("map_data.layers.custom.zoom")).placement(_mainLocalizer.textDirection() === "rtl" ? "right" : "left")
+ ).on("click", function(d3_event) {
+ if (select_default2(this).classed("disabled")) return;
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ dataLayer.fitZoom();
+ }).call(svgIcon("#iD-icon-framed-dot", "monochrome"));
+ ul = ul.merge(ulEnter);
+ ul.selectAll(".list-item-data").classed("active", showsData).selectAll("label").classed("deemphasize", !hasData).selectAll("input").property("disabled", !hasData).property("checked", showsData);
+ ul.selectAll("button.zoom-to-data").classed("disabled", !hasData);
}
- function keybindingOn() {
- select_default2(document).call(keybinding.on("\u238B", cancel, true));
+ function editCustom() {
+ context.container().call(settingsCustomData);
}
- function keybindingOff() {
- select_default2(document).call(keybinding.unbind);
+ function customChanged(d2) {
+ var dataLayer = layers.layer("data");
+ if (d2 && d2.url) {
+ dataLayer.url(d2.url);
+ } else if (d2 && d2.fileList) {
+ dataLayer.fileList(d2.fileList);
+ }
}
- function prepareForSuccess() {
- _success = uiSuccess(context);
- _location = null;
- if (!services.geocoder)
- return;
- services.geocoder.reverse(context.map().center(), function(err, result) {
- if (err || !result || !result.address)
- return;
- var addr = result.address;
- var place = addr && (addr.town || addr.city || addr.county) || "";
- var region = addr && (addr.state || addr.country) || "";
- var separator = place && region ? _t("success.thank_you_where.separator") : "";
- _location = _t(
- "success.thank_you_where.format",
- { place, separator, region }
- );
+ function drawPanelItems(selection2) {
+ var panelsListEnter = selection2.selectAll(".md-extras-list").data([0]).enter().append("ul").attr("class", "layer-list md-extras-list");
+ var historyPanelLabelEnter = panelsListEnter.append("li").attr("class", "history-panel-toggle-item").append("label").call(
+ uiTooltip().title(() => _t.append("map_data.history_panel.tooltip")).keys([uiCmd("\u2318\u21E7" + _t("info_panels.history.key"))]).placement("top")
+ );
+ historyPanelLabelEnter.append("input").attr("type", "checkbox").on("change", function(d3_event) {
+ d3_event.preventDefault();
+ context.ui().info.toggle("history");
});
+ historyPanelLabelEnter.append("span").call(_t.append("map_data.history_panel.title"));
+ var measurementPanelLabelEnter = panelsListEnter.append("li").attr("class", "measurement-panel-toggle-item").append("label").call(
+ uiTooltip().title(() => _t.append("map_data.measurement_panel.tooltip")).keys([uiCmd("\u2318\u21E7" + _t("info_panels.measurement.key"))]).placement("top")
+ );
+ measurementPanelLabelEnter.append("input").attr("type", "checkbox").on("change", function(d3_event) {
+ d3_event.preventDefault();
+ context.ui().info.toggle("measurement");
+ });
+ measurementPanelLabelEnter.append("span").call(_t.append("map_data.measurement_panel.title"));
}
- mode.selectedIDs = function() {
- return _conflictsUi ? _conflictsUi.shownEntityIds() : [];
- };
- mode.enter = function() {
- context.ui().sidebar.expand();
- function done() {
- context.ui().sidebar.show(commit);
- }
- keybindingOn();
- context.container().selectAll(".main-content").classed("active", false).classed("inactive", true);
- var osm = context.connection();
- if (!osm) {
- cancel();
- return;
- }
- if (osm.authenticated()) {
- done();
- } else {
- osm.authenticate(function(err) {
- if (err) {
- cancel();
- } else {
- done();
- }
- });
- }
- };
- mode.exit = function() {
- keybindingOff();
- context.container().selectAll(".main-content").classed("active", true).classed("inactive", false);
- context.ui().sidebar.hide();
- };
- return mode;
+ context.layers().on("change.uiSectionDataLayers", section.reRender);
+ context.map().on(
+ "move.uiSectionDataLayers",
+ debounce_default(function() {
+ window.requestIdleCallback(section.reRender);
+ }, 1e3)
+ );
+ return section;
}
- // modules/modes/select_error.js
- function modeSelectError(context, selectedErrorID, selectedErrorService) {
- var mode = {
- id: "select-error",
- button: "browse"
- };
- var keybinding = utilKeybinding("select-error");
- var errorService = services[selectedErrorService];
- var errorEditor;
- switch (selectedErrorService) {
- case "improveOSM":
- errorEditor = uiImproveOsmEditor(context).on("change", function() {
- context.map().pan([0, 0]);
- var error = checkSelectedID();
- if (!error)
- return;
- context.ui().sidebar.show(errorEditor.error(error));
- });
- break;
- case "keepRight":
- errorEditor = uiKeepRightEditor(context).on("change", function() {
- context.map().pan([0, 0]);
- var error = checkSelectedID();
- if (!error)
- return;
- context.ui().sidebar.show(errorEditor.error(error));
- });
- break;
- case "osmose":
- errorEditor = uiOsmoseEditor(context).on("change", function() {
- context.map().pan([0, 0]);
- var error = checkSelectedID();
- if (!error)
- return;
- context.ui().sidebar.show(errorEditor.error(error));
- });
- break;
- }
- var behaviors = [
- behaviorBreathe(context),
- behaviorHover(context),
- behaviorSelect(context),
- behaviorLasso(context),
- modeDragNode(context).behavior,
- modeDragNote(context).behavior
- ];
- function checkSelectedID() {
- if (!errorService)
- return;
- var error = errorService.getError(selectedErrorID);
- if (!error) {
- context.enter(modeBrowse(context));
- }
- return error;
+ // modules/ui/sections/map_features.js
+ function uiSectionMapFeatures(context) {
+ var _features = context.features().keys();
+ var section = uiSection("map-features", context).label(() => _t.append("map_data.map_features")).disclosureContent(renderDisclosureContent).expandedByDefault(false);
+ function renderDisclosureContent(selection2) {
+ var container = selection2.selectAll(".layer-feature-list-container").data([0]);
+ var containerEnter = container.enter().append("div").attr("class", "layer-feature-list-container");
+ containerEnter.append("ul").attr("class", "layer-list layer-feature-list");
+ var footer = containerEnter.append("div").attr("class", "feature-list-links section-footer");
+ footer.append("a").attr("class", "feature-list-link").attr("role", "button").attr("href", "#").call(_t.append("issues.disable_all")).on("click", function(d3_event) {
+ d3_event.preventDefault();
+ context.features().disableAll();
+ });
+ footer.append("a").attr("class", "feature-list-link").attr("role", "button").attr("href", "#").call(_t.append("issues.enable_all")).on("click", function(d3_event) {
+ d3_event.preventDefault();
+ context.features().enableAll();
+ });
+ container = container.merge(containerEnter);
+ container.selectAll(".layer-feature-list").call(drawListItems, _features, "checkbox", "feature", clickFeature, showsFeature);
}
- mode.zoomToSelected = function() {
- if (!errorService)
- return;
- var error = errorService.getError(selectedErrorID);
- if (error) {
- context.map().centerZoomEase(error.loc, 20);
- }
- };
- mode.enter = function() {
- var error = checkSelectedID();
- if (!error)
- return;
- behaviors.forEach(context.install);
- keybinding.on(_t("inspector.zoom_to.key"), mode.zoomToSelected).on("\u238B", esc, true);
- select_default2(document).call(keybinding);
- selectError();
- var sidebar = context.ui().sidebar;
- sidebar.show(errorEditor.error(error));
- context.map().on("drawn.select-error", selectError);
- function selectError(d3_event, drawn) {
- if (!checkSelectedID())
- return;
- var selection2 = context.surface().selectAll(".itemId-" + selectedErrorID + "." + selectedErrorService);
- if (selection2.empty()) {
- var source = d3_event && d3_event.type === "zoom" && d3_event.sourceEvent;
- if (drawn && source && (source.type === "pointermove" || source.type === "mousemove" || source.type === "touchmove")) {
- context.enter(modeBrowse(context));
+ function drawListItems(selection2, data, type2, name, change, active) {
+ var items = selection2.selectAll("li").data(data);
+ items.exit().remove();
+ var enter = items.enter().append("li").call(
+ uiTooltip().title(function(d2) {
+ var tip = _t.append(name + "." + d2 + ".tooltip");
+ if (autoHiddenFeature(d2)) {
+ var msg = showsLayer("osm") ? _t.append("map_data.autohidden") : _t.append("map_data.osmhidden");
+ return (selection3) => {
+ selection3.call(tip);
+ selection3.append("div").call(msg);
+ };
}
- } else {
- selection2.classed("selected", true);
- context.selectedErrorID(selectedErrorID);
- }
- }
- function esc() {
- if (context.container().select(".combobox").size())
- return;
- context.enter(modeBrowse(context));
- }
- };
- mode.exit = function() {
- behaviors.forEach(context.uninstall);
- select_default2(document).call(keybinding.unbind);
- context.surface().selectAll(".qaItem.selected").classed("selected hover", false);
- context.map().on("drawn.select-error", null);
- context.ui().sidebar.hide();
- context.selectedErrorID(null);
- context.features().forceVisible([]);
- };
- return mode;
- }
-
- // modules/ui/tools/modes.js
- function uiToolDrawModes(context) {
- var tool = {
- id: "old_modes",
- label: _t.append("toolbar.add_feature")
- };
- var modes = [
- modeAddPoint(context, {
- title: _t.append("modes.add_point.title"),
- button: "point",
- description: _t.append("modes.add_point.description"),
- preset: _mainPresetIndex.item("point"),
- key: "1"
- }),
- modeAddLine(context, {
- title: _t.append("modes.add_line.title"),
- button: "line",
- description: _t.append("modes.add_line.description"),
- preset: _mainPresetIndex.item("line"),
- key: "2"
- }),
- modeAddArea(context, {
- title: _t.append("modes.add_area.title"),
- button: "area",
- description: _t.append("modes.add_area.description"),
- preset: _mainPresetIndex.item("area"),
- key: "3"
- })
- ];
- function enabled(_mode) {
- return osmEditable();
+ return tip;
+ }).placement("top")
+ );
+ var label = enter.append("label");
+ label.append("input").attr("type", type2).attr("name", name).on("change", change);
+ label.append("span").html(function(d2) {
+ return _t.html(name + "." + d2 + ".description");
+ });
+ items = items.merge(enter);
+ items.classed("active", active).selectAll("input").property("checked", active).property("indeterminate", autoHiddenFeature);
}
- function osmEditable() {
- return context.editable();
+ function autoHiddenFeature(d2) {
+ return context.features().autoHidden(d2);
}
- modes.forEach(function(mode) {
- context.keybinding().on(mode.key, function() {
- if (!enabled(mode))
- return;
- if (mode.id === context.mode().id) {
- context.enter(modeBrowse(context));
- } else {
- context.enter(mode);
- }
- });
- });
- tool.render = function(selection2) {
- var wrap2 = selection2.append("div").attr("class", "joined").style("display", "flex");
- var debouncedUpdate = debounce_default(update, 500, { leading: true, trailing: true });
- context.map().on("move.modes", debouncedUpdate).on("drawn.modes", debouncedUpdate);
- context.on("enter.modes", update);
- update();
- function update() {
- var buttons = wrap2.selectAll("button.add-button").data(modes, function(d) {
- return d.id;
- });
- buttons.exit().remove();
- var buttonsEnter = buttons.enter().append("button").attr("class", function(d) {
- return d.id + " add-button bar-button";
- }).on("click.mode-buttons", function(d3_event, d) {
- if (!enabled(d))
- return;
- var currMode = context.mode().id;
- if (/^draw/.test(currMode))
- return;
- if (d.id === currMode) {
- context.enter(modeBrowse(context));
- } else {
- context.enter(d);
- }
- }).call(
- uiTooltip().placement("bottom").title(function(d) {
- return d.description;
- }).keys(function(d) {
- return [d.key];
- }).scrollContainer(context.container().select(".top-toolbar"))
- );
- buttonsEnter.each(function(d) {
- select_default2(this).call(svgIcon("#iD-icon-" + d.button));
- });
- buttonsEnter.append("span").attr("class", "label").text("").each(function(mode) {
- mode.title(select_default2(this));
- });
- if (buttons.enter().size() || buttons.exit().size()) {
- context.ui().checkOverflow(".top-toolbar", true);
- }
- buttons = buttons.merge(buttonsEnter).attr("aria-disabled", function(d) {
- return !enabled(d);
- }).classed("disabled", function(d) {
- return !enabled(d);
- }).attr("aria-pressed", function(d) {
- return context.mode() && context.mode().button === d.button;
- }).classed("active", function(d) {
- return context.mode() && context.mode().button === d.button;
- });
- }
- };
- return tool;
- }
-
- // modules/ui/tools/notes.js
- function uiToolNotes(context) {
- var tool = {
- id: "notes",
- label: _t.append("modes.add_note.label")
- };
- var mode = modeAddNote(context);
- function enabled() {
- return notesEnabled() && notesEditable();
+ function showsFeature(d2) {
+ return context.features().enabled(d2);
}
- function notesEnabled() {
- var noteLayer = context.layers().layer("notes");
- return noteLayer && noteLayer.enabled();
+ function clickFeature(d3_event, d2) {
+ context.features().toggle(d2);
}
- function notesEditable() {
- var mode2 = context.mode();
- return context.map().notesEditable() && mode2 && mode2.id !== "save";
+ function showsLayer(id2) {
+ var layer = context.layers().layer(id2);
+ return layer && layer.enabled();
}
- context.keybinding().on(mode.key, function() {
- if (!enabled())
- return;
- if (mode.id === context.mode().id) {
- context.enter(modeBrowse(context));
- } else {
- context.enter(mode);
- }
- });
- tool.render = function(selection2) {
- var debouncedUpdate = debounce_default(update, 500, { leading: true, trailing: true });
- context.map().on("move.notes", debouncedUpdate).on("drawn.notes", debouncedUpdate);
- context.on("enter.notes", update);
- update();
- function update() {
- var showNotes = notesEnabled();
- var data = showNotes ? [mode] : [];
- var buttons = selection2.selectAll("button.add-button").data(data, function(d) {
- return d.id;
- });
- buttons.exit().remove();
- var buttonsEnter = buttons.enter().append("button").attr("class", function(d) {
- return d.id + " add-button bar-button";
- }).on("click.notes", function(d3_event, d) {
- if (!enabled())
- return;
- var currMode = context.mode().id;
- if (/^draw/.test(currMode))
- return;
- if (d.id === currMode) {
- context.enter(modeBrowse(context));
- } else {
- context.enter(d);
- }
- }).call(
- uiTooltip().placement("bottom").title(function(d) {
- return d.description;
- }).keys(function(d) {
- return [d.key];
- }).scrollContainer(context.container().select(".top-toolbar"))
- );
- buttonsEnter.each(function(d) {
- select_default2(this).call(svgIcon(d.icon || "#iD-icon-" + d.button));
- });
- if (buttons.enter().size() || buttons.exit().size()) {
- context.ui().checkOverflow(".top-toolbar", true);
- }
- buttons = buttons.merge(buttonsEnter).classed("disabled", function() {
- return !enabled();
- }).attr("aria-disabled", function() {
- return !enabled();
- }).classed("active", function(d) {
- return context.mode() && context.mode().button === d.button;
- }).attr("aria-pressed", function(d) {
- return context.mode() && context.mode().button === d.button;
- });
- }
- };
- tool.uninstall = function() {
- context.on("enter.editor.notes", null).on("exit.editor.notes", null).on("enter.notes", null);
- context.map().on("move.notes", null).on("drawn.notes", null);
- };
- return tool;
+ context.features().on("change.map_features", section.reRender);
+ return section;
}
- // modules/ui/tools/save.js
- function uiToolSave(context) {
- var tool = {
- id: "save",
- label: _t.append("save.title")
- };
- var button = null;
- var tooltipBehavior = null;
- var history = context.history();
- var key = uiCmd("\u2318S");
- var _numChanges = 0;
- function isSaving() {
- var mode = context.mode();
- return mode && mode.id === "save";
+ // modules/ui/sections/map_style_options.js
+ function uiSectionMapStyleOptions(context) {
+ var section = uiSection("fill-area", context).label(() => _t.append("map_data.style_options")).disclosureContent(renderDisclosureContent).expandedByDefault(false);
+ function renderDisclosureContent(selection2) {
+ var container = selection2.selectAll(".layer-fill-list").data([0]);
+ container.enter().append("ul").attr("class", "layer-list layer-fill-list").merge(container).call(drawListItems, context.map().areaFillOptions, "radio", "area_fill", setFill, isActiveFill);
+ var container2 = selection2.selectAll(".layer-visual-diff-list").data([0]);
+ container2.enter().append("ul").attr("class", "layer-list layer-visual-diff-list").merge(container2).call(drawListItems, ["highlight_edits"], "checkbox", "visual_diff", toggleHighlightEdited, function() {
+ return context.surface().classed("highlight-edited");
+ });
}
- function isDisabled() {
- return _numChanges === 0 || isSaving();
+ function drawListItems(selection2, data, type2, name, change, active) {
+ var items = selection2.selectAll("li").data(data);
+ items.exit().remove();
+ var enter = items.enter().append("li").call(
+ uiTooltip().title(function(d2) {
+ return _t.append(name + "." + d2 + ".tooltip");
+ }).keys(function(d2) {
+ var key = d2 === "wireframe" ? _t("area_fill.wireframe.key") : null;
+ if (d2 === "highlight_edits") key = _t("map_data.highlight_edits.key");
+ return key ? [key] : null;
+ }).placement("top")
+ );
+ var label = enter.append("label");
+ label.append("input").attr("type", type2).attr("name", name).on("change", change);
+ label.append("span").html(function(d2) {
+ return _t.html(name + "." + d2 + ".description");
+ });
+ items = items.merge(enter);
+ items.classed("active", active).selectAll("input").property("checked", active).property("indeterminate", false);
}
- function save(d3_event) {
- d3_event.preventDefault();
- if (!context.inIntro() && !isSaving() && history.hasChanges()) {
- context.enter(modeSave(context));
- }
+ function isActiveFill(d2) {
+ return context.map().activeAreaFill() === d2;
}
- function bgColor(numChanges) {
- var step;
- if (numChanges === 0) {
- return null;
- } else if (numChanges <= 50) {
- step = numChanges / 50;
- return rgb_default("#fff", "#ff8")(step);
- } else {
- step = Math.min((numChanges - 50) / 50, 1);
- return rgb_default("#ff8", "#f88")(step);
- }
+ function toggleHighlightEdited(d3_event) {
+ d3_event.preventDefault();
+ context.map().toggleHighlightEdited();
}
- function updateCount() {
- var val = history.difference().summary().length;
- if (val === _numChanges)
- return;
- _numChanges = val;
- if (tooltipBehavior) {
- tooltipBehavior.title(() => _t.append(_numChanges > 0 ? "save.help" : "save.no_changes")).keys([key]);
- }
- if (button) {
- button.classed("disabled", isDisabled()).style("background", bgColor(_numChanges));
- button.select("span.count").text(_numChanges);
- }
+ function setFill(d3_event, d2) {
+ context.map().activeAreaFill(d2);
}
- tool.render = function(selection2) {
- tooltipBehavior = uiTooltip().placement("bottom").title(() => _t.append("save.no_changes")).keys([key]).scrollContainer(context.container().select(".top-toolbar"));
- var lastPointerUpType;
- button = selection2.append("button").attr("class", "save disabled bar-button").on("pointerup", function(d3_event) {
- lastPointerUpType = d3_event.pointerType;
- }).on("click", function(d3_event) {
- save(d3_event);
- if (_numChanges === 0 && (lastPointerUpType === "touch" || lastPointerUpType === "pen")) {
- context.ui().flash.duration(2e3).iconName("#iD-icon-save").iconClass("disabled").label(_t.append("save.no_changes"))();
- }
- lastPointerUpType = null;
- }).call(tooltipBehavior);
- button.call(svgIcon("#iD-icon-save"));
- button.append("span").attr("class", "count").attr("aria-hidden", "true").text("0");
- updateCount();
- context.keybinding().on(key, save, true);
- context.history().on("change.save", updateCount);
- context.on("enter.save", function() {
- if (button) {
- button.classed("disabled", isDisabled());
- if (isSaving()) {
- button.call(tooltipBehavior.hide);
- }
- }
- });
- };
- tool.uninstall = function() {
- context.keybinding().off(key, true);
- context.history().on("change.save", null);
- context.on("enter.save", null);
- button = null;
- tooltipBehavior = null;
- };
- return tool;
+ context.map().on("changeHighlighting.ui_style, changeAreaFill.ui_style", section.reRender);
+ return section;
}
- // modules/ui/tools/sidebar_toggle.js
- function uiToolSidebarToggle(context) {
- var tool = {
- id: "sidebar_toggle",
- label: _t.append("toolbar.inspect")
- };
- tool.render = function(selection2) {
- selection2.append("button").attr("class", "bar-button").attr("aria-label", _t("sidebar.tooltip")).on("click", function() {
- context.ui().sidebar.toggle();
- }).call(
- uiTooltip().placement("bottom").title(() => _t.append("sidebar.tooltip")).keys([_t("sidebar.key")]).scrollContainer(context.container().select(".top-toolbar"))
- ).call(svgIcon("#iD-icon-sidebar-" + (_mainLocalizer.textDirection() === "rtl" ? "right" : "left")));
- };
- return tool;
+ // modules/ui/settings/local_photos.js
+ function uiSettingsLocalPhotos(context) {
+ var dispatch14 = dispatch_default("change");
+ var photoLayer = context.layers().layer("local-photos");
+ var modal;
+ function render(selection2) {
+ modal = uiConfirm(selection2).okButton();
+ modal.classed("settings-modal settings-local-photos", true);
+ modal.select(".modal-section.header").append("h3").call(_t.append("local_photos.header"));
+ modal.select(".modal-section.message-text").append("div").classed("local-photos", true);
+ var instructionsSection = modal.select(".modal-section.message-text .local-photos").append("div").classed("instructions", true);
+ instructionsSection.append("p").classed("instructions-local-photos", true).call(_t.append("local_photos.file.instructions"));
+ instructionsSection.append("input").classed("field-file", true).attr("type", "file").attr("multiple", "multiple").attr("accept", ".jpg,.jpeg,.png,image/png,image/jpeg").style("visibility", "hidden").attr("id", "local-photo-files").on("change", function(d3_event) {
+ var files = d3_event.target.files;
+ if (files && files.length) {
+ photoList.select("ul").append("li").classed("placeholder", true).append("div");
+ dispatch14.call("change", this, files);
+ }
+ d3_event.target.value = null;
+ });
+ instructionsSection.append("label").attr("for", "local-photo-files").classed("button", true).call(_t.append("local_photos.file.label"));
+ const photoList = modal.select(".modal-section.message-text .local-photos").append("div").append("div").classed("list-local-photos", true);
+ photoList.append("ul");
+ updatePhotoList(photoList.select("ul"));
+ context.layers().on("change", () => updatePhotoList(photoList.select("ul")));
+ }
+ function updatePhotoList(container) {
+ var _a3;
+ function locationUnavailable(d2) {
+ return !(isArray_default(d2.loc) && isNumber_default(d2.loc[0]) && isNumber_default(d2.loc[1]));
+ }
+ container.selectAll("li.placeholder").remove();
+ let selection2 = container.selectAll("li").data((_a3 = photoLayer.getPhotos()) != null ? _a3 : [], (d2) => d2.id);
+ selection2.exit().remove();
+ const selectionEnter = selection2.enter().append("li");
+ selectionEnter.append("span").classed("filename", true);
+ selectionEnter.append("button").classed("form-field-button zoom-to-data", true).attr("title", _t("local_photos.zoom_single")).call(svgIcon("#iD-icon-framed-dot"));
+ selectionEnter.append("button").classed("form-field-button no-geolocation", true).call(svgIcon("#iD-icon-alert")).call(
+ uiTooltip().title(() => _t.append("local_photos.no_geolocation.tooltip")).placement("left")
+ );
+ selectionEnter.append("button").classed("form-field-button remove", true).attr("title", _t("icons.remove")).call(svgIcon("#iD-operation-delete"));
+ selection2 = selection2.merge(selectionEnter);
+ selection2.classed("invalid", locationUnavailable);
+ selection2.select("span.filename").text((d2) => d2.name).attr("title", (d2) => d2.name);
+ selection2.select("span.filename").on("click", (d3_event, d2) => {
+ photoLayer.openPhoto(d3_event, d2, false);
+ });
+ selection2.select("button.zoom-to-data").on("click", (d3_event, d2) => {
+ photoLayer.openPhoto(d3_event, d2, true);
+ });
+ selection2.select("button.remove").on("click", (d3_event, d2) => {
+ photoLayer.removePhoto(d2.id);
+ updatePhotoList(container);
+ });
+ }
+ return utilRebind(render, dispatch14, "on");
}
- // modules/ui/tools/undo_redo.js
- function uiToolUndoRedo(context) {
- var tool = {
- id: "undo_redo",
- label: _t.append("toolbar.undo_redo")
- };
- var commands = [{
- id: "undo",
- cmd: uiCmd("\u2318Z"),
- action: function() {
- context.undo();
- },
- annotation: function() {
- return context.history().undoAnnotation();
- },
- icon: "iD-icon-" + (_mainLocalizer.textDirection() === "rtl" ? "redo" : "undo")
- }, {
- id: "redo",
- cmd: uiCmd("\u2318\u21E7Z"),
- action: function() {
- context.redo();
- },
- annotation: function() {
- return context.history().redoAnnotation();
- },
- icon: "iD-icon-" + (_mainLocalizer.textDirection() === "rtl" ? "undo" : "redo")
- }];
- function editable() {
- return context.mode() && context.mode().id !== "save" && context.map().editableDataEnabled(true);
+ // modules/ui/sections/photo_overlays.js
+ function uiSectionPhotoOverlays(context) {
+ var settingsLocalPhotos = uiSettingsLocalPhotos(context).on("change", localPhotosChanged);
+ var layers = context.layers();
+ var section = uiSection("photo-overlays", context).label(() => _t.append("photo_overlays.title")).disclosureContent(renderDisclosureContent).expandedByDefault(false);
+ function renderDisclosureContent(selection2) {
+ var container = selection2.selectAll(".photo-overlay-container").data([0]);
+ container.enter().append("div").attr("class", "photo-overlay-container").merge(container).call(drawPhotoItems).call(drawPhotoTypeItems).call(drawDateFilter).call(drawUsernameFilter).call(drawLocalPhotos);
}
- tool.render = function(selection2) {
- var tooltipBehavior = uiTooltip().placement("bottom").title(function(d) {
- return d.annotation() ? _t.append(d.id + ".tooltip", { action: d.annotation() }) : _t.append(d.id + ".nothing");
- }).keys(function(d) {
- return [d.cmd];
- }).scrollContainer(context.container().select(".top-toolbar"));
- var lastPointerUpType;
- var buttons = selection2.selectAll("button").data(commands).enter().append("button").attr("class", function(d) {
- return "disabled " + d.id + "-button bar-button";
- }).on("pointerup", function(d3_event) {
- lastPointerUpType = d3_event.pointerType;
- }).on("click", function(d3_event, d) {
- d3_event.preventDefault();
- var annotation = d.annotation();
- if (editable() && annotation) {
- d.action();
+ function drawPhotoItems(selection2) {
+ var photoKeys = context.photos().overlayLayerIDs();
+ var photoLayers = layers.all().filter(function(obj) {
+ return photoKeys.indexOf(obj.id) !== -1;
+ });
+ var data = photoLayers.filter(function(obj) {
+ if (!obj.layer.supported()) return false;
+ if (layerEnabled(obj)) return true;
+ if (typeof obj.layer.validHere === "function") {
+ return obj.layer.validHere(context.map().extent(), context.map().zoom());
}
- if (editable() && (lastPointerUpType === "touch" || lastPointerUpType === "pen")) {
- var label = annotation ? _t.append(d.id + ".tooltip", { action: annotation }) : _t.append(d.id + ".nothing");
- context.ui().flash.duration(2e3).iconName("#" + d.icon).iconClass(annotation ? "" : "disabled").label(label)();
+ return true;
+ });
+ function layerSupported(d2) {
+ return d2.layer && d2.layer.supported();
+ }
+ function layerEnabled(d2) {
+ return layerSupported(d2) && d2.layer.enabled();
+ }
+ function layerRendered(d2) {
+ var _a3, _b3, _c;
+ return (_c = (_b3 = (_a3 = d2.layer).rendered) == null ? void 0 : _b3.call(_a3, context.map().zoom())) != null ? _c : true;
+ }
+ var ul = selection2.selectAll(".layer-list-photos").data([0]);
+ ul = ul.enter().append("ul").attr("class", "layer-list layer-list-photos").merge(ul);
+ var li = ul.selectAll(".list-item-photos").data(data, (d2) => d2.id);
+ li.exit().remove();
+ var liEnter = li.enter().append("li").attr("class", function(d2) {
+ var classes = "list-item-photos list-item-" + d2.id;
+ if (d2.id === "mapillary-signs" || d2.id === "mapillary-map-features") {
+ classes += " indented";
}
- lastPointerUpType = null;
- }).call(tooltipBehavior);
- buttons.each(function(d) {
- select_default2(this).call(svgIcon("#" + d.icon));
+ return classes;
});
- context.keybinding().on(commands[0].cmd, function(d3_event) {
- d3_event.preventDefault();
- if (editable())
- commands[0].action();
- }).on(commands[1].cmd, function(d3_event) {
- d3_event.preventDefault();
- if (editable())
- commands[1].action();
+ var labelEnter = liEnter.append("label").each(function(d2) {
+ var titleID;
+ if (d2.id === "mapillary-signs") titleID = "mapillary.signs.tooltip";
+ else if (d2.id === "mapillary") titleID = "mapillary_images.tooltip";
+ else if (d2.id === "kartaview") titleID = "kartaview_images.tooltip";
+ else titleID = d2.id.replace(/-/g, "_") + ".tooltip";
+ select_default2(this).call(
+ uiTooltip().title(() => {
+ if (!layerRendered(d2)) {
+ return _t.append("street_side.minzoom_tooltip");
+ } else {
+ return _t.append(titleID);
+ }
+ }).placement("top")
+ );
});
- var debouncedUpdate = debounce_default(update, 500, { leading: true, trailing: true });
- context.map().on("move.undo_redo", debouncedUpdate).on("drawn.undo_redo", debouncedUpdate);
- context.history().on("change.undo_redo", function(difference) {
- if (difference)
- update();
+ labelEnter.append("input").attr("type", "checkbox").on("change", function(d3_event, d2) {
+ toggleLayer(d2.id);
});
- context.on("enter.undo_redo", update);
- function update() {
- buttons.classed("disabled", function(d) {
- return !editable() || !d.annotation();
- }).each(function() {
- var selection3 = select_default2(this);
- if (!selection3.select(".tooltip.in").empty()) {
- selection3.call(tooltipBehavior.updateContent);
- }
- });
- }
- };
- tool.uninstall = function() {
- context.keybinding().off(commands[0].cmd).off(commands[1].cmd);
- context.map().on("move.undo_redo", null).on("drawn.undo_redo", null);
- context.history().on("change.undo_redo", null);
- context.on("enter.undo_redo", null);
- };
- return tool;
- }
-
- // modules/ui/top_toolbar.js
- function uiTopToolbar(context) {
- var sidebarToggle = uiToolSidebarToggle(context), modes = uiToolDrawModes(context), notes = uiToolNotes(context), undoRedo = uiToolUndoRedo(context), save = uiToolSave(context);
- function notesEnabled() {
- var noteLayer = context.layers().layer("notes");
- return noteLayer && noteLayer.enabled();
- }
- function topToolbar(bar) {
- bar.on("wheel.topToolbar", function(d3_event) {
- if (!d3_event.deltaX) {
- bar.node().scrollLeft += d3_event.deltaY;
- }
+ labelEnter.append("span").html(function(d2) {
+ var id2 = d2.id;
+ if (id2 === "mapillary-signs") id2 = "photo_overlays.traffic_signs";
+ return _t.html(id2.replace(/-/g, "_") + ".title");
});
- var debouncedUpdate = debounce_default(update, 500, { leading: true, trailing: true });
- context.layers().on("change.topToolbar", debouncedUpdate);
- update();
- function update() {
- var tools = [
- sidebarToggle,
- "spacer",
- modes
- ];
- tools.push("spacer");
- if (notesEnabled()) {
- tools = tools.concat([notes, "spacer"]);
- }
- tools = tools.concat([undoRedo, save]);
- var toolbarItems = bar.selectAll(".toolbar-item").data(tools, function(d) {
- return d.id || d;
- });
- toolbarItems.exit().each(function(d) {
- if (d.uninstall) {
- d.uninstall();
- }
- }).remove();
- var itemsEnter = toolbarItems.enter().append("div").attr("class", function(d) {
- var classes = "toolbar-item " + (d.id || d).replace("_", "-");
- if (d.klass)
- classes += " " + d.klass;
- return classes;
- });
- var actionableItems = itemsEnter.filter(function(d) {
- return d !== "spacer";
- });
- actionableItems.append("div").attr("class", "item-content").each(function(d) {
- select_default2(this).call(d.render, bar);
- });
- actionableItems.append("div").attr("class", "item-label").each(function(d) {
- d.label(select_default2(this));
- });
- }
- }
- return topToolbar;
- }
-
- // modules/ui/zoom_to_selection.js
- function uiZoomToSelection(context) {
- function isDisabled() {
- var mode = context.mode();
- return !mode || !mode.zoomToSelected;
- }
- var _lastPointerUpType;
- function pointerup(d3_event) {
- _lastPointerUpType = d3_event.pointerType;
- }
- function click(d3_event) {
- d3_event.preventDefault();
- if (isDisabled()) {
- if (_lastPointerUpType === "touch" || _lastPointerUpType === "pen") {
- context.ui().flash.duration(2e3).iconName("#iD-icon-framed-dot").iconClass("disabled").label(_t.append("inspector.zoom_to.no_selection"))();
- }
- } else {
- var mode = context.mode();
- if (mode && mode.zoomToSelected) {
- mode.zoomToSelected();
- }
- }
- _lastPointerUpType = null;
- }
- return function(selection2) {
- var tooltipBehavior = uiTooltip().placement(_mainLocalizer.textDirection() === "rtl" ? "right" : "left").title(function() {
- if (isDisabled()) {
- return _t.append("inspector.zoom_to.no_selection");
- }
- return _t.append("inspector.zoom_to.title");
- }).keys([_t("inspector.zoom_to.key")]);
- var button = selection2.append("button").on("pointerup", pointerup).on("click", click).call(svgIcon("#iD-icon-framed-dot", "light")).call(tooltipBehavior);
- function setEnabledState() {
- button.classed("disabled", isDisabled());
- if (!button.select(".tooltip.in").empty()) {
- button.call(tooltipBehavior.updateContent);
- }
- }
- context.on("enter.uiZoomToSelection", setEnabledState);
- setEnabledState();
- };
- }
-
- // modules/ui/pane.js
- function uiPane(id2, context) {
- var _key;
- var _label = "";
- var _description = "";
- var _iconName = "";
- var _sections;
- var _paneSelection = select_default2(null);
- var _paneTooltip;
- var pane = {
- id: id2
- };
- pane.label = function(val) {
- if (!arguments.length)
- return _label;
- _label = val;
- return pane;
- };
- pane.key = function(val) {
- if (!arguments.length)
- return _key;
- _key = val;
- return pane;
- };
- pane.description = function(val) {
- if (!arguments.length)
- return _description;
- _description = val;
- return pane;
- };
- pane.iconName = function(val) {
- if (!arguments.length)
- return _iconName;
- _iconName = val;
- return pane;
- };
- pane.sections = function(val) {
- if (!arguments.length)
- return _sections;
- _sections = val;
- return pane;
- };
- pane.selection = function() {
- return _paneSelection;
- };
- function hidePane() {
- context.ui().togglePanes();
- }
- pane.togglePane = function(d3_event) {
- if (d3_event)
- d3_event.preventDefault();
- _paneTooltip.hide();
- context.ui().togglePanes(!_paneSelection.classed("shown") ? _paneSelection : void 0);
- };
- pane.renderToggleButton = function(selection2) {
- if (!_paneTooltip) {
- _paneTooltip = uiTooltip().placement(_mainLocalizer.textDirection() === "rtl" ? "right" : "left").title(() => _description).keys([_key]);
- }
- selection2.append("button").on("click", pane.togglePane).call(svgIcon("#" + _iconName, "light")).call(_paneTooltip);
- };
- pane.renderContent = function(selection2) {
- if (_sections) {
- _sections.forEach(function(section) {
- selection2.call(section.render);
- });
- }
- };
- pane.renderPane = function(selection2) {
- _paneSelection = selection2.append("div").attr("class", "fillL map-pane hide " + id2 + "-pane").attr("pane", id2);
- var heading = _paneSelection.append("div").attr("class", "pane-heading");
- heading.append("h2").text("").call(_label);
- heading.append("button").attr("title", _t("icons.close")).on("click", hidePane).call(svgIcon("#iD-icon-close"));
- _paneSelection.append("div").attr("class", "pane-content").call(pane.renderContent);
- if (_key) {
- context.keybinding().on(_key, pane.togglePane);
- }
- };
- return pane;
- }
-
- // modules/ui/sections/background_display_options.js
- function uiSectionBackgroundDisplayOptions(context) {
- var section = uiSection("background-display-options", context).label(() => _t.append("background.display_options")).disclosureContent(renderDisclosureContent);
- var _storedOpacity = corePreferences("background-opacity");
- var _minVal = 0;
- var _maxVal = 3;
- var _sliders = ["brightness", "contrast", "saturation", "sharpness"];
- var _options = {
- brightness: _storedOpacity !== null ? +_storedOpacity : 1,
- contrast: 1,
- saturation: 1,
- sharpness: 1
- };
- function clamp3(x, min3, max3) {
- return Math.max(min3, Math.min(x, max3));
+ li.merge(liEnter).classed("active", layerEnabled).selectAll("input").property("disabled", (d2) => !layerRendered(d2)).property("checked", layerEnabled);
}
- function updateValue(d, val) {
- val = clamp3(val, _minVal, _maxVal);
- _options[d] = val;
- context.background()[d](val);
- if (d === "brightness") {
- corePreferences("background-opacity", val);
+ function drawPhotoTypeItems(selection2) {
+ var data = context.photos().allPhotoTypes();
+ function typeEnabled(d2) {
+ return context.photos().showsPhotoType(d2);
}
- section.reRender();
- }
- function renderDisclosureContent(selection2) {
- var container = selection2.selectAll(".display-options-container").data([0]);
- var containerEnter = container.enter().append("div").attr("class", "display-options-container controls-list");
- var slidersEnter = containerEnter.selectAll(".display-control").data(_sliders).enter().append("label").attr("class", function(d) {
- return "display-control display-control-" + d;
+ var ul = selection2.selectAll(".layer-list-photo-types").data([0]);
+ ul.exit().remove();
+ ul = ul.enter().append("ul").attr("class", "layer-list layer-list-photo-types").merge(ul);
+ var li = ul.selectAll(".list-item-photo-types").data(context.photos().shouldFilterByPhotoType() ? data : []);
+ li.exit().remove();
+ var liEnter = li.enter().append("li").attr("class", function(d2) {
+ return "list-item-photo-types list-item-" + d2;
});
- slidersEnter.html(function(d) {
- return _t.html("background." + d);
- }).append("span").attr("class", function(d) {
- return "display-option-value display-option-value-" + d;
+ var labelEnter = liEnter.append("label").each(function(d2) {
+ select_default2(this).call(
+ uiTooltip().title(() => _t.append("photo_overlays.photo_type." + d2 + ".tooltip")).placement("top")
+ );
});
- var sildersControlEnter = slidersEnter.append("div").attr("class", "control-wrap");
- sildersControlEnter.append("input").attr("class", function(d) {
- return "display-option-input display-option-input-" + d;
- }).attr("type", "range").attr("min", _minVal).attr("max", _maxVal).attr("step", "0.05").on("input", function(d3_event, d) {
- var val = select_default2(this).property("value");
- if (!val && d3_event && d3_event.target) {
- val = d3_event.target.value;
- }
- updateValue(d, val);
+ labelEnter.append("input").attr("type", "checkbox").on("change", function(d3_event, d2) {
+ context.photos().togglePhotoType(d2);
});
- sildersControlEnter.append("button").attr("title", function(d) {
- return `${_t("background.reset")} ${_t("background." + d)}`;
- }).attr("class", function(d) {
- return "display-option-reset display-option-reset-" + d;
- }).on("click", function(d3_event, d) {
- if (d3_event.button !== 0)
- return;
- updateValue(d, 1);
- }).call(svgIcon("#iD-icon-" + (_mainLocalizer.textDirection() === "rtl" ? "redo" : "undo")));
- containerEnter.append("a").attr("class", "display-option-resetlink").attr("role", "button").attr("href", "#").call(_t.append("background.reset_all")).on("click", function(d3_event) {
- d3_event.preventDefault();
- for (var i2 = 0; i2 < _sliders.length; i2++) {
- updateValue(_sliders[i2], 1);
- }
+ labelEnter.append("span").html(function(d2) {
+ return _t.html("photo_overlays.photo_type." + d2 + ".title");
});
- container = containerEnter.merge(container);
- container.selectAll(".display-option-input").property("value", function(d) {
- return _options[d];
+ li.merge(liEnter).classed("active", typeEnabled).selectAll("input").property("checked", typeEnabled);
+ }
+ function drawDateFilter(selection2) {
+ var data = context.photos().dateFilters();
+ function filterEnabled(d2) {
+ return context.photos().dateFilterValue(d2);
+ }
+ var ul = selection2.selectAll(".layer-list-date-filter").data([0]);
+ ul.exit().remove();
+ ul = ul.enter().append("ul").attr("class", "layer-list layer-list-date-filter").merge(ul);
+ var li = ul.selectAll(".list-item-date-filter").data(context.photos().shouldFilterByDate() ? data : []);
+ li.exit().remove();
+ var liEnter = li.enter().append("li").attr("class", "list-item-date-filter");
+ var labelEnter = liEnter.append("label").each(function(d2) {
+ select_default2(this).call(
+ uiTooltip().title(() => _t.append("photo_overlays.date_filter." + d2 + ".tooltip")).placement("top")
+ );
});
- container.selectAll(".display-option-value").text(function(d) {
- return Math.floor(_options[d] * 100) + "%";
+ labelEnter.append("span").each(function(d2) {
+ _t.append("photo_overlays.date_filter." + d2 + ".title")(select_default2(this));
});
- container.selectAll(".display-option-reset").classed("disabled", function(d) {
- return _options[d] === 1;
+ labelEnter.append("input").attr("type", "date").attr("class", "list-item-input").attr("placeholder", _t("units.year_month_day")).call(utilNoAuto).each(function(d2) {
+ utilGetSetValue(select_default2(this), context.photos().dateFilterValue(d2) || "");
+ }).on("change", function(d3_event, d2) {
+ var value = utilGetSetValue(select_default2(this)).trim();
+ context.photos().setDateFilter(d2, value, true);
+ li.selectAll("input").each(function(d4) {
+ utilGetSetValue(select_default2(this), context.photos().dateFilterValue(d4) || "");
+ });
});
- if (containerEnter.size() && _options.brightness !== 1) {
- context.background().brightness(_options.brightness);
- }
+ li = li.merge(liEnter).classed("active", filterEnabled);
}
- return section;
- }
-
- // modules/ui/settings/custom_background.js
- function uiSettingsCustomBackground() {
- var dispatch10 = dispatch_default("change");
- function render(selection2) {
- var _origSettings = {
- template: corePreferences("background-custom-template")
- };
- var _currSettings = {
- template: corePreferences("background-custom-template")
- };
- var example = "https://{switch:a,b,c}.tile.openstreetmap.org/{zoom}/{x}/{y}.png";
- var modal = uiConfirm(selection2).okButton();
- modal.classed("settings-modal settings-custom-background", true);
- modal.select(".modal-section.header").append("h3").call(_t.append("settings.custom_background.header"));
- var textSection = modal.select(".modal-section.message-text");
- var instructions = `${_t.html("settings.custom_background.instructions.info")}
-
-#### ${_t.html("settings.custom_background.instructions.wms.tokens_label")}
-* ${_t.html("settings.custom_background.instructions.wms.tokens.proj")}
-* ${_t.html("settings.custom_background.instructions.wms.tokens.wkid")}
-* ${_t.html("settings.custom_background.instructions.wms.tokens.dimensions")}
-* ${_t.html("settings.custom_background.instructions.wms.tokens.bbox")}
-
-#### ${_t.html("settings.custom_background.instructions.tms.tokens_label")}
-* ${_t.html("settings.custom_background.instructions.tms.tokens.xyz")}
-* ${_t.html("settings.custom_background.instructions.tms.tokens.flipped_y")}
-* ${_t.html("settings.custom_background.instructions.tms.tokens.switch")}
-* ${_t.html("settings.custom_background.instructions.tms.tokens.quadtile")}
-* ${_t.html("settings.custom_background.instructions.tms.tokens.scale_factor")}
-
-#### ${_t.html("settings.custom_background.instructions.example")}
-\`${example}\``;
- textSection.append("div").attr("class", "instructions-template").html(marked(instructions));
- textSection.append("textarea").attr("class", "field-template").attr("placeholder", _t("settings.custom_background.template.placeholder")).call(utilNoAuto).property("value", _currSettings.template);
- var buttonSection = modal.select(".modal-section.buttons");
- buttonSection.insert("button", ".ok-button").attr("class", "button cancel-button secondary-action").call(_t.append("confirm.cancel"));
- buttonSection.select(".cancel-button").on("click.cancel", clickCancel);
- buttonSection.select(".ok-button").attr("disabled", isSaveDisabled).on("click.save", clickSave);
- function isSaveDisabled() {
- return null;
- }
- function clickCancel() {
- textSection.select(".field-template").property("value", _origSettings.template);
- corePreferences("background-custom-template", _origSettings.template);
- this.blur();
- modal.close();
+ function drawUsernameFilter(selection2) {
+ function filterEnabled() {
+ return context.photos().usernames();
}
- function clickSave() {
- _currSettings.template = textSection.select(".field-template").property("value");
- corePreferences("background-custom-template", _currSettings.template);
- this.blur();
- modal.close();
- dispatch10.call("change", this, _currSettings);
+ var ul = selection2.selectAll(".layer-list-username-filter").data([0]);
+ ul.exit().remove();
+ ul = ul.enter().append("ul").attr("class", "layer-list layer-list-username-filter").merge(ul);
+ var li = ul.selectAll(".list-item-username-filter").data(context.photos().shouldFilterByUsername() ? ["username-filter"] : []);
+ li.exit().remove();
+ var liEnter = li.enter().append("li").attr("class", "list-item-username-filter");
+ var labelEnter = liEnter.append("label").each(function() {
+ select_default2(this).call(
+ uiTooltip().title(() => _t.append("photo_overlays.username_filter.tooltip")).placement("top")
+ );
+ });
+ labelEnter.append("span").call(_t.append("photo_overlays.username_filter.title"));
+ labelEnter.append("input").attr("type", "text").attr("class", "list-item-input").call(utilNoAuto).property("value", usernameValue).on("change", function() {
+ var value = select_default2(this).property("value");
+ context.photos().setUsernameFilter(value, true);
+ select_default2(this).property("value", usernameValue);
+ });
+ li.merge(liEnter).classed("active", filterEnabled);
+ function usernameValue() {
+ var usernames = context.photos().usernames();
+ if (usernames) return usernames.join("; ");
+ return usernames;
}
}
- return utilRebind(render, dispatch10, "on");
- }
-
- // modules/ui/sections/background_list.js
- function uiSectionBackgroundList(context) {
- var _backgroundList = select_default2(null);
- var _customSource = context.background().findSource("custom");
- var _settingsCustomBackground = uiSettingsCustomBackground(context).on("change", customChanged);
- var section = uiSection("background-list", context).label(() => _t.append("background.backgrounds")).disclosureContent(renderDisclosureContent);
- function previousBackgroundID() {
- return corePreferences("background-last-used-toggle");
+ function toggleLayer(which) {
+ setLayer(which, !showsLayer(which));
}
- function renderDisclosureContent(selection2) {
- var container = selection2.selectAll(".layer-background-list").data([0]);
- _backgroundList = container.enter().append("ul").attr("class", "layer-list layer-background-list").attr("dir", "auto").merge(container);
- var bgExtrasListEnter = selection2.selectAll(".bg-extras-list").data([0]).enter().append("ul").attr("class", "layer-list bg-extras-list");
- var minimapLabelEnter = bgExtrasListEnter.append("li").attr("class", "minimap-toggle-item").append("label").call(
- uiTooltip().title(() => _t.append("background.minimap.tooltip")).keys([_t("background.minimap.key")]).placement("top")
- );
- minimapLabelEnter.append("input").attr("type", "checkbox").on("change", function(d3_event) {
- d3_event.preventDefault();
- uiMapInMap.toggle();
- });
- minimapLabelEnter.append("span").call(_t.append("background.minimap.description"));
- var panelLabelEnter = bgExtrasListEnter.append("li").attr("class", "background-panel-toggle-item").append("label").call(
- uiTooltip().title(() => _t.append("background.panel.tooltip")).keys([uiCmd("\u2318\u21E7" + _t("info_panels.background.key"))]).placement("top")
- );
- panelLabelEnter.append("input").attr("type", "checkbox").on("change", function(d3_event) {
- d3_event.preventDefault();
- context.ui().info.toggle("background");
- });
- panelLabelEnter.append("span").call(_t.append("background.panel.description"));
- var locPanelLabelEnter = bgExtrasListEnter.append("li").attr("class", "location-panel-toggle-item").append("label").call(
- uiTooltip().title(() => _t.append("background.location_panel.tooltip")).keys([uiCmd("\u2318\u21E7" + _t("info_panels.location.key"))]).placement("top")
- );
- locPanelLabelEnter.append("input").attr("type", "checkbox").on("change", function(d3_event) {
- d3_event.preventDefault();
- context.ui().info.toggle("location");
- });
- locPanelLabelEnter.append("span").call(_t.append("background.location_panel.description"));
- selection2.selectAll(".imagery-faq").data([0]).enter().append("div").attr("class", "imagery-faq").append("a").attr("target", "_blank").call(svgIcon("#iD-icon-out-link", "inline")).attr("href", "https://github.com/openstreetmap/iD/blob/develop/FAQ.md#how-can-i-report-an-issue-with-background-imagery").append("span").call(_t.append("background.imagery_problem_faq"));
- _backgroundList.call(drawListItems, "radio", function(d3_event, d) {
- chooseBackground(d);
- }, function(d) {
- return !d.isHidden() && !d.overlay;
- });
+ function showsLayer(which) {
+ var layer = layers.layer(which);
+ if (layer) {
+ return layer.enabled();
+ }
+ return false;
}
- function setTooltips(selection2) {
- selection2.each(function(d, i2, nodes) {
- var item = select_default2(this).select("label");
- var span = item.select("span");
- var placement = i2 < nodes.length / 2 ? "bottom" : "top";
- var hasDescription = d.hasDescription();
- var isOverflowing = span.property("clientWidth") !== span.property("scrollWidth");
- item.call(uiTooltip().destroyAny);
- if (d.id === previousBackgroundID()) {
- item.call(
- uiTooltip().placement(placement).title(() => _t.append("background.switch")).keys([uiCmd("\u2318" + _t("background.key"))])
- );
- } else if (hasDescription || isOverflowing) {
- item.call(
- uiTooltip().placement(placement).title(() => hasDescription ? d.description() : d.label())
- );
- }
- });
+ function setLayer(which, enabled) {
+ var layer = layers.layer(which);
+ if (layer) {
+ layer.enabled(enabled);
+ }
}
- function drawListItems(layerList, type3, change, filter2) {
- var sources = context.background().sources(context.map().extent(), context.map().zoom(), true).filter(filter2).sort(function(a, b) {
- return a.best() && !b.best() ? -1 : b.best() && !a.best() ? 1 : descending(a.area(), b.area()) || ascending(a.name(), b.name()) || 0;
- });
- var layerLinks = layerList.selectAll("li").data(sources, function(d, i2) {
- return d.id + "---" + i2;
- });
- layerLinks.exit().remove();
- var enter = layerLinks.enter().append("li").classed("layer-custom", function(d) {
- return d.id === "custom";
- }).classed("best", function(d) {
- return d.best();
- });
- var label = enter.append("label");
- label.append("input").attr("type", type3).attr("name", "background-layer").attr("value", function(d) {
- return d.id;
- }).on("change", change);
- label.append("span").each(function(d) {
- d.label()(select_default2(this));
- });
- enter.filter(function(d) {
- return d.id === "custom";
- }).append("button").attr("class", "layer-browse").call(
- uiTooltip().title(() => _t.append("settings.custom_background.tooltip")).placement(_mainLocalizer.textDirection() === "rtl" ? "right" : "left")
+ function drawLocalPhotos(selection2) {
+ var photoLayer = layers.layer("local-photos");
+ var hasData = photoLayer && photoLayer.hasData();
+ var showsData = hasData && photoLayer.enabled();
+ var ul = selection2.selectAll(".layer-list-local-photos").data(photoLayer ? [0] : []);
+ ul.exit().remove();
+ var ulEnter = ul.enter().append("ul").attr("class", "layer-list layer-list-local-photos");
+ var localPhotosEnter = ulEnter.append("li").attr("class", "list-item-local-photos");
+ var localPhotosLabelEnter = localPhotosEnter.append("label").call(uiTooltip().title(() => _t.append("local_photos.tooltip")));
+ localPhotosLabelEnter.append("input").attr("type", "checkbox").on("change", function() {
+ toggleLayer("local-photos");
+ });
+ localPhotosLabelEnter.call(_t.append("local_photos.header"));
+ localPhotosEnter.append("button").attr("class", "open-data-options").call(
+ uiTooltip().title(() => _t.append("local_photos.tooltip_edit")).placement(_mainLocalizer.textDirection() === "rtl" ? "right" : "left")
).on("click", function(d3_event) {
d3_event.preventDefault();
- editCustom();
+ editLocalPhotos();
}).call(svgIcon("#iD-icon-more"));
- enter.filter(function(d) {
- return d.best();
- }).append("div").attr("class", "best").call(
- uiTooltip().title(() => _t.append("background.best_imagery")).placement(_mainLocalizer.textDirection() === "rtl" ? "right" : "left")
- ).append("span").text("\u2605");
- layerList.call(updateLayerSelections);
- }
- function updateLayerSelections(selection2) {
- function active(d) {
- return context.background().showsLayer(d);
- }
- selection2.selectAll("li").classed("active", active).classed("switch", function(d) {
- return d.id === previousBackgroundID();
- }).call(setTooltips).selectAll("input").property("checked", active);
- }
- function chooseBackground(d) {
- if (d.id === "custom" && !d.template()) {
- return editCustom();
- }
- var previousBackground = context.background().baseLayerSource();
- corePreferences("background-last-used-toggle", previousBackground.id);
- corePreferences("background-last-used", d.id);
- context.background().baseLayerSource(d);
+ localPhotosEnter.append("button").attr("class", "zoom-to-data").call(
+ uiTooltip().title(() => _t.append("local_photos.zoom")).placement(_mainLocalizer.textDirection() === "rtl" ? "right" : "left")
+ ).on("click", function(d3_event) {
+ if (select_default2(this).classed("disabled")) return;
+ d3_event.preventDefault();
+ d3_event.stopPropagation();
+ photoLayer.fitZoom();
+ }).call(svgIcon("#iD-icon-framed-dot", "monochrome"));
+ ul = ul.merge(ulEnter);
+ ul.selectAll(".list-item-local-photos").classed("active", showsData).selectAll("label").classed("deemphasize", !hasData).selectAll("input").property("disabled", !hasData).property("checked", showsData);
+ ul.selectAll("button.zoom-to-data").classed("disabled", !hasData);
}
- function customChanged(d) {
- if (d && d.template) {
- _customSource.template(d.template);
- chooseBackground(_customSource);
- } else {
- _customSource.template("");
- chooseBackground(context.background().findSource("none"));
- }
+ function editLocalPhotos() {
+ context.container().call(settingsLocalPhotos);
}
- function editCustom() {
- context.container().call(_settingsCustomBackground);
+ function localPhotosChanged(d2) {
+ var localPhotosLayer = layers.layer("local-photos");
+ localPhotosLayer.fileList(d2);
}
- context.background().on("change.background_list", function() {
- _backgroundList.call(updateLayerSelections);
- });
+ context.layers().on("change.uiSectionPhotoOverlays", section.reRender);
+ context.photos().on("change.uiSectionPhotoOverlays", section.reRender);
context.map().on(
- "move.background_list",
+ "move.photo_overlays",
debounce_default(function() {
window.requestIdleCallback(section.reRender);
}, 1e3)
@@ -68172,2161 +70301,5481 @@ ${content}
return section;
}
- // modules/ui/sections/background_offset.js
- function uiSectionBackgroundOffset(context) {
- var section = uiSection("background-offset", context).label(() => _t.append("background.fix_misalignment")).disclosureContent(renderDisclosureContent).expandedByDefault(false);
- var _pointerPrefix = "PointerEvent" in window ? "pointer" : "mouse";
- var _directions = [
- ["top", [0, -0.5]],
- ["left", [-0.5, 0]],
- ["right", [0.5, 0]],
- ["bottom", [0, 0.5]]
- ];
- function updateValue() {
- var meters = geoOffsetToMeters(context.background().offset());
- var x = +meters[0].toFixed(2);
- var y = +meters[1].toFixed(2);
- context.container().selectAll(".nudge-inner-rect").select("input").classed("error", false).property("value", x + ", " + y);
- context.container().selectAll(".nudge-reset").classed("disabled", function() {
- return x === 0 && y === 0;
- });
- }
- function resetOffset() {
- context.background().offset([0, 0]);
- updateValue();
- }
- function nudge(d) {
- context.background().nudge(d, context.map().zoom());
- updateValue();
- }
- function inputOffset() {
- var input = select_default2(this);
- var d = input.node().value;
- if (d === "")
- return resetOffset();
- d = d.replace(/;/g, ",").split(",").map(function(n2) {
- return !isNaN(n2) && n2;
- });
- if (d.length !== 2 || !d[0] || !d[1]) {
- input.classed("error", true);
- return;
- }
- context.background().offset(geoMetersToOffset(d));
- updateValue();
- }
- function dragOffset(d3_event) {
- if (d3_event.button !== 0)
- return;
- var origin = [d3_event.clientX, d3_event.clientY];
- var pointerId = d3_event.pointerId || "mouse";
- context.container().append("div").attr("class", "nudge-surface");
- select_default2(window).on(_pointerPrefix + "move.drag-bg-offset", pointermove).on(_pointerPrefix + "up.drag-bg-offset", pointerup);
- if (_pointerPrefix === "pointer") {
- select_default2(window).on("pointercancel.drag-bg-offset", pointerup);
- }
- function pointermove(d3_event2) {
- if (pointerId !== (d3_event2.pointerId || "mouse"))
- return;
- var latest = [d3_event2.clientX, d3_event2.clientY];
- var d = [
- -(origin[0] - latest[0]) / 4,
- -(origin[1] - latest[1]) / 4
- ];
- origin = latest;
- nudge(d);
- }
- function pointerup(d3_event2) {
- if (pointerId !== (d3_event2.pointerId || "mouse"))
- return;
- if (d3_event2.button !== 0)
- return;
- context.container().selectAll(".nudge-surface").remove();
- select_default2(window).on(".drag-bg-offset", null);
- }
- }
- function renderDisclosureContent(selection2) {
- var container = selection2.selectAll(".nudge-container").data([0]);
- var containerEnter = container.enter().append("div").attr("class", "nudge-container");
- containerEnter.append("div").attr("class", "nudge-instructions").call(_t.append("background.offset"));
- var nudgeWrapEnter = containerEnter.append("div").attr("class", "nudge-controls-wrap");
- var nudgeEnter = nudgeWrapEnter.append("div").attr("class", "nudge-outer-rect").on(_pointerPrefix + "down", dragOffset);
- nudgeEnter.append("div").attr("class", "nudge-inner-rect").append("input").attr("type", "text").attr("aria-label", _t("background.offset_label")).on("change", inputOffset);
- nudgeWrapEnter.append("div").selectAll("button").data(_directions).enter().append("button").attr("title", function(d) {
- return _t(`background.nudge.${d[0]}`);
- }).attr("class", function(d) {
- return d[0] + " nudge";
- }).on("click", function(d3_event, d) {
- nudge(d[1]);
- });
- nudgeWrapEnter.append("button").attr("title", _t("background.reset")).attr("class", "nudge-reset disabled").on("click", function(d3_event) {
- d3_event.preventDefault();
- resetOffset();
- }).call(svgIcon("#iD-icon-" + (_mainLocalizer.textDirection() === "rtl" ? "redo" : "undo")));
- updateValue();
- }
- context.background().on("change.backgroundOffset-update", updateValue);
- return section;
+ // modules/ui/panes/map_data.js
+ function uiPaneMapData(context) {
+ var mapDataPane = uiPane("map-data", context).key(_t("map_data.key")).label(_t.append("map_data.title")).description(_t.append("map_data.description")).iconName("iD-icon-data").sections([
+ uiSectionDataLayers(context),
+ uiSectionPhotoOverlays(context),
+ uiSectionMapStyleOptions(context),
+ uiSectionMapFeatures(context)
+ ]);
+ return mapDataPane;
}
- // modules/ui/sections/overlay_list.js
- function uiSectionOverlayList(context) {
- var section = uiSection("overlay-list", context).label(() => _t.append("background.overlays")).disclosureContent(renderDisclosureContent);
- var _overlayList = select_default2(null);
- function setTooltips(selection2) {
- selection2.each(function(d, i2, nodes) {
- var item = select_default2(this).select("label");
- var span = item.select("span");
- var placement = i2 < nodes.length / 2 ? "bottom" : "top";
- var description = d.description();
- var isOverflowing = span.property("clientWidth") !== span.property("scrollWidth");
- item.call(uiTooltip().destroyAny);
- if (description || isOverflowing) {
- item.call(
- uiTooltip().placement(placement).title(() => description || d.name())
- );
- }
+ // modules/ui/panes/preferences.js
+ function uiPanePreferences(context) {
+ let preferencesPane = uiPane("preferences", context).key(_t("preferences.key")).label(_t.append("preferences.title")).description(_t.append("preferences.description")).iconName("fas-user-cog").sections([
+ uiSectionPrivacy(context)
+ ]);
+ return preferencesPane;
+ }
+
+ // modules/ui/init.js
+ function uiInit(context) {
+ var _initCounter = 0;
+ var _needWidth = {};
+ var _lastPointerType;
+ function render(container) {
+ container.on("click.ui", function(d3_event) {
+ if (d3_event.button !== 0) return;
+ if (!d3_event.composedPath) return;
+ var isOkayTarget = d3_event.composedPath().some(function(node) {
+ return node.nodeType === 1 && // clicking focuses it and/or changes a value
+ (node.nodeName === "INPUT" || // clicking